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

FSP/BPA redundancy: parse input nodes, change CEC/Frame nodes into FSP/BPA nodes

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8688 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle
2011-01-18 06:11:32 +00:00
parent 737779fc4a
commit 8fa83d7571
1 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
xCAT-server/lib/xcat/plugins/dhcp.pm
View File

@@ -972,6 +972,32 @@ sub process_request
}
}
}
#need to transfer CEC/Frame to FSPs/BPAs
my @inodes = ();
my @validnodes = ();
my $pnode;
my $cnode;
if ($req->{node})
{
#@inodes = split /,/,${$req->{noderange}};
foreach $pnode(@{$req->{node}})
{
my $ntype = xCAT::DBobjUtils->getnodetype($pnode);
if ($ntype =~ /^(cec|frame)$/)
{
$cnode = xCAT::DBobjUtils->getchildren($pnode);
foreach (@$cnode)
{
push @validnodes, $_;
}
} else
{
push @validnodes, $pnode;
}
}
$req->{node} = \@validnodes;
}
if ((!$req->{node}) && (grep /^-a$/, @{$req->{arg}}))
{
if (grep /-d$/, @{$req->{arg}}) #delete all entries
@@ -981,7 +1007,12 @@ sub process_request
my @entries = ($nodelist->getAllNodeAttribs([qw(node)]));
foreach (@entries)
{
push @{$req->{node}}, $_->{node};
#delete the CEC and Frame node
my $ntype = xCAT::DBobjUtils->getnodetype($_->{node});
unless ($ntype =~ /^(cec|frame)$/)
{
push @{$req->{node}}, $_->{node};
}
}
}
else #add all entries