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

defect 3008429: handle the mac range for blade like a1->a5. This change will make all the mac a1,a2,a3,a4,a5 available for the getmacs command

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6277 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi
2010-05-31 09:11:05 +00:00
parent 48f4ef86ea
commit a36e7c4976
1 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
xCAT-server/lib/xcat/plugins/blade.pm
View File

@@ -1464,36 +1464,48 @@ sub getmacs {
return (0, @ret);
}
(my $code,my @macs)=inv('mac');
foreach (@macs) {
if (/(.*) ->/) { #Convert JS style mac ranges to pretend to be simple
#this is not a guarantee of how the macs work, but
#this is as complex as this function can reasonably accomodate
#if you need more complexity, the auto-discovery process
#can actually cope
my @macs = ();
(my $code,my @orig_macs)=inv('mac');
foreach my $mac (@orig_macs) {
push @macs, $mac;
if ($mac =~ /(.*) -> (.*)/) {
#Convert JS style mac ranges to pretend to be simple
#this is not a guarantee of how the macs work, but
#this is as complex as this function can reasonably accomodate
#if you need more complexity, the auto-discovery process
#can actually cope
my $basemac = $1;
my $lastmac = $2;
$basemac =~ s/mac address \d: //i;
$basemac =~ s/://g;
# Since 32bit Operating System can only handle 32bit integer,
# split the mac address as high 24bit and low 24bit
$basemac =~ /(......)(......)/;
my ($basemac_h6, $basemac_l6) = ($1, $2);
my $macnum_l6 = hex($basemac_l6);
my $macnum_h6 = hex($basemac_h6);
$macnum_l6 += 1;
if ($macnum_l6 > 0xFFFFFF) {
$macnum_h6 += 1;
$lastmac =~ s/mac address \d: //i;
while ($basemac ne $lastmac) {
$basemac =~ s/://g;
# Since 32bit Operating System can only handle 32bit integer,
# split the mac address as high 24bit and low 24bit
$basemac =~ /(......)(......)/;
my ($basemac_h6, $basemac_l6) = ($1, $2);
my $macnum_l6 = hex($basemac_l6);
my $macnum_h6 = hex($basemac_h6);
$macnum_l6 += 1;
if ($macnum_l6 > 0xFFFFFF) {
$macnum_h6 += 1;
}
my $newmac_l6 = sprintf("%06X", $macnum_l6);
$newmac_l6 =~ /(......)$/;
$newmac_l6 = $1;
my $newmac_h6 = sprintf("%06X", $macnum_h6);
my $newmac = $newmac_h6.$newmac_l6;
$newmac =~ s/(..)(..)(..)(..)(..)(..)/$1:$2:$3:$4:$5:$6/;
my $newidx = scalar(@macs)+1;
push @macs,"MAC Address $newidx: ".$newmac;
$basemac = $newmac;
}
my $newmac_l6 = sprintf("%06X", $macnum_l6);
$newmac_l6 =~ /(......)$/;
$newmac_l6 = $1;
my $newmac_h6 = sprintf("%06X", $macnum_h6);
my $newmac = $newmac_h6.$newmac_l6;
$newmac =~ s/(..)(..)(..)(..)(..)(..)/$1:$2:$3:$4:$5:$6/;
my $newidx = scalar(@macs)+1;
push @macs,"MAC Address $newidx: ".$newmac;
}
}
my $midx=0;
my @midxary;
my $nrtab = xCAT::Table->new('noderes');