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

-Place dynamic range tracking into a place that will actually run

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6491 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2010-06-16 19:19:47 +00:00
parent 04cc2a0c2a
commit 9c58ca3672
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -714,7 +714,15 @@ sub process_request
}
}
my $nettab = xCAT::Table->new("networks");
my @vnets = $nettab->getAllAttribs('net','mgtifname','mask');
my @vnets = $nettab->getAllAttribs('net','mgtifname','mask','dynamicrange');
foreach (@vnets) {
my $trange = $_->{dynamicrange}; #temp range, the dollar sign makes it look strange
$trange =~ s/[,-]/ /g;
my $begin;
my $end;
($begin,$end) = split / /,$trange;
$dynamicranges{$trange}=[unpack("N*",inet_aton($begin)),unpack("N*",inet_aton($end))];
}
if ($^O eq 'aix')
{
@nrn = xCAT::Utils::get_subnet_aix();
@@ -1160,16 +1168,11 @@ sub addnet
}
if ($ent and $ent->{dynamicrange})
{
my $trange = $ent->{dynamicrange}; #temp range, the dollar sign makes it look strange
$trange =~ s/[,-]/ /g;
my $begin;
my $end;
($begin,$end) = split / /,$trange;
$dynamicranges{$trange}=[unpack("N*",inet_aton($begin)),unpack("N*",inet_aton($end))];
unless ($ent->{dhcpserver}
and xCAT::Utils->thishostisnot($ent->{dhcpserver}))
{ #If specific, only one dhcp server gets a dynamic range
$range = $trange;
$range = $ent->{dynamicrange};
$range =~ s/[,-]/ /g;
}
}
else