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

Make sure the otherinterfaces attribute value is always up to date

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6560 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz
2010-06-18 16:33:31 +00:00
parent f1f41d2480
commit 8583cffdc4
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1963,20 +1963,24 @@ sub do_resetnet {
foreach my $host ( @hostslist ) {
my $name = $host->{node};
my $ip = $host->{ip};
my $oi = $host->{otherinterfaces};
my $oi;
#####################################
# Skip the node if the IP attributes
# is same as otherinterfaces or ip
# discovered
#####################################
if ( $namehash->{$name} ) {
$oi = $namehash->{$name};
$hoststab->setNodeAttribs( $name,{otherinterfaces=>$namehash->{$name}} );
} else {
$oi = $host->{otherinterfaces};
}
if ( !$reset_all ) {
if ( $namehash->{$name} ) {
if ( !$ip or $ip eq $namehash->{$name} ) {
send_msg( $req, 0, "$name: same ip address, skipping network reset" );
if ( $ip ne $oi) {
$hoststab->setNodeAttribs( $name,{otherinterfaces=>$namehash->{$name}} );
}
next;
}
} else {
@@ -2003,16 +2007,16 @@ sub do_resetnet {
# Make the target that will reset its
# network interface
#####################################
$targets->{$type->{nodetype}}->{$oi}->{'args'} = "0.0.0.0,$name";
$targets->{$type->{nodetype}}->{$oi}->{'mac'} = $mac->{mac};
$targets->{$type->{nodetype}}->{$oi}->{'name'} = $name;
$targets->{$type->{nodetype}}->{$oi}->{'ip'} = $oi;
$targets->{$type->{nodetype}}->{$oi}->{'type'} = $type->{nodetype};
$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$/ ) {
my %netinfo = xCAT::DBobjUtils->getNetwkInfo( [$oi] );
$targets->{$type->{nodetype}}->{$oi}->{'args'} .= ",$netinfo{$oi}{'gateway'},$netinfo{$oi}{'mask'}";
my %netinfo = xCAT::DBobjUtils->getNetwkInfo( [$namehash->{$name}] );
$targets->{$type->{nodetype}}->{$namehash->{$name}}->{'args'} .= ",$netinfo{$namehash->{$name}}{'gateway'},$netinfo{$oi}{'mask'}";
}
$ip_host->{$oi} = $name;
$ip_host->{$namehash->{$name}} = $name;
}
$result = undef;