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

Merge pull request #5061 from robin2008/ipmi_debug

Browse Source 
report ipmi_debug message under node name (#5033)
This commit is contained in:
zet809
2018-05-03 15:17:55 +08:00
committed by GitHub
parent 7bbf1cacec c3ae956dd3
commit 5d6e9fe7a0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xCAT-server/lib/perl/xCAT/IPMI.pm
View File

@ -193,6 +193,9 @@ sub new {
foreach (keys %args) { #store all passed parameters
$self->{$_} = $args{$_};
}
unless ($args{'node'}) { #default to port 623 unless specified
$self->{'node'} = $args{'bmc'};
}
unless ($args{'port'}) { #default to port 623 unless specified
$self->{'port'} = 623;
}
@ -482,7 +485,7 @@ sub subcmd {
my $command_string = $command_info{$args{netfn}}->{$args{command}};
my $data_values = join ", ", @{$args{data}};
my $msg = sprintf ("[ipmi_debug] $self->{onlogon_args}->{command}:$self->{onlogon_args}->{subcommand}(@{$self->{onlogon_args}->{extraargs}}), raw_cmd: netfn(0x%02x=>%s), cmd(0x%02x=>%s), data=[%s]", $args{netfn}, $netfn_types{$args{netfn}}, $args{command}, $command_string, $data_values);
xCAT::SvrUtils::sendmsg([0, $msg], $self->{onlogon_args}->{outfunc});
xCAT::SvrUtils::sendmsg([0, $msg], $self->{onlogon_args}->{outfunc}, $self->{node});
}
my $seqincrement = 7;
while ($tabooseq{ $self->{expectednetfn} }->{ $self->{expectedcmd} }->{ $self->{seqlun} } and $seqincrement) { #avoid using a seqlun formerly marked 'taboo', but don't advance by more than 7, just in case

2
xCAT-server/lib/xcat/plugins/ipmi.pm
View File

@ -9045,7 +9045,7 @@ sub donode {
on_bmc_connect(0, $sessiondata{$node});
return 0;
}
$sessiondata{$node}->{ipmisession} = xCAT::IPMI->new(bmc => $bmcip, userid => $user, password => $pass);
$sessiondata{$node}->{ipmisession} = xCAT::IPMI->new(bmc => $bmcip, userid => $user, password => $pass, node => $node);
if ($sessiondata{$node}->{ipmisession}->{error}) {
xCAT::SvrUtils::sendmsg([ 1, $sessiondata{$node}->{ipmisession}->{error} ], $callback, $node, %allerrornodes);
} else {