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

fix the issue that cannot handle the rspconfig without args

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11287 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi
2011-12-22 06:41:39 +00:00
parent efd242fc35
commit 99c1733f50
2 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1428,7 +1428,7 @@ sub rscan {
}
}
}
if ($type eq "fsp" || $type eq "blade" || $type eq "ppcblade") {
if ($type eq "fsp" || $type eq "ppcblade") {
# for the fsp, using the ppc.parent and ppc.id to match
# also get the fsp of the blade
my @ppclist = $db{'ppc'}->getAllNodeAttribs(['node','parent','id']);
@@ -1454,14 +1454,16 @@ sub rscan {
$u1->{nodetype} = "fsp";
$u1->{id} = $id;
$u1->{parent} = $mpa;
$db{ppc}->setAttribs($k1,$u1);
$db{ppc}{commit} = 1;
} elsif ($type eq "ppcblade") {
$u1->{hcp} = $fspname;
$u1->{nodetype} = "lpar";
$u1->{id} = "1";
$u1->{parent} = $fspname;
$db{ppc}->setAttribs($k1,$u1);
$db{ppc}{commit} = 1;
}
$db{ppc}->setAttribs($k1,$u1);
$db{ppc}{commit} = 1;
# Update the entry in mp table for ppcblade and general blade
if ($type ne "fsp") {
@@ -3621,9 +3623,18 @@ sub preprocess_request {
sub filter_nodes{
my ($req, $mpnodes, $fspnodes) = @_;
my @nodes = @{$req->{'node'}};
my $cmd = $req->{'command'}->[0];
my @args = @{$req->{'arg'}};
my (@nodes,@args,$cmd);
if (defined($req->{'node'})) {
@nodes = @{$req->{'node'}};
} else {
return 1;
}
if (defined($req->{'command'})) {
$cmd = $req->{'command'}->[0];
}
if (defined($req->{'arg'})) {
@args = @{$req->{'arg'}};
}
# get the nodes in the mp table
my $mptabhash;
my $mptab = xCAT::Table->new("mp");
@@ -3669,7 +3680,7 @@ sub filter_nodes{
push @{$mpnodes}, @mp;
push @{$fspnodes}, @commonfsp;
if (($cmd eq "rspconfig") && (grep /^(network|network=.*)$/, @args)) {
if (@args && ($cmd eq "rspconfig") && (grep /^(network|network=.*)$/, @args)) {
push @{$mpnodes}, @ngpfsp;
} else {
push @{$fspnodes}, @ngpfsp;

17
xCAT-server/lib/xcat/plugins/fsp.pm
View File

@@ -101,9 +101,18 @@ sub process_request {
sub filter_nodes{
my ($req, $mpnodes, $fspnodes) = @_;
my @nodes = @{$req->{'node'}};
my $cmd = $req->{'command'}->[0];
my @args = @{$req->{'arg'}};
my (@nodes,@args,$cmd);
if (defined($req->{'node'})) {
@nodes = @{$req->{'node'}};
} else {
return 1;
}
if (defined($req->{'command'})) {
$cmd = $req->{'command'}->[0];
}
if (defined($req->{'arg'})) {
@args = @{$req->{'arg'}};
}
# get the nodes in the mp table
my $mptabhash;
my $mptab = xCAT::Table->new("mp");
@@ -149,7 +158,7 @@ sub filter_nodes{
push @{$mpnodes}, @mp;
push @{$fspnodes}, @commonfsp;
if (($cmd eq "rspconfig") && (grep /^(network|network=.*)$/, @args)) {
if (@args && ($cmd eq "rspconfig") && (grep /^(network|network=.*)$/, @args)) {
push @{$mpnodes}, @ngpfsp;
} else {
push @{$fspnodes}, @ngpfsp;