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

modify the way of finding nodetype

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10028 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle 2011-07-07 02:38:07 +00:00
parent 78cfc4801f
commit 0e2b2088c0
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -689,13 +689,17 @@ sub preprocess_request
foreach my $n (@nodes)
{
# get the nodetype for each node
my $ntype = xCAT::DBobjUtils->getnodetype($n);
if ($ntype =~ /osi/) {
#my $ntype = xCAT::DBobjUtils->getnodetype($n);
my $ntable = xCAT::Table->new('nodetype');
if ($ntable) {
my $mytype = $ntable->getNodesAttribs($n,['nodetype']);
if ($mytype =~ /osi/) {
$Imsg++;
}
unless ($ntype =~ /osi/) {
push @tmplist, $n;
}
}
unless ($mytype =~ /osi/) {
push @tmplist, $n;
}
}
}
@nodes = @tmplist;
@ -1139,11 +1143,16 @@ sub process_request
foreach my $n (@{$req->{node}})
{
# get the nodetype for each node
my $ntype = xCAT::DBobjUtils->getnodetype($n);
# don't add if it is type "osi"
unless ($ntype =~ /osi/) {
#my $ntype = xCAT::DBobjUtils->getnodetype($n);
my $ntable = xCAT::Table->new('nodetype');
if ($ntable) {
my $ntype = $ntable->getNodesAttribs($n,['nodetype']);
# don't add if it is type "osi"
unless ($ntype =~ /osi/) {
push @tmplist, $n;
}
}
}
}
@{$req->{node}} = @tmplist;
}