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

Fix bug 3555910:lsslp -i gives reduntant info which is not specified by -i

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13483 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle 2012-08-11 06:23:35 +00:00
parent d5064385f8
commit 916bd86a87
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xCAT-server/lib/xcat/plugins/lsslp.pm
View File

@ -615,6 +615,12 @@ sub format_output {
}
###########################################
# filter the result in the same vlan
###########################################
if ( exists( $globalopt{i} )) {
my $outhash1 = filtersamevlan( $outhash );
$outhash = $outhash1;
}
# filter the result and keep the specified nodes
###########################################
if ( scalar(@filternodes)) {
@ -1634,7 +1640,6 @@ sub filter {
# Filter nodes not in the user specified vlan
##########################################################################
sub filtersamevlan {
my $request = shift;
my $oldhash = shift;
my $newhash;
my $nets = xCAT::NetworkUtils::my_nets();
@ -1647,12 +1652,12 @@ sub filtersamevlan {
}
}
foreach my $name ( keys %$oldhash ) {
if ($name->{type} =~ /^(fsp|bpa)$/) {
my $ip = $name->{ip};
if (${$oldhash->{$name}}{type} =~ /^(fsp|bpa)$/) {
my $ip = ${$oldhash->{$name}}{ip};
for my $net ( keys %$validnets){
my ($n,$m) = split /\//,$net;
if ( xCAT::NetworkUtils::isInSameSubnet( $n, $ip, $m, 1) and xCAT::NetworkUtils::isPingable( $ip)) {
$newhash->{$name} = ${$oldhash->{$name}}{hostname};
if ( xCAT::Utils::isInSameSubnet( $n, $ip, $m, 1)) {#and xCAT::Utils::isPingable( $ip)) {
$newhash->{$name} = $oldhash->{$name};
}
}
} else {