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

FSP/BPA redundancy: modify the process of finding nodetype

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8529 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle 2010-12-30 09:00:43 +00:00
parent 173252fa88
commit 2bba1b7836
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xCAT-server/lib/xcat/plugins/lsslp.pm
View File

@ -2036,15 +2036,16 @@ sub do_resetnet {
next;
}
my $type = $nodetypetab->getNodeAttribs( $name, [qw(nodetype)]);
if ( !$type or !$type->{nodetype} ) {
#my $type = $nodetypetab->getNodeAttribs( $name, [qw(nodetype)]);
my $type = xCAT::DBobjUtils->getnodetype($name);
if ( !$type ) {
send_msg( $req, 0, "$name: no nodetype defined, skipping network reset" );
next;
}
# Skip frame and cec
if ( $type->{nodetype} eq "cec" or $type->{nodetype} eq "frame" ) {
send_msg( $req, 0, "$name: $type->{nodetype}, skipping network reset" );
if ( $type eq "cec" or $type eq "frame" ) {
send_msg( $req, 0, "$name: $type, skipping network reset" );
next;
}
@ -2058,14 +2059,14 @@ sub do_resetnet {
# Make the target that will reset its
# network interface
#####################################
$targets->{$type->{nodetype}}->{$namehash->{$name}}->{'args'} = "0.0.0.0,$name";
$targets->{$type->{nodetype}}->{$namehash->{$name}}->{'mac'} = $mac->{mac};
$targets->{$type->{nodetype}}->{$namehash->{$name}}->{'name'} = $name;
$targets->{$type->{nodetype}}->{$namehash->{$name}}->{'ip'} = $namehash->{$name};
$targets->{$type->{nodetype}}->{$namehash->{$name}}->{'type'} = $type->{nodetype};
if ( $type->{nodetype} !~ /^mm$/ ) {
$targets->{$type}->{$namehash->{$name}}->{'args'} = "0.0.0.0,$name";
$targets->{$type}->{$namehash->{$name}}->{'mac'} = $mac->{mac};
$targets->{$type}->{$namehash->{$name}}->{'name'} = $name;
$targets->{$type}->{$namehash->{$name}}->{'ip'} = $namehash->{$name};
$targets->{$type}->{$namehash->{$name}}->{'type'} = $type;
if ( $type !~ /^mm$/ ) {
my %netinfo = xCAT::DBobjUtils->getNetwkInfo( [$namehash->{$name}] );
$targets->{$type->{nodetype}}->{$namehash->{$name}}->{'args'} .= ",$netinfo{$namehash->{$name}}{'gateway'},$netinfo{$oi}{'mask'}";
$targets->{$type}->{$namehash->{$name}}->{'args'} .= ",$netinfo{$namehash->{$name}}{'gateway'},$netinfo{$oi}{'mask'}";
}
$ip_host->{$namehash->{$name}} = $name;
}