From ce76aa18e97c60c958b214431f6fe8e53eab752b Mon Sep 17 00:00:00 2001
From: xuweibj <xwbj@cn.ibm.com>
Date: Tue, 11 Sep 2018 16:34:21 +0800
Subject: [PATCH] fix issue 5617, show existed node info when bmcdiscover -z
 (#5619)

---
 xCAT-server/lib/xcat/plugins/bmcdiscover.pm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
index d77639548..5d9798132 100644
--- a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
@@ -1175,6 +1175,10 @@ sub bmcdiscovery_ipmi {
                 if (exists($::VPDHASH{$mtmsip})) {
                     my $pre_node = $::VPDHASH{$mtmsip};
                     xCAT::MsgUtils->message("I", { data => ["Found match node $pre_node with bmc ip address: $ip, rsetboot/rpower $pre_node to continue hardware discovery."] }, $::CALLBACK);
+                    if ($opz) {
+                        $node_data .= ",";
+                        display_output($opz,undef,$pre_node,$mac_node,$node_data,"ipmi",$request_command);
+                    }
                     return;
                 }
                 $mtms_node = "node-$mtm-$serial";
@@ -1304,6 +1308,10 @@ sub bmcdiscovery_openbmc{
             if (exists($::VPDHASH{$mtmsip})) {
                 my $pre_node = $::VPDHASH{$mtmsip};
                 xCAT::MsgUtils->message("I", { data => ["Found match node $pre_node with bmc ip address: $ip, rsetboot/rpower $pre_node to continue hardware discovery."] }, $::CALLBACK);
+                if ($opz) {
+                    $node_data .= ",";
+                    display_output($opz,undef,$pre_node,$mac_node,$node_data,"openbmc",$request_command);
+                }
                 return;
             }
             $mtms_node = "node-$mtm-$serial";