From a64c7d0a60954e4651b325402a0e347ac1ed2cf1 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Wed, 21 Jul 2010 14:48:47 +0000 Subject: [PATCH] -bug 3031635, (really a feature to allow shortcut port names on another switch syntax) git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6814 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/MacMap.pm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/perl-xCAT/xCAT/MacMap.pm b/perl-xCAT/xCAT/MacMap.pm index d83417bdd..d69dc1006 100644 --- a/perl-xCAT/xCAT/MacMap.pm +++ b/perl-xCAT/xCAT/MacMap.pm @@ -51,6 +51,15 @@ OID, and have the switch table port value match exactly the format suggested by return 1; } } + + # dell 6248 convention + if ( $namepersnmp =~ /^Unit \d Port (\d+)$/ ) { + if ( $1 eq $namepercfg ) { + return 1; + } + } + + unless ($namepersnmp =~ /[^0123456789]$namepercfg\z/) { #Most common case, won't match at all return 0;