arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix 3com logic and BNT port detection

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3009 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2009-03-27 03:33:59 +00:00
parent 5df02b528f
commit 066d705b64
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
perl-xCAT/xCAT/MacMap.pm
View File

@ -45,16 +45,16 @@ OID, and have the switch table port value match exactly the format suggested by
}
#Begin guessing, first off, all tested scenarios have likely correct guesses ending
#in the cfg string, with some non-numeric prefix before it.
unless ($namepersnmp =~ /[^0123456789]$namepercfg\z/) {
#Most common case, won't match at all
return 0;
}
#3com convention, contributed by Aaron Knister
if ( $namepersnmp =~ /^RMON Port (0?)(\d+) on unit \d+/ ) {
if ( $2 =~ $namepercfg ) {
return 1;
}
}
unless ($namepersnmp =~ /[^0123456789]$namepercfg\z/) {
#Most common case, won't match at all
return 0;
}
#stop contemplating vlan, Nu, stacking ports, and console interfaces
if (($namepersnmp =~ /vl/i) or ($namepersnmp =~ /Nu/) or ($namepersnmp =~ /onsole/) or ($namepersnmp =~ /Stack/)) {
@ -62,7 +62,7 @@ OID, and have the switch table port value match exactly the format suggested by
}
#broken up for code readablitiy, don't check port channel numbers or CPU
#have to distinguish betweer Port and Po and PortChannel
if (($namepersnmp !~ /Port #/) and ($namepersnmp !~ /Port\d/) and ($namepersnmp =~ /Po/) or ($namepersnmp =~ /LAG/) or ($namepersnmp =~ /CPU/)) {
if (($namepersnmp !~ /Port #/) and ($namepersnmp !~ /Port\d/) and ($namepersnmp =~ /Po/) or ($namepersnmp =~ /po\d/) or ($namepersnmp =~ /XGE/) or ($namepersnmp =~ /LAG/) or ($namepersnmp =~ /CPU/)) {
return 0;
}
#don't contemplate ManagementEthernet