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

merge efix about rspconfig <noderange> textid

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12838 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
zhaoertao 2012-05-21 02:48:29 +00:00
parent bf86ee1a8a
commit 346a03ba5d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -555,6 +555,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');
@ -563,7 +564,7 @@ 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;
}
}
} else {
my $data;
if ($slot > 0) {
$data = $session->get([$bladeoname,$nodeid]);
@ -571,11 +572,11 @@ sub mpaconfig {
else {
$data = $session->get([$mmoname->{$mptype},0]);
}
$textid = 1;
push @cfgtext,"textid: $data";
foreach(@morenodeids) {
$data = $session->get([$bladeoname,$_]);
push @cfgtext,"textid: $data";
}
}
}
elsif ($parameter =~ /^snmpcfg$/i) {
@ -4106,6 +4107,7 @@ sub clicmds {
elsif (/^network_reset$/) { $result = network($t,$handled{$_},$mpa,$mm,$node,$nodeid,1); $reset=1; }
elsif (/^(USERID)$/) {$result = passwd($t, $mpa, $1, "=".$handled{$_}, $mm);}
elsif (/^userpassword$/) {$result = passwd($t, $mpa, $1, $handled{$_}, $mm);}
if (!defined($result)) {next;}
push @data, "$_: @$result";
$Rc |= shift(@$result);
push @cfgtext,@$result;
@ -4242,7 +4244,7 @@ sub mmtextid {
return([1,@data]);
}
my @data = $t->cmd("config -name \"$value\" -T system"); #on cmms, this identifier is frequently relevant...
return([0,"textid: $value"]);
return undef; #([0,"textid: $value"]);
}
sub get_blades_for_mpa {