From 79f4ae63fa000c5919f1a78eb148385928233975 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Wed, 24 May 2017 02:35:33 -0400
Subject: [PATCH] Close ssl verify for bmcdiscover on Ubuntu

---
 xCAT-server/lib/xcat/plugins/bmcdiscover.pm | 9 ++++++++-
 xCAT-server/lib/xcat/plugins/openbmc.pm     | 9 ++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
index 28e0d951d..36f086c74 100644
--- a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
@@ -982,6 +982,10 @@ sub bmcdiscovery_ipmi {
 
                 }
             }
+            if ($mtm eq '' or $serial eq '') {
+                xCAT::MsgUtils->message("W", { data => ["BMC Type/Model and/or Serial is unavailable for $ip"] }, $::CALLBACK);
+                return;
+            }
 
             $node_data .= ",$mtm";
             $node_data .= ",$serial";
@@ -1043,7 +1047,7 @@ sub bmcdiscovery_openbmc{
     my $node            = sprintf("node-%08x", unpack("N*", inet_aton($ip)));
 
     my $node_data = $ip;
-    my $brower = LWP::UserAgent->new( ssl_opts => { verify_hostname => 0 }, );
+    my $brower = LWP::UserAgent->new( ssl_opts => { SSL_verify_mode => 0x00, verify_hostname => 0  }, );
     my $cookie_jar = HTTP::Cookies->new();
     my $header = HTTP::Headers->new('Content-Type' => 'application/json');
     my $url = "https://$ip/login";
@@ -1065,6 +1069,7 @@ sub bmcdiscovery_openbmc{
             $mtm = $response->{data}->{Model};
             $serial = $response->{data}->{SerialNumber}; 
         } else {
+            xCAT::MsgUtils->message("W", { data => ["BMC Type/Model and/or Serial is unavailable for $ip"] }, $::CALLBACK);
             return;
         }
 
@@ -1093,6 +1098,8 @@ sub bmcdiscovery_openbmc{
     } else {
         if ($login_response->status_line =~ /401 Unauthorized/) {
             xCAT::MsgUtils->message("W", { data => ["Invalid username or password for $ip"] }, $::CALLBACK); 
+        } else {
+            xCAT::MsgUtils->message("W", { data => ["$login_response->status_line for $ip"] }, $::CALLBACK);
         }
         return;
     }
diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 7eb476757..9143f0b9d 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -360,7 +360,7 @@ sub process_request {
         }
     } 
 
-    $callback->({ errorcode => $check }) if ($check);
+    $callback->({ errorcode => [$check] }) if ($check);
     return;
 }
 
@@ -864,10 +864,9 @@ sub rpower_response {
             else {
                 xCAT::SvrUtils::sendmsg("$::POWER_STATE_ON", $callback, $node);
             }
-        }
-        else {
-                my $unexpected_state = $response_info->{'data'}->{CurrentHostState};
-                xCAT::SvrUtils::sendmsg("Unexpected state - $unexpected_state", $callback, $node);
+        } else {
+            my $unexpected_state = $response_info->{'data'}->{CurrentHostState};
+            xCAT::SvrUtils::sendmsg("Unexpected state - $unexpected_state", $callback, $node);
         }
     }