fix the issue that nodediscoverdef -u -n command cannot move the discovered node to next destiny. And also formatted the indention that replace the tab with four space
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@16591 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi
parent
f6c559ca0a
commit
6a72e5feb6
@ -20,331 +20,333 @@ use xCAT::DiscoveryUtils;
|
||||
|
||||
|
||||
sub gethosttag {
|
||||
#This function tries to return a good hostname for a node based on the
|
||||
#network to which it is connected (by $netn or maybe $ifname)
|
||||
#heuristic:
|
||||
#if the client had a valid IP address from a dhcp server, that is used as key
|
||||
#once the matching network is found, and an explicit mapping defined, try that
|
||||
#next, try to see if the ip for the case where hostname==nodename is on this net, if so, return that
|
||||
#next, try to do nodename-ifname, return that if successful
|
||||
#next, repeat process for all networks that have the common mgtifname field
|
||||
#return undef for now if none of the above worked
|
||||
my $node = shift;
|
||||
my $netn = shift;
|
||||
my $ifname = shift;
|
||||
my $usednames = shift;
|
||||
my %netmap = %{xCAT::NetworkUtils::my_if_netmap()};
|
||||
my $mgtifname = $netmap{$netn};
|
||||
my $secondpass = 0;
|
||||
my $name = "";
|
||||
my $defhost = inet_aton($node);
|
||||
my $nettab = xCAT::Table->new('networks');
|
||||
my $defn="";
|
||||
my @netents = @{$nettab->getAllEntries()};
|
||||
my $pass;
|
||||
#TODO: mgtifname field will get trounced in hierarchical setup, use a live check to match accurately
|
||||
foreach (@netents) {
|
||||
if ($_->{net} eq $netn or ($mgtifname and $mgtifname eq $netmap{$_->{net}})) { #either is the network or shares physical interface
|
||||
if ($_->{nodehostname}) { #Check for a nodehostname rule in the table
|
||||
$name = $node;
|
||||
if ($_->{nodehostname} =~ /^\/[^\/]*\/[^\/]*\/$/)
|
||||
{
|
||||
my $exp = substr($_->{nodehostname}, 1);
|
||||
chop $exp;
|
||||
my @parts = split('/', $exp, 2);
|
||||
$name =~ s/$parts[0]/$parts[1]/;
|
||||
}
|
||||
elsif ($_->{nodehostname} =~ /^\|.*\|.*\|$/)
|
||||
{
|
||||
|
||||
#Perform arithmetic and only arithmetic operations in bracketed issues on the right.
|
||||
#Tricky part: don't allow potentially dangerous code, only eval if
|
||||
#to-be-evaled expression is only made up of ()\d+-/%$
|
||||
#Futher paranoia? use Safe module to make sure I'm good
|
||||
my $exp = substr($_->{nodehostname}, 1);
|
||||
chop $exp;
|
||||
my @parts = split('\|', $exp, 2);
|
||||
my $curr;
|
||||
my $next;
|
||||
my $prev;
|
||||
my $retval = $parts[1];
|
||||
($curr, $next, $prev) =
|
||||
extract_bracketed($retval, '()', qr/[^()]*/);
|
||||
|
||||
unless($curr) { #If there were no paramaters to save, treat this one like a plain regex
|
||||
$name =~ s/$parts[0]/$parts[1]/;
|
||||
}
|
||||
while ($curr)
|
||||
{
|
||||
#my $next = $comps[0];
|
||||
if ($curr =~ /^[\{\}()\-\+\/\%\*\$\d]+$/ or $curr =~ /^\(sprintf\(["'%\dcsduoxefg]+,\s*[\{\}()\-\+\/\%\*\$\d]+\)\)$/ )
|
||||
{
|
||||
use integer;
|
||||
#We only allow integer operations, they are the ones that make sense for the application
|
||||
my $value = $name;
|
||||
$value =~ s/$parts[0]/$curr/ee;
|
||||
$retval = $prev . $value . $next;
|
||||
}
|
||||
else
|
||||
{
|
||||
print "$curr is bad\n";
|
||||
}
|
||||
($curr, $next, $prev) =
|
||||
extract_bracketed($retval, '()', qr/[^()]*/);
|
||||
}
|
||||
#At this point, $retval is the expression after being arithmetically contemplated, a generated regex, and therefore
|
||||
#must be applied in total
|
||||
$name =~ s/$parts[0]/$retval/;
|
||||
|
||||
#print Data::Dumper::Dumper(extract_bracketed($parts[1],'()',qr/[^()]*/));
|
||||
#use text::balanced extract_bracketed to parse earch atom, make sure nothing but arith operators, parans, and numbers are in it to guard against code execution
|
||||
#This function tries to return a good hostname for a node based on the
|
||||
#network to which it is connected (by $netn or maybe $ifname)
|
||||
#heuristic:
|
||||
#if the client had a valid IP address from a dhcp server, that is used as key
|
||||
#once the matching network is found, and an explicit mapping defined, try that
|
||||
#next, try to see if the ip for the case where hostname==nodename is on this net, if so, return that
|
||||
#next, try to do nodename-ifname, return that if successful
|
||||
#next, repeat process for all networks that have the common mgtifname field
|
||||
#return undef for now if none of the above worked
|
||||
my $node = shift;
|
||||
my $netn = shift;
|
||||
my $ifname = shift;
|
||||
my $usednames = shift;
|
||||
my %netmap = %{xCAT::NetworkUtils::my_if_netmap()};
|
||||
my $mgtifname = $netmap{$netn};
|
||||
my $secondpass = 0;
|
||||
my $name = "";
|
||||
my $defhost = inet_aton($node);
|
||||
my $nettab = xCAT::Table->new('networks');
|
||||
my $defn="";
|
||||
my @netents = @{$nettab->getAllEntries()};
|
||||
my $pass;
|
||||
#TODO: mgtifname field will get trounced in hierarchical setup, use a live check to match accurately
|
||||
foreach (@netents) {
|
||||
if ($_->{net} eq $netn or ($mgtifname and $mgtifname eq $netmap{$_->{net}})) { #either is the network or shares physical interface
|
||||
if ($_->{nodehostname}) { #Check for a nodehostname rule in the table
|
||||
$name = $node;
|
||||
if ($_->{nodehostname} =~ /^\/[^\/]*\/[^\/]*\/$/) {
|
||||
my $exp = substr($_->{nodehostname}, 1);
|
||||
chop $exp;
|
||||
my @parts = split('/', $exp, 2);
|
||||
$name =~ s/$parts[0]/$parts[1]/;
|
||||
}
|
||||
elsif ($_->{nodehostname} =~ /^\|.*\|.*\|$/) {
|
||||
#Perform arithmetic and only arithmetic operations in bracketed issues on the right.
|
||||
#Tricky part: don't allow potentially dangerous code, only eval if
|
||||
#to-be-evaled expression is only made up of ()\d+-/%$
|
||||
#Futher paranoia? use Safe module to make sure I'm good
|
||||
my $exp = substr($_->{nodehostname}, 1);
|
||||
chop $exp;
|
||||
my @parts = split('\|', $exp, 2);
|
||||
my $curr;
|
||||
my $next;
|
||||
my $prev;
|
||||
my $retval = $parts[1];
|
||||
($curr, $next, $prev) =
|
||||
extract_bracketed($retval, '()', qr/[^()]*/);
|
||||
|
||||
unless($curr) { #If there were no paramaters to save, treat this one like a plain regex
|
||||
$name =~ s/$parts[0]/$parts[1]/;
|
||||
}
|
||||
while ($curr) {
|
||||
#my $next = $comps[0];
|
||||
if ($curr =~ /^[\{\}()\-\+\/\%\*\$\d]+$/ or $curr =~ /^\(sprintf\(["'%\dcsduoxefg]+,\s*[\{\}()\-\+\/\%\*\$\d]+\)\)$/ )
|
||||
{
|
||||
use integer;
|
||||
#We only allow integer operations, they are the ones that make sense for the application
|
||||
my $value = $name;
|
||||
$value =~ s/$parts[0]/$curr/ee;
|
||||
$retval = $prev . $value . $next;
|
||||
}
|
||||
else {
|
||||
print "$curr is bad\n";
|
||||
}
|
||||
($curr, $next, $prev) =
|
||||
extract_bracketed($retval, '()', qr/[^()]*/);
|
||||
}
|
||||
#At this point, $retval is the expression after being arithmetically contemplated, a generated regex, and therefore
|
||||
#must be applied in total
|
||||
$name =~ s/$parts[0]/$retval/;
|
||||
|
||||
#print Data::Dumper::Dumper(extract_bracketed($parts[1],'()',qr/[^()]*/));
|
||||
#use text::balanced extract_bracketed to parse earch atom, make sure nothing but arith operators, parans, and numbers are in it to guard against code execution
|
||||
}
|
||||
|
||||
print "Name: $name\n";
|
||||
|
||||
#$name =~ s/$left/$right/;
|
||||
if ($name and inet_aton($name)) {
|
||||
if ($netn eq $_->{net} and not $usednames->{$name}) { return $name; }
|
||||
#At this point, it could still be valid if block was entered due to mgtifname
|
||||
my $nnetn = inet_ntoa(pack("N",unpack("N",inet_aton($name)) & unpack("N",inet_aton($_->{mask}))));
|
||||
if ($nnetn eq $_->{net} and not $usednames->{$name}) { return $name; }
|
||||
}
|
||||
$name=""; #Still here, this branch failed
|
||||
}
|
||||
$defn="";
|
||||
if ($defhost) {
|
||||
$defn = inet_ntoa(pack("N",unpack("N",$defhost) & unpack("N",inet_aton($_->{mask}))));
|
||||
}
|
||||
if ($defn eq $_->{net} and not $usednames->{$node}) { #the default nodename is on this network
|
||||
return $node;
|
||||
}
|
||||
my $tentativehost = $node . "-".$ifname;
|
||||
my $tnh = inet_aton($tentativehost);
|
||||
if ($tnh) {
|
||||
my $nnetn = inet_ntoa(pack("N",unpack("N",$tnh) & unpack("N",inet_aton($_->{mask}))));
|
||||
if ($nnetn eq $_->{net} and not $usednames->{$tentativehost}) {
|
||||
return $tentativehost;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
print "Name: $name\n";
|
||||
|
||||
#$name =~ s/$left/$right/;
|
||||
if ($name and inet_aton($name)) {
|
||||
if ($netn eq $_->{net} and not $usednames->{$name}) { return $name; }
|
||||
#At this point, it could still be valid if block was entered due to mgtifname
|
||||
my $nnetn = inet_ntoa(pack("N",unpack("N",inet_aton($name)) & unpack("N",inet_aton($_->{mask}))));
|
||||
if ($nnetn eq $_->{net} and not $usednames->{$name}) { return $name; }
|
||||
}
|
||||
$name=""; #Still here, this branch failed
|
||||
}
|
||||
$defn="";
|
||||
if ($defhost) {
|
||||
$defn = inet_ntoa(pack("N",unpack("N",$defhost) & unpack("N",inet_aton($_->{mask}))));
|
||||
}
|
||||
if ($defn eq $_->{net} and not $usednames->{$node}) { #the default nodename is on this network
|
||||
return $node;
|
||||
}
|
||||
my $tentativehost = $node . "-".$ifname;
|
||||
my $tnh = inet_aton($tentativehost);
|
||||
if ($tnh) {
|
||||
my $nnetn = inet_ntoa(pack("N",unpack("N",$tnh) & unpack("N",inet_aton($_->{mask}))));
|
||||
if ($nnetn eq $_->{net} and not $usednames->{$tentativehost}) {
|
||||
return $tentativehost;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sub handled_commands {
|
||||
return {
|
||||
#discovered => 'chain:ondiscover',
|
||||
discovered => 'nodediscover',
|
||||
};
|
||||
return {
|
||||
#discovered => 'chain:ondiscover',
|
||||
discovered => 'nodediscover',
|
||||
};
|
||||
}
|
||||
sub process_request {
|
||||
my $request = shift;
|
||||
my $callback = shift;
|
||||
my $doreq = shift;
|
||||
my $node = $request->{node}->[0];
|
||||
my $ip = $request->{'_xcat_clientip'};
|
||||
openlog("xCAT node discovery",'','local0');
|
||||
|
||||
my $request = shift;
|
||||
my $callback = shift;
|
||||
my $doreq = shift;
|
||||
my $node = $request->{node}->[0];
|
||||
my $clientip = $request->{'_xcat_clientip'};
|
||||
openlog("xCAT node discovery",'','local0');
|
||||
|
||||
#First, fill in tables with data fields..
|
||||
if (defined($request->{mtm}) or defined($request->{serial})) {
|
||||
my $vpdtab = xCAT::Table->new("vpd",-create=>1);
|
||||
if ($request->{uuid}->[0]) {
|
||||
$vpdtab->setNodeAttribs($node,{uuid=>$request->{uuid}->[0]});
|
||||
}
|
||||
if ($request->{mtm}->[0]) {
|
||||
$vpdtab->setNodeAttribs($node,{mtm=>$request->{mtm}->[0]});
|
||||
}
|
||||
if ($request->{serial}) {
|
||||
$vpdtab->setNodeAttribs($node,{serial=>$request->{serial}->[0]});
|
||||
}
|
||||
}
|
||||
my $nrtab;
|
||||
my @discoverynics;
|
||||
my @forcenics; #list of 'eth' style interface names to require to come up on post-discovery client dhcp restart
|
||||
if (defined($request->{arch})) {
|
||||
#Set the architecture in nodetype. If 32-bit only x86 or ppc detected, overwrite. If x86_64, only set if either not set or not an x86 family
|
||||
my $typetab=xCAT::Table->new("nodetype",-create=>1);
|
||||
(my $nent) = $typetab->getNodeAttribs($node,['arch','supportedarchs']);
|
||||
if ($request->{arch}->[0] =~ /x86_64/) {
|
||||
if ($nent and ($nent->{arch} =~ /x86/)) { #If already an x86 variant, do not change
|
||||
unless ($nent and $nent->{supportedarchs} =~ /x86_64/) {
|
||||
$typetab->setNodeAttribs($node,{supportedarchs=>"x86,x86_64"});
|
||||
}
|
||||
} else {
|
||||
$typetab->setNodeAttribs($node,{arch=>$request->{arch}->[0],supportedarchs=>"x86,x86_64"});
|
||||
#this check is so that if an admin explicitly declares a node 'x86', the 64 bit capability is ignored
|
||||
}
|
||||
} else {
|
||||
unless ($nent and $nent->{supportedarchs} eq $request->{arch}->[0] and $nent->{arch} eq $request->{arch}->[0]) {
|
||||
$typetab->setNodeAttribs($node,{arch=>$request->{arch}->[0],supportedarchs=>$request->{arch}->[0]});
|
||||
|
||||
#First, fill in tables with data fields..
|
||||
if (defined($request->{mtm}) or defined($request->{serial})) {
|
||||
my $vpdtab = xCAT::Table->new("vpd",-create=>1);
|
||||
if ($request->{uuid}->[0]) {
|
||||
$vpdtab->setNodeAttribs($node,{uuid=>$request->{uuid}->[0]});
|
||||
}
|
||||
if ($request->{mtm}->[0]) {
|
||||
$vpdtab->setNodeAttribs($node,{mtm=>$request->{mtm}->[0]});
|
||||
}
|
||||
if ($request->{serial}) {
|
||||
$vpdtab->setNodeAttribs($node,{serial=>$request->{serial}->[0]});
|
||||
}
|
||||
}
|
||||
my $currboot='';
|
||||
$nrtab = xCAT::Table->new('noderes'); #Attempt to check and set if wrong the netboot method on discovery, if admin omitted
|
||||
(my $rent) = $nrtab->getNodeAttribs($node,['netboot','discoverynics']);
|
||||
if ($rent and defined $rent->{discoverynics}) {
|
||||
@discoverynics=split /,/,$rent->{discoverynics};
|
||||
my $nrtab;
|
||||
my @discoverynics;
|
||||
my @forcenics; #list of 'eth' style interface names to require to come up on post-discovery client dhcp restart
|
||||
if (defined($request->{arch})) {
|
||||
#Set the architecture in nodetype. If 32-bit only x86 or ppc detected, overwrite. If x86_64, only set if either not set or not an x86 family
|
||||
my $typetab=xCAT::Table->new("nodetype",-create=>1);
|
||||
(my $nent) = $typetab->getNodeAttribs($node,['arch','supportedarchs']);
|
||||
if ($request->{arch}->[0] =~ /x86_64/) {
|
||||
if ($nent and ($nent->{arch} =~ /x86/)) { #If already an x86 variant, do not change
|
||||
unless ($nent and $nent->{supportedarchs} =~ /x86_64/) {
|
||||
$typetab->setNodeAttribs($node,{supportedarchs=>"x86,x86_64"});
|
||||
}
|
||||
} else {
|
||||
$typetab->setNodeAttribs($node,{arch=>$request->{arch}->[0],supportedarchs=>"x86,x86_64"});
|
||||
#this check is so that if an admin explicitly declares a node 'x86', the 64 bit capability is ignored
|
||||
}
|
||||
} else {
|
||||
unless ($nent and $nent->{supportedarchs} eq $request->{arch}->[0] and $nent->{arch} eq $request->{arch}->[0]) {
|
||||
$typetab->setNodeAttribs($node,{arch=>$request->{arch}->[0],supportedarchs=>$request->{arch}->[0]});
|
||||
}
|
||||
}
|
||||
my $currboot='';
|
||||
$nrtab = xCAT::Table->new('noderes'); #Attempt to check and set if wrong the netboot method on discovery, if admin omitted
|
||||
(my $rent) = $nrtab->getNodeAttribs($node,['netboot','discoverynics']);
|
||||
if ($rent and defined $rent->{discoverynics}) {
|
||||
@discoverynics=split /,/,$rent->{discoverynics};
|
||||
}
|
||||
if ($rent and $rent->{'netboot'}) {
|
||||
$currboot=$rent->{'netboot'};
|
||||
}
|
||||
if ($request->{arch}->[0] =~ /x86/ and $currboot !~ /pxe/ and $currboot !~ /xnba/) {
|
||||
$nrtab->setNodeAttribs($node,{netboot=>'xnba'});
|
||||
} elsif ($request->{arch}->[0] =~ /ppc/ and $currboot !~ /yaboot/) {
|
||||
$nrtab->setNodeAttribs($node,{netboot=>'yaboot'});
|
||||
}
|
||||
}
|
||||
if ($rent and $rent->{'netboot'}) {
|
||||
$currboot=$rent->{'netboot'};
|
||||
}
|
||||
if ($request->{arch}->[0] =~ /x86/ and $currboot !~ /pxe/ and $currboot !~ /xnba/) {
|
||||
$nrtab->setNodeAttribs($node,{netboot=>'xnba'});
|
||||
} elsif ($request->{arch}->[0] =~ /ppc/ and $currboot !~ /yaboot/) {
|
||||
$nrtab->setNodeAttribs($node,{netboot=>'yaboot'});
|
||||
}
|
||||
}
|
||||
|
||||
my $macstring = "";
|
||||
if (defined($request->{mac})) {
|
||||
my $mactab = xCAT::Table->new("mac",-create=>1);
|
||||
my @ifinfo;
|
||||
my %usednames;
|
||||
my %bydriverindex;
|
||||
my $forcenic=0; #-1 is force skip, 0 is use default behavior, 1 is force to be declared even if hosttag is skipped to do so
|
||||
foreach (@{$request->{mac}}) {
|
||||
@ifinfo = split /\|/;
|
||||
if ($ifinfo[1] eq 'usb0') { #skip usb nic
|
||||
next;
|
||||
}
|
||||
$bydriverindex{$ifinfo[0]} += 1;
|
||||
if (scalar @discoverynics) {
|
||||
$forcenic=-1; #$forcenic defaults to explicitly skip nic
|
||||
foreach my $nic (@discoverynics) {
|
||||
if ($nic =~ /:/) { #syntax like 'bnx2:0' to say the first bnx2 managed interface
|
||||
(my $driver,my $index) = split /:/,$nic;
|
||||
if ($driver eq $ifinfo[0] and $index == ($bydriverindex{$driver}-1)) {
|
||||
$forcenic=1; #force nic to be put into database
|
||||
push @forcenics,$ifinfo[1];
|
||||
last;
|
||||
|
||||
my $macstring = "";
|
||||
if (defined($request->{mac})) {
|
||||
my $mactab = xCAT::Table->new("mac",-create=>1);
|
||||
my @ifinfo;
|
||||
my %usednames;
|
||||
my %bydriverindex;
|
||||
my $forcenic=0; #-1 is force skip, 0 is use default behavior, 1 is force to be declared even if hosttag is skipped to do so
|
||||
foreach (@{$request->{mac}}) {
|
||||
@ifinfo = split /\|/;
|
||||
if ($ifinfo[1] eq 'usb0') { #skip usb nic
|
||||
next;
|
||||
}
|
||||
$bydriverindex{$ifinfo[0]} += 1;
|
||||
if (scalar @discoverynics) {
|
||||
$forcenic=-1; #$forcenic defaults to explicitly skip nic
|
||||
foreach my $nic (@discoverynics) {
|
||||
if ($nic =~ /:/) { #syntax like 'bnx2:0' to say the first bnx2 managed interface
|
||||
(my $driver,my $index) = split /:/,$nic;
|
||||
if ($driver eq $ifinfo[0] and $index == ($bydriverindex{$driver}-1)) {
|
||||
$forcenic=1; #force nic to be put into database
|
||||
push @forcenics,$ifinfo[1];
|
||||
last;
|
||||
}
|
||||
} else { #simple 'eth2' sort of argument
|
||||
if ($nic eq $ifinfo[1]) {
|
||||
push @forcenics,$ifinfo[1];
|
||||
$forcenic=1;
|
||||
last;
|
||||
}
|
||||
}
|
||||
} else { #simple 'eth2' sort of argument
|
||||
if ($nic eq $ifinfo[1]) {
|
||||
push @forcenics,$ifinfo[1];
|
||||
$forcenic=1;
|
||||
last;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($forcenic == -1) { #if force to skip, go to next nic
|
||||
next;
|
||||
}
|
||||
my $currmac = lc($ifinfo[2]);
|
||||
if ($ifinfo[3]) {
|
||||
(my $ip,my $netbits) = split /\//,$ifinfo[3];
|
||||
if ($ip =~ /\d+\.\d+\.\d+\.\d+/) {
|
||||
my $ipn = unpack("N",inet_aton($ip));
|
||||
my $mask = 2**$netbits-1<<(32-$netbits);
|
||||
my $netn = inet_ntoa(pack("N",$ipn & $mask));
|
||||
my $hosttag = gethosttag($node,$netn,@ifinfo[1],\%usednames);
|
||||
print Dumper($hosttag) . "\n";
|
||||
if ($hosttag) {
|
||||
$usednames{$hosttag}=1;
|
||||
if ($hosttag eq $node) {
|
||||
$macstring .= $currmac."|";
|
||||
} else {
|
||||
$macstring .= $currmac."!".$hosttag."|";
|
||||
}
|
||||
} else {
|
||||
if ($forcenic == 1) { $macstring .= $currmac."|"; } else { $macstring .= $currmac."!*NOIP*|"; }
|
||||
if ($forcenic == -1) { #if force to skip, go to next nic
|
||||
next;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if ($forcenic == 1) { $macstring .= $currmac."|"; }
|
||||
}
|
||||
my $currmac = lc($ifinfo[2]);
|
||||
if ($ifinfo[3]) {
|
||||
(my $ip,my $netbits) = split /\//,$ifinfo[3];
|
||||
if ($ip =~ /\d+\.\d+\.\d+\.\d+/) {
|
||||
my $ipn = unpack("N",inet_aton($ip));
|
||||
my $mask = 2**$netbits-1<<(32-$netbits);
|
||||
my $netn = inet_ntoa(pack("N",$ipn & $mask));
|
||||
my $hosttag = gethosttag($node,$netn,@ifinfo[1],\%usednames);
|
||||
print Dumper($hosttag) . "\n";
|
||||
if ($hosttag) {
|
||||
$usednames{$hosttag}=1;
|
||||
if ($hosttag eq $node) {
|
||||
$macstring .= $currmac."|";
|
||||
} else {
|
||||
$macstring .= $currmac."!".$hosttag."|";
|
||||
}
|
||||
# following is for manual discovery by nodediscoverdef to define a undef node to predefine node
|
||||
# this this case, the $clientip is null
|
||||
unless ($clientip) {
|
||||
$clientip = $ip;
|
||||
}
|
||||
} else {
|
||||
if ($forcenic == 1) { $macstring .= $currmac."|"; } else { $macstring .= $currmac."!*NOIP*|"; }
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if ($forcenic == 1) { $macstring .= $currmac."|"; }
|
||||
}
|
||||
}
|
||||
$macstring =~ s/\|\z//;
|
||||
$mactab->setNodeAttribs($node,{mac=>$macstring});
|
||||
my %request = (
|
||||
command => ['makedhcp'],
|
||||
node => [$node]
|
||||
);
|
||||
$doreq->(\%request);
|
||||
}
|
||||
$macstring =~ s/\|\z//;
|
||||
$mactab->setNodeAttribs($node,{mac=>$macstring});
|
||||
my %request = (
|
||||
command => ['makedhcp'],
|
||||
node => [$node]
|
||||
#TODO: mac table? on the one hand, 'the' definitive interface was determined earlier...
|
||||
#Delete the state it was in to make it traverse destiny once agoin
|
||||
my $chaintab = xCAT::Table->new('chain');
|
||||
if ($chaintab) {
|
||||
$chaintab->setNodeAttribs($node,{currstate=>'',currchain=>''});
|
||||
$chaintab->close();
|
||||
}
|
||||
|
||||
# Update the switch port information if the 'updateswitch' flag is added in the request.
|
||||
# 'updateswitch' is default added for sequential discovery
|
||||
if ($request->{'updateswitch'} && $macstring) {
|
||||
my $firstmac;
|
||||
|
||||
# Get the mac which defined as the management nic
|
||||
my @macents = split (/\|/, $macstring);
|
||||
foreach my $macent (@macents) {
|
||||
my ($mac, $host) = split (/!/, $macent);
|
||||
unless ($firstmac) {
|
||||
$firstmac = $mac;
|
||||
}
|
||||
if (!$host || $host eq $node) {
|
||||
$firstmac = $mac;
|
||||
last;
|
||||
}
|
||||
}
|
||||
|
||||
# search the management nic and record the switch informaiton
|
||||
foreach my $nic (@{$request->{nic}}) {
|
||||
if (defined ($nic->{'hwaddr'}) && $nic->{'hwaddr'}->[0] =~ /$firstmac/i ) {
|
||||
if (defined ($nic->{'switchname'}) && defined ($nic->{'switchaddr'})) {
|
||||
# update the switch to switches table
|
||||
my $switchestab = xCAT::Table->new('switches');
|
||||
if ($switchestab) {
|
||||
$switchestab->setAttribs({switch=>$nic->{'switchname'}->[0]}, {comments=>$nic->{'switchdesc'}->[0]});
|
||||
$switchestab->close();
|
||||
}
|
||||
# update the ip of switch to hosts table
|
||||
my $hosttab = xCAT::Table->new('hosts');
|
||||
if ($hosttab) {
|
||||
$hosttab->setNodeAttribs($nic->{'switchname'}->[0], {ip => $nic->{'switchaddr'}->[0]});
|
||||
$hosttab->commit();
|
||||
}
|
||||
|
||||
# add the switch as a node to xcat db
|
||||
my $nltab = xCAT::Table->new('nodelist');
|
||||
if ($nltab) {
|
||||
$nltab->setNodeAttribs($nic->{'switchname'}->[0], {groups=>"all,switch"});
|
||||
$nltab->commit();
|
||||
}
|
||||
|
||||
if (defined ($nic->{'switchport'})) {
|
||||
# update the switch table
|
||||
my $switchtab = xCAT::Table->new('switch');
|
||||
if ($switchtab) {
|
||||
$switchtab->setNodeAttribs($node, {switch=>$nic->{'switchname'}->[0], port=>$nic->{'switchport'}->[0]});
|
||||
$switchtab->close();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
my $restartstring = "restart";
|
||||
if (scalar @forcenics > 0) {
|
||||
$restartstring .= " (".join("|",@forcenics).")";
|
||||
}
|
||||
#now, notify the node to continue life
|
||||
my $sock = new IO::Socket::INET (
|
||||
PeerAddr => $clientip,
|
||||
PeerPort => '3001',
|
||||
Timeout => '1',
|
||||
Proto => 'tcp'
|
||||
);
|
||||
$doreq->(\%request);
|
||||
}
|
||||
#TODO: mac table? on the one hand, 'the' definitive interface was determined earlier...
|
||||
#Delete the state it was in to make it traverse destiny once agoin
|
||||
my $chaintab = xCAT::Table->new('chain');
|
||||
if ($chaintab) {
|
||||
$chaintab->setNodeAttribs($node,{currstate=>'',currchain=>''});
|
||||
$chaintab->close();
|
||||
}
|
||||
unless ($sock) { syslog("err","Failed to notify $clientip that it's actually $node."); return; } #Give up if the node won't hear of it.
|
||||
print $sock $restartstring;
|
||||
close($sock);
|
||||
|
||||
# Update the switch port information if the 'updateswitch' flag is added in the request.
|
||||
# 'updateswitch' is default added for sequential discovery
|
||||
if ($request->{'updateswitch'} && $macstring) {
|
||||
my $firstmac;
|
||||
# sleep 2 seconds for genesis to complete the disocvery process
|
||||
sleep (2);
|
||||
|
||||
# Get the mac which defined as the management nic
|
||||
my @macents = split (/\|/, $macstring);
|
||||
foreach my $macent (@macents) {
|
||||
my ($mac, $host) = split (/!/, $macent);
|
||||
unless ($firstmac) {
|
||||
$firstmac = $mac;
|
||||
}
|
||||
if (!$host || $host eq $node) {
|
||||
$firstmac = $mac;
|
||||
last;
|
||||
}
|
||||
}
|
||||
#Update the discoverydata table to indicate the successful discovery
|
||||
xCAT::DiscoveryUtils->update_discovery_data($request);
|
||||
|
||||
# search the management nic and record the switch informaiton
|
||||
foreach my $nic (@{$request->{nic}}) {
|
||||
if (defined ($nic->{'hwaddr'}) && $nic->{'hwaddr'}->[0] =~ /$firstmac/i ) {
|
||||
if (defined ($nic->{'switchname'}) && defined ($nic->{'switchaddr'})) {
|
||||
# update the switch to switches table
|
||||
my $switchestab = xCAT::Table->new('switches');
|
||||
if ($switchestab) {
|
||||
$switchestab->setAttribs({switch=>$nic->{'switchname'}->[0]}, {comments=>$nic->{'switchdesc'}->[0]});
|
||||
$switchestab->close();
|
||||
}
|
||||
# update the ip of switch to hosts table
|
||||
my $hosttab = xCAT::Table->new('hosts');
|
||||
if ($hosttab) {
|
||||
$hosttab->setNodeAttribs($nic->{'switchname'}->[0], {ip => $nic->{'switchaddr'}->[0]});
|
||||
$hosttab->commit();
|
||||
}
|
||||
|
||||
# add the switch as a node to xcat db
|
||||
my $nltab = xCAT::Table->new('nodelist');
|
||||
if ($nltab) {
|
||||
$nltab->setNodeAttribs($nic->{'switchname'}->[0], {groups=>"all,switch"});
|
||||
$nltab->commit();
|
||||
}
|
||||
|
||||
if (defined ($nic->{'switchport'})) {
|
||||
# update the switch table
|
||||
my $switchtab = xCAT::Table->new('switch');
|
||||
if ($switchtab) {
|
||||
$switchtab->setNodeAttribs($node, {switch=>$nic->{'switchname'}->[0], port=>$nic->{'switchport'}->[0]});
|
||||
$switchtab->close();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#Update the discoverydata table to indicate the successful discovery
|
||||
xCAT::DiscoveryUtils->update_discovery_data($request);
|
||||
|
||||
my $restartstring = "restart";
|
||||
if (scalar @forcenics > 0) {
|
||||
$restartstring .= " (".join("|",@forcenics).")";
|
||||
}
|
||||
#now, notify the node to continue life
|
||||
my $sock = new IO::Socket::INET (
|
||||
PeerAddr => $ip,
|
||||
PeerPort => '3001',
|
||||
Timeout => '1',
|
||||
Proto => 'tcp'
|
||||
);
|
||||
unless ($sock) { syslog("err","Failed to notify $ip that it's actually $node."); return; } #Give up if the node won't hear of it.
|
||||
print $sock $restartstring;
|
||||
close($sock);
|
||||
|
||||
syslog("info","$node has been discovered");
|
||||
syslog("info","$node has been discovered");
|
||||
}
|
||||
|
||||
1;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user