xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 17:46:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1311 from immarvin/onchdefnicsip

Browse Source 
fix issue nicips.enP5p7s0f1 can not removed from node definition. #1276
This commit is contained in:
Xiaopeng Wang 2016-06-16 14:22:02 +08:00 committed by GitHub
commit d03dec8d8b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
perl-xCAT/xCAT/DBobjUtils.pm
View File

@ -2541,10 +2541,8 @@ sub collapsenicsattr()
if ($1 && $2) {
# chdef <noderange> nicips.eth2= to remove the definition for eth2
# in this case, the $nodeattrhash->{'nicips.eth0'} is blank
if ($nodeattrhash->{$nodeattr}) {
# $nicattrs{nicips}{eth0} = "1.1.1.1|1.2.1.1"
$nicattrs{$1}{$2} = $nodeattrhash->{$nodeattr};
}
# $nicattrs{nicips}{eth0} = "1.1.1.1|1.2.1.1"
$nicattrs{$1}{$2} = $nodeattrhash->{$nodeattr};
# remove nicips.eth0 from the %::FILEATTRS
delete $nodeattrhash->{$nodeattr};
@ -2557,7 +2555,9 @@ sub collapsenicsattr()
my @tmparray = ();
foreach my $nicname (keys %{$nicattrs{$nicattr}}) {
# eth0!1.1.1.1|1.2.1.1
push @tmparray, "$nicname!$nicattrs{$nicattr}{$nicname}";
if($nicattrs{$nicattr}{$nicname}){
push @tmparray, "$nicname!$nicattrs{$nicattr}{$nicname}";
}
}
# eth0!1.1.1.1|1.2.1.1,eth1!2.1.1.1|2.2.1.1
$nodeattrhash->{$nicattr} = join(',', @tmparray);