xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-31 01:56:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3896 from xuweibj/probe_issues

Browse Source 
Fix xcatprobe discovery pre-check issues
This commit is contained in:
Weihua Hu 2017-09-12 15:11:53 +08:00 committed by GitHub
commit 436f69e85f
1 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
xCAT-probe/subcmds/discovery
View File

@ -242,12 +242,19 @@ sub check_pre_defined_node {
$vpd_line =~ s/"//g;
my @split_vpd = split(",", $vpd_line);
if (($split_vpd[1] ne "") and ($split_vpd[2] ne "")) {
my $mtmsvpd = "$split_vpd[2]*$split_vpd[1]";
push @{ $mtms_node{$mtmsvpd} }, $split_vpd[0];
my $mtms = uc ("$split_vpd[2]*$split_vpd[1]");
my $tmp_node = $split_vpd[0];
my $tmp_type = `lsdef $tmp_node -i hwtype,nodetype -c`;
if ($tmp_type =~ /hwtype=bmc/ and $tmp_type =~ /nodetype=mp/) {
push @{ $mtms_node{$mtms}{bmc} }, $tmp_node;
} else {
push @{ $mtms_node{$mtms}{node} }, $tmp_node;
}
}
}
my @error_mtms;
my @error_mtms_bmc;
foreach my $node (keys %nodecheckrst) {
# check pre-define node whether has mtm and serial
@ -259,26 +266,13 @@ sub check_pre_defined_node {
# check if there is one or more node has the same mtms with current node
my $mtms = "$nodecheckrst{$node}{\"mtm\"}*$nodecheckrst{$node}{\"serial\"}";
my $mtms_num = @{$mtms_node{$mtms}};
if ($mtms_num > 2) {
my $mtms_node_num = @{ $mtms_node{$mtms}{node} };
my $mtms_bmc_num = @{ $mtms_node{$mtms}{bmc} };
if ($mtms_node_num >= 2) {
push @error_mtms, $mtms if (!grep {$_ eq $mtms} @error_mtms);
} elsif ($mtms_num == 2) {
foreach my $mtmsnode (@{$mtms_node{$mtms}}) {
next if ($mtmsnode eq $node);
if (exists($nodecheckrst{$mtmsnode})) {
if (($nodecheckrst{$mtmsnode}{"nodetype"} eq $nodecheckrst{$node}{"nodetype"}) and ($nodecheckrst{$mtmsnode}{"hwtype"} eq $nodecheckrst{$node}{"hwtype"})) {
push @error_mtms, $mtms if (!grep {$_ eq $mtms} @error_mtms);
}
} else {
my $nodetype = `lsdef $mtmsnode -i nodetype -c |awk -F"=" '{print \$2}'`;
my $hwtype = `lsdef $mtmsnode -i hwtype -c |awk -F"=" '{print \$2}'`;
chomp($nodetype);
chomp($hwtype);
if (($nodetype eq $nodecheckrst{$node}{"nodetype"}) and ($hwtype eq $nodecheckrst{$node}{"hwtype"})) {
push @error_mtms, $mtms if (!grep {$_ eq $mtms} @error_mtms);
}
}
}
}
if ($mtms_bmc_num >= 2) {
push @error_mtms_bmc, $mtms if (!grep {$_ eq $mtms} @error_mtms_bmc);
}
}
}
@ -291,11 +285,20 @@ sub check_pre_defined_node {
if (@error_mtms) {
foreach (@error_mtms) {
my $errornode = join(",", @{$mtms_node{$_}});
my $errornode = join(",", @{$mtms_node{$_}{node}});
probe_utils->send_msg("stdout", "f", "[$errornode] : Duplicate node definition found for the same mtms $_.");
$rst = 1;
}
}
if (@error_mtms_bmc) {
foreach (@error_mtms_bmc) {
my $errorbmcnode = join(",", @{$mtms_node{$_}{bmc}});
my $errornode = join(",", @{$mtms_node{$_}{node}});
probe_utils->send_msg("stdout", "f", "[$errornode] : Duplicate BMC node ($errorbmcnode) definition found for the same mtms $_.");
$rst = 1;
}
}
}
if ($discovery_type eq "switch") {
@ -356,7 +359,7 @@ sub check_pre_defined_node {
next;
}
if (!(exists($nodecheckrst{$node}{"switchport"})) or $nodecheckrst{$node}{"switchport"} !~ /^\w/ or $valid_nodes !~ $node) {
if (!(exists($nodecheckrst{$node}{"switchport"})) or $nodecheckrst{$node}{"switchport"} !~ /^\d+$/ or $valid_nodes !~ $node) {
push @error_attribute, "switchport";
}
@ -378,18 +381,6 @@ sub check_pre_defined_node {
$keystring = "Missing definition for related switch $nodecheckrst{$node}{\"switch\"}";
last;
}
if ($tmpoutput !~ /snmpversion=/) {
$keystring = "Missing attribute 'snmpversion' definition for related switch $nodecheckrst{$node}{\"switch\"}";
last;
}
if ($tmpoutput !~ /username=/) {
$keystring = "Missing attribute 'username' definition for related switch $nodecheckrst{$node}{\"switch\"}";
last;
}
if ($tmpoutput !~ /password=/) {
$keystring = "Missing attribute 'password' definition for related switch $nodecheckrst{$node}{\"switch\"}";
last;
}
}
if ($keystring) {
@ -649,14 +640,13 @@ sub check_genesis_file {
$rst = 1;
}
if ($initrd_path =~ /http.+($tftpdir\/.+)/) {
if ($initrd_path =~ /http:\/\/.+:80(\/.+)/) {
my $initrd_file = $1;
my $initrd_time = `stat $initrd_file | grep Modify | cut -d ' ' -f 2-3`;
if ($genesis_time and $initrd_time < $genesis_time) {
$genesis_update_flag_p = 1;
}
}
}
if ($genesis_line =~ /^kernel/) {