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

fix bug 3525896: FB rspconfig setting node name with testid= nor working. The modification is not output any information when setting.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12720 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
zhaoertao
2012-05-15 08:49:42 +00:00
parent fc92c7844a
commit b10ad91d3c
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
xCAT-server/lib/xcat/plugins/blade.pm
View File

@@ -553,6 +553,7 @@ sub mpaconfig {
next;
}
elsif ($parameter eq "textid") {
$textid = 1;
if ($assignment) {
my $txtid = ($value =~ /^\*/) ? $node : $value;
setoid("1.3.6.1.4.1.2.3.51.2.22.1.7.1.1.5",$nodeid,$txtid,'OCTET');
@@ -561,19 +562,18 @@ sub mpaconfig {
setoid("1.3.6.1.4.1.2.3.51.2.22.1.7.1.1.5",$_,$txtid.", slot $extrabay",'OCTET');
$extrabay+=1;
}
}
my $data;
if ($slot > 0) {
$data = $session->get([$bladeoname,$nodeid]);
}
else {
$data = $session->get([$mmoname->{$mptype},0]);
}
$textid = 1;
push @cfgtext,"textid: $data";
foreach(@morenodeids) {
$data = $session->get([$bladeoname,$_]);
push @cfgtext,"textid: $data";
} else {
my $data;
if ($slot > 0) {
$data = $session->get([$bladeoname,$nodeid]);
} else {
$data = $session->get([$mmoname->{$mptype},0]);
}
push @cfgtext,"textid: $data";
foreach(@morenodeids) {
$data = $session->get([$bladeoname,$_]);
push @cfgtext,"textid: $data";
}
}
}
elsif ($parameter =~ /^snmpcfg$/i) {
@@ -4057,6 +4057,9 @@ sub telnetcmds {
elsif (/^solcfg$/) { $result = solcfg($t,$handled{$_},$mm); }
elsif (/^network_reset$/) { $result = network($t,$handled{$_},$mpa,$mm,$node,$nodeid,1); }
elsif (/^(USERID)$/) {$result = passwd($t, $mpa, $1, $handled{$_}, $mm);}
if (!defined($result)) {
next;
}
push @data, "$_: @$result";
$Rc |= shift(@$result);
push @cfgtext,@$result;
@@ -4188,7 +4191,8 @@ sub mmtextid {
if (!grep(/OK/i,@data)) {
return([1,@data]);
}
return([0,"textid: $value"]);
return undef;
#return([0,"mmtextid: $value"]);
}
sub get_blades_for_mpa {