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

modified the output of fsp-api with query_connection, so modified the rscan and lshwconn

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6016 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jjhua 2010-05-07 09:28:52 +00:00
parent 0d4b44bc80
commit 932d6e0273
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
perl-xCAT/xCAT/FSPconn.pm
View File

@ -497,20 +497,21 @@ sub lshwconn
next;
}
if( $data =~ /state/) {
$data =~ /state=([\w\s]+),\(type=([\w-]+)\),\(serial-number=([\w]+)\),\(machinetype-model=([\w-]+)\),sp=([\w]+),\(ip-address=([\w.]+),([\w.]+)\)/ ;
$data =~ /state=([\w\s]+), type=([\w-]+), MTMS=([\w-\*]+), ([\w=]+), slot=([\w]+), ipadd=([\w.]+), alt_ipadd=([\w.]+)/ ;
#$data =~ /state=([\w\s]+),\(type=([\w-]+)\),\(serial-number=([\w]+)\),\(machinetype-model=([\w-]+)\),sp=([\w]+),\(ip-address=([\w.]+),([\w.]+)\)/ ;
print "parsing: $1,$2,$3,$4,$5,$6,$7\n";
my $state = $1;
my $type = $2;
my $sn = $3;
my $mtm = $4;
my $sp = $5;
my $mtms = $3;
my $sp = $4;
my $slot = $5;
my $ipadd = $6;
my $alt_ipaddr = $7;
if($ipadd ne $node_ip) {
$ipadd=$7;
$alt_ipaddr = $6;
}
$data = "sp=$sp,ipadd=$node_ip,alt_ipadd=$alt_ipaddr,state=$state";
$data = "$sp,ipadd=$node_ip,alt_ipadd=$alt_ipaddr,state=$state";
#my $s;
#foreach my $val ( @infomap ) {
# if ( $data =~ /@$val[0]=([\w.\-\s]+)/ ) {

15
perl-xCAT/xCAT/FSPscan.pm
View File

@ -118,17 +118,18 @@ sub enumerate {
#########################################
# GET CEC's information
#########################################
$data =~ /state=([\w\s]+),\(type=([\w-]+)\),\(serial-number=([\w]+)\),\(machinetype-model=([\w-]+)\),sp=([\w]+),\(ip-address=([\w.]+),([\w.]+)\)/ ;
print "parsing: $1,$2,$3,$4,$5,$6,$7\n";
#$data =~ /state=([\w\s]+),\(type=([\w-]+)\),\(serial-number=([\w]+)\),\(machinetype-model=([\w-]+)\),sp=([\w]+),\(ip-address=([\w.]+),([\w.]+)\)/ ;
$data =~ /state=([\w\s]+), type=([\w-]+), MTMS=([\w-]+)\*([\w-]+), ([\w=]+), slot=([\w]+), ipadd=([\w.]+), alt_ipadd=([\w.]+)/ ;
print "parsing: $1,$2,$3,$4,$5,$6,$7,$8\n";
my $fsp=$node_name;
my $model = $4;
my $serial = $3;
my $side = $5;
my $model = $3;
my $serial = $4;
my $side = $6;
$server = $fsp;
my $ips ="$6,$7";
my $ips ="$7,$8";
push @values, join( ",",
"fsp",$node_name,$cageid,$4,$3,$5, $server,$prof,$fname, $6);
"fsp",$node_name,$cageid,$model,$serial,$side, $server,$prof,$fname, $7);
#"fsp",$fsp,$cageid,$model,$serial,$side,$server,$prof,$fname,$ips );
#####################################