From c3ae956dd3c6f5676d4ea2448ee588b170415410 Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Thu, 5 Apr 2018 10:41:08 +0800
Subject: [PATCH] report ipmi_debug message under node name (#5033)

---
 xCAT-server/lib/perl/xCAT/IPMI.pm    | 5 ++++-
 xCAT-server/lib/xcat/plugins/ipmi.pm | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/IPMI.pm b/xCAT-server/lib/perl/xCAT/IPMI.pm
index 4b444ac48..775583368 100644
--- a/xCAT-server/lib/perl/xCAT/IPMI.pm
+++ b/xCAT-server/lib/perl/xCAT/IPMI.pm
@@ -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
diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 6b6684450..a1cda1a6f 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -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 {