xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-19 01:30:21 +00:00
Code Issues Releases Wiki Activity

More mac address prechecking to destiny plugin

Browse Source
This commit is contained in:
Bin Xu
2017-09-30 13:09:54 +08:00
parent a717283a28
commit 15a149583d
2 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xCAT-server/lib/xcat/plugins/destiny.pm
View File

@@ -432,6 +432,21 @@ sub setdestiny {
$nodetypetable->setNodesAttribs(\@tmpnodelist, $updateattribs);
}
}
if (%state_hash) { # To valide mac here
my @tempnodes = keys(%state_hash);
my $mactab = xCAT::Table->new('mac', -create => 1);
my $machash = $mactab->getNodesAttribs(\@tempnodes, ['mac']);
foreach (@tempnodes) {
my $macs = $machash->{$_}->[0];
unless ($macs and $macs->{mac}) {
$failurenodes{$_} = 1;
xCAT::MsgUtils->report_node_error($callback, $_, "No MAC address available for this node");
delete $state_hash{$_};
}
}
}
}
#print Dumper(\%state_hash);

27
xCAT-server/lib/xcat/plugins/petitboot.pm
View File

@@ -150,7 +150,6 @@ sub setstate {
unless (-d "$bootloader_root") {
mkpath("$bootloader_root");
}
#my $nodemac;
my $cref = $chainhash{$node}->[0]; #$chaintab->getNodeAttribs($node,['currstate']);
@@ -525,31 +524,6 @@ sub process_request {
return;
}
my $state = $args[0];
my $reststates;
# to support the case that the state could be 'osimage=xxx'; 'runimage=yyy,runcmd=xxx'
($state, $reststates) = split(/,/, $state, 2);
chomp($state);
my $mactab = xCAT::Table->new('mac', -create => 1);
my $machash = $mactab->getNodesAttribs(\@nodes, ['mac']);
if ($state eq 'osimage' || $state =~ 'osimage=') { # To valide mac here
my @validnodes = ();
my $cflag = 0;
foreach (@nodes) {
my $macs = $machash->{$_}->[0];
unless ($macs and $macs->{mac}) {
$failurenodes{$_} = 1;
xCAT::MsgUtils->report_node_error($callback, $_, "No MAC address available");
$cflag = 1;
next;
}
push @validnodes, $_;
}
@nodes = @validnodes if $cflag;
}
#now run the begin part of the prescripts
unless ($args[0] eq '') { # or $args[0] eq 'enact') {
$errored = 0;
@@ -614,6 +588,7 @@ sub process_request {
my $typehash = $typetab->getNodesAttribs(\@nodes, [ 'os', 'provmethod', 'arch', 'profile' ]);
my $linuximgtab = xCAT::Table->new('linuximage', -create => 1);
my $osimagetab = xCAT::Table->new('osimage', -create => 1);
my %machash = ();
my $rc;
my $errstr;