From 4624ff5fe673827f64c94852ae8034a0f8df24c3 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Tue, 11 Sep 2012 13:42:33 +0000 Subject: [PATCH] Back off change to discovery process to care one way or another about 'primary' interface git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13761 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/MacMap.pm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/perl-xCAT/xCAT/MacMap.pm b/perl-xCAT/xCAT/MacMap.pm index 3d87f293b..b4a909ad5 100644 --- a/perl-xCAT/xCAT/MacMap.pm +++ b/perl-xCAT/xCAT/MacMap.pm @@ -334,16 +334,11 @@ sub refresh_table { } } my %checked_pairs; - my @entries = $self->{switchtab}->getAllNodeAttribs(['node','port','switch','interface']); + my @entries = $self->{switchtab}->getAllNodeAttribs(['node','port','switch']); #Build hash of switch port names per switch $self->{switches} = {}; foreach my $entry (@entries) { if (defined($entry->{switch}) and $entry->{switch} ne "" and defined($entry->{port}) and $entry->{port} ne "") { - #skip the none primary interface. - # The vlaue of the primary interface could be empty, primary or primary:ethx - if (defined($entry->{interface})) { - if ($entry->{interface} !~ /primary/) { next;} - } if ( !$self->{switches}->{$entry->{switch}}->{$entry->{port}}) {