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

Merge pull request #2095 from xuweibj/macmaps

Browse Source 
fix issue 1650, help to resolve errors
This commit is contained in:
zet809
2016-11-09 11:11:37 +08:00
committed by GitHub
parent f74704d790 409e32bd70
commit 8a60e6419f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
perl-xCAT/xCAT/MacMap.pm
View File

@ -345,7 +345,7 @@ sub dump_mac_info {
$ret{$switch}->{ErrorStr} = $self->{macinfo}->{$switch}->{ErrorStr};
# To show the error message that the username/password related error is for SNMP only
if ($ret{$switch}->{ErrorStr} =~ /username|password/i) {
if ($ret{$switch}->{ErrorStr} =~ /user\s*name|password/i) {
$ret{$switch}->{ErrorStr} .= " through SNMP";
}
} else {

8
xCAT-probe/subcmds/switch-macmap
View File

@ -94,7 +94,7 @@ if (-f $error_file) {
my $fd;
open($fd, "<", "$normal_file");
my @fails = ();
my @error_nodes = ();
# There is 2 kinds of error message:
# 1. Error: The nodetype is not 'switch' for nodes: switch1
# Error: No switch configuration info find for switch-10-5-23-1
@ -104,6 +104,8 @@ foreach (<$fd>) {
if (/Error:/) {
if (/^(\S*):\s*Error:\s*(.*)/) {
push @fails, "$1 - $2";
} elsif (/^Error:\s*The nodetype is not 'switch' for nodes: (.+)/) {
push @error_nodes, "$1";
} elsif (/^Error:\s*(.*)/) {
push @fails, $1;
} else {
@ -124,6 +126,10 @@ if (-f $normal_file) {
if (-f $error_file) {
unlink($error_file);
}
if (@error_nodes) {
my $error_node = join(",", @error_nodes);
probe_utils->send_msg("$output", "d", "[$error_node] : Error, switch-macmap can only be run against xCAT objects that have 'nodetype=switch'");
}
foreach (@fails) {
probe_utils->send_msg("$output", "f", "$_");
}