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

-Switch to common getMacAddress code

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7312 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2010-08-30 19:45:10 +00:00
parent c128792e1f
commit f6b9fc6a5f
1 changed files with 1 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
xCAT-server/lib/xcat/plugins/kvm.pm
View File

@@ -462,54 +462,13 @@ sub getNodeUUID {
sub build_nicstruct {
my $rethash;
my $node = shift;
my @macs=();
my @nics=();
if ($confdata->{vm}->{$node}->[0]->{nics}) {
@nics = split /,/,$confdata->{vm}->{$node}->[0]->{nics};
} else {
@nics = ('virbr0');
}
if ($confdata->{mac}->{$node}->[0]->{mac}) {
my $macdata=$confdata->{mac}->{$node}->[0]->{mac};
foreach my $macaddr (split /\|/,$macdata) {
$macaddr =~ s/\!.*//;
push @macs,$macaddr;
}
}
unless (scalar(@macs) >= scalar(@nics)) {
#TODO: MUST REPLACE WITH VMCOMMON CODE
my $neededmacs=scalar(@nics) - scalar(@macs);
my $macstr;
my $tmac;
my $leading;
srand;
while ($neededmacs--) {
my $allbutmult = 65279; # & mask for bitwise clearing of the multicast bit of mac
my $localad=512; # | to set the bit for locally admnistered mac address
$leading=int(rand(65535));
$leading=$leading|512;
$leading=$leading&65279;
my $n=inet_aton($node);
my $tail;
if ($n) {
$tail=unpack("N",$n);
}
unless ($tail) {
$tail=int(rand(4294967295));
}
$tmac = sprintf("%04x%08x",$leading,$tail);
$tmac =~ s/(..)(..)(..)(..)(..)(..)/$1:$2:$3:$4:$5:$6/;
if ($usedmacs{$tmac}) { #If we have a collision we can actually perceive, retry the generation of this mac
$neededmacs++;
next;
}
$usedmacs{$tmac}=1;
push @macs,$tmac;
}
#$mactab->setNodeAttribs($node,{mac=>join('|',@macs)});
#$nrtab->setNodeAttribs($node,{netboot=>'pxe'});
#$doreq->({command=>['makedhcp'],node=>[$node]});
}
my @macs=xCAT::VMCommon::getMacAddresses($confdata,$node,scalar @nics);
my @rethashes;
foreach (@macs) {
my $rethash;