FSP/BPA redundancy: modify the way of matching node in rscan

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8765 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle 2011-01-28 14:31:47 +00:00
parent 87954afea6
commit 3e5784c331

View File

@ -11,7 +11,6 @@ use xCAT::PPCdb;
use xCAT::GlobalDef;
use xCAT::Usage;
use xCAT::NetworkUtils;
use xCAT_plugin::lsslp;
##############################################
@ -410,29 +409,7 @@ sub format_output {
# Strip errors for results
#######################################
my @val = grep( !/^#.*: ERROR /, @$values );
#$values = xCAT::PPCdb::update_ppc( $hwtype, \@val );
foreach my $node (@val)
{
my ($ttype,$tname,$tid,$tmtm,$tsn,$ttmp,$thcp,$tprofile,$tparent) = split /,/, $node;
if ($ttype eq "cec" )
{
my $hostname = xCAT_plugin::lsslp::gethost_from_url_or_old($tname, "FSP", $tmtm, $tsn, "", "", $tid, "","");
if ($hostname ne $tname)
{
push @$values, join( ",",
"fsp",$hostname,$tid,$tmtm,$tsn,$ttmp,$thcp,$tprofile,$tparent,"");
}
}
if ($ttype eq "frame" )
{
my $hostname = xCAT_plugin::lsslp::gethost_from_url_or_old($tname, "BPA", $tmtm, $tsn, "", "", $tid, "","");
if ($hostname ne $tname)
{
push @$values, join( ",",
"bpa",$hostname,$tid,$tmtm,$tsn,$ttmp,$thcp,$tprofile,$tparent,"");
}
}
}
$values = xCAT::PPCdb::update_ppc( $hwtype, \@val );
if ( exists( $opt->{x} ) or exists( $opt->{z} ))
{
unshift @$values, "hmc";