xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-11 14:00:17 +00:00
Code Issues Releases Wiki Activity

To have bmcdiscover matching pre-defined node with lc(mtm)*lc(serial)-ip

Browse Source
This commit is contained in:
ertaozh
2018-08-30 06:17:10 -04:00
parent 092c045d9a
commit 27a2292995
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
xCAT-server/lib/xcat/plugins/bmcdiscover.pm
View File

@@ -540,6 +540,35 @@ sub check_auth_process {
}
}
sub buildup_mtms_hash {
xCAT::MsgUtils->trace(0, "I", "Establish hash for vpd table with key=mtm*serial, value=node");
my %nodehash = ();
if (my $vpdtab = xCAT::Table->new("vpd")) {
my @entries = $vpdtab->getAllAttribs(qw/node serial mtm/);
foreach (@entries) {
unless ($_->{mtm} and $_->{serial}) { next; }
my $mtms = lc($_->{mtm}) . "*" . lc($_->{serial});
$nodehash{$_->{node}} = $mtms;
}
}
foreach my $tab (qw/ipmi openbmc/) {
my $tabfd = xCAT::Table->new($tab);
my $entries = $tabfd->getAllAttribs(qw/node bmc/);
foreach (@entries) {
unless($_->{bmc}) { next; }
my $node = $_->{node};
if (exists($nodehash{$node})) {
my $mtmsip = $nodehash{$node}."-".$_->{bmc};
$nodehash{$node} = $mtmsip;
}
}
}
foreach my $node (keys %nodehash) {
my $mtmsip = $nodehash{$node};
push @{ $::VPDHASH{$mtmsip} }, $node;
}
}
#----------------------------------------------------------------------------
=head3 scan_process
@@ -619,6 +648,7 @@ sub scan_process {
my $live_mac = split_comma_delim_str($mac_list);
my %pipe_map;
if (scalar(@{$live_ip}) > 0) {
xCAT::MsgUtils->trace(0, "I", "$log_label Scaned live IPs " . scalar(@{$live_ip}) . " with mac " . scalar(@{$live_mac}));
foreach (@{$live_ip}) {
my $new_mac = lc(shift @{$live_mac});