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

fix for bug 3109394: makenetworks handle gateway in the networks table

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8160 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc 2010-11-15 12:26:20 +00:00
parent e9e176c111
commit d37c29b4f4
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xCAT-server/lib/xcat/plugins/networks.pm
View File

@ -372,6 +372,16 @@ sub donets
}
}
splice @rtable, 0, 2;
my %netgw = ();
foreach my $rtent (@rtable)
{
my @entarr = split /\s+/, $rtent;
if ($entarr[3] eq 'UG')
{
$netgw{$entarr[0]}{$entarr[2]} = $entarr[1];
}
}
foreach (@rtable)
{ #should be the lines to think about, do something with U, and something else with UG
@ -395,6 +405,12 @@ sub donets
$net = $ent[0];
$mask = $ent[2];
$mgtifname = $ent[7];
if (defined($netgw{$net}{$mask}))
{
$gw = $netgw{$net}{$mask}; #gateway for this network
} else {
$gw = $netgw{'0.0.0.0'}{'0.0.0.0'}; #default gatetway
}
# use convention for netname attr
my $netn;
@ -435,10 +451,14 @@ sub donets
push @{$rsp->{data}}, " objtype=network";
push @{$rsp->{data}}, " net=$net";
push @{$rsp->{data}}, " mask=$mask";
if ($gw)
{
push @{$rsp->{data}}, " gateway=$gw";
}
push @{$rsp->{data}}, " mgtifname=$mgtifname";
} else {
if (!$foundmatch) {
$nettab->setAttribs({'net' => $net, 'mask' => $mask}, {'netname' => $netname, 'mgtifname' => $mgtifname});
$nettab->setAttribs({'net' => $net, 'mask' => $mask}, {'netname' => $netname, 'mgtifname' => $mgtifname, 'gateway' => $gw});
}
}