Fix get_nim_attr_val

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4357 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott 2009-10-12 18:32:55 +00:00
parent 8a7619410e
commit 5207c665f5

View File

@ -3002,32 +3002,20 @@ sub get_nim_attr_val
}
chomp $target;
my $cmd = "/usr/sbin/lsnim -l $resname 2>/dev/null";
my $nout = &xcmd($callback, "xdsh", $target, $cmd, 1);
my @result = @$nout;
if ($::RUNCMD_RC != 0)
{
my $cmd = "/usr/sbin/lsnim -a location -Z $resname 2>/dev/null";
my $nout = &xcmd($callback, "xdsh", $target, $cmd, 0);
if ($::RUNCMD_RC != 0)
{
my $rsp;
push @{$rsp->{data}}, "Could not run lsnim command: \'$cmd\'.\n";
xCAT::MsgUtils->message("E", $rsp, $callback);
return 1;
}
foreach my $line (@result){
my ($junk, $out);
if (grep(/:/, $line)) { # strip off node name if used xdsh
($junk, $out) = split(/:/, $line);
}
my ($attr,$value) = split('\=', $out);
chomp $attr;
$attr =~ s/\s*//g; # remove blanks
chomp $value;
$value =~ s/^\s*//;
if ($attr eq $attrname) {
return $value;
}
push @{$rsp->{data}}, "Could not run lsnim command: \'$cmd\'.\n";
xCAT::MsgUtils->message("E", $rsp, $callback);
return undef;
}
return undef;
my ($junk, $junk, $junk, $loc) = split(/:/, $nout);
chomp $loc;
return $loc;
}