xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-18 04:10:46 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2365 from xuweibj/I1567

Browse Source 
Fix issue 1567, check attribute switch & switchport
This commit is contained in:
zet809
2017-01-10 14:49:13 +08:00
committed by GitHub
parent 491ad4c605 42aee200dc
commit b88af7cbe3
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
xCAT-probe/subcmds/discovery
View File

@ -315,10 +315,20 @@ sub check_pre_defined_node {
my $keystring;
foreach my $node (keys %nodecheckrst) {
{
last if ($nodecheckrst{$node}{"nodetype"} eq "switch");
my @error_attribute = ();
$keystring = "";
if (!(exists($nodecheckrst{$node}{"switch"}) && exists($nodecheckrst{$node}{"switchport"}))) {
last if ($nodecheckrst{$node}{"nodetype"} eq "switch");
$keystring = "Atrribute 'switch' or 'switchport' isn't defined for '$discovery_type' type discovery";
if (!(exists($nodecheckrst{$node}{"switch"})) or $nodecheckrst{$node}{"switch"} !~ /^\w/) {
push @error_attribute, "switch";
}
if (!(exists($nodecheckrst{$node}{"switchport"})) or $nodecheckrst{$node}{"switchport"} !~ /^\w/) {
push @error_attribute, "switchport";
}
if (@error_attribute) {
$keystring = "Attribute " . join(", ", @error_attribute) . " Invalid";
last;
} else {
my $switchport = "$nodecheckrst{$node}{\"switch\"}*$nodecheckrst{$node}{\"switchport\"}";