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

Modify the process of filter noderange and some mistakes.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9131 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle 2011-03-23 01:05:13 +00:00
parent ffb0268f5c
commit 1add2198f2
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,7 @@ my %mgt = (
lc(TYPE_RSA) => "blade"
);
my @attribs = qw(nodetype mtm serial side otherinterfaces groups mgt id parent mac hidden);
my @attribs = qw(nodetype mtm serial side ip groups mgt id parent mac hidden);
my $verbose = 0;
my %ip_addr = ();
my %slp_result = ();
@ -2830,8 +2830,10 @@ sub format_stanza {
if ( $type !~ /^(fsp|bpa|cec)$/ ) {
next;
}
} elsif ( /^otherinterfaces$/ ) {
} elsif ( /^ip$/ ) {
if ( $type =~ /^(frame|cec)$/ ) {
next;
}
} elsif (/^hidden$/) {
if ( $type =~ /^(fsp|bpa)$/ ) {
$d = "1";
@ -2921,8 +2923,10 @@ sub format_xml {
if ( $type !~ /^(fsp|bpa|cec)$/ ) {
next;
}
} elsif ( /^otherinterfaces$/ ) {
} elsif ( /^ip$/ ) {
if ( $type =~ /^(frame|cec)$/ ) {
next;
}
} elsif (/^hidden$/) {
if ( $type =~ /^(fsp|bpa)$/ ) {
$d = "1";
@ -3734,13 +3738,31 @@ sub copypasswd {
sub filter {
my $oldhash = shift;
my $newhash;
# find HMC/CEC/Frame that the user want to find
foreach my $n(@filternodes) {
for my $foundnode ( keys %$oldhash ) {
if ( $foundnode =~ /\Q$n\E/ ) {
for my $foundnode ( keys %$oldhash ) {
if ( $foundnode =~ /^(\w+)\(.*\)/ ) {
if ( $1 eq $n ) {
$newhash->{$foundnode} = $oldhash->{$foundnode};
}
}
elsif ( $foundnode eq $n ) {
$newhash->{$foundnode} = $oldhash->{$foundnode};
}
}
}
}
}
# fine the FSP/BPA nodes for the CEC/Frame.
for my $cn ( keys %$oldhash ) {
for my $pn ( keys %$newhash ) {
if ( (${$oldhash->{$cn}}[0] =~ /^(FSP|BPA)$/)
and (${$newhash->{$pn}}[2] eq ${$oldhash->{$cn}}[2])
and (${$newhash->{$pn}}[1] eq ${$oldhash->{$cn}}[1]) ) {
$newhash->{$cn} = $oldhash->{$cn};
}
}
}
return $newhash;
}
1;