From 1d8e565f6f38e30d3dca034be88b13b4614a14b2 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Tue, 14 Oct 2008 22:56:43 +0000 Subject: [PATCH] -3com naming convention fuzziness on switch search (from Aaron Knister) git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2348 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/MacMap.pm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/perl-xCAT/xCAT/MacMap.pm b/perl-xCAT/xCAT/MacMap.pm index 4eddb716a..8bdd5c941 100644 --- a/perl-xCAT/xCAT/MacMap.pm +++ b/perl-xCAT/xCAT/MacMap.pm @@ -50,6 +50,13 @@ OID, and have the switch table port value match exactly the format suggested by #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; + } + } + #stop contemplating vlan, Nu, and console interfaces if (($namepersnmp =~ /vl/i) or ($namepersnmp =~ /Nu/) or ($namepersnmp =~ /onsole/)) { return 0;