From d3e1ab3cd49db9e0dcda4848b0aa9c5b698293a8 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Tue, 11 Aug 2015 02:45:24 -0400
Subject: [PATCH 1/4] update bmcdiscover related rest api

---
 xCAT-server/xCAT-wsapi/xcatws.cgi | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/xCAT-server/xCAT-wsapi/xcatws.cgi b/xCAT-server/xCAT-wsapi/xcatws.cgi
index 3c28c4a51..ab59091a3 100755
--- a/xCAT-server/xCAT-wsapi/xcatws.cgi
+++ b/xCAT-server/xCAT-wsapi/xcatws.cgi
@@ -2357,10 +2357,15 @@ sub bmccheckhdl {
     
     if ($params->{'resourcename'} eq "checkbmcauth") {
         if (isGET()) {
+
             push @args, "-i";
             push @args, $bmc_ip;
-            push @args, "-u";
-            push @args, $bmc_user;
+            if ( defined($bmc_user) && $bmc_user ne "none")
+            {
+                push @args, "-u";
+                push @args, $bmc_user;
+
+            }
             push @args, "-p";
             push @args, $bmc_pw;
             push @args, "-c";
@@ -2371,11 +2376,14 @@ sub bmccheckhdl {
         if (isGET()) {
             push @args, "-i";
             push @args, $bmc_ip;
-            push @args, "-u";
-            push @args, $bmc_user;
+            if ( defined($bmc_user) && $bmc_user ne "none" )
+            {
+                push @args, "-u";
+                push @args, $bmc_user;
+            }
             push @args, "-p";
             push @args, $bmc_pw;
-            push @args, "-s";
+            push @args, "--ipsource";
         }
     }
 

From 3dd90a0faad8e8d320197a09aa49ba2ac35b0f79 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Tue, 11 Aug 2015 02:53:22 -0400
Subject: [PATCH 2/4] update bmcdiscover restapi

---
 xCAT-server/xCAT-wsapi/xcatws.cgi | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/xCAT-wsapi/xcatws.cgi b/xCAT-server/xCAT-wsapi/xcatws.cgi
index ab59091a3..c23eb8993 100755
--- a/xCAT-server/xCAT-wsapi/xcatws.cgi
+++ b/xCAT-server/xCAT-wsapi/xcatws.cgi
@@ -1763,8 +1763,7 @@ sub actionout {
                     push @{$jsonnode->{$d->{node}->[0]->{name}->[0]}->{$param->{'resourcename'}}}, $d->{node}->[0]->{data}->[0]->{contents}->[0];
                 } elsif ($param->{'resourcename'} =~ /(vitals|inventory)/) {
                     # handle output of rvital and rinv for ppc node
-                    #push @{$jsonnode->{$d->{node}->[0]->{name}->[0]}}, $d->{node}->[0]->{data}->[0]->{contents}->[0];
-                    push @{$jsonnode->{$d->{node}->[0]->{name}->[0]}->{Message}}, $d->{node}->[0]->{data}->[0]->{contents}->[0];
+                    push @{$jsonnode->{$d->{node}->[0]->{name}->[0]}}, $d->{node}->[0]->{data}->[0]->{contents}->[0];
                 } else {
                     $jsonnode->{$d->{node}->[0]->{name}->[0]}->{$param->{'resourcename'}} = $d->{node}->[0]->{data}->[0]->{contents}->[0];
                 }
@@ -2434,9 +2433,9 @@ sub bmclisthdl {
 
     if ($params->{'resourcename'} eq "bmcdiscover") {
         if (isGET()) {
-            push @args, "-m";
+            push @args, "-s";
             push @args, $m_value;
-            push @args, "-r";
+            push @args, "--range";
             push @args, $ip_range;
         }
 

From 2fa4742127ae9d9e9093e26e366f7eb7c161ee73 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Tue, 11 Aug 2015 02:56:42 -0400
Subject: [PATCH 3/4] update vitals restapi

---
 xCAT-server/xCAT-wsapi/xcatws.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/xCAT-wsapi/xcatws.cgi b/xCAT-server/xCAT-wsapi/xcatws.cgi
index c23eb8993..4ddb9fa73 100755
--- a/xCAT-server/xCAT-wsapi/xcatws.cgi
+++ b/xCAT-server/xCAT-wsapi/xcatws.cgi
@@ -1763,7 +1763,8 @@ sub actionout {
                     push @{$jsonnode->{$d->{node}->[0]->{name}->[0]}->{$param->{'resourcename'}}}, $d->{node}->[0]->{data}->[0]->{contents}->[0];
                 } elsif ($param->{'resourcename'} =~ /(vitals|inventory)/) {
                     # handle output of rvital and rinv for ppc node
-                    push @{$jsonnode->{$d->{node}->[0]->{name}->[0]}}, $d->{node}->[0]->{data}->[0]->{contents}->[0];
+                    #push @{$jsonnode->{$d->{node}->[0]->{name}->[0]}}, $d->{node}->[0]->{data}->[0]->{contents}->[0];
+                    push @{$jsonnode->{$d->{node}->[0]->{name}->[0]}->{Message}}, $d->{node}->[0]->{data}->[0]->{contents}->[0];
                 } else {
                     $jsonnode->{$d->{node}->[0]->{name}->[0]}->{$param->{'resourcename'}} = $d->{node}->[0]->{data}->[0]->{contents}->[0];
                 }

From faf05c6753e5f6c197b66926fd3bcebe5a688315 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Tue, 11 Aug 2015 03:06:27 -0400
Subject: [PATCH 4/4] set default scan_methord nmap

---
 xCAT-server/xCAT-wsapi/xcatws.cgi | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/xCAT-wsapi/xcatws.cgi b/xCAT-server/xCAT-wsapi/xcatws.cgi
index 4ddb9fa73..6392a2142 100755
--- a/xCAT-server/xCAT-wsapi/xcatws.cgi
+++ b/xCAT-server/xCAT-wsapi/xcatws.cgi
@@ -2434,8 +2434,11 @@ sub bmclisthdl {
 
     if ($params->{'resourcename'} eq "bmcdiscover") {
         if (isGET()) {
-            push @args, "-s";
-            push @args, $m_value;
+            if ( defined($m_value) )
+            {
+               push @args, "-s";
+               push @args, $m_value;
+            }
             push @args, "--range";
             push @args, $ip_range;
         }