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

Fixed one issue in lsslp that the CEC name is possible to overwrite one of the FSP name.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.6@9589 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz
2011-05-13 06:29:49 +00:00
parent 9570d8f83b
commit bc4ff1b05f
1 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-server/lib/xcat/plugins/lsslp.pm
+27 -20
View File
@@ -2220,28 +2220,35 @@ sub parse_responses {
###########################################
$hostname = undef;
$host = "Server-$result[1]-SN$result[2]";
unless ( exists( $outhash{$host} ))
if ( $type eq SERVICE_BPA )
{
if ( $type eq SERVICE_BPA )
{
$result[0] = TYPE_FRAME;
}
else
{
$result[0] = TYPE_CEC;
}
# IP of frame and cec should be null
$result[3] = "";
# side of frame and cec should be null
$result[4] = "";
push @result, $rsp;
$hostname = gethost_from_url_or_old($host, $result[0], $result[1], $result[2],
$result[3],$result[4], $result[8],$result[5],$result[6]);
if ( $hostname )
{
$outhash{$hostname} = \@result;
}
$result[0] = TYPE_FRAME;
}
else
{
$result[0] = TYPE_CEC;
}
# IP of frame and cec should be null
$result[3] = "";
# side of frame and cec should be null
$result[4] = "";
push @result, $rsp;
$hostname = gethost_from_url_or_old($host, $result[0], $result[1], $result[2],
$result[3],$result[4], $result[8],$result[5],$result[6]);
if ( $hostname )
{
my $newhostname;
if ( exists( $outhash{$hostname} ) ) {
my $tmp = $outhash{$hostname};
if ( @$tmp[0] ne TYPE_FRAME and @$tmp[0] ne TYPE_CEC ) {
@$tmp[3] =~ /^(A|B)\-/;
$newhostname = $hostname."-".$1;
$outhash{$newhostname} = $tmp;
}
}
$outhash{$hostname} = \@result;
}
} else {
###########################################