From 2acd4365f0bce03407fb07eccaea6efecdf30b48 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Thu, 25 Jan 2018 13:34:37 -0500
Subject: [PATCH 001/100] Support hostname and network setting changes for
 IRPDU

---
 docs/source/advanced/pdu/irpdu.rst            |   8 +
 docs/source/advanced/pdu/pdu.rst              |   2 +-
 xCAT-server/lib/xcat/plugins/pdu.pm           | 179 ++++++++++++++++--
 .../lib/xcat/plugins/switchdiscover.pm        |  53 +++---
 4 files changed, 206 insertions(+), 36 deletions(-)

diff --git a/docs/source/advanced/pdu/irpdu.rst b/docs/source/advanced/pdu/irpdu.rst
index c7a557ed7..dccaf049a 100644
--- a/docs/source/advanced/pdu/irpdu.rst
+++ b/docs/source/advanced/pdu/irpdu.rst
@@ -47,6 +47,14 @@ The following commands are supported against a compute node:
 
 The following commands are supported against a PDU: 
 
+   * To change hostname of IR PDU: ::
+
+       # rspconfig f5pdu3 hosname=f5pdu3
+
+   * To change ip address of IR PDU: ::
+
+       # rsconfig f5pdu3 ip=x.x.x.x netmaks=255.x.x.x
+
    * Check the status of the full PDU: ::
 
        # rpower f5pdu3 stat
diff --git a/docs/source/advanced/pdu/pdu.rst b/docs/source/advanced/pdu/pdu.rst
index 0157ee8da..6e0ca6862 100644
--- a/docs/source/advanced/pdu/pdu.rst
+++ b/docs/source/advanced/pdu/pdu.rst
@@ -20,7 +20,7 @@ xCAT uses snmp scan method to discover PDU.  Make sure net-snmp-utils package is
        -x        XML formatted output.
        -z        Stanza formatted output.
        -w        Writes output to xCAT database.
-       --setup   Process switch-based pdu discovery and configure the PDUs(it included passwordless , change ip address from dhcp to static and snmp configuration). It required predefined PDU node definition with switch name and switch port attributes for mapping. (Notes: only support for crpdu for now for this options)
+       --setup   Process switch-based pdu discovery and configure the PDUs. For crpdu, --setup options will configure passwordless , change ip address from dhcp to static, hostname changes and snmp v3 configuration. For irpdu, it will configure ip address and hostname.  It required predefined PDU node definition with switch name and switch port attributes for mapping.
 
 
 Define PDU Objects
diff --git a/xCAT-server/lib/xcat/plugins/pdu.pm b/xCAT-server/lib/xcat/plugins/pdu.pm
index eca4553bf..f62121089 100644
--- a/xCAT-server/lib/xcat/plugins/pdu.pm
+++ b/xCAT-server/lib/xcat/plugins/pdu.pm
@@ -76,20 +76,21 @@ sub pdu_usage
     my ($callback, $command) = @_;
     my $usagemsg = 
     "Usage: 
+     The following commands support both type of PDUs :
         pdudiscover [<noderange>|--range ipranges] [-r|-x|-z] [-w] [-V|--verbose] [--setup]
         rpower pdunodes [off|on|stat|reset]
+        rinv      pdunodes
+        rvitals   pdunodes
 
-     The following command supports IR PDU with pdutype=irpdu :
-        rpower CN [pduoff|pduon|pdustat|pdustatus|pdureset] 
+     The following commands support IR PDU with pdutype=irpdu :
+        rpower computenodes [pduoff|pduon|pdustat|pdustatus|pdureset] 
+        rspconfig irpdunode [hostname=<NAME>|ip=<IP>|gateway=<GATEWAY>|mask=<MASK>]
 
      The following commands support CR PDU with pdutype=crpdu :
         rpower    pdunodes relay=[1|2|3] [on|off]
-        rinv      pdunodes
-        rvitals   pdunodes
         rspconfig pdunodes sshcfg
         rspconfig pdunodes snmpcfg
         rspconfig pdunode [hostname=<NAME>|ip=<IP>|mask=<MASK>]
-         
         \n";
                     
     if ($callback)
@@ -214,7 +215,7 @@ sub process_request
             process_sshcfg($noderange, $subcmd, $callback);
         }elsif ($subcmd eq 'snmpcfg') {
             process_snmpcfg($noderange, $subcmd, $callback);
-        }elsif ($subcmd =~ /ip|netmask|hostname/) {
+        }elsif ($subcmd =~ /ip|gateway|netmask|hostname/) {
             process_netcfg($request, $subreq, $subcmd, $callback);
         } else {
             $callback->({ errorcode => [1],error => "The input $command $subcmd is not support for pdu"});
@@ -628,17 +629,19 @@ sub process_netcfg {
 
     my $pdutab = xCAT::Table->new('pdu');
     my $pduhash = $pdutab->getNodesAttribs($nodes, ['pdutype']);
-    unless ($pduhash->{$pdu}->[0]->{pdutype} eq "crpdu") {
-        xCAT::SvrUtils::sendmsg("This command only supports CONSTELLATION PDU with pdutype=crpdu", $callback,$pdu);
-        return;
-    }
 
     my $nodetab = xCAT::Table->new('hosts');
     my $nodehash = $nodetab->getNodesAttribs($nodes,['ip','otherinterfaces']);
-
-    # connect to PDU
     my $static_ip = $nodehash->{$pdu}->[0]->{ip};
     my $discover_ip = $nodehash->{$pdu}->[0]->{otherinterfaces};
+
+    unless ($pduhash->{$pdu}->[0]->{pdutype} eq "crpdu") {
+        netcfg_for_irpdu($pdu, $static_ip, $discover_ip, $request, $subreq, $callback); 
+        return;
+    }
+
+
+    # connect to PDU
     ($exp, $errstr) = session_connect($static_ip, $discover_ip);
     if (defined $errstr) {
         xCAT::SvrUtils::sendmsg("Failed to connect", $callback,$pdu);
@@ -1361,6 +1364,158 @@ sub process_snmpcfg {
     }
 }
 
+#-------------------------------------------------------
+
+=head3  netcfg_for_irpdu
+
+  change hostname and network setting for IR PDU.
+
+=cut
+#-------------------------------------------------------
+sub netcfg_for_irpdu {
+    my $pdu = shift;
+    my $static_ip = shift;
+    my $discover_ip = shift;
+    my $request = shift;
+    my $subreq = shift;
+    my $callback = shift;
+    my $hostname;
+    my $ip;
+    my $gateway;
+    my $netmask;
+
+    my $extrargs  = $request->{arg};
+    my @exargs    = ($request->{arg});
+    if (ref($extrargs)) {
+        @exargs = @$extrargs;
+    }
+
+    #default password for irpdu
+    my $passwd = "1001";
+    my $username = "ADMIN";
+    my $timeout = 20;
+    my $send_change = "N";
+  
+    my $login_ip;
+   
+    # somehow, only system command works for checking if irpdu is pingable
+    # Net::Ping Module and xCAT::NetworkUtils::isPingable both are not working
+    if (system("ping -c 2 $static_ip") == 0 ) {
+        $login_ip = $static_ip;
+    } elsif (system("ping -c 2 $discover_ip") == 0) {
+        $login_ip = $discover_ip;
+    } else {
+        xCAT::SvrUtils::sendmsg(" is not reachable", $callback,$pdu);
+    }
+    
+    foreach my $cmd (@exargs) {
+        my ($key, $value) = split(/=/, $cmd);
+        if ($key =~ /hostname/) {
+            $hostname = $value;
+            xCAT::SvrUtils::sendmsg("change pdu hostname to $hostname", $callback);
+        }
+        if ($key =~ /ip/) {
+            $ip = $value;
+            $send_change = "Y";
+            xCAT::SvrUtils::sendmsg("change ip address for $pdu to $ip", $callback);
+        }
+        if ($key =~ /gateway/) {
+            $gateway = $value;
+            $send_change = "Y";
+            xCAT::SvrUtils::sendmsg("change gateway for $pdu to $gateway", $callback);
+        }
+        if ($key =~ /netmask/) {
+            $netmask = $value;
+            $send_change = "Y";
+            xCAT::SvrUtils::sendmsg("change netmask for $pdu to $netmask", $callback);
+        }
+
+    }
+
+    my $login_cmd = "telnet $login_ip\r";
+    my $user_prompt = " Login: ";
+    my $pwd_prompt = "Password: ";
+    my $pdu_prompt = "Please Enter Your Selection => ";
+    my $send_zero = 0;
+    my $send_one = 1;
+    my $send_two = 2;
+
+    my $mypdu = new Expect;
+
+    $mypdu->log_stdout(1);    # suppress stdout output..
+    $mypdu->slave->stty(qw(sane -echo));
+
+    unless ($mypdu->spawn($login_cmd))
+    {
+        $mypdu->soft_close();
+        xCAT::SvrUtils::sendmsg("Unable to run $login_cmd", $callback);
+        return;
+    }
+    my @result = $mypdu->expect(
+        $timeout,
+        [
+            $user_prompt,
+            sub {
+                $mypdu->clear_accum();
+                $mypdu->send("$username\r");
+                $mypdu->clear_accum();
+                $mypdu->exp_continue();
+            }
+        ],
+        [
+            $pwd_prompt,
+            sub {
+                $mypdu->clear_accum();
+                $mypdu->send("$passwd\r");
+                $mypdu->clear_accum();
+                $mypdu->exp_continue();
+            }
+        ],
+        [
+            $pdu_prompt,
+            sub {
+                $mypdu->clear_accum();
+                $mypdu->send("$send_one\r");
+                $mypdu->send("$send_one\r");
+                #change hostname
+                $mypdu->send("$send_one\r");
+                $mypdu->send("$hostname\r");
+                $mypdu->send("$send_zero\r");
+                #change network setting
+                $mypdu->send("$send_two\r");
+                $mypdu->send("$send_one\r");
+                $mypdu->send("$ip\r");
+                $mypdu->send("$gateway\r");
+                $mypdu->send("$netmask\r");
+                $mypdu->send("$send_change\r");
+                # go back Previous Menu
+                $mypdu->send("$send_zero\r");
+                $mypdu->send("$send_zero\r");
+            }
+        ],
+    );
+
+    if (defined($result[1]))
+    {
+        my $errmsg = $result[1];
+        $mypdu->soft_close();
+        xCAT::SvrUtils::sendmsg("Failed expect command $errmsg", $callback);
+        return;
+    }
+    $mypdu->soft_close();
+
+    xCAT::SvrUtils::sendmsg("hostname or network setting changed, update node definition ", $callback);
+    xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$pdu,"otherinterfaces="] }, $subreq, 0, 1);
+    if ( (defined $ip) and ($static_ip ne $ip) ) {
+        xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$pdu,"ip=$ip",'status=configured'] }, $subreq, 0, 1);
+        xCAT::Utils->runxcmd({ command => ['makehosts'], node => [$pdu] },  $subreq, 0, 1);
+    }
+
+    return;
+}
+
+
+
 
 
 1;
diff --git a/xCAT-server/lib/xcat/plugins/switchdiscover.pm b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
index 7c3277154..630727af7 100644
--- a/xCAT-server/lib/xcat/plugins/switchdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
@@ -1440,31 +1440,38 @@ sub switchsetup {
             @nets = $nettab->getAllAttribs('net','mask');
         }
         foreach my $mytype (keys %$nodes_to_config) {
-            if ( $mytype eq "irpdu" ) {
-                send_msg($request, 0, "the setup options for irpdu is not support yet\n");
-            } elsif ( $mytype eq "crpdu" ) {
-                my $nodetab = xCAT::Table->new('hosts');
-                my $nodehash = $nodetab->getNodesAttribs(\@{${nodes_to_config}->{$mytype}},['ip','otherinterfaces']);
-                foreach my $pdu(@{${nodes_to_config}->{$mytype}}) {
-                    my $cmd = "rspconfig $pdu sshcfg"; 
-                    xCAT::Utils->runcmd($cmd, 0);
-                    my $ip = $nodehash->{$pdu}->[0]->{ip};
-                    my $mask;
-                    foreach my $net (@nets) {
-                        if (xCAT::NetworkUtils::isInSameSubnet( $net->{'net'}, $ip, $net->{'mask'}, 0)) {
-                            $mask=$net->{'mask'};
-                        }
-                    }
-                    $cmd = "rspconfig $pdu hostname=$pdu ip=$ip netmask=$mask";
-                    xCAT::Utils->runcmd($cmd, 0);
-                    if ($::RUNCMD_RC == 0) {
-                        xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$pdu,"ip=$ip","otherinterfaces="] }, $sub_req, 0, 1);
-                    } else {
-                        send_msg($request, 0, "Failed to run rspconfig command to set ip/netmask\n");
+            my $nodetab = xCAT::Table->new('hosts');
+            my $nodehash = $nodetab->getNodesAttribs(\@{${nodes_to_config}->{$mytype}},['ip','otherinterfaces']);
+            foreach my $pdu(@{${nodes_to_config}->{$mytype}}) {
+                my $ip = $nodehash->{$pdu}->[0]->{ip};
+                my $mask;
+                foreach my $net (@nets) {
+                    if (xCAT::NetworkUtils::isInSameSubnet( $net->{'net'}, $ip, $net->{'mask'}, 0)) {
+                        $mask=$net->{'mask'};
                     }
                 }
-            } else {
-                send_msg($request, 0, "the pdu type $mytype is not support\n");
+                my $cmd;
+                my $rc = 0;
+                if ( $mytype eq "crpdu" ) {
+                    $cmd = "rspconfig $pdu sshcfg"; 
+                    send_msg($request, 0, "process command: $cmd\n");
+                    $rc = xCAT::Utils->runcmd($cmd, 0);
+                    $cmd = "rspconfig $pdu hostname=$pdu ip=$ip netmask=$mask";
+                    send_msg($request, 0, "process command: $cmd\n");
+                    $rc  = xCAT::Utils->runcmd($cmd, 0);
+                } elsif ( $mytype eq "irpdu" ) {
+                    $cmd = "rspconfig $pdu hostname=$pdu ip=$ip netmask=$mask";
+                    send_msg($request, 0, "process command: $cmd\n");
+                    $rc = xCAT::Utils->runcmd($cmd, 0);
+                } else {
+                    send_msg($request, 0, "the pdu type $mytype is not support\n");
+                    $rc = 1;
+                }
+                if ($rc == 0) {
+                    xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$pdu,'status=configured',"ip=$ip","otherinterfaces="] }, $sub_req, 0, 1);
+                } else {
+                    send_msg($request, 0, "Failed to run rspconfig command to set ip/netmask\n");
+                }
             }
         }
         return;

From e98e2701e0d19b4fcae5dc616657f53816b45ebd Mon Sep 17 00:00:00 2001
From: Weihua Hu <huweihua@cn.ibm.com>
Date: Fri, 26 Jan 2018 15:49:04 +0800
Subject: [PATCH 002/100] Update Version

---
 Version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Version b/Version
index 3caff04ae..3c5ed7828 100644
--- a/Version
+++ b/Version
@@ -1 +1 @@
-2.13.10
+2.13.11

From 231d9347329cdaddad00f7c29390d543acbd008b Mon Sep 17 00:00:00 2001
From: chenglch <chenglch@cn.ibm.com>
Date: Tue, 23 Jan 2018 17:42:43 +0800
Subject: [PATCH 003/100] Define some attributes as array type in rest api ver
 1.0

Split attribute with comma is not a standard way, this commit
bumped REST version to 1.0 to deal with these attributes in
array type.

```
curl -X GET -k 'http://10.5.101.10/xcatws/nodes/restnode1?userName=root&userPW=cluster'
{"restnode1":{"serialspeed":"115200","nicips.ib1":"10.0.0.100|fd55::214:5eff:fe15:849b","nicnetworks.ib0":"IB00","nicnetworks.ib1":"IB01","cons":"ipmi","postscripts":"syslog,remoteshell,syncfiles,hello,world2","nicips.ib0":"10.10.100.9","groups":"conpute,staticconsolegroup","postbootscripts":"otherpkgs","nictypes.ib0":"Infiniband","nicips.ib2":"10.0.0.103|10.0.0.104"}}

 curl -X GET -k 'http://10.5.101.10/xcatws/nodes/restnode1?userName=root&userPW=cluster&ver=1.0'
{"restnode1":{"nicnetworks.ib0":"IB00","nicnetworks.ib1":"IB01","cons":"ipmi","postscripts":["syslog","remoteshell","syncfiles","hello","world2"],"nicips.ib0":["10.10.100.9"],"nicips.ib2":["10.0.0.103","10.0.0.104"],"groups":["conpute","staticconsolegroup"],"postbootscripts":["otherpkgs"],"serialspeed":"115200","nicips.ib1":["10.0.0.100","fd55::214:5eff:fe15:849b"],"nictypes.ib0":"Infiniband"}}

```
---
 xCAT-server/xCAT-wsapi/xcatws.cgi | 50 +++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/xCAT-wsapi/xcatws.cgi b/xCAT-server/xCAT-wsapi/xcatws.cgi
index a5e8c39dd..5fbea07ca 100644
--- a/xCAT-server/xCAT-wsapi/xcatws.cgi
+++ b/xCAT-server/xCAT-wsapi/xcatws.cgi
@@ -45,6 +45,12 @@ my %usagemsg = (
     non_getreturn => "No output when execution is successfull. Otherwise output the error information in the Standard Error Format: {error:[msg1,msg2...],errocode:errornum}."
 );
 
+# ver(1.0): Use array type instread of string split by '|' or ','
+# ver(1.0): Specify the version number as 'ver=1.0' which is a url parameter
+# ver(1.0): Example: curl -X GET -k 'http://hostname/xcatws/nodes/restnode1?userName=root&userPW=cluster&ver=1.0'
+my @ARRAY_ATTRS = ('groups', 'members', 'postscripts', 'postbootscripts');
+my $NICS_ATTR = 'nicips';
+
 my %URIdef = (
     #### definition for node resources
     nodes => {
@@ -1387,14 +1393,19 @@ if ($ARGV[0] eq "-h") {
     $pathInfo    = $ARGV[1];
 
     unless ($pathInfo) { dbgusage(); exit 1; }
-
-    if ($ARGV[2] =~ /(.*):(.*)/) {
-        $ENV{userName} = $1;
-        $ENV{password} = $2;
-    } else {
+    # userName:userPW:version
+    my @params = split(':', $ARGV[2]);
+    if (@params < 2) {
         dbgusage();
         exit 0;
     }
+    if(@params >= 2) {
+        $ENV{userName} = $params[0];
+        $ENV{password} = $params[1];
+    }
+    if(@params == 3) {
+        $ENV{ver} = $params[2];
+    }
     $dbgdata = $ARGV[3] if defined($ARGV[3]);
 } elsif (defined($ARGV[0])) {
     dbgusage();
@@ -1626,6 +1637,23 @@ sub defout {
                 if (!$nodename) { error('improperly formatted lsdef output from xcatd', $STATUS_TEAPOT); }
                 my ($attr, $val) = $l =~ /^\s*(\S+?)=(.*)$/;
                 if (!defined($attr)) { error('improperly formatted lsdef output from xcatd', $STATUS_TEAPOT); }
+                if ((defined($generalparams->{ver}) && $generalparams->{ver} eq '1.0') ||
+                    (defined($ENV{ver}) && $ENV{ver} eq '1.0')) {
+                    # ver(1.0): Return array type directly instead of string split by '|' or ','
+                    if (grep(/^$attr$/, @ARRAY_ATTRS)) {
+                        my @vals = split(',', $val);
+                        if (@vals) {
+                            $json->{$nodename}->{$attr} = \@vals;
+                        }
+                        next;
+                    } elsif ($attr =~ /^$NICS_ATTR.+/) {
+                        my @vals = split('\|', $val);
+                        if (@vals) {
+                            $json->{$nodename}->{$attr} = \@vals;
+                        }
+                        next;
+                    }
+                }
                 $json->{$nodename}->{$attr} = $val;
             }
         }
@@ -1971,6 +1999,16 @@ sub defhdl {
                 push @args, $opt_val if $opt_val;
             }
             next;
+        } elsif (ref($paramhash->{$k}) eq "ARRAY") {
+            # ver(1.0): Accept array type for the attributes split by ',' or '|'
+            my $val;
+            if (grep(/^$k$/, @ARRAY_ATTRS)) {
+                $val = join(',', @{$paramhash->{$k}});
+            } elsif ($k =~ /^$NICS_ATTR.+/) {
+                $val = join('|', @{$paramhash->{$k}});
+            }
+            push(@args, "$k=$val") if $val;
+            next;
         }
         push @args, "$k=$paramhash->{$k}" if $paramhash->{$k};
     }
@@ -3302,7 +3340,7 @@ sub sendRequest {
 # 1st output param - The params which are listed in @generalparamlis as a general parameters like 'debug=1, pretty=1'
 # 2nd output param - All the params from url params and 'PUTDATA'/'POSTDATA' except the ones in @generalparamlis
 sub fetchParameters {
-    my @generalparamlist = qw(userName userPW pretty debug xcoll);
+    my @generalparamlist = qw(userName userPW pretty debug xcoll ver);
 
     # 1st check for put/post data and put that in the hash
     my $pdata;

From e944582a65051144d9d73eec1132fdb549011eb0 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Mon, 29 Jan 2018 11:14:34 -0500
Subject: [PATCH 004/100] Detect invalid dump id

---
 xCAT-server/lib/xcat/plugins/openbmc.pm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 658dee13c..bf0cb75a7 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -3926,12 +3926,7 @@ sub dump_download_process {
         return 1;
     }
     if ($h->{message} eq $::RESPONSE_OK) {
-        if ($::RSPCONFIG_DUMP_DOWNLOAD_ALL_REQUESTED) {
-            # Slightly different message if downloading dumps as part of "download all" processing
-            xCAT::SvrUtils::sendmsg("Downloading dump $dump_id to $file_name", $callback, $node);
-        } else {
-            xCAT::SvrUtils::sendmsg("Dump $dump_id generated. Downloading to $file_name", $callback, $node);
-        }
+        xCAT::SvrUtils::sendmsg("Downloading dump $dump_id to $file_name", $callback, $node);
         my $curl_dwld_result = `$curl_dwld_cmd -s`;
         if (!$curl_dwld_result) {
             if ($xcatdebugmode) {
@@ -3941,7 +3936,17 @@ sub dump_download_process {
             `$curl_logout_cmd -s`;
             # Verify the file actually got downloaded
             if (-e $file_name) {
-                xCAT::SvrUtils::sendmsg("Downloaded dump $dump_id to $file_name", $callback, $node) if ($::VERBOSE);
+                # Check inside downloaded file, if there is a "Path not found" -> invalid ID
+                my $grep_cmd = "/usr/bin/grep -a";
+                my $path_not_found = "Path not found";
+                my $grep_for_path = `$grep_cmd $path_not_found $file_name`;
+                if ($grep_for_path) {
+                    xCAT::SvrUtils::sendmsg([1, "Invalid dump $dump_id was specified. Use -l option to list."], $callback, $node);
+                    # Remove downloaded file, nothing useful inside of it
+                    unlink $file_name;
+                } else {
+                    xCAT::SvrUtils::sendmsg("Downloaded dump $dump_id to $file_name", $callback, $node) if ($::VERBOSE);
+                }
             }
             else {
                 xCAT::SvrUtils::sendmsg([1, "Failed to download dump $dump_id to $file_name. Verify destination directory exists and has correct access permissions."], $callback, $node);

From 86d8c4749e1b01ac74d035b077157d6b53a0ca5a Mon Sep 17 00:00:00 2001
From: cxhong <abcdqiu@gmail.com>
Date: Mon, 29 Jan 2018 21:12:53 -0500
Subject: [PATCH 005/100] Remove not existing table fields in PDU table (#4750)

---
 perl-xCAT/xCAT/Schema.pm | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index 49bbd68f7..2639cba81 100755
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -4245,22 +4245,7 @@ push(@{ $defspec{group}->{'attrs'} }, @nodeattrs);
         tabentry        => 'pdu.outlet',
         access_tabentry => 'pdu.node=attr:node',
     },
-    {   attr_name => 'machinetype',
-        only_if         => 'nodetype=pdu',
-        tabentry        => 'pdu.machinetype',
-        access_tabentry => 'pdu.node=attr:node',
-    },
-    { attr_name => 'modelnum',
-        only_if         => 'nodetype=pdu',
-        tabentry        => 'pdu.modelnum',
-        access_tabentry => 'pdu.node=attr:node',
-    },
-    { attr_name => 'serialnum',
-        only_if         => 'nodetype=pdu',
-        tabentry        => 'pdu.serialnum',
-        access_tabentry => 'pdu.node=attr:node',
-    },
-);
+  );
 
 
 

From 08ffa002fb15bf0058a69e2743771395a5a026c6 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Tue, 30 Jan 2018 00:21:27 -0500
Subject: [PATCH 006/100] fix issue 4652: extra warning message for bmcdiscover

---
 xCAT-server/lib/xcat/plugins/bmcdiscover.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
index c4f1e2d5c..4674205df 100644
--- a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
@@ -1130,8 +1130,6 @@ sub bmcdiscovery_ipmi {
         }
 
         display_output($opz,$opw,$mtms_node,$mac_node,$node_data,"ipmi",$request_command);
-    } else {
-        store_fd({data=>0}, $fd);
     }
 }
 
@@ -1156,6 +1154,7 @@ sub bmcdiscovery_openbmc{
     my $mtms_node       = "";
     my $mac_node        = "";
 
+    store_fd({data=>1}, $fd);
     print "$ip: Detected openbmc, attempting to obtain system information...\n";
     my $http_protocol="https";
     my $openbmc_project_url = "xyz/openbmc_project";

From df3a89c6a9a82f761cfd81c081f2c604b24247be Mon Sep 17 00:00:00 2001
From: Kilian Cavalotti <kilian@stanford.edu>
Date: Tue, 30 Jan 2018 17:56:14 -0800
Subject: [PATCH 007/100] dodiscovery: FRU info may be present may incomplete.
 Check the contents of MTM obtained from FRU and fallback to DMI if it's
 empty.

---
 xCAT-genesis-scripts/usr/bin/dodiscovery | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xCAT-genesis-scripts/usr/bin/dodiscovery b/xCAT-genesis-scripts/usr/bin/dodiscovery
index c23f99fae..b83759ecf 100755
--- a/xCAT-genesis-scripts/usr/bin/dodiscovery
+++ b/xCAT-genesis-scripts/usr/bin/dodiscovery
@@ -95,7 +95,8 @@ if [ -r /sys/devices/virtual/dmi/id/product_name ]; then  #x86
 			FRU=`ipmitool fru print 0`
 			if [ $? -eq 0 ]; then
                                 MTM=`echo "$FRU" | awk -F': ' '/Product Manufacturer/ {m=$2} /Product Name|Product Part Number/ {if (n==""||n=="NONE") {n=$2}} END {print m":"n}'`
-			else
+            fi
+            if [ -z "$MTM" -o "$MTM" == ":" ]; then
 				logger -s -t $log_label -p local4.warning "Couldn't find MTM information in FRU, falling back to DMI (MTMS-based discovery may fail)"
 				m=`cat /sys/devices/virtual/dmi/id/sys_vendor`
 				n=`cat /sys/devices/virtual/dmi/id/product_name`

From 601df797293e993ee06e191144c269d45e53ea11 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Wed, 31 Jan 2018 00:42:56 -0500
Subject: [PATCH 008/100] modify error msg for rflash unsupported option

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index 766791242..3f8855527 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -163,6 +163,11 @@ sub parse_args {
         if ($option_num >= 2) {
             return ([ 1, "Multiple options are not supported."]);
         } elsif ($option_num == 0) {
+            for my $arg (@ARGV) {
+                if ($arg =~ /^-/) {
+                    return ([ 1, "Unsupported command: $command $arg" ]);
+                }
+            }
             return ([ 1, "No options specified."]);
         }
         if ($activate or $check or $delete or $upload) {

From 8d06fe119545b0b1f69b32f8b73ea3238a616b66 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Wed, 31 Jan 2018 13:58:39 +0800
Subject: [PATCH 009/100] Add package dependency dependency for goconserver

---
 xCAT/debian/control   | 2 +-
 xCAT/xCAT.spec        | 4 ++++
 xCATsn/debian/control | 2 +-
 xCATsn/xCATsn.spec    | 4 ++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/xCAT/debian/control b/xCAT/debian/control
index e0cb0b97b..24649a905 100644
--- a/xCAT/debian/control
+++ b/xCAT/debian/control
@@ -10,7 +10,7 @@ Homepage: https://xcat.org/
 Package: xcat
 Architecture: amd64 ppc64el
 Depends: ${perl:Depends}, xcat-server (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libdbd-sqlite3-perl, isc-dhcp-server, apache2, nfs-kernel-server, libxml-parser-perl, xinetd, rsync, tftpd-hpa, conserver-xcat, libnet-telnet-perl, xcat-genesis-scripts-ppc64 (>= 2.13-snap000000000000), xcat-genesis-scripts-amd64 (>= 2.13-snap000000000000)
-Recommends: bind9, nmap, tftp-hpa, ipmitool-xcat (>= 1.8.17-1), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat, xnba-undi, elilo-xcat, xcat-buildkit (>= 2.13-snap000000000000), xcat-probe (>= 2.13-snap000000000000)
+Recommends: bind9, nmap, tftp-hpa, ipmitool-xcat (>= 1.8.17-1), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat, xnba-undi, elilo-xcat, xcat-buildkit (>= 2.13-snap000000000000), xcat-probe (>= 2.13-snap000000000000), goconserver
 Suggests: yaboot-xcat
 Description: Metapackage for a common, default xCAT setup
  xCAT is Extreme Cluster/Cloud Administration Toolkit. xCAT offers complete
diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index e62ae73dd..1f67b1d78 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -73,6 +73,10 @@ Requires: conserver-xcat
 %endif
 %endif
 
+%ifos linux
+Recommends: goconserver
+%endif
+
 #support mixed cluster
 %if %nots390x
 Requires: elilo-xcat xnba-undi
diff --git a/xCATsn/debian/control b/xCATsn/debian/control
index 4f2b6f223..ca494800e 100644
--- a/xCATsn/debian/control
+++ b/xCATsn/debian/control
@@ -9,7 +9,7 @@ Homepage: https://xcat.org/
 Package: xcatsn
 Architecture: amd64 ppc64el
 Depends: ${perl:Depends}, xcat-server (>= 2.13-snap000000000000), xcat-client (>= 2.13-snap000000000000), libdbd-sqlite3-perl, libxml-parser-perl, tftpd-hpa, conserver-xcat, libnet-telnet-perl, isc-dhcp-server, apache2, nfs-kernel-server, xcat-genesis-scripts-ppc64 (>= 2.13-snap000000000000), xcat-genesis-scripts-amd64 (>= 2.13-snap000000000000)
-Recommends: bind9, nmap, tftp-hpa, ipmitool-xcat (>= 1.8.17-1), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat, xnba-undi, elilo-xcat, xcat-buildkit (>= 2.13-snap000000000000), xcat-probe (>= 2.13-snap000000000000)
+Recommends: bind9, nmap, tftp-hpa, ipmitool-xcat (>= 1.8.17-1), syslinux[any-amd64], libsys-virt-perl, syslinux-xcat, xnba-undi, elilo-xcat, xcat-buildkit (>= 2.13-snap000000000000), xcat-probe (>= 2.13-snap000000000000), goconserver
 Suggests: yaboot-xcat
 Description: Metapackage for a common, default xCAT service node setup
  xCATsn is a service node management package intended for at-scale
diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec
index 07dde086c..26baaa439 100644
--- a/xCATsn/xCATsn.spec
+++ b/xCATsn/xCATsn.spec
@@ -56,6 +56,10 @@ Requires: conserver-xcat
 %endif
 %endif
 
+%ifos linux
+Recommends: goconserver
+%endif
+
 #support mixed cluster
 %ifnarch s390x
 Requires: elilo-xcat xnba-undi

From 9b04b8483c3bd3b580209be5bd877ba3cd0362a4 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Tue, 30 Jan 2018 20:25:53 -0500
Subject: [PATCH 010/100] fix issue 4758, add '-V' in rflash Usage and manpage

---
 .../guides/admin-guides/references/man1/rflash.1.rst   |  8 ++++----
 perl-xCAT/xCAT/Usage.pm                                | 10 +++++-----
 xCAT-client/pods/man1/rflash.1.pod                     |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man1/rflash.1.rst b/docs/source/guides/admin-guides/references/man1/rflash.1.rst
index 4eb48fa80..5e833a139 100644
--- a/docs/source/guides/admin-guides/references/man1/rflash.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rflash.1.rst
@@ -19,15 +19,15 @@ Name
 ****************
 
 
-\ **rflash**\  [\ **-h | -**\ **-help**\  | \ **-v | -**\ **-version**\ ]
+\ **rflash**\  [\ **-h | -**\ **-help**\  | \ **-v | -**\ **-version**\  | \ **-V | -**\ **-verbose**\ ]
 
 PPC (with HMC) specific:
 ========================
 
 
-\ **rflash**\  \ *noderange*\  \ **-p**\  \ *directory*\  [\ **-**\ **-activate**\  {\ **concurrent | disruptive**\ }] [\ **-V | -**\ **-verbose**\ ]
+\ **rflash**\  \ *noderange*\  \ **-p**\  \ *directory*\  [\ **-**\ **-activate**\  {\ **concurrent | disruptive**\ }]
 
-\ **rflash**\  \ *noderange*\  {\ **-**\ **-commit | -**\ **-recover**\ } [\ **-V | -**\ **-verbose**\ ]
+\ **rflash**\  \ *noderange*\  {\ **-**\ **-commit | -**\ **-recover**\ }
 
 
 PPC (without HMC, using Direct FSP Management) specific:
@@ -50,7 +50,7 @@ OpenPOWER BMC specific (using IPMI):
 ====================================
 
 
-\ **rflash**\  \ *noderange*\  [\ *hpm_file_path*\  | \ **-d**\  \ *data_directory*\ ] [\ **-c | -**\ **-check**\ ] [\ **-**\ **-retry=**\ \ *count*\ ] [\ **-V**\ ]
+\ **rflash**\  \ *noderange*\  [\ *hpm_file_path*\  | \ **-d**\  \ *data_directory*\ ] [\ **-c | -**\ **-check**\ ] [\ **-**\ **-retry=**\ \ *count*\ ]
 
 \ **rflash**\  \ *noderange*\  \ **-**\ **-recover**\  \ *bmc_file_path*\ 
 
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 40e510247..70a0646b9 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -351,16 +351,16 @@ my %usage = (
        makentp [-a|--all] [-V|--verbose]",
     "rflash" =>
       "Usage: 
-    rflash [ -h|--help|-v|--version]
+    rflash [ -h|--help|-v|--version|-V|--verbose]
     PPC (with HMC) specific:
-	rflash <noderange> -p <rpm_directory> [--activate {concurrent | disruptive}] [-V|--verbose] 
-	rflash <noderange> {--commit | --recover} [-V|--verbose]
+	rflash <noderange> -p <rpm_directory> [--activate {concurrent | disruptive}] 
+	rflash <noderange> {--commit | --recover}
     PPC (using Direct FSP Management) specific:
 	rflash <noderange> -p <rpm_directory> [--activate {disruptive|deferred}] [-d <data_directory>]
-	rflash <noderange> [--commit | --recover] [-V|--verbose]
+	rflash <noderange> [--commit | --recover]
         rflash <noderange> [--bpa_acdl]
     OpenPOWER BMC specific (using IPMI):
-        rflash <noderange> [<hpm_file_path>|-d <data_directory>] [-c|--check] [--retry=<count>] [-V]
+        rflash <noderange> [<hpm_file_path>|-d <data_directory>] [-c|--check] [--retry=<count>]
         rflash <noderange> --recover <bmc_file_path>
     OpenPOWER OpenBMC specific:
         rflash <noderange> {[-c|--check] | [-l|--list]}
diff --git a/xCAT-client/pods/man1/rflash.1.pod b/xCAT-client/pods/man1/rflash.1.pod
index f6985b970..94d0db3bc 100644
--- a/xCAT-client/pods/man1/rflash.1.pod
+++ b/xCAT-client/pods/man1/rflash.1.pod
@@ -4,13 +4,13 @@ B<rflash> - Performs Licensed Internal Code (LIC) update or firmware update on s
 
 =head1 B<Synopsis>
 
-B<rflash> [B<-h>|B<--help> | B<-v>|B<--version>]
+B<rflash> [B<-h>|B<--help> | B<-v>|B<--version> | B<-V>|B<--verbose>]
 
 =head2 PPC (with HMC) specific:
 
-B<rflash> I<noderange> B<-p> I<directory> [B<--activate> {B<concurrent>|B<disruptive>}] [B<-V>|B<--verbose>]
+B<rflash> I<noderange> B<-p> I<directory> [B<--activate> {B<concurrent>|B<disruptive>}]
 
-B<rflash> I<noderange> {B<--commit>|B<--recover>} [B<-V>|B<--verbose>]
+B<rflash> I<noderange> {B<--commit>|B<--recover>}
 
 =head2 PPC (without HMC, using Direct FSP Management) specific:
 
@@ -24,7 +24,7 @@ B<rflash> I<noderange> I<http_directory>
 
 =head2 OpenPOWER BMC specific (using IPMI):
 
-B<rflash> I<noderange> [I<hpm_file_path> | B<-d> I<data_directory>] [B<-c>|B<--check>] [B<--retry=>I<count>] [B<-V>]
+B<rflash> I<noderange> [I<hpm_file_path> | B<-d> I<data_directory>] [B<-c>|B<--check>] [B<--retry=>I<count>]
 
 B<rflash> I<noderange> B<--recover> I<bmc_file_path>
 

From 3e4d70383a28e781f1d2afec42f12c22a49cff7e Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Wed, 31 Jan 2018 12:11:08 -0500
Subject: [PATCH 011/100] return sub routine if ip is not reachable

---
 xCAT-server/lib/xcat/plugins/pdu.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xCAT-server/lib/xcat/plugins/pdu.pm b/xCAT-server/lib/xcat/plugins/pdu.pm
index f62121089..d2a94ca3f 100644
--- a/xCAT-server/lib/xcat/plugins/pdu.pm
+++ b/xCAT-server/lib/xcat/plugins/pdu.pm
@@ -1406,6 +1406,7 @@ sub netcfg_for_irpdu {
         $login_ip = $discover_ip;
     } else {
         xCAT::SvrUtils::sendmsg(" is not reachable", $callback,$pdu);
+        return;
     }
     
     foreach my $cmd (@exargs) {

From 31c47c303434ffac3961ad2a9d888f9595ef2849 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Wed, 31 Jan 2018 15:38:43 -0500
Subject: [PATCH 012/100] Add code to support timesyncmethod for OpenBMC using
 rspconfig

---
 .../references/man1/rspconfig.1.rst           | 32 ++++++++++++-------
 xCAT-client/pods/man1/rspconfig.1.pod         | 30 ++++++++++-------
 xCAT-server/lib/xcat/plugins/openbmc.pm       | 13 ++++++++
 3 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
index 118a39de1..a31d08533 100644
--- a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
@@ -49,6 +49,14 @@ OpenBMC specific:
 
 \ **rspconfig**\  \ *noderange*\  {\ **ipsrc | ip | netmask | gateway | hostname | vlan | sshcfg**\ }
 
+\ **rspconfig**\  \ *noderange*\  \ **autoreboot**\ 
+
+\ **rspconfig**\  \ *noderange*\  \ **autoreboot={0|1}**\ 
+
+\ **rspconfig**\  \ *noderange*\  \ **bootmode**\ 
+
+\ **rspconfig**\  \ *noderange*\  \ **bootmode={safe|regular|setup}**\ 
+
 \ **rspconfig**\  \ *noderange*\  \ **dump**\  [\ **-l | -**\ **-list**\ ] [\ **-g | -**\ **-generate**\ ] [\ **-c | -**\ **-clear**\  {\ *id*\  | \ **all**\ }] [\ **-d | -**\ **-download**\  {\ *id*\  | \ **all**\ }]
 
 \ **rspconfig**\  \ *noderange*\  \ **powerrestorepolicy**\ 
@@ -59,13 +67,9 @@ OpenBMC specific:
 
 \ **rspconfig**\  \ *noderange*\  \ **powersupplyredundancy={disabled|enabled}**\ 
 
-\ **rspconfig**\  \ *noderange*\  \ **autoreboot**\ 
+\ **rspconfig**\  \ *noderange*\  \ **timesyncmethod**\ 
 
-\ **rspconfig**\  \ *noderange*\  \ **autoreboot={0|1}**\ 
-
-\ **rspconfig**\  \ *noderange*\  \ **bootmode**\ 
-
-\ **rspconfig**\  \ *noderange*\  \ **bootmode={safe|regular|setup}**\ 
+\ **rspconfig**\  \ *noderange*\  \ **timesyncmethod={manual|ntp}**\ 
 
 
 MPA specific:
@@ -450,31 +454,31 @@ OPTIONS
 
 \ **powerrestorepolicy**\ 
  
- Display or control BMC Power Restore Policy attribute setting.
+ Display or control BMC Power Restore Policy attribute setting. [OpenBMC]
  
 
 
 \ **powersupplyredundancy**\ 
  
- Display or control BMC Power Supply Redundancy attribute setting.
+ Display or control BMC Power Supply Redundancy attribute setting. [OpenBMC]
  
 
 
 \ **autoreboot**\ 
  
- Display or control BMC Auto Reboot attribute setting.
+ Display or control BMC Auto Reboot attribute setting. [OpenBMC]
  
 
 
 \ **bootmode**\ 
  
- Display or control BMC Boot Mode attribute setting.
+ Display or control BMC Boot Mode attribute setting. [OpenBMC]
  
 
 
 \ **dump**\ 
  
- Manage OpenBMC system dumps. If no sub-option is provided, will generate, wait, and download the dump.
+ Generate BMC system dump. If no sub-option is provided, will generate, wait, and download the dump. [OpenBMC]
  
  
  \ **-c**\  will clear a single specified dump, or use 'all' to clear all dumps on the BMC.
@@ -495,6 +499,12 @@ OPTIONS
  
 
 
+\ **timesyncmethod**\ 
+ 
+ Set the method for time synchronization on the BMC. [OpenBMC]
+ 
+
+
 \ **network**\ ={[\ *ip*\ ],[\ *host*\ ],[\ *gateway*\ ],[\ *netmask*\ ]|\*}
  
  For MPA:  get or set the MPA network parameters. If '\*' is specified, all parameters are read from the xCAT database.
diff --git a/xCAT-client/pods/man1/rspconfig.1.pod b/xCAT-client/pods/man1/rspconfig.1.pod
index c75d8dae7..d87900134 100644
--- a/xCAT-client/pods/man1/rspconfig.1.pod
+++ b/xCAT-client/pods/man1/rspconfig.1.pod
@@ -26,6 +26,14 @@ B<rspconfig> I<noderange> B<garp>=I<time>
 
 B<rspconfig> I<noderange> {B<ipsrc>|B<ip>|B<netmask>|B<gateway>|B<hostname>|B<vlan>|B<sshcfg>}
 
+B<rspconfig> I<noderange> B<autoreboot>
+
+B<rspconfig> I<noderange> B<autoreboot={0|1}>
+
+B<rspconfig> I<noderange> B<bootmode>
+
+B<rspconfig> I<noderange> B<bootmode={safe|regular|setup}>
+
 B<rspconfig> I<noderange> B<dump> [B<-l>|B<--list>] [B<-g>|B<--generate>] [B<-c>|B<--clear> {I<id> | B<all>}] [B<-d>|B<--download> {I<id> | B<all>}]
 
 B<rspconfig> I<noderange> B<powerrestorepolicy>
@@ -36,13 +44,9 @@ B<rspconfig> I<noderange> B<powersupplyredundancy>
 
 B<rspconfig> I<noderange> B<powersupplyredundancy={disabled|enabled}>
 
-B<rspconfig> I<noderange> B<autoreboot>
+B<rspconfig> I<noderange> B<timesyncmethod>
 
-B<rspconfig> I<noderange> B<autoreboot={0|1}>
-
-B<rspconfig> I<noderange> B<bootmode>
-
-B<rspconfig> I<noderange> B<bootmode={safe|regular|setup}>
+B<rspconfig> I<noderange> B<timesyncmethod={manual|ntp}>
 
 =head2 MPA specific:
 
@@ -344,23 +348,23 @@ The subnet mask.
 
 =item B<powerrestorepolicy>
 
-Display or control BMC Power Restore Policy attribute setting.
+Display or control BMC Power Restore Policy attribute setting. [OpenBMC]
 
 =item B<powersupplyredundancy>
 
-Display or control BMC Power Supply Redundancy attribute setting.
+Display or control BMC Power Supply Redundancy attribute setting. [OpenBMC]
 
 =item B<autoreboot>
 
-Display or control BMC Auto Reboot attribute setting.
+Display or control BMC Auto Reboot attribute setting. [OpenBMC]
 
 =item B<bootmode>
 
-Display or control BMC Boot Mode attribute setting.
+Display or control BMC Boot Mode attribute setting. [OpenBMC]
 
 =item B<dump>
 
-Manage OpenBMC system dumps. If no sub-option is provided, will generate, wait, and download the dump.
+Generate BMC system dump. If no sub-option is provided, will generate, wait, and download the dump. [OpenBMC]
 
 =over 4
 
@@ -378,6 +382,10 @@ B<-d> will download a single dump or all generated dumps from the BMC to /var/lo
 
 =back
 
+=item B<timesyncmethod>
+
+Set the method for time synchronization on the BMC. [OpenBMC]
+
 =item B<network>={[I<ip>],[I<host>],[I<gateway>],[I<netmask>]|*}
 
 For MPA:  get or set the MPA network parameters. If '*' is specified, all parameters are read from the xCAT database.
diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 658dee13c..1da7cef1a 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -638,6 +638,19 @@ my %api_config_info = (
             always_off  => "xyz.openbmc_project.Control.Power.RestorePolicy.Policy.AlwaysOff",
         },
     },
+    RSPCONFIG_TIME_SYNC_METHOD => {
+        command      => "rspconfig",
+        url          => "/time/sync_method",
+        attr_url     => "TimeSyncMethod",
+        display_name => "BMC TimeSyncMethod",
+        instruct_msg => "",
+        type         => "attribute",
+        subcommand   => "timesyncmethod",
+        attr_value   => {
+            ntp         => "xyz.openbmc_project.Time.Synchronization.Method.NTP",
+            manual      => "xyz.openbmc_project.Time.Synchronization.Method.Manual",
+        },
+    },
 );
 
 $::RESPONSE_OK                  = "200 OK";

From 913873430c28a825513859e3e32bbfa5c820957d Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Wed, 31 Jan 2018 16:39:19 -0500
Subject: [PATCH 013/100] Handle update files with - in the path

---
 xCAT-server/lib/xcat/plugins/openbmc.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 658dee13c..77516b813 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -1850,23 +1850,23 @@ sub parse_command_status {
         my $nohost_reboot = 0;
 
         foreach $subcommand (@$subcommands) {
-            if ($subcommand =~ /-c|--check/) {
+            if ($subcommand =~ /^-c|^--check/) {
                 $check_version = 1;
-            } elsif ($subcommand =~ /-l|--list/) {
+            } elsif ($subcommand =~ /^-l|^--list/) {
                 $list = 1;
-            } elsif ($subcommand =~ /--delete/) {
+            } elsif ($subcommand =~ /^--delete/) {
                 $delete = 1;
-            } elsif ($subcommand =~ /-u|--upload/) {
+            } elsif ($subcommand =~ /^-u|^--upload/) {
                 $upload = 1;
-            } elsif ($subcommand =~ /-a|--activate/) {
+            } elsif ($subcommand =~ /^-a|^--activate/) {
                 $activate = 1;
-            } elsif ($subcommand =~ /-d/) {
+            } elsif ($subcommand =~ /^-d/) {
                 my $check = unsupported($callback); if (ref($check) eq "ARRAY") {
                     xCAT::SvrUtils::sendmsg($check, $callback);
                     return 1;
                 }
                 $streamline = 1;
-            } elsif ($subcommand =~ /--no-host-reboot/) {
+            } elsif ($subcommand =~ /^--no-host-reboot/) {
                 $nohost_reboot = 1;
             } else {
                 $update_file = $subcommand;

From 49b8f0cf44c64b0a02838d35d4814ee06e595529 Mon Sep 17 00:00:00 2001
From: Kilian Cavalotti <kilian@stanford.edu>
Date: Tue, 30 Jan 2018 17:56:14 -0800
Subject: [PATCH 014/100] dodiscovery: FRU info may be present may incomplete.
 Check the contents of MTM obtained from FRU and fallback to DMI if it's
 empty.

---
 xCAT-genesis-scripts/usr/bin/dodiscovery | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xCAT-genesis-scripts/usr/bin/dodiscovery b/xCAT-genesis-scripts/usr/bin/dodiscovery
index c23f99fae..8e11133c5 100755
--- a/xCAT-genesis-scripts/usr/bin/dodiscovery
+++ b/xCAT-genesis-scripts/usr/bin/dodiscovery
@@ -95,7 +95,8 @@ if [ -r /sys/devices/virtual/dmi/id/product_name ]; then  #x86
 			FRU=`ipmitool fru print 0`
 			if [ $? -eq 0 ]; then
                                 MTM=`echo "$FRU" | awk -F': ' '/Product Manufacturer/ {m=$2} /Product Name|Product Part Number/ {if (n==""||n=="NONE") {n=$2}} END {print m":"n}'`
-			else
+			fi
+			if [ -z "$MTM" -o "$MTM" == ":" ]; then
 				logger -s -t $log_label -p local4.warning "Couldn't find MTM information in FRU, falling back to DMI (MTMS-based discovery may fail)"
 				m=`cat /sys/devices/virtual/dmi/id/sys_vendor`
 				n=`cat /sys/devices/virtual/dmi/id/product_name`

From ddf4cd932c2ca6acdaaa18431fcdc43921c173a7 Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Wed, 31 Jan 2018 03:11:34 +0800
Subject: [PATCH 015/100] openbmc python refactor

---
 xCAT-openbmc-py/lib/python/agent/client.py    |   2 +-
 .../lib/python/agent/common/__init__.py       |   0
 .../exceptions.py}                            |   0
 .../lib/python/agent/common/rest.py           |  58 +++++
 .../lib/python/agent/common/task.py           |  96 ++++++++
 .../agent/{xcatagent => common}/utils.py      |  19 ++
 .../lib/python/agent/hwctl/__init__.py        |   0
 .../lib/python/agent/hwctl/openbmc.py         | 227 ++++++++++++++++++
 .../lib/python/agent/hwctl/power.py           |  66 +++++
 .../lib/python/agent/hwctl/task.py            | 175 ++++++++++++++
 .../lib/python/agent/xcatagent/base.py        |   3 +-
 .../lib/python/agent/xcatagent/openbmc.py     |  70 +++++-
 .../python/agent/xcatagent/openbmc_rest.py    |   4 +-
 .../lib/python/agent/xcatagent/rest.py        |  41 ----
 .../lib/python/agent/xcatagent/server.py      |   6 +-
 xCAT-openbmc-py/xCAT-openbmc-py.spec          |   6 +-
 16 files changed, 719 insertions(+), 54 deletions(-)
 create mode 100644 xCAT-openbmc-py/lib/python/agent/common/__init__.py
 rename xCAT-openbmc-py/lib/python/agent/{xcatagent/xcat_exception.py => common/exceptions.py} (100%)
 create mode 100644 xCAT-openbmc-py/lib/python/agent/common/rest.py
 create mode 100644 xCAT-openbmc-py/lib/python/agent/common/task.py
 rename xCAT-openbmc-py/lib/python/agent/{xcatagent => common}/utils.py (71%)
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/__init__.py
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/openbmc.py
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/power.py
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/task.py
 delete mode 100644 xCAT-openbmc-py/lib/python/agent/xcatagent/rest.py

diff --git a/xCAT-openbmc-py/lib/python/agent/client.py b/xCAT-openbmc-py/lib/python/agent/client.py
index ed5bd3e84..1c8e0448e 100755
--- a/xCAT-openbmc-py/lib/python/agent/client.py
+++ b/xCAT-openbmc-py/lib/python/agent/client.py
@@ -8,7 +8,7 @@ import json
 import os
 import socket
 import sys
-from xcatagent import utils
+from common import utils
 
 class ClientShell(object):
     def get_base_parser(self):
diff --git a/xCAT-openbmc-py/lib/python/agent/common/__init__.py b/xCAT-openbmc-py/lib/python/agent/common/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/xcat_exception.py b/xCAT-openbmc-py/lib/python/agent/common/exceptions.py
similarity index 100%
rename from xCAT-openbmc-py/lib/python/agent/xcatagent/xcat_exception.py
rename to xCAT-openbmc-py/lib/python/agent/common/exceptions.py
diff --git a/xCAT-openbmc-py/lib/python/agent/common/rest.py b/xCAT-openbmc-py/lib/python/agent/common/rest.py
new file mode 100644
index 000000000..8a49016c7
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/common/rest.py
@@ -0,0 +1,58 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+
+from gevent.subprocess import Popen, PIPE
+import requests
+import urllib3
+urllib3.disable_warnings()
+
+import exceptions as xcat_exception
+
+class RestSession(object):
+
+    def __init__(self):
+        self.session = requests.Session()
+        self.cookies = None
+
+    def request(self, method, url, headers, data=None, timeout=30):
+
+        try:
+            response = self.session.request(method, url,
+                                            data=data,
+                                            headers=headers,
+                                            verify=False,
+                                            timeout=timeout)
+        except requests.exceptions.ConnectionError:
+            raise xcat_exception.SelfServerException('Error: Failed to connect to server.')
+
+        except requests.exceptions.Timeout:
+            raise xcat_exception.SelfServerException('Error: Timeout to connect to server')
+
+        if not self.cookies:
+            self.cookies = requests.utils.dict_from_cookiejar(self.session.cookies)
+
+        return response
+
+    def request_upload(self, method, url, headers, files, using_curl=True):
+        if using_curl:
+            return self._upload_by_curl(method, url, headers, files)
+
+    def _upload_by_curl(self, method, url, headers, files):
+
+        header_str = ' '.join([ "%s: %s" % (k, v) for k,v in headers.items() ])
+        request_cmd = 'curl -k -b sid=%s -H "%s" -X %s -T %s %s -s' % \
+                      (self.cookies['sid'], header_str, method, files, url)
+
+        sub = Popen(request_cmd, stdout=PIPE, shell=True)
+        response, err = sub.communicate()
+
+        if not response:
+            error = 'Error: Did not receive response from server after ' \
+                    'running command \'%s\'' % request_cmd
+            raise SelfServerException(error)
+
+        return response
diff --git a/xCAT-openbmc-py/lib/python/agent/common/task.py b/xCAT-openbmc-py/lib/python/agent/common/task.py
new file mode 100644
index 000000000..899d8fd8b
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/common/task.py
@@ -0,0 +1,96 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+
+from __future__ import print_function
+import gevent
+import sys
+import traceback
+
+class BaseCommand(object):
+
+    def _validate(self, op, *args, **kw):
+        if hasattr(self, 'validate_%s' % op):
+            return getattr(self, 'validate_%s' % op)(self, *args, **kw)
+
+    def _pre(self, op, *args, **kw):
+        if hasattr(self, 'pre_%s' % op):
+            return getattr(self, 'pre_%s' % op)(self, *args, **kw)
+
+    def _execute(self, op, *args, **kw):
+        if hasattr(self, '%s' % op):
+            return getattr(self, '%s' % op)(self, *args, **kw)
+
+    def _post(self, op, *args, **kw):
+        if hasattr(self, 'post_%s' % op):
+            return getattr(self, 'post_%s' % op)(self, *args, **kw)
+
+    def run(self, op, *args, **kwargs):
+        #print 'op=%s, args=%s, kwargs=%s' % (op, args, kwargs)
+        try:
+            self._validate(op, *args, **kwargs)
+            self._pre(op, *args, **kwargs)
+            self._execute(op, *args, **kwargs)
+            self._post(op, *args, **kwargs)
+        except Exception, e:
+            # TODO: put e into log
+            print(traceback.format_exc(), file=sys.stderr)
+            return None
+
+        return self.result()
+
+    def result(self):
+        """Assume the result will be set by *_<op>"""
+        return True
+
+class ParallelNodesCommand(BaseCommand):
+
+    def __init__(self, inventory, callback=None, **kwargs):
+        """
+        inventory: {'node1': {k1:v1, k2:v2, ...}, 'node2': ...}
+        """
+        self.inventory = inventory
+        self.callback = callback
+        self.debugmode = kwargs.get('debugmode')
+        self.verbose = kwargs.get('verbose')
+
+    def _execute_in_parallel(self, op, *args, **kw):
+        if not hasattr(self, '%s' % op):
+            return
+
+        assert self.inventory and type(self.inventory) is dict
+        func = getattr(self, '%s' % op)
+        if len(self.inventory) == 1:
+            node = self.inventory.keys()[0]
+            func(*args, node=node, nodeinfo=self.inventory[node], **kw)
+            return
+
+        pool_size = 1000 # Get it from kw later
+        gevent_pool = gevent.pool.Pool(pool_size)
+
+        for node in self.inventory.keys():
+            try:
+                gevent_pool.add( gevent.spawn(func, *args, node=node, nodeinfo=self.inventory[node], **kw))
+            except Exception, e:
+                error = '%s: Internel Error occured in gevent' % node
+                #print(traceback.format_exc(), file=sys.stderr)
+                self.callback.error(error)
+
+        gevent_pool.join()
+
+    def run(self, op, *args, **kwargs):
+        #print 'op=%s, args=%s, kwargs=%s' % (op, args, kwargs)
+        try:
+            self._validate(op, *args, **kwargs)
+            self._pre(op, *args, **kwargs)
+            self._execute_in_parallel(op, *args, **kwargs)
+            self._post(op, *args, **kwargs)
+        except Exception, e:
+            # TODO: put e into log
+            print(traceback.format_exc(), file=sys.stderr)
+            return None
+
+        return self.result()
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/utils.py b/xCAT-openbmc-py/lib/python/agent/common/utils.py
similarity index 71%
rename from xCAT-openbmc-py/lib/python/agent/xcatagent/utils.py
rename to xCAT-openbmc-py/lib/python/agent/common/utils.py
index 183f1ebb8..c386f0f52 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/utils.py
+++ b/xCAT-openbmc-py/lib/python/agent/common/utils.py
@@ -1,6 +1,7 @@
 import struct
 import sys
 import inspect
+import logging
 
 
 def int2bytes(num):
@@ -47,3 +48,21 @@ def update2Ddict(updata_dict, key_a, key_b, value):
     else: 
         updata_dict.update({key_a: {key_b: value}})
 
+class Messager(object):
+    def __init__(self, name=None):
+        self.logger = logging.getLogger(name or 'xcatagent')
+
+    def info(self, msg):
+        self.logger.info(msg)
+
+    def warn(self, msg):
+        self.logger.warn(msg)
+
+    def error(self, msg):
+        self.logger.error(msg)
+
+    def syslog(self, msg):
+        pass
+
+    def update_node_attributes(self, attribute, node, data):
+        pass
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/__init__.py b/xCAT-openbmc-py/lib/python/agent/hwctl/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc.py
new file mode 100644
index 000000000..d9f4922d3
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc.py
@@ -0,0 +1,227 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+
+import requests
+import json
+import time
+
+from common import rest
+from common.exceptions import SelfClientException, SelfServerException
+
+import logging
+logger = logging.getLogger('xcatagent')
+
+HTTP_PROTOCOL = "https://"
+PROJECT_URL = "/xyz/openbmc_project"
+PROJECT_PAYLOAD = "xyz.openbmc_project."
+
+RPOWER_STATES = {
+    "on"        : "on",
+    "off"       : "off",
+    "Off"       : "off",
+    "softoff"   : "softoff",
+    "boot"      : "reset",
+    "reset"     : "reset",
+    "bmcreboot" : "BMC reboot",
+    "Ready"     : "BMC Ready",
+    "NotReady"  : "BMC NotReady",
+    "chassison" : "on (Chassis)",
+    "Running"   : "on",
+    "Quiesced"  : "quiesced",
+}
+
+RPOWER_URLS = {
+    "on"        : {
+        "path"  : "/state/host0/attr/RequestedHostTransition",
+        "field" : "State.Host.Transition.On",
+    },
+    "off"       : {
+        "path"  : "/state/chassis0/attr/RequestedPowerTransition",
+        "field" : "State.Chassis.Transition.Off",
+    },
+    "softoff"   : {
+        "path"  : "/state/host0/attr/RequestedHostTransition",
+        "field" : "State.Host.Transition.Off",
+    },
+    "state"     : {
+        "path"  : "/state/enumerate",
+    },
+}
+
+BMC_URLS = {
+    "reboot" : {
+        "path"  : "/state/bmc0/attr/RequestedBMCTransition",
+        "field" : "State.BMC.Transition.Reboot",
+    },
+    "state"     : {
+        "path"  : "/state/bmc0/attr/CurrentBMCState",
+    },
+}
+
+RESULT_OK = 'ok'
+RESULT_FAIL = 'fail'
+
+class OpenBMCRest(object):
+
+    headers = {'Content-Type': 'application/json'}
+
+    def __init__(self, name, **kwargs):
+
+        #set default user/passwd
+        self.name = name
+        self.username, self.password = ('root', '0penBmc')
+
+        if 'nodeinfo' in kwargs:
+            for key, value in kwargs['nodeinfo'].items():
+                setattr(self, key, value)
+        if not hasattr(self, 'bmcip'):
+            self.bmcip = self.name
+
+        self.verbose = kwargs.get('debugmode')
+        # print back to xcatd or just stdout
+        self.messager = kwargs.get('messager')
+
+        self.session = rest.RestSession()
+        self.root_url = HTTP_PROTOCOL + self.bmcip + PROJECT_URL
+
+    def _print_record_log (self, msg, cmd):
+
+        if self.verbose :
+            localtime = time.asctime( time.localtime(time.time()) )
+            log = self.name + ': [openbmc_debug] ' + cmd + ' ' + msg
+            self.messager.info(localtime + ' ' + log)
+            logger.debug(log)
+
+    def _log_request (self, method, url, headers, data=None, files=None, cmd=''):
+
+        header_str = ' '.join([ "%s: %s" % (k, v) for k,v in headers.items() ])
+        msg = 'curl -k -c cjar -b cjar -X %s -H \"%s\" ' % (method, header_str)
+
+        if files:
+            msg += '-T \'%s\' %s -s' % (files, url)
+        elif data:
+            if cmd == 'login':
+                data = data.replace(self.password, "xxxxxx")
+            msg += '%s -d \'%s\'' % (url, data)
+        else:
+            msg += url
+
+        self._print_record_log(msg, cmd)
+        return msg
+
+    def handle_response (self, resp, cmd=''):
+
+        data = resp.json() # it will raise ValueError
+        code = resp.status_code
+        if code != requests.codes.ok:
+            description = ''.join(data['data']['description'])
+            error = 'Error: [%d] %s' % (code, description)
+            self._print_record_log(error, cmd)
+            raise SelfClientException(error, code)
+
+        self._print_record_log(data['message'], cmd)
+        return data['data']
+
+    def request (self, method, resource, headers=None, payload=None, timeout=30, cmd=''):
+
+        httpheaders = headers or OpenBMCRest.headers
+        url = resource
+        if not url.startswith(HTTP_PROTOCOL):
+            url = self.root_url + resource
+
+        data = None
+        if payload:
+            data=json.dumps(payload)
+
+        self._log_request(method, url, httpheaders, data=data, cmd=cmd)
+        try:
+            response = self.session.request(method, url, httpheaders, data=data)
+            return self.handle_response(response, cmd=cmd)
+        except SelfServerException as e:
+            e.message = 'Error: BMC did not respond. ' \
+                        'Validate BMC configuration and retry the command.'
+            self._print_record_log(e.message, cmd)
+            raise
+        except ValueError:
+            error = 'Error: Received wrong format response: %s' % response
+            self._print_record_log(error, cmd)
+            raise SelfServerException(error)
+
+    def upload (self, method, resource, files, headers=None, cmd=''):
+
+        httpheaders = headers or OpenBMCRest.headers
+        url = resource
+        if not url.startswith(HTTP_PROTOCOL):
+            url = self.root_url + resource
+
+        request_cmd = self._log_request(method, url, httpheaders, files=files, cmd=cmd)
+
+        try:
+            response = self.session.request_upload(method, url, httpheaders, files)
+        except SelfServerException:
+            self._print_record_log(error, cmd=cmd)
+            raise
+        try:
+            data = json.loads(response)
+        except ValueError:
+            error = 'Error: Received wrong format response when running command \'%s\': %s' % \
+                    (request_cmd, response)
+            self._print_record_log(error, cmd=cmd)
+            raise SelfServerException(error)
+
+        if data['message'] != '200 OK':
+            error = 'Error: Failed to upload update file %s : %s-%s' % \
+                    (files, data['message'], \
+                    ''.join(data['data']['description']))
+            self._print_record_log(error, cmd=cmd)
+            raise SelfClientException(error, code)
+
+        self._print_record_log(data['message'], cmd=cmd) 
+
+        return True
+
+    def login(self):
+
+        payload = { "data": [ self.username, self.password ] }
+
+        url = HTTP_PROTOCOL + self.bmcip + '/login'
+        self.request('POST', url, payload=payload, timeout=20, cmd='login')
+
+    def list_power_states(self):
+
+        states = self.request('GET', RPOWER_URLS['state']['path'], cmd='list_power_states')
+        #filter non used states
+        try:
+            host_stat = states[PROJECT_URL + '/state/host0']['CurrentHostState']
+            chassis_stat = states[PROJECT_URL + '/state/chassis0']['CurrentPowerState']
+            return {'host': host_stat.split('.')[-1], 'chassis': chassis_stat.split('.')[-1]}
+        except KeyError:
+            error = 'Error: Received wrong format response: %s' % states
+            raise SelfServerException(error)
+
+    def set_power_state(self, state):
+
+        payload = { "data": PROJECT_PAYLOAD + RPOWER_URLS[state]['field'] }
+        return self.request('PUT', RPOWER_URLS[state]['path'], payload=payload, cmd='set_power_state')
+
+    def get_bmc_state(self):
+
+        state = self.request('GET', BMC_URLS['state']['path'], cmd='get_bmc_state')
+        try:
+            return {'bmc': state.split('.')[-1]}
+        except KeyError:
+            error = 'Error: Received wrong format response: %s' % state
+            raise SelfServerException(error)
+
+    def reboot_bmc(self, optype='warm'):
+
+        payload = { "data": PROJECT_PAYLOAD + BMC_URLS['reboot']['field'] }
+        try:
+            self.request('PUT', BMC_URLS['reboot']['path'], payload=payload, cmd='bmc_reset')
+        except SelfServerException,SelfClientException:
+            # TODO: Need special handling for bmc reset, as it is normal bmc may return error
+            pass
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/power.py b/xCAT-openbmc-py/lib/python/agent/hwctl/power.py
new file mode 100644
index 000000000..e10435b20
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/power.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+
+class PowerInterface(object):
+    """Interface for power-related actions."""
+    interface_type = 'power'
+    version = '1.0'
+
+    def get_power_state(self, task):
+        """Return the power state of the task's nodes.
+
+        :param task: a Task instance containing the nodes to act on.
+        :raises: MissingParameterValue if a required parameter is missing.
+        :returns: a power state.
+        """
+        return task.run('get_state')
+
+    def set_power_state(self, task, power_state, timeout=None):
+        """Set the power state of the task's nodes.
+
+        :param task: a Task instance containing the nodes to act on.
+        :param power_state: Any power state from :mod:`ironic.common.states`.
+        :param timeout: timeout (in seconds) positive integer (> 0) for any
+          power state. ``None`` indicates to use default timeout.
+        :raises: MissingParameterValue if a required parameter is missing.
+        """
+        return task.run('set_state', power_state, timeout=timeout)
+
+    def reboot(self, task, optype='boot', timeout=None):
+        """Perform a hard reboot of the task's nodes.
+
+        Drivers are expected to properly handle case when node is powered off
+        by powering it on.
+
+        :param task: a Task instance containing the node to act on.
+        :param timeout: timeout (in seconds) positive integer (> 0) for any
+          power state. ``None`` indicates to use default timeout.
+        """
+        return task.run('reboot', optype, timeout=timeout)
+
+    def get_bmc_state(self, task):
+        """Return the bmc state of the task's nodes.
+
+        :param task: a Task instance containing the nodes to act on.
+        :raises: MissingParameterValue if a required parameter is missing.
+        :returns: a power state.
+        """
+        return task.run('get_bmcstate')
+
+    def reboot_bmc(self, task, optype='warm'):
+        """Return the bmc state of the task's nodes.
+
+        :param task: a Task instance containing the nodes to act on.
+        :raises: MissingParameterValue if a required parameter is missing.
+        :returns: a power state.
+        """
+        return task.run('reboot_bmc', optype)
+
+
+class DefaultPowerManager(PowerInterface):
+    """Interface for power-related actions."""
+    pass
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/task.py b/xCAT-openbmc-py/lib/python/agent/hwctl/task.py
new file mode 100644
index 000000000..53612a6b9
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/task.py
@@ -0,0 +1,175 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+from __future__ import print_function
+import gevent
+import time
+
+from common.task import ParallelNodesCommand
+from common.exceptions import SelfClientException, SelfServerException
+from hwctl import openbmc
+
+import logging
+logger = logging.getLogger('xcatagent')
+
+
+POWER_STATE_DB = {
+    "on"      : "powering-on",
+    "off"     : "powering-off",
+    "softoff" : "powering-off",
+    "boot"    : "powering-on",
+    "reset"   : "powering-on",
+}
+class OpenBMCPowerTask(ParallelNodesCommand):
+    """Executor for power-related actions."""
+
+    def _determine_state(self, states):
+
+        chassis_state = states.get('chassis')
+        host_state = states.get('host')
+        state = 'Unknown'
+        if chassis_state == 'Off':
+            state = chassis_state
+
+        elif chassis_state == 'On':
+            if host_state == 'Off':
+                state = 'chassison'
+            elif host_state in ['Quiesced', 'Running']:
+                state = host_state
+            else:
+                state = 'Unexpected host state=%s' % host_state
+        else:
+            state = 'Unexpected chassis state=%s' % chassis_state
+        return state
+
+    def get_state(self, **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+        state = 'Unknown'
+        try:
+            obmc.login()
+            states = obmc.list_power_states()
+            state = self._determine_state(states)
+            result = '%s: %s' % (node, openbmc.RPOWER_STATES.get(state, state))
+
+        except SelfServerException as e:
+            result = '%s: %s'  % (node, e.message)
+        except SelfClientException as e:
+            result = '%s: %s'  % (node, e.message)
+
+        self.callback.info(result)
+        return state
+
+    def get_bmcstate(self, **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+        bmc_not_ready = bmc_state = 'NotReady'
+        try:
+            obmc.login()
+            state = obmc.get_bmc_state()
+            bmc_state = state.get('bmc')
+
+            if bmc_state != 'Ready':
+                bmc_state = bmc_not_ready
+
+            result = '%s: %s' % (node, openbmc.RPOWER_STATES.get(bmc_state, bmc_state))
+
+        except SelfServerException, SelfClientException:
+            # There is no response when BMC is not ready
+            result = '%s: %s'  % (node, openbmc.RPOWER_STATES[bmc_not_ready])
+
+        self.callback.info(result)
+        return bmc_state
+
+    def set_state(self, state, **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+        try:
+            obmc.login()
+            ret = obmc.set_power_state(state)
+            new_status = POWER_STATE_DB.get(state, '')
+
+            result = '%s: %s' % (node, state)
+            if new_status:
+                self.callback.update_node_attributes('status', node, new_status)
+        except (SelfServerException, SelfClientException) as e:
+            result = '%s: %s'  % (node, e.message)
+
+        self.callback.info(result)
+
+
+    def reboot(self, optype='boot', **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+        try:
+            obmc.login()
+            states = obmc.list_power_states()
+            status = self._determine_state(states)
+
+            new_status =''
+            if optype == 'reset' and status in ['Off', 'chassison']:
+                status = openbmc.RPOWER_STATES['Off']
+                result = '%s: %s'  % (node, status)
+            else:
+                if status not in ['Off', 'off']:
+                    obmc.set_power_state('off')
+                    self.callback.update_node_attributes('status', node, POWER_STATE_DB['off'])
+
+                    off_flag = False
+                    start_timeStamp = int(time.time())
+                    for i in range (0, 30):
+                        states = obmc.list_power_states()
+                        status = self._determine_state(states)
+                        if openbmc.RPOWER_STATES.get(status) == 'off':
+                            off_flag = True
+                            break
+                        gevent.sleep( 2 )
+
+                    end_timeStamp = int(time.time())
+
+                    if not off_flag:
+                        error = 'Error: Sent power-off command but state did not change ' \
+                                 'to off after waiting %s seconds. (State= %s).' % (end_timeStamp - start_timeStamp, status)
+                        raise SelfServerException(error)
+
+                ret = obmc.set_power_state('on')
+                self.callback.update_node_attributes('status', node, POWER_STATE_DB['on'])
+
+                result = '%s: %s'  % (node, optype)
+
+        except (SelfServerException, SelfClientException) as e:
+            result = '%s: %s'  % (node, e.message)
+
+        self.callback.info(result)
+
+
+    def reboot_bmc(self, optype='warm', **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+        new_status = ''
+        try:
+            obmc.login()
+        except (SelfServerException, SelfClientException) as e:
+            result = '%s: %s'  % (node, e.message)
+        else:
+            try:
+                obmc.reboot_bmc(optype)
+            except (SelfServerException, SelfClientException) as e:
+                result = '%s: %s'  % (node, e.message)
+            else:
+                result = '%s: %s'  % (node, openbmc.RPOWER_STATES['bmcreboot'])
+        self.callback.info(result)
+
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/base.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/base.py
index b1ebb6aac..bf58ef628 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/base.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/base.py
@@ -1,10 +1,9 @@
-from xcatagent import utils
+from common import utils
 import gevent
 from gevent.pool import Pool
 
 MODULE_MAP = {"openbmc": "OpenBMCManager"}
 
-
 class BaseManager(object):
     def __init__(self, messager, cwd):
         self.messager = messager
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index 0b301ec42..8b49b88eb 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -1,11 +1,22 @@
-from xcatagent import base
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+
+import argparse
 import os
 import time
 import sys
 import gevent
 
-import utils
-import xcat_exception
+from common import utils
+from common import exceptions as xcat_exception
+from hwctl.task import OpenBMCPowerTask
+from hwctl.power import DefaultPowerManager
+
+from xcatagent import base
 import openbmc_rest
 
 HTTP_PROTOCOL = "https://"
@@ -58,6 +69,7 @@ XCAT_LOG_RFLASH_DIR = XCAT_LOG_DIR + "/rflash/"
 FIRM_URL = PROJECT_URL + "/software/enumerate"
 
 # global variables of rpower
+POWER_REBOOT_OPTIONS = ('boot', 'reset')
 POWER_SET_OPTIONS = ('on', 'off', 'bmcreboot', 'softoff')
 POWER_GET_OPTIONS = ('bmcstate', 'state', 'stat', 'status')
 
@@ -808,5 +820,55 @@ class OpenBMCManager(base.BaseManager):
         self._summary(nodes_num, 'Firmware update')
 
     def rpower(self, nodeinfo, args):
-        super(OpenBMCManager, self).process_nodes_worker('openbmc', 'OpenBMC', 
+        mgr = OpenBMCManager2(self.messager, self.cwd, nodes=self.nodes)
+        mgr.debugmode = DEBUGMODE
+        mgr.rpower(nodeinfo, args)
+
+    def _rpower(self, nodeinfo, args):
+        super(OpenBMCManager, self).process_nodes_worker('openbmc', 'OpenBMC',
                     self.nodes, nodeinfo, 'rpower', args)
+
+class OpenBMCManager2(base.BaseManager):
+    def __init__(self, messager, cwd, nodes=None, envs=None):
+        super(OpenBMCManager2, self).__init__(messager, cwd)
+        self.nodes = nodes
+        self.debugmode = (envs and envs.get('debugmode')) or None
+
+    def rpower(self, nodesinfo, args):
+
+        # 1, parse args
+        parser = argparse.ArgumentParser(description='Handle rpower operations.')
+        parser.add_argument('--action',
+                            help="rpower subcommand.")
+        parser.add_argument('-V', '--verbose', action='store_true',
+                            help="rpower verbose mode.")
+        args.insert(0,'--action')
+        opts = parser.parse_args(args)
+
+        # 2, validate the args
+        if opts.action is None:
+            self.messager.error("Not specify the subcommand for rpower")
+            return
+
+        if opts.action not in (POWER_GET_OPTIONS + POWER_SET_OPTIONS + POWER_REBOOT_OPTIONS):
+            self.messager.error("Not supported subcommand for rpower: %s" % opts.action)
+            return
+
+        # 3, run the subcommands
+        runner = OpenBMCPowerTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=opts.verbose)
+        if opts.action == 'bmcstate':
+            DefaultPowerManager().get_bmc_state(runner)
+        elif opts.action == 'bmcreboot':
+            DefaultPowerManager().reboot_bmc(runner)
+        elif opts.action in POWER_GET_OPTIONS:
+            DefaultPowerManager().get_power_state(runner)
+        elif opts.action in POWER_REBOOT_OPTIONS:
+            DefaultPowerManager().reboot(runner, optype=opts.action)
+        else:
+            DefaultPowerManager().set_power_state(runner, power_state=opts.action)     
+
+    def rflash(self, nodesinfo, args):
+        # 1, parse args
+        # 2, validate the args
+        # 3, run the subcommands
+        pass
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc_rest.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc_rest.py
index 40152a118..9dcf8c99e 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc_rest.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc_rest.py
@@ -3,8 +3,8 @@ import requests
 import json
 import time
 
-import rest
-import xcat_exception
+from common import rest
+from common import exceptions as xcat_exception
 
 class OpenBMCRest:
 
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/rest.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/rest.py
deleted file mode 100644
index 35cbb449d..000000000
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/rest.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env python
-import requests
-from gevent.subprocess import Popen, PIPE
-import urllib3
-urllib3.disable_warnings()
-
-import xcat_exception
-
-class RestSession :
-
-    def __init__(self):
-        self.session = requests.Session()
-        self.cookies = None
-
-    def request (self, method, url, headers, data):
-        try:
-            response = self.session.request(method, url,
-                                            data=data,
-                                            headers=headers,
-                                            verify=False,
-                                            timeout=30)
-        except requests.exceptions.ConnectionError:
-            raise xcat_exception.SelfServerException(
-                  'Error: BMC did not respond. ' \
-                  'Validate BMC configuration and retry the command.')
-        except requests.exceptions.Timeout:
-            raise xcat_exception.SelfServerException('Error: Timeout to connect to server')
-
-        if not self.cookies:
-            self.cookies = requests.utils.dict_from_cookiejar(self.session.cookies)
-
-        return response
-
-    def request_upload (self, method, url, headers, files):
-        request_cmd = 'curl -k -b sid=%s -H "%s" -X %s -T %s %s -s' % \
-                      (self.cookies['sid'], headers, method, files, url)
-        
-        sub = Popen(request_cmd, stdout=PIPE, shell=True)
-        response, err = sub.communicate()
- 
-        return response
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
index a0b242356..86a6867de 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
@@ -9,7 +9,7 @@ import traceback
 from gevent import socket
 from gevent.server import StreamServer
 from gevent.lock import BoundedSemaphore
-from xcatagent import utils
+from common import utils
 from xcatagent import base as xcat_manager
 
 MSG_TYPE = 'message'
@@ -17,7 +17,7 @@ DB_TYPE  = 'db'
 LOCK_FILE = '/var/lock/xcat/agent.lock'
 
 
-class Messager(object):
+class XCATMessager(utils.Messager):
     def __init__(self, sock):
         self.sock = sock
         self.sem = BoundedSemaphore(1)
@@ -68,7 +68,7 @@ class Server(object):
 
     def _handle(self, sock, address):
         try:
-            messager = Messager(sock)
+            messager = XCATMessager(sock)
             buf = sock.recv(4)
             sz = utils.bytes2int(buf)
             buf = utils.recv_all(sock, sz)
diff --git a/xCAT-openbmc-py/xCAT-openbmc-py.spec b/xCAT-openbmc-py/xCAT-openbmc-py.spec
index 18bcd94ee..dcd8d8ee7 100644
--- a/xCAT-openbmc-py/xCAT-openbmc-py.spec
+++ b/xCAT-openbmc-py/xCAT-openbmc-py.spec
@@ -30,11 +30,15 @@ xCAT-openbmc-py provides openbmc related functions.
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/%{prefix}/lib/python/agent
 install -d $RPM_BUILD_ROOT/%{prefix}/lib/python/agent/xcatagent
+install -d $RPM_BUILD_ROOT/%{prefix}/lib/python/agent/common
+install -d $RPM_BUILD_ROOT/%{prefix}/lib/python/agent/hwctl
 install -m755 lib/python/agent/*.py $RPM_BUILD_ROOT/%{prefix}/lib/python/agent
 install -m644 lib/python/agent/xcatagent/*.py $RPM_BUILD_ROOT/%{prefix}/lib/python/agent/xcatagent
+install -m644 lib/python/agent/common/*.py $RPM_BUILD_ROOT/%{prefix}/lib/python/agent/common
+install -m644 lib/python/agent/hwctl/*.py $RPM_BUILD_ROOT/%{prefix}/lib/python/agent/hwctl
 
 %ifnos linux
-rm -rf $RPM_BUILD_ROOT/%{prefix}/lib/python
+rm -rf $RPM_BUILD_ROOT/%{prefix}/lib/python/agent
 %endif
 
 %clean

From 15b7ace1d972c1d9c23409d534295d0d35f62ec2 Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Thu, 1 Feb 2018 13:55:30 +0800
Subject: [PATCH 016/100] - rpower <nr> boot should show 'reset' instead

---
 xCAT-openbmc-py/lib/python/agent/hwctl/task.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/task.py b/xCAT-openbmc-py/lib/python/agent/hwctl/task.py
index 53612a6b9..aac1f2422 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/task.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/task.py
@@ -146,7 +146,7 @@ class OpenBMCPowerTask(ParallelNodesCommand):
                 ret = obmc.set_power_state('on')
                 self.callback.update_node_attributes('status', node, POWER_STATE_DB['on'])
 
-                result = '%s: %s'  % (node, optype)
+                result = '%s: %s'  % (node, 'reset')
 
         except (SelfServerException, SelfClientException) as e:
             result = '%s: %s'  % (node, e.message)

From bb40c2356e5a11621bc0b7223251b4e5ec95b991 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Thu, 1 Feb 2018 01:57:18 -0500
Subject: [PATCH 017/100] print go-xcat.log each time when we run go-xcat

---
 xCAT-test/autotest/testcase/go-xcat/case0 | 15 +++++++++++++++
 xCAT-test/autotest/testcase/go-xcat/case1 |  8 ++++++++
 xCAT-test/autotest/testcase/go-xcat/case2 | 13 +++++++++++++
 xCAT-test/autotest/testcase/go-xcat/case4 |  2 ++
 4 files changed, 38 insertions(+)

diff --git a/xCAT-test/autotest/testcase/go-xcat/case0 b/xCAT-test/autotest/testcase/go-xcat/case0
index eb620e312..49181c35b 100644
--- a/xCAT-test/autotest/testcase/go-xcat/case0
+++ b/xCAT-test/autotest/testcase/go-xcat/case0
@@ -21,8 +21,10 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "scp -r $$MN:/etc/resolv.conf /e
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cd /; ./go-xcat --xcat-core=/etc/zypp/repos.d/xCAT-core.repo -y install"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cd /; ./go-xcat --xcat-core=/etc/yum.repos.d/xCAT-core.repo -y install"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cd /; ./go-xcat --xcat-core=/etc/apt/sources.list.d/xcat-core.list -y install";else echo "Sorry,this is not supported os"; fi
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 cmd:xdsh $$CN "service xcatd status"
@@ -57,8 +59,10 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "scp -r $$MN:/etc/resolv.conf /e
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:xdsh $$CN "cd /; ./go-xcat --xcat-core=/xcat-core -y install"
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 cmd:xdsh $$CN "service xcatd status"
@@ -93,8 +97,10 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "scp -r $$MN:/etc/resolv.conf /e
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:xdsh $$CN "cd /; ./go-xcat --xcat-core=/xcat-core.tar -y install"
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 cmd:xdsh $$CN "service xcatd status"
@@ -129,8 +135,10 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "scp -r $$MN:/etc/resolv.conf /e
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:xdsh $$CN "cd /; ./go-xcat --xcat-core=/xcat-core.tar.bz2 --xcat-dep=/xcat-dep.tar.bz2 -y install"
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 cmd:xdsh $$CN "service xcatd status"
@@ -173,7 +181,10 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "scp -r $$MN:/etc/resolv.conf /e
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cd /; ./go-xcat --xcat-core=/etc/zypp/repos.d/xCAT-core.repo --xcat-dep=/etc/zypp/repos.d/xCAT-dep.repo -y install"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cd /; ./go-xcat --xcat-core=/etc/yum.repos.d/xCAT-core.repo --xcat-dep=/etc/yum.repos.d/xCAT-dep.repo -y install"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cd /; ./go-xcat --xcat-core=/etc/apt/sources.list.d/xcat-core.list --xcat-dep=/etc/apt/sources.list.d/xcat-dep.list -y install"; else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 cmd:xdsh $$CN "service xcatd status"
@@ -212,8 +223,10 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "scp -r $$MN:/etc/resolv.conf /e
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:xdsh $$CN "cd /; ./go-xcat --xcat-core=/xcat-core --xcat-dep=/xcat-dep -y install"
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 cmd:xdsh $$CN "service xcatd status"
@@ -246,8 +259,10 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "scp -r $$MN:/etc/resolv.conf /e
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:xdsh $$CN "cd /; ./go-xcat --xcat-core=/xcat-core.tar.bz2 --xcat-dep=/xcat-dep.tar.bz2 -y install"
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 cmd:xdsh $$CN "service xcatd status"
diff --git a/xCAT-test/autotest/testcase/go-xcat/case1 b/xCAT-test/autotest/testcase/go-xcat/case1
index fd3688eae..00d9381a1 100644
--- a/xCAT-test/autotest/testcase/go-xcat/case1
+++ b/xCAT-test/autotest/testcase/go-xcat/case1
@@ -15,8 +15,10 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "scp -r $$MN:/etc/resolv.conf /e
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:xdsh $$CN "cd /; ./go-xcat --yes install"
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 cmd:xdsh $$CN "service xcatd status"
@@ -47,8 +49,10 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "scp -r $$MN:/etc/resolv.conf /e
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:xdsh $$CN "cd /; ./go-xcat -x $$MIGRATION2_VERSION -y install"
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:output=~Version $$MIGRATION2_VERSION 
 cmd:xdsh $$CN "service xcatd status"
@@ -79,8 +83,10 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "scp -r $$MN:/etc/resolv.conf /e
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:xdsh $$CN "cd /; ./go-xcat --xcat-version=devel -y install"
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 cmd:xdsh $$CN "service xcatd status"
@@ -111,8 +117,10 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "scp -r $$MN:/etc/resolv.conf /e
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:xdsh $$CN "cd /; ./go-xcat --xcat-version=$$MIGRATION2_VERSION -y install"
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 check:output=~Version $$MIGRATION2_VERSION 
diff --git a/xCAT-test/autotest/testcase/go-xcat/case2 b/xCAT-test/autotest/testcase/go-xcat/case2
index 1ffdb3734..65eae3b44 100644
--- a/xCAT-test/autotest/testcase/go-xcat/case2
+++ b/xCAT-test/autotest/testcase/go-xcat/case2
@@ -10,8 +10,10 @@ cmd:xdsh $$CN "cd /; rm -rf /go-xcat"
 check:rc==0
 cmd:xdsh $$CN "cd /; scp -r $$MN:/opt/xcat/share/xcat/tools/go-xcat ./"
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:xdsh $$CN "cd /; ./go-xcat --xcat-core=http://xcat.org/files/xcat/repos/yum/$$BRANCH/core-snap/xCAT-core.repo -y install"
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 check:output=~Version $$BRANCH
@@ -43,8 +45,10 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "scp -r $$MN:/etc/resolv.conf /e
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "cd /; ./go-xcat --xcat-core=http://xcat.org/files/xcat/repos/apt/$$BRANCH/core-snap/";else xdsh $$CN "cd /; ./go-xcat --xcat-core=http://xcat.org/files/xcat/repos/yum/$$BRANCH/core-snap/ -y install"; fi
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 check:output=~Version $$BRANCH
@@ -76,8 +80,10 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "scp -r $$MN:/etc/resolv.conf /e
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "cd /; ./go-xcat --xcat-core=http://xcat.org/files/xcat/xcat-core/devel/Ubuntu/core-snap/core-debs-snap.tar.bz2";else xdsh $$CN "cd /; ./go-xcat --xcat-core=http://xcat.org/files/xcat/xcat-core/devel/Linux/core-snap/core-rpms-snap.tar.bz2 -y install"; fi
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 check:output=~Version 2.12
@@ -104,8 +110,10 @@ cmd:xdsh $$CN "cd /; rm -rf /go-xcat"
 check:rc==0
 cmd:xdsh $$CN "cd /; scp -r $$MN:/opt/xcat/share/xcat/tools/go-xcat ./"
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:dir="__GETNODEATTR($$CN,os)__"; if grep SUSE /etc/*release;then os=`echo $dir |cut -c 1-6` && xdsh $$CN "cd /; ./go-xcat --xcat-core=http://xcat.org/files/xcat/repos/yum/devel/core-snap/xCAT-core.repo --xcat-dep=http://xcat.org/files/xcat/repos/yum/xcat-dep/$os/__GETNODEATTR($$CN,arch)__/xCAT-dep.repo -y install" ; elif grep "Red Hat" /etc/*release;then os=`echo $dir |cut -c 1-2` && xdsh $$CN "cd /; ./go-xcat --xcat-core=http://xcat.org/files/xcat/repos/yum/devel/core-snap/xCAT-core.repo --xcat-dep=http://xcat.org/files/xcat/repos/yum/xcat-dep/$os`echo __GETNODEATTR($$CN,os)__ | cut -c6`/__GETNODEATTR($$CN,arch)__/xCAT-dep.repo -y install";fi
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 cmd:xdsh $$CN "service xcatd status"
@@ -138,7 +146,10 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "scp -r $$MN:/etc/resolv.conf /e
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "cd /; ./go-xcat --xcat-core=http://xcat.org/files/xcat/repos/apt/devel/core-snap/ --xcat-dep=http://xcat.org/files/xcat/repos/apt/xcat-dep/ -y install"; else xdsh $$CN "cd /; ./go-xcat --xcat-core=http://xcat.org/files/xcat/repos/yum/devel/core-snap/ --xcat-dep=http://xcat.org/files/xcat/repos/yum/xcat-dep/ -y install"; fi
+check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 cmd:xdsh $$CN "service xcatd status"
@@ -170,8 +181,10 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "scp -r $$MN:/etc/resolv.conf /e
 check:rc==0
 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi
 check:rc==0
+cmd:rm -rf /tmp/go-xcat.log
 cmd:dep=`ls /install/xcat-dep-*.tar.bz2`;if grep Ubuntu /etc/*release;then  xdsh $$CN "cd /; ./go-xcat --xcat-core=http://xcat.org/files/xcat/xcat-core/devel/Ubuntu/core-snap/core-debs-snap.tar.bz2 --xcat-dep=http://$$MN/$dep -y install"; else xdsh $$CN "cd /; ./go-xcat --xcat-core=http://xcat.org/files/xcat/xcat-core/devel/Linux/core-snap/core-rpms-snap.tar.bz2 --xcat-dep=http://$$MN/$dep -y install"; fi
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0
 cmd:xdsh $$CN "service xcatd status"
diff --git a/xCAT-test/autotest/testcase/go-xcat/case4 b/xCAT-test/autotest/testcase/go-xcat/case4
index c85d2a6dc..3bf2af7e0 100644
--- a/xCAT-test/autotest/testcase/go-xcat/case4
+++ b/xCAT-test/autotest/testcase/go-xcat/case4
@@ -26,8 +26,10 @@ check:rc==0
 cmd:xdsh $$CN "lsxcatd -v"
 check:rc==0
 check:output=~Version $$MIGRATION1_VERSION
+cmd:rm -rf /tmp/go-xcat.log
 cmd:xdsh $$CN "cd /; ./go-xcat update -y"
 check:rc==0
+cmd:cat /tmp/go-xcat.log
 check:output=~xCAT has been successfully updated
 cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v"
 check:rc==0

From 6925eb9196876843c034c21ec7135373058f34c1 Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Thu, 1 Feb 2018 16:30:01 +0800
Subject: [PATCH 018/100]   - adjust the directory layout   - remove the
 deprecate rpower related codes

---
 .../python/agent/hwctl/executor/__init__.py   |   0
 .../{task.py => executor/openbmc_power.py}    |   2 +-
 .../hwctl/{openbmc.py => openbmc_client.py}   |   0
 .../lib/python/agent/xcatagent/openbmc.py     | 291 +++---------------
 xCAT-openbmc-py/xCAT-openbmc-py.spec          |   2 +
 5 files changed, 41 insertions(+), 254 deletions(-)
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/executor/__init__.py
 rename xCAT-openbmc-py/lib/python/agent/hwctl/{task.py => executor/openbmc_power.py} (99%)
 rename xCAT-openbmc-py/lib/python/agent/hwctl/{openbmc.py => openbmc_client.py} (100%)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/__init__.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/task.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_power.py
similarity index 99%
rename from xCAT-openbmc-py/lib/python/agent/hwctl/task.py
rename to xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_power.py
index aac1f2422..c400ee13d 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/task.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_power.py
@@ -10,7 +10,7 @@ import time
 
 from common.task import ParallelNodesCommand
 from common.exceptions import SelfClientException, SelfServerException
-from hwctl import openbmc
+from hwctl import openbmc_client as openbmc
 
 import logging
 logger = logging.getLogger('xcatagent')
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
similarity index 100%
rename from xCAT-openbmc-py/lib/python/agent/hwctl/openbmc.py
rename to xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index 8b49b88eb..004a392bc 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -13,7 +13,7 @@ import gevent
 
 from common import utils
 from common import exceptions as xcat_exception
-from hwctl.task import OpenBMCPowerTask
+from hwctl.executor.openbmc_power import OpenBMCPowerTask
 from hwctl.power import DefaultPowerManager
 
 from xcatagent import base
@@ -73,51 +73,6 @@ POWER_REBOOT_OPTIONS = ('boot', 'reset')
 POWER_SET_OPTIONS = ('on', 'off', 'bmcreboot', 'softoff')
 POWER_GET_OPTIONS = ('bmcstate', 'state', 'stat', 'status')
 
-RPOWER_URLS = {
-    "on"        : {
-        "url"   : PROJECT_URL + "/state/host0/attr/RequestedHostTransition",
-        "field" : "xyz.openbmc_project.State.Host.Transition.On",
-    },
-    "off"       : {
-        "url"   : PROJECT_URL + "/state/chassis0/attr/RequestedPowerTransition",
-        "field" : "xyz.openbmc_project.State.Chassis.Transition.Off",
-    },
-    "softoff"   : {
-        "url"   : PROJECT_URL + "/state/host0/attr/RequestedHostTransition",
-        "field" : "xyz.openbmc_project.State.Host.Transition.Off",
-    },
-    "bmcreboot" : {
-        "url"   : PROJECT_URL + "/state/bmc0/attr/RequestedBMCTransition",
-        "field" : "xyz.openbmc_project.State.BMC.Transition.Reboot",
-    },
-    "state"     : {
-        "url"   : PROJECT_URL + "/state/enumerate",
-    },
-}
-
-RPOWER_STATE = {
-    "on"        : "on",
-    "off"       : "off",
-    "Off"       : "off",
-    "softoff"   : "softoff",
-    "boot"      : "reset",
-    "reset"     : "reset",
-    "bmcreboot" : "BMC reboot",
-    "Ready"     : "BMC Ready",
-    "NotReady"  : "BMC NotReady",
-    "chassison" : "on (Chassis)",
-    "Running"   : "on",
-    "Quiesced"  : "quiesced",
-}
-
-POWER_STATE_DB = {
-    "on"      : "powering-on",
-    "off"     : "powering-off",
-    "softoff" : "powering-off",
-    "boot"    : "powering-on",
-    "reset"   : "powering-on",
-}
-
 class OpenBMC(base.BaseDriver):
 
     headers = {'Content-Type': 'application/json'}
@@ -501,107 +456,6 @@ class OpenBMC(base.BaseDriver):
 
         return RESULT_OK
 
-    def _set_power_onoff(self, subcommand):
-        """ Set power on/off/softoff/bmcreboot
-        :param subcommand: subcommand for rpower
-        :returns: ok if success
-        :raise: error message if failed
-        """
-        url = HTTP_PROTOCOL + self.bmcip + RPOWER_URLS[subcommand]['url']
-        data = { "data": RPOWER_URLS[subcommand]['field'] }
-        try:
-            response = self.client.request('PUT', url, OpenBMC.headers, 
-                                           data, 'rpower_' + subcommand)
-        except (xcat_exception.SelfServerException,
-                xcat_exception.SelfClientException) as e:
-            if subcommand != 'bmcreboot':
-                result = e.message
-            return result
-
-        return RESULT_OK
-
-
-    def _get_power_state(self, subcommand):
-        """ Get power current state
-        :param subcommand: state/stat/status/bmcstate
-        :returns: current state if success
-        :raise: error message if failed
-        """
-        result = ''
-        bmc_not_ready = 'NotReady'
-        url = HTTP_PROTOCOL + self.bmcip + RPOWER_URLS['state']['url']
-        try:
-            response = self.client.request('GET', url, OpenBMC.headers,
-                                           '', 'rpower_' + subcommand)
-        except xcat_exception.SelfServerException, e:
-            if subcommand == 'bmcstate':
-                result = bmc_not_ready
-            else:
-                result = e.message
-        except xcat_exception.SelfClientException, e:
-            result = e.message
-
-        if result: 
-            return result
-
-        for key in response['data']:
-            key_type = key.split('/')[-1]
-            if key_type == 'bmc0':
-                bmc_current_state = response['data'][key]['CurrentBMCState'].split('.')[-1]
-            if key_type == 'chassis0':
-                chassis_current_state = response['data'][key]['CurrentPowerState'].split('.')[-1]
-            if key_type == 'host0':
-                host_current_state = response['data'][key]['CurrentHostState'].split('.')[-1]
-
-        if subcommand == 'bmcstate':
-            if bmc_current_state == 'Ready':
-                return bmc_current_state 
-            else:
-                return bmc_not_ready
-
-        if chassis_current_state == 'Off':
-            return chassis_current_state
-        elif chassis_current_state == 'On':
-            if host_current_state == 'Off':
-                return 'chassison'
-            elif host_current_state == 'Quiesced':
-                return host_current_state
-            elif host_current_state == 'Running':
-                return host_current_state
-            else:
-                return 'Unexpected chassis state=' + host_current_state
-        else:
-            return 'Unexpected chassis state=' + chassis_current_state
-
-
-    def _rpower_boot(self):
-        """Power boot
-        :returns: 'reset' if success
-        :raise: error message if failed
-        """
-        result = self._set_power_onoff('off')
-        if result != RESULT_OK:
-            return result
-        self.messager.update_node_attributes('status', self.node, POWER_STATE_DB['off'])
-
-        start_timeStamp = int(time.time())
-        for i in range (0,30):
-            status = self._get_power_state('state')
-            if status in RPOWER_STATE and RPOWER_STATE[status] == 'off':
-                break
-            gevent.sleep( 2 )
-
-        end_timeStamp = int(time.time())
-
-        if status not in RPOWER_STATE or RPOWER_STATE[status] != 'off':
-            wait_time = str(end_timeStamp - start_timeStamp)
-            result = 'Error: Sent power-off command but state did not change ' \
-                     'to off after waiting %s seconds. (State= %s).' % (wait_time, status)
-            return result
-
-        result = self._set_power_onoff('on')
-        return result
-
     def rflash(self, args):
         """handle rflash command
         :param args: subcommands and parameters for rflash
@@ -665,65 +519,49 @@ class OpenBMC(base.BaseDriver):
             self.rflash_log_handle.close()
 
 
-    def rpower(self, args):
-        """handle rpower command
-        :param args: subcommands for rpower
-        """
-        subcommand = args[0]
-        try:
-            result = self._login()
-        except xcat_exception.SelfServerException as e:
-            if subcommand == 'bmcstate':
-                result = '%s: %s' % (self.node, RPOWER_STATE['NotReady'])
-            else:
-                result = '%s: %s'  % (self.node, e.message)
-        except xcat_exception.SelfClientException as e:
-            result = '%s: %s'  % (self.node, e.message)
-
-        if result != RESULT_OK:
-            self.messager.info(result)
-            return
-
-        new_status = ''
-        if subcommand in POWER_SET_OPTIONS:
-            result = self._set_power_onoff(subcommand)
-            if result == RESULT_OK:
-                result = RPOWER_STATE[subcommand]
-                new_status = POWER_STATE_DB.get(subcommand, '')
-
-        if subcommand in POWER_GET_OPTIONS:
-            tmp_result = self._get_power_state(subcommand)
-            result = RPOWER_STATE.get(tmp_result, tmp_result)
-
-        if subcommand == 'boot':
-            result = self._rpower_boot()
-            if result == RESULT_OK:
-                result = RPOWER_STATE[subcommand]
-                new_status = POWER_STATE_DB.get(subcommand, '')
-
-        if subcommand == 'reset':
-            status = self._get_power_state('state')
-            if status == 'Off' or status == 'chassison':
-                result = RPOWER_STATE['Off']
-            else:
-                result = self._rpower_boot()
-                if result == RESULT_OK:
-                    result = RPOWER_STATE[subcommand]
-                    new_status = POWER_STATE_DB.get(subcommand, '')
-
-        message = '%s: %s' % (self.node, result)
-        self.messager.info(message)
-        if new_status:
-            self.messager.update_node_attributes('status', self.node, new_status)
-
-
 class OpenBMCManager(base.BaseManager):
-    def __init__(self, messager, cwd, nodes, envs):
+    def __init__(self, messager, cwd, nodes=None, envs=None):
         super(OpenBMCManager, self).__init__(messager, cwd)
         self.nodes = nodes
+        self.debugmode = (envs and envs.get('debugmode')) or None
+
+        #TODO, remove the global variable DEBUGMODE
         global DEBUGMODE
         DEBUGMODE = envs['debugmode']
 
+    def rpower(self, nodesinfo, args):
+
+        # 1, parse args
+        parser = argparse.ArgumentParser(description='Handle rpower operations.')
+        parser.add_argument('--action',
+                            help="rpower subcommand.")
+        parser.add_argument('-V', '--verbose', action='store_true',
+                            help="rpower verbose mode.")
+        args.insert(0,'--action')
+        opts = parser.parse_args(args)
+
+        # 2, validate the args
+        if opts.action is None:
+            self.messager.error("Not specify the subcommand for rpower")
+            return
+
+        if opts.action not in (POWER_GET_OPTIONS + POWER_SET_OPTIONS + POWER_REBOOT_OPTIONS):
+            self.messager.error("Not supported subcommand for rpower: %s" % opts.action)
+            return
+
+        # 3, run the subcommands
+        runner = OpenBMCPowerTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=opts.verbose)
+        if opts.action == 'bmcstate':
+            DefaultPowerManager().get_bmc_state(runner)
+        elif opts.action == 'bmcreboot':
+            DefaultPowerManager().reboot_bmc(runner)
+        elif opts.action in POWER_GET_OPTIONS:
+            DefaultPowerManager().get_power_state(runner)
+        elif opts.action in POWER_REBOOT_OPTIONS:
+            DefaultPowerManager().reboot(runner, optype=opts.action)
+        else:
+            DefaultPowerManager().set_power_state(runner, power_state=opts.action)
+
     def _get_full_path(self,file_path):
         if type(self.cwd) == 'unicode':
             dir_path = self.cwd
@@ -819,56 +657,3 @@ class OpenBMCManager(base.BaseManager):
                     self.nodes, nodeinfo, 'rflash', args)
         self._summary(nodes_num, 'Firmware update')
 
-    def rpower(self, nodeinfo, args):
-        mgr = OpenBMCManager2(self.messager, self.cwd, nodes=self.nodes)
-        mgr.debugmode = DEBUGMODE
-        mgr.rpower(nodeinfo, args)
-
-    def _rpower(self, nodeinfo, args):
-        super(OpenBMCManager, self).process_nodes_worker('openbmc', 'OpenBMC',
-                    self.nodes, nodeinfo, 'rpower', args)
-
-class OpenBMCManager2(base.BaseManager):
-    def __init__(self, messager, cwd, nodes=None, envs=None):
-        super(OpenBMCManager2, self).__init__(messager, cwd)
-        self.nodes = nodes
-        self.debugmode = (envs and envs.get('debugmode')) or None
-
-    def rpower(self, nodesinfo, args):
-
-        # 1, parse args
-        parser = argparse.ArgumentParser(description='Handle rpower operations.')
-        parser.add_argument('--action',
-                            help="rpower subcommand.")
-        parser.add_argument('-V', '--verbose', action='store_true',
-                            help="rpower verbose mode.")
-        args.insert(0,'--action')
-        opts = parser.parse_args(args)
-
-        # 2, validate the args
-        if opts.action is None:
-            self.messager.error("Not specify the subcommand for rpower")
-            return
-
-        if opts.action not in (POWER_GET_OPTIONS + POWER_SET_OPTIONS + POWER_REBOOT_OPTIONS):
-            self.messager.error("Not supported subcommand for rpower: %s" % opts.action)
-            return
-
-        # 3, run the subcommands
-        runner = OpenBMCPowerTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=opts.verbose)
-        if opts.action == 'bmcstate':
-            DefaultPowerManager().get_bmc_state(runner)
-        elif opts.action == 'bmcreboot':
-            DefaultPowerManager().reboot_bmc(runner)
-        elif opts.action in POWER_GET_OPTIONS:
-            DefaultPowerManager().get_power_state(runner)
-        elif opts.action in POWER_REBOOT_OPTIONS:
-            DefaultPowerManager().reboot(runner, optype=opts.action)
-        else:
-            DefaultPowerManager().set_power_state(runner, power_state=opts.action)     
-
-    def rflash(self, nodesinfo, args):
-        # 1, parse args
-        # 2, validate the args
-        # 3, run the subcommands
-        pass
diff --git a/xCAT-openbmc-py/xCAT-openbmc-py.spec b/xCAT-openbmc-py/xCAT-openbmc-py.spec
index dcd8d8ee7..8ba431f1a 100644
--- a/xCAT-openbmc-py/xCAT-openbmc-py.spec
+++ b/xCAT-openbmc-py/xCAT-openbmc-py.spec
@@ -32,10 +32,12 @@ install -d $RPM_BUILD_ROOT/%{prefix}/lib/python/agent
 install -d $RPM_BUILD_ROOT/%{prefix}/lib/python/agent/xcatagent
 install -d $RPM_BUILD_ROOT/%{prefix}/lib/python/agent/common
 install -d $RPM_BUILD_ROOT/%{prefix}/lib/python/agent/hwctl
+install -d $RPM_BUILD_ROOT/%{prefix}/lib/python/agent/hwctl/executor
 install -m755 lib/python/agent/*.py $RPM_BUILD_ROOT/%{prefix}/lib/python/agent
 install -m644 lib/python/agent/xcatagent/*.py $RPM_BUILD_ROOT/%{prefix}/lib/python/agent/xcatagent
 install -m644 lib/python/agent/common/*.py $RPM_BUILD_ROOT/%{prefix}/lib/python/agent/common
 install -m644 lib/python/agent/hwctl/*.py $RPM_BUILD_ROOT/%{prefix}/lib/python/agent/hwctl
+install -m644 lib/python/agent/hwctl/executor/*.py $RPM_BUILD_ROOT/%{prefix}/lib/python/agent/hwctl/executor
 
 %ifnos linux
 rm -rf $RPM_BUILD_ROOT/%{prefix}/lib/python/agent

From e25be9b9cfe231e69794fe07e49166b560f7b68a Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Thu, 1 Feb 2018 09:49:56 -0500
Subject: [PATCH 019/100] Modify man page for dumps based on review comments

---
 docs/source/guides/admin-guides/references/man1/rspconfig.1.rst | 2 +-
 xCAT-client/pods/man1/rspconfig.1.pod                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
index a31d08533..ebd4923f4 100644
--- a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
@@ -478,7 +478,7 @@ OPTIONS
 
 \ **dump**\ 
  
- Generate BMC system dump. If no sub-option is provided, will generate, wait, and download the dump. [OpenBMC]
+ Generate/Manage BMC system dumps. If no sub-option is provided, will generate, wait, and download the dump. [OpenBMC]
  
  
  \ **-c**\  will clear a single specified dump, or use 'all' to clear all dumps on the BMC.
diff --git a/xCAT-client/pods/man1/rspconfig.1.pod b/xCAT-client/pods/man1/rspconfig.1.pod
index d87900134..ee0dc98f4 100644
--- a/xCAT-client/pods/man1/rspconfig.1.pod
+++ b/xCAT-client/pods/man1/rspconfig.1.pod
@@ -364,7 +364,7 @@ Display or control BMC Boot Mode attribute setting. [OpenBMC]
 
 =item B<dump>
 
-Generate BMC system dump. If no sub-option is provided, will generate, wait, and download the dump. [OpenBMC]
+Generate/Manage BMC system dumps. If no sub-option is provided, will generate, wait, and download the dump. [OpenBMC]
 
 =over 4
 

From fc14f5274fa206eac28740a6876cbfb406a59dd7 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Thu, 1 Feb 2018 11:20:05 -0500
Subject: [PATCH 020/100] Add gateway info

---
 xCAT-server/lib/xcat/plugins/switchdiscover.pm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/switchdiscover.pm b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
index 630727af7..24a2f3192 100644
--- a/xCAT-server/lib/xcat/plugins/switchdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
@@ -1439,12 +1439,21 @@ sub switchsetup {
         if ($nettab) {
             @nets = $nettab->getAllAttribs('net','mask');
         }
+        #get master from site table
+        my @entries = xCAT::TableUtils->get_site_attribute("master");
+        my $master  = $entries[0];
+
         foreach my $mytype (keys %$nodes_to_config) {
             my $nodetab = xCAT::Table->new('hosts');
             my $nodehash = $nodetab->getNodesAttribs(\@{${nodes_to_config}->{$mytype}},['ip','otherinterfaces']);
             foreach my $pdu(@{${nodes_to_config}->{$mytype}}) {
                 my $ip = $nodehash->{$pdu}->[0]->{ip};
                 my $mask;
+                my $gateway = $master;
+                my @master_ips = xCAT::NetworkUtils->my_ip_facing($ip);
+                unless ($master_ips[0]) {
+                    $gateway = $master_ips[1];
+                }
                 foreach my $net (@nets) {
                     if (xCAT::NetworkUtils::isInSameSubnet( $net->{'net'}, $ip, $net->{'mask'}, 0)) {
                         $mask=$net->{'mask'};
@@ -1460,7 +1469,7 @@ sub switchsetup {
                     send_msg($request, 0, "process command: $cmd\n");
                     $rc  = xCAT::Utils->runcmd($cmd, 0);
                 } elsif ( $mytype eq "irpdu" ) {
-                    $cmd = "rspconfig $pdu hostname=$pdu ip=$ip netmask=$mask";
+                    $cmd = "rspconfig $pdu hostname=$pdu ip=$ip gateway=$gateway netmask=$mask";
                     send_msg($request, 0, "process command: $cmd\n");
                     $rc = xCAT::Utils->runcmd($cmd, 0);
                 } else {

From 5edae8d52e7ff20d500efffe233d830ede335fbf Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Thu, 1 Feb 2018 15:59:03 -0500
Subject: [PATCH 021/100] Handle the PowerSupplyRedundancy API issue where
 Value is lower case

---
 xCAT-server/lib/xcat/plugins/openbmc.pm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 1da7cef1a..742ad78f8 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -4076,11 +4076,19 @@ sub rvitals_response {
             # Calculate the adjusted value based on the scale attribute
             #  
             $calc_value = $content{Value};
-            if ( $content{Scale} != 0 ) { 
+            if (!defined($calc_value)) {
+                # Handle the bug where the keyword in the API is lower case value 
+                $calc_value = $content{value};
+            }
+
+            if (defined $content{Scale} and $content{Scale} != 0) { 
                 $calc_value = ($content{Value} * (10 ** $content{Scale}));
             } 
 
-            $content_info = $label . ": " . $calc_value . " " . $sensor_units{ $content{Unit} };
+            $content_info = $label . ": " . $calc_value;
+            if (defined($content{Unit})) { 
+	        $content_info = $content_info . " " . $sensor_units{ $content{Unit} };
+            }
             push (@sorted_output, $content_info); #Save output in array
         } 
     }

From ea9b20e1fe934f757d67735c13ec75e56dca8246 Mon Sep 17 00:00:00 2001
From: Kilian Cavalotti <kilian@stanford.edu>
Date: Thu, 1 Feb 2018 17:33:34 -0800
Subject: [PATCH 022/100] dodiscovery: fix syntax error in case flag_serial is
 not defined

---
 xCAT-genesis-scripts/usr/bin/dodiscovery | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-genesis-scripts/usr/bin/dodiscovery b/xCAT-genesis-scripts/usr/bin/dodiscovery
index c23f99fae..aa90efc88 100755
--- a/xCAT-genesis-scripts/usr/bin/dodiscovery
+++ b/xCAT-genesis-scripts/usr/bin/dodiscovery
@@ -154,7 +154,7 @@ if [ "$flag_mtm" ] && [ "$MTM" != "unknown" ]; then
 	echo "<mtm>$MTM</mtm>" >> /tmp/discopacket
 fi
 flag_serial=`echo "$SERIAL" | sed 's/0//g'`
-if [ $flag_serial ] && [ "$SERIAL" != "unknown" ]; then
+if [ "$flag_serial" ] && [ "$SERIAL" != "unknown" ]; then
 	SERIAL=`echo $SERIAL | sed 's/\.//g'`
 	echo "<serial>$SERIAL</serial>" >> /tmp/discopacket
 fi

From 55b2b1e61c8209dd02d3eda5cabc7e3a6814801a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=E1=B4=8F=C9=B4=C9=A2=20Jie?= <gongjie@linux.vnet.ibm.com>
Date: Fri, 2 Feb 2018 12:49:31 +0800
Subject: [PATCH 023/100] Revert patch 8d06fe119545b0b1f69b32f8b73ea3238a616b66
 on xCAT/xCAT.spec and xCATsn/xCATsn.spec (#4783)

---
 xCAT/xCAT.spec     | 4 ----
 xCATsn/xCATsn.spec | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index 1f67b1d78..e62ae73dd 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -73,10 +73,6 @@ Requires: conserver-xcat
 %endif
 %endif
 
-%ifos linux
-Recommends: goconserver
-%endif
-
 #support mixed cluster
 %if %nots390x
 Requires: elilo-xcat xnba-undi
diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec
index 26baaa439..07dde086c 100644
--- a/xCATsn/xCATsn.spec
+++ b/xCATsn/xCATsn.spec
@@ -56,10 +56,6 @@ Requires: conserver-xcat
 %endif
 %endif
 
-%ifos linux
-Recommends: goconserver
-%endif
-
 #support mixed cluster
 %ifnarch s390x
 Requires: elilo-xcat xnba-undi

From dbba4322086e7482fafd3211d0c6b461204c3a91 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Mon, 5 Feb 2018 16:01:56 +0800
Subject: [PATCH 024/100] Add package dependency for goconserver

---
 xCAT/xCAT.spec     | 4 ++++
 xCATsn/xCATsn.spec | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index e62ae73dd..476b42109 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -73,6 +73,10 @@ Requires: conserver-xcat
 %endif
 %endif
 
+%ifos linux
+Requires: goconserver
+%endif
+
 #support mixed cluster
 %if %nots390x
 Requires: elilo-xcat xnba-undi
diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec
index 07dde086c..f8c3531f2 100644
--- a/xCATsn/xCATsn.spec
+++ b/xCATsn/xCATsn.spec
@@ -56,6 +56,10 @@ Requires: conserver-xcat
 %endif
 %endif
 
+%ifos linux
+Requires: goconserver
+%endif
+
 #support mixed cluster
 %ifnarch s390x
 Requires: elilo-xcat xnba-undi

From 1a5795573a42b56b8e3e75e68a78f4473331de5c Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Mon, 5 Feb 2018 13:03:29 +0800
Subject: [PATCH 025/100] using docopt here for arguments parsing

---
 .../lib/python/agent/common/utils.py          | 22 ++++++++
 .../lib/python/agent/hwctl/power.py           | 13 ++---
 .../lib/python/agent/xcatagent/openbmc.py     | 54 +++++++++++--------
 3 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/common/utils.py b/xCAT-openbmc-py/lib/python/agent/common/utils.py
index c386f0f52..69f29efcc 100644
--- a/xCAT-openbmc-py/lib/python/agent/common/utils.py
+++ b/xCAT-openbmc-py/lib/python/agent/common/utils.py
@@ -1,8 +1,30 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
 import struct
 import sys
 import inspect
 import logging
+from logging.handlers import SysLogHandler
 
+XCAT_LOG_FMT = logging.Formatter("%(asctime)s %(levelname)s " +
+                                 "%(name)s %(process)d " +
+                                 "(%(filename)s:%(lineno)d) "+
+                                 "%(message)s")
+XCAT_LOG_FMT.datefmt = '%Y-%m-%d %H:%M:%S'
+
+def getxCATLog(name=None):
+    xl = logging.getLogger(name)
+    xl.fmt = XCAT_LOG_FMT
+    return xl
+
+def enableSyslog(name='xcat'):
+    h = SysLogHandler(address='/dev/log', facility=SysLogHandler.LOG_LOCAL4)
+    h.setFormatter(logging.Formatter('%s: ' % name + '%(levelname)s %(message)s'))
+    logging.getLogger('xcatagent').addHandler(h)
 
 def int2bytes(num):
     return struct.pack('i', num)
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/power.py b/xCAT-openbmc-py/lib/python/agent/hwctl/power.py
index e10435b20..84b59ab99 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/power.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/power.py
@@ -14,7 +14,6 @@ class PowerInterface(object):
         """Return the power state of the task's nodes.
 
         :param task: a Task instance containing the nodes to act on.
-        :raises: MissingParameterValue if a required parameter is missing.
         :returns: a power state.
         """
         return task.run('get_state')
@@ -23,19 +22,15 @@ class PowerInterface(object):
         """Set the power state of the task's nodes.
 
         :param task: a Task instance containing the nodes to act on.
-        :param power_state: Any power state from :mod:`ironic.common.states`.
+        :param power_state: Any supported power state.
         :param timeout: timeout (in seconds) positive integer (> 0) for any
           power state. ``None`` indicates to use default timeout.
-        :raises: MissingParameterValue if a required parameter is missing.
         """
         return task.run('set_state', power_state, timeout=timeout)
 
     def reboot(self, task, optype='boot', timeout=None):
         """Perform a hard reboot of the task's nodes.
 
-        Drivers are expected to properly handle case when node is powered off
-        by powering it on.
-
         :param task: a Task instance containing the node to act on.
         :param timeout: timeout (in seconds) positive integer (> 0) for any
           power state. ``None`` indicates to use default timeout.
@@ -46,16 +41,14 @@ class PowerInterface(object):
         """Return the bmc state of the task's nodes.
 
         :param task: a Task instance containing the nodes to act on.
-        :raises: MissingParameterValue if a required parameter is missing.
-        :returns: a power state.
+        :returns: a bmc state.
         """
         return task.run('get_bmcstate')
 
     def reboot_bmc(self, task, optype='warm'):
-        """Return the bmc state of the task's nodes.
+        """Set the BMC state of the task's nodes.
 
         :param task: a Task instance containing the nodes to act on.
-        :raises: MissingParameterValue if a required parameter is missing.
         :returns: a power state.
         """
         return task.run('reboot_bmc', optype)
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index 004a392bc..f7f877ada 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -5,11 +5,11 @@
 # -*- coding: utf-8 -*-
 #
 
-import argparse
 import os
 import time
 import sys
 import gevent
+from docopt import docopt
 
 from common import utils
 from common import exceptions as xcat_exception
@@ -18,6 +18,10 @@ from hwctl.power import DefaultPowerManager
 
 from xcatagent import base
 import openbmc_rest
+import logging
+logger = logging.getLogger('xcatagent')
+if not logger.handlers:
+    utils.enableSyslog('xcat.agent')
 
 HTTP_PROTOCOL = "https://"
 PROJECT_URL = "/xyz/openbmc_project"
@@ -524,43 +528,51 @@ class OpenBMCManager(base.BaseManager):
         super(OpenBMCManager, self).__init__(messager, cwd)
         self.nodes = nodes
         self.debugmode = (envs and envs.get('debugmode')) or None
-
         #TODO, remove the global variable DEBUGMODE
         global DEBUGMODE
         DEBUGMODE = envs['debugmode']
 
+        if self.debugmode:
+            logger.setLevel(logging.DEBUG)
+
     def rpower(self, nodesinfo, args):
 
         # 1, parse args
-        parser = argparse.ArgumentParser(description='Handle rpower operations.')
-        parser.add_argument('--action',
-                            help="rpower subcommand.")
-        parser.add_argument('-V', '--verbose', action='store_true',
-                            help="rpower verbose mode.")
-        args.insert(0,'--action')
-        opts = parser.parse_args(args)
+        rpower_usage = """
+        Usage:
+            rpower [-V|--verbose] [on|off|softoff|reset|boot|bmcreboot|bmcstate|stat|state|status]
 
-        # 2, validate the args
-        if opts.action is None:
-            self.messager.error("Not specify the subcommand for rpower")
+        Options:
+            -V --verbose   rpower verbose mode.
+        """
+
+        try:
+            opts=docopt(rpower_usage, argv=args)
+
+            self.verbose=opts.pop('--verbose')
+            action=[k for k,v in opts.items() if v][0]
+        except Exception as e:
+            # It will not be here as perl has validation for args
+            self.messager.error("Failed to parse arguments for rpower: %s" % args)
             return
 
-        if opts.action not in (POWER_GET_OPTIONS + POWER_SET_OPTIONS + POWER_REBOOT_OPTIONS):
-            self.messager.error("Not supported subcommand for rpower: %s" % opts.action)
+        # 2, validate the args
+        if action not in (POWER_GET_OPTIONS + POWER_SET_OPTIONS + POWER_REBOOT_OPTIONS):
+            self.messager.error("Not supported subcommand for rpower: %s" % action)
             return
 
         # 3, run the subcommands
-        runner = OpenBMCPowerTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=opts.verbose)
-        if opts.action == 'bmcstate':
+        runner = OpenBMCPowerTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=self.verbose)
+        if action == 'bmcstate':
             DefaultPowerManager().get_bmc_state(runner)
-        elif opts.action == 'bmcreboot':
+        elif action == 'bmcreboot':
             DefaultPowerManager().reboot_bmc(runner)
-        elif opts.action in POWER_GET_OPTIONS:
+        elif action in POWER_GET_OPTIONS:
             DefaultPowerManager().get_power_state(runner)
-        elif opts.action in POWER_REBOOT_OPTIONS:
-            DefaultPowerManager().reboot(runner, optype=opts.action)
+        elif action in POWER_REBOOT_OPTIONS:
+            DefaultPowerManager().reboot(runner, optype=action)
         else:
-            DefaultPowerManager().set_power_state(runner, power_state=opts.action)
+            DefaultPowerManager().set_power_state(runner, power_state=action)
 
     def _get_full_path(self,file_path):
         if type(self.cwd) == 'unicode':

From 64f8602755c0ccffb694c3aa3547fae24a1c35af Mon Sep 17 00:00:00 2001
From: xuweibj <xwbj@cn.ibm.com>
Date: Mon, 5 Feb 2018 16:42:37 +0800
Subject: [PATCH 026/100] rsetboot for openbmc in python (#4784)

* rsetboot for openbmc in python
---
 .../agent/hwctl/executor/openbmc_setboot.py   | 64 ++++++++++++++++++
 .../lib/python/agent/hwctl/openbmc_client.py  | 65 +++++++++++++++++++
 .../lib/python/agent/hwctl/setboot.py         | 34 ++++++++++
 .../lib/python/agent/xcatagent/openbmc.py     | 45 +++++++++++++
 xCAT-server/lib/xcat/plugins/openbmc2.pm      | 17 ++++-
 5 files changed, 223 insertions(+), 2 deletions(-)
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_setboot.py
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/setboot.py

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_setboot.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_setboot.py
new file mode 100644
index 000000000..eb8ff65dc
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_setboot.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+from __future__ import print_function
+import gevent
+import time
+
+from common.task import ParallelNodesCommand
+from common.exceptions import SelfClientException, SelfServerException
+from hwctl import openbmc_client as openbmc
+
+import logging
+logger = logging.getLogger('xcatagent')
+
+
+class OpenBMCBootTask(ParallelNodesCommand):
+    """Executor for setboot-related actions."""
+
+    def get_state(self, **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+
+        state = 'Unknown'
+        try:
+            obmc.login()
+            state = obmc.get_boot_state()
+
+            result = '%s: %s' % (node, state)
+
+        except (SelfServerException, SelfClientException) as e:
+            result = '%s: %s'  % (node, e.message)
+
+        self.callback.info(result)
+        return state
+
+    def set_state(self, state, persistant, **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+
+        try:
+            obmc.login()
+            if persistant:
+                obmc.set_one_time_boot_enable(0)
+                obmc.set_boot_state(state)
+            else:
+                obmc.set_one_time_boot_enable(1)
+                obmc.set_one_time_boot_state(state)
+
+            state = obmc.get_boot_state()
+
+            result = '%s: %s' % (node, state)
+
+        except (SelfServerException, SelfClientException) as e:
+            result = '%s: %s'  % (node, e.message)
+
+        self.callback.info(result)
+
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index d9f4922d3..52dacb7cd 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -62,6 +62,37 @@ BMC_URLS = {
     },
 }
 
+BOOTSOURCE_URLS = {
+    "enable"       : {
+        "path"      : "/control/host0/boot/one_time/attr/Enabled",
+    },
+    "get"          : {
+        "path"      : "/control/host0/enumerate",
+    },
+    "set_one_time" : {
+        "path"      : "/control/host0/boot/one_time/attr/BootSource",
+    },
+    "set"          : {
+        "path"      : "/control/host0/boot/attr/BootSource",
+    },
+    "field"        : "xyz.openbmc_project.Control.Boot.Source.Sources.",
+}
+
+BOOTSOURCE_GET_STATE = {
+    "Default"       : "Default",
+    "Disk"          : "Hard Drive",
+    "ExternalMedia" : "CD/DVD",
+    "Network"       : "Network",
+}
+
+BOOTSOURCE_SET_STATE = {
+    "cd"      : "ExternalMedia",
+    "def"     : "Default",
+    "default" : "Default",
+    "hd"      : "Disk",
+    "net"     : "Network",
+}
+
 RESULT_OK = 'ok'
 RESULT_FAIL = 'fail'
 
@@ -225,3 +256,37 @@ class OpenBMCRest(object):
         except SelfServerException,SelfClientException:
             # TODO: Need special handling for bmc reset, as it is normal bmc may return error
             pass
+
+    def set_one_time_boot_enable(self, enabled):
+
+        payload = { "data": enabled }
+        self.request('PUT', BOOTSOURCE_URLS['enable']['path'], payload=payload, cmd='set_one_time_boot_enable')
+
+    def set_boot_state(self, state):
+
+        payload = { "data": BOOTSOURCE_URLS['field'] + BOOTSOURCE_SET_STATE[state] } 
+        self.request('PUT', BOOTSOURCE_URLS['set']['path'], payload=payload, cmd='set_boot_state')
+
+    def set_one_time_boot_state(self, state):
+
+        payload = { "data": BOOTSOURCE_URLS['field'] + BOOTSOURCE_SET_STATE[state] }
+        self.request('PUT', BOOTSOURCE_URLS['set_one_time']['path'], payload=payload, cmd='set_one_time_boot_state')
+
+    def get_boot_state(self):
+
+        state = self.request('GET', BOOTSOURCE_URLS['get']['path'], cmd='get_boot_state')
+        try:
+            one_time_path = PROJECT_URL + '/control/host0/boot/one_time'
+            one_time_enabled =  state[one_time_path]['Enabled']
+            if one_time_enabled:
+                boot_source = state[one_time_path]['BootSource'].split('.')[-1]
+            else:
+                boot_source = state[PROJECT_URL + '/control/host0/boot']['BootSource'].split('.')[-1]
+
+            error = 'Can not get valid rsetboot status, the data is %s' % boot_source
+            boot_state = BOOTSOURCE_GET_STATE.get(boot_source.split('.')[-1], error)
+            return boot_state
+        except KeyError:
+            error = 'Error: Received wrong format response: %s' % states
+            raise SelfServerException(error)
+
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/setboot.py b/xCAT-openbmc-py/lib/python/agent/hwctl/setboot.py
new file mode 100644
index 000000000..d45ae34e7
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/setboot.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+
+class BootInterface(object):
+    """Interface for setboot-related actions."""
+    interface_type = 'setboot'
+    version = '1.0'
+
+    def get_boot_state(self, task):
+        """Return the setboot state of the task's nodes.
+
+        :param task: a Task instance containing the nodes to act on.
+        :returns: a setboot state.
+        """
+        return task.run('get_state')
+
+    def set_boot_state(self, task, setboot_state, persistant=False, timeout=None):
+        """Set the setboot state of the task's nodes.
+
+        :param task: a Task instance containing the nodes to act on.
+        :param setboot_state: Any boot state allowed.
+        :param persistant: whether set boot state persistant
+        :param timeout: timeout (in seconds) positive integer (> 0) for any
+          setboot state. ``None`` indicates to use default timeout.
+        """
+        return task.run('set_state', setboot_state, persistant, timeout=timeout)
+
+class DefaultBootManager(BootInterface):
+    """Interface for setboot-related actions."""
+    pass
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index 004a392bc..7fe009949 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -10,11 +10,14 @@ import os
 import time
 import sys
 import gevent
+from docopt import docopt
 
 from common import utils
 from common import exceptions as xcat_exception
 from hwctl.executor.openbmc_power import OpenBMCPowerTask
+from hwctl.executor.openbmc_setboot import OpenBMCBootTask
 from hwctl.power import DefaultPowerManager
+from hwctl.setboot import DefaultBootManager
 
 from xcatagent import base
 import openbmc_rest
@@ -73,6 +76,10 @@ POWER_REBOOT_OPTIONS = ('boot', 'reset')
 POWER_SET_OPTIONS = ('on', 'off', 'bmcreboot', 'softoff')
 POWER_GET_OPTIONS = ('bmcstate', 'state', 'stat', 'status')
 
+# global variables of rsetboot
+SETBOOT_GET_OPTIONS = ('stat', '')
+SETBOOT_SET_OPTIONS = ('cd', 'def', 'default', 'hd', 'net')
+
 class OpenBMC(base.BaseDriver):
 
     headers = {'Content-Type': 'application/json'}
@@ -562,6 +569,44 @@ class OpenBMCManager(base.BaseManager):
         else:
             DefaultPowerManager().set_power_state(runner, power_state=opts.action)
 
+    def rsetboot(self, nodesinfo, args):
+
+        # 1, parse args
+        if not args:
+            args = ['stat']
+
+        rsetboot_usage = """
+        Usage:
+            rsetboot [-V|--verbose] [cd|def|default|hd|net|stat] [-p]
+
+        Options:
+            -V --verbose    rsetboot verbose mode.
+            -p              persistant boot source.
+        """
+
+        try:
+            opts = docopt(rsetboot_usage, argv=args)
+
+            self.verbose = opts.pop('--verbose')
+            action_type = opts.pop('-p')
+            action = [k for k,v in opts.items() if v][0]
+        except Exception as e:
+            self.messager.error("Failed to parse arguments for rsetboot: %s" % args)
+            return
+
+        # 2, validate the args
+        if action not in (SETBOOT_GET_OPTIONS + SETBOOT_SET_OPTIONS):
+            self.messager.error("Not supported subcommand for rsetboot: %s" % action)
+            return
+
+        # 3, run the subcommands
+        runner = OpenBMCBootTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=self.verbose)
+        if action in SETBOOT_GET_OPTIONS:
+            DefaultBootManager().get_boot_state(runner)
+        else:
+            DefaultBootManager().set_boot_state(runner, setboot_state=action, persistant=action_type)
+
+
     def _get_full_path(self,file_path):
         if type(self.cwd) == 'unicode':
             dir_path = self.cwd
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index 3f8855527..bc3161e2d 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -137,6 +137,13 @@ sub parse_args {
     my $noderange = shift;
     my $subcommand = undef;
 
+    my $verbose;
+    unless (GetOptions(
+        'V|verbose'  => \$verbose,
+    )) {
+        return ([ 1, "Error parsing arguments." ]);
+    }
+
     if (scalar(@ARGV) >= 2 and ($command =~ /rpower/)) {
         return ([ 1, "Only one option is supported at the same time for $command" ]);
     } elsif (scalar(@ARGV) == 0 and $command =~ /rpower|rflash/) {
@@ -146,7 +153,6 @@ sub parse_args {
     }
 
     if ($command eq "rflash") {
-        my $verbose;
         my ($activate, $check, $delete, $directory, $list, $upload) = (0) x 6;
         my $no_host_reboot;
         GetOptions(
@@ -156,7 +162,6 @@ sub parse_args {
             'd'          => \$directory,
             'l|list'     => \$list,
             'u|upload'   => \$upload,
-            'V|verbose'  => \$verbose,
             'no-host-reboot' => \$no_host_reboot,
         );
         my $option_num = $activate+$check+$delete+$directory+$list+$upload;
@@ -200,6 +205,14 @@ sub parse_args {
         unless ($subcommand =~ /^on$|^off$|^softoff$|^reset$|^boot$|^bmcreboot$|^bmcstate$|^status$|^stat$|^state$/) {
             return ([ 1, "Unsupported command: $command $subcommand" ]);
         }
+    } elsif ($command eq "rsetboot") {
+        my $persistant;
+        GetOptions('p'  => \$persistant);
+        return ([ 1, "Only one option is supported at the same time for $command" ]) if (@ARGV > 1);
+        $subcommand = "stat" if (!defined($ARGV[0]));
+        unless ($subcommand =~ /^net$|^hd$|^cd$|^def$|^default$|^stat$/) {
+            return ([ 1, "Unsupported command: $command $subcommand" ]);
+        }
     } else {
         return ([ 1, "Unsupported command: $command" ]);
     }

From 4aab8997c61e3a96c15f73c2095d6f983cc24a33 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Mon, 5 Feb 2018 10:53:31 -0500
Subject: [PATCH 027/100] Allow makepythonrpm to build as non root user, remove
 hard code

---
 makepythonrpm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/makepythonrpm b/makepythonrpm
index 4ee5b60b7..8718e7ae5 100755
--- a/makepythonrpm
+++ b/makepythonrpm
@@ -4,7 +4,9 @@
 
 function makepythonrpm {
     RPMNAME="$1"
-    SPEC_FILE="$RPMNAME.spec"
+    SPEC_FILE="$RPMNAME/$RPMNAME.spec"
+    RPMROOT=`rpmbuild --eval '%_topdir' ${SPEC_FILE}`
+    mkdir -p $RPMROOT/SOURCES
     tar --exclude .svn -czvf $RPMROOT/SOURCES/$RPMNAME-${VER}.tar.gz $RPMNAME
     rm -f $RPMROOT/SRPMS/$RPMNAME-$VER*rpm $RPMROOT/RPMS/noarch/$RPMNAME-$VER*rpm
     echo "Building $RPMROOT/RPMS/noarch/$RPMNAME-$VER-snap*.noarch.rpm $EMBEDTXT..."
@@ -15,14 +17,12 @@ function makepythonrpm {
         exit 1
     fi
 }	
-	
+
 # Main code....
 OSNAME=$(uname)
 VER=`cat Version`
 REL="--define"
 EASE='usedate 1'
-RPMROOT=/root/rpmbuild
-mkdir -p $RPMROOT/SOURCES
 rpmbuild --version > /dev/null
 if [ $? -gt 0 ]; then
     echo "Error: rpmbuild does not appear to be installed or working."

From a46c086c2a5a746e5693f4ef3b0cccb237a75ca0 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Mon, 5 Feb 2018 10:54:54 -0500
Subject: [PATCH 028/100] Rename the makerpm files to all start with the same
 name to group the scripts better

---
 makegenesisbuilderrpm => makerpm-genesisbuilder | 0
 makepythonrpm => makerpm-python                 | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename makegenesisbuilderrpm => makerpm-genesisbuilder (100%)
 rename makepythonrpm => makerpm-python (100%)

diff --git a/makegenesisbuilderrpm b/makerpm-genesisbuilder
similarity index 100%
rename from makegenesisbuilderrpm
rename to makerpm-genesisbuilder
diff --git a/makepythonrpm b/makerpm-python
similarity index 100%
rename from makepythonrpm
rename to makerpm-python

From cb9ac0d4fba31496e3b88265962ed3e4fdda9c99 Mon Sep 17 00:00:00 2001
From: Yuan Bai <bybai@cn.ibm.com>
Date: Tue, 6 Feb 2018 14:57:54 +0800
Subject: [PATCH 029/100] enhance confignetwork -s return code (#4789)

* enhance confignetwork -s return code

* restart nic when updatenode and postbootscripts

* enhance >/dev/null 2>&1

* polished
---
 xCAT/postscripts/configeth     | 4 +++-
 xCAT/postscripts/confignetwork | 2 +-
 xCAT/postscripts/nicutils.sh   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth
index 35a1e6c89..d4f528a11 100755
--- a/xCAT/postscripts/configeth
+++ b/xCAT/postscripts/configeth
@@ -640,7 +640,9 @@ elif [ "$1" = "-s" ];then
         fi
     fi
 
-    ifdown $str_inst_nic;ifup $str_inst_nic
+    if [ "$UPDATENODE" = "1" ] || grep "REBOOT=TRUE" /opt/xcat/xcatinfo >/dev/null 2>&1; then
+        ifdown $str_inst_nic;ifup $str_inst_nic
+    fi 
     if [ $? -ne 0 ]; then
         log_error "ifup $str_inst_nic failed."
         error_code=1
diff --git a/xCAT/postscripts/confignetwork b/xCAT/postscripts/confignetwork
index f7e60fc88..4e57753b3 100755
--- a/xCAT/postscripts/confignetwork
+++ b/xCAT/postscripts/confignetwork
@@ -632,7 +632,7 @@ if [ $boot_install_nic -eq 1 ];then
         echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
         log_info "configure the install nic $installnic. "
         instnic_conf=1
-        configeth -s $installnic |log_lines info
+        configeth -s $installnic 
         if [ $? -ne 0 ]; then
             errorcode=1
         fi
diff --git a/xCAT/postscripts/nicutils.sh b/xCAT/postscripts/nicutils.sh
index 766694e64..ea86d4320 100755
--- a/xCAT/postscripts/nicutils.sh
+++ b/xCAT/postscripts/nicutils.sh
@@ -77,7 +77,7 @@ function log_lines {
 function log_error {
     local __msg="$*"
     $log_print_cmd $log_print_arg "[E]:Error: $__msg" 
-    return 0
+    return 1
 }
 
 ######################################################

From c3963283aa37adf31ccca92c62071faedba4716b Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Tue, 6 Feb 2018 15:51:14 +0800
Subject: [PATCH 030/100] add list_firmware method in hwctl/openbmc_client.py

---
 .../lib/python/agent/hwctl/openbmc_client.py  | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index 52dacb7cd..2211c3981 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -93,6 +93,24 @@ BOOTSOURCE_SET_STATE = {
     "net"     : "Network",
 }
 
+FIRM_URLS = {
+    "activate"  : {
+        "path"   : "/software/%(id)s/attr/RequestedActivation",
+        "field" : "Software.Activation.RequestedActivations.Active",
+    },
+    "delete"    : {
+        "path"   : "/software/%(id)s/action/Delete",
+        "field" : [],
+    },
+    "priority"  : {
+        "path"   : "/software/%(id)s/attr/Priority",
+        "field" : False,
+    },
+    "list"      : {
+        "path"   : "/software/enumerate",
+    }
+}
+
 RESULT_OK = 'ok'
 RESULT_FAIL = 'fail'
 
@@ -290,3 +308,42 @@ class OpenBMCRest(object):
             error = 'Error: Received wrong format response: %s' % states
             raise SelfServerException(error)
 
+    def list_firmware(self):
+
+        data = self.request('GET', FIRM_URLS['list']['path'], cmd='list_firmware')
+        try:
+            func_list = data.pop('/xyz/openbmc_project/software/functional')['endpoints']
+        except:
+            logger.debug('Not found functional firmwares')
+            func_list = []
+
+        fw_dict={}
+        for key, swinfo in data.items():
+            if 'Version' not in swinfo:
+                logger.debug('Not found version information for %s' % key)
+                continue
+            fw = OpenBMCImage(key, swinfo)
+            if func_list:
+                fw.functional = key in func_list
+            
+            fw_dict[str(fw)]=fw
+
+        return bool(func_list), fw_dict
+
+class OpenBMCImage(object):
+    def __init__(self, rawid, data=None):
+        self.id = rawid.split('/')[-1]
+        self.functional = False
+        self.purpose = 'Unknown'
+        if data:
+            self.version = data.get('Version')
+            self.purpose = data.get('Purpose', self.purpose).split('.')[-1]
+            self.priority = data.get('Priority')
+            self.extver   = data.get('ExtendedVersion')
+            self.progress   = data.get('Progress')
+            self.active = data.get('Activation')
+            if self.active:
+                self.active = self.active.split('.')[-1]
+
+    def __str__(self):
+        return '%s-%s' % (self.purpose, self.id)

From 2528631737011af9926327d39e14de746ab6940a Mon Sep 17 00:00:00 2001
From: Yuan Bai <bybai@cn.ibm.com>
Date: Tue, 6 Feb 2018 15:59:59 +0800
Subject: [PATCH 031/100] enhance setroute doc and routeop return code (#4798)

* enhance return code when error happen

* specify removing gateway from networks when configure static route
---
 .../common/deployment/network/cfg_routes.rst             | 2 ++
 xCAT/postscripts/routeop                                 | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_routes.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_routes.rst
index d9a4bcb70..b1903bc93 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_routes.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_routes.rst
@@ -10,6 +10,8 @@ There are 2 ways to configure OS route in xCAT:
 
 Before using ``makeroutes`` or ``setroute`` to configure OS route, details of the routes data such as routename, subnet, net mask and gateway should be stored in ``routes`` table.
 
+**Notes**: the ``gateway`` in the ``networks`` table assigns ``gateway`` from DHCP to compute node, so if use ``makeroutes`` or ``setroute`` to configure OS static route for compute node, make sure there is no ``gateway`` for the specific network in ``networks`` table.
+
 Configure ``routes`` table
 ``````````````````````````
 
diff --git a/xCAT/postscripts/routeop b/xCAT/postscripts/routeop
index 9ee356107..b90e447a6 100755
--- a/xCAT/postscripts/routeop
+++ b/xCAT/postscripts/routeop
@@ -271,7 +271,7 @@ replace_persistent_route()
             #echo "rh/fedora/centos"
             if [ -z "$ifname" ]; then
                 echo "Error: the device name is necessary to configure static route."
-                return
+                return 1
             fi
             
             if echo $net | grep : 2>&1 1>/dev/null
@@ -319,7 +319,7 @@ replace_persistent_route()
             # on debian/ubuntu need the network device name
             if [ -z "$ifname" ]; then
                 echo "Error: the device name is necessary to configure static route."
-                return
+                return 1
             fi
             filename="/etc/network/interfaces.d/$ifname"
 
@@ -901,7 +901,10 @@ elif [ "$op" = "replace" ]; then
     #replace the persistent route
     # the $cmd param is used for Ubuntu since it needs to run the specific cmd to enable 
     # the route during the up of the device
-    replace_persistent_route $net $mask $gw $ifname 
+    replace_persistent_route $net $mask $gw $ifname
+    if [ $? -ne 0 ]; then
+        exit 1
+    fi 
 fi
 
 exit 0

From ce3a32fdebf4a4d3ca328754151296d853f115f4 Mon Sep 17 00:00:00 2001
From: xuweibj <xwbj@cn.ibm.com>
Date: Tue, 6 Feb 2018 18:24:06 +0800
Subject: [PATCH 032/100] rbeacon & rvitals for openbmc in python (#4795)

* rbeacon & rvitals for openbmc in python
---
 .../lib/python/agent/common/utils.py          |  12 ++
 .../lib/python/agent/hwctl/beacon.py          |  26 ++++
 .../agent/hwctl/executor/openbmc_beacon.py    |  35 ++++++
 .../agent/hwctl/executor/openbmc_sensor.py    | 118 ++++++++++++++++++
 .../lib/python/agent/hwctl/openbmc_client.py  |  75 +++++++++++
 .../lib/python/agent/hwctl/sensor.py          |  32 +++++
 .../lib/python/agent/xcatagent/openbmc.py     |  79 ++++++++++++
 xCAT-server/lib/xcat/plugins/openbmc2.pm      |  20 ++-
 8 files changed, 393 insertions(+), 4 deletions(-)
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/beacon.py
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_beacon.py
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_sensor.py
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/sensor.py

diff --git a/xCAT-openbmc-py/lib/python/agent/common/utils.py b/xCAT-openbmc-py/lib/python/agent/common/utils.py
index 69f29efcc..9c2c2786f 100644
--- a/xCAT-openbmc-py/lib/python/agent/common/utils.py
+++ b/xCAT-openbmc-py/lib/python/agent/common/utils.py
@@ -7,6 +7,7 @@
 import struct
 import sys
 import inspect
+import re
 import logging
 from logging.handlers import SysLogHandler
 
@@ -70,6 +71,17 @@ def update2Ddict(updata_dict, key_a, key_b, value):
     else: 
         updata_dict.update({key_a: {key_b: value}})
 
+def emb_numbers(string):
+    re_digits = re.compile(r'(\d+)')
+    pieces = re_digits.split(string)
+    pieces[1::2] = map(int,pieces[1::2])
+    return pieces
+
+def sort_string_with_numbers(origin_list):
+    new_list = [(emb_numbers(string),string) for string in origin_list]
+    new_list.sort()
+    return [string for __,string in new_list]
+
 class Messager(object):
     def __init__(self, name=None):
         self.logger = logging.getLogger(name or 'xcatagent')
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/beacon.py b/xCAT-openbmc-py/lib/python/agent/hwctl/beacon.py
new file mode 100644
index 000000000..0c4cb6672
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/beacon.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+
+class BeaconInterface(object):
+    """Interface for beacon-related actions."""
+    interface_type = 'beacon'
+    version = '1.0'
+
+    def set_beacon_state(self, task, beacon_state, timeout=None):
+        """Set the beacon state of the task's nodes.
+
+        :param task: a Task instance containing the nodes to act on.
+        :param beacon_state: on|off beacon state.
+        :param timeout: timeout (in seconds) positive integer (> 0) for any
+          beacon state. ``None`` indicates to use default timeout.
+        """
+        return task.run('set_state', beacon_state, timeout=timeout)
+
+
+class DefaultBeaconManager(BeaconInterface):
+    """Interface for beacon-related actions."""
+    pass
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_beacon.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_beacon.py
new file mode 100644
index 000000000..e68f56f7a
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_beacon.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+from __future__ import print_function
+import gevent
+import time
+
+from common.task import ParallelNodesCommand
+from common.exceptions import SelfClientException, SelfServerException
+from hwctl import openbmc_client as openbmc
+
+import logging
+logger = logging.getLogger('xcatagent')
+
+
+class OpenBMCBeaconTask(ParallelNodesCommand):
+    """Executor for beacon-related actions."""
+
+    def set_state(self, state, **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+        try:
+            obmc.login()
+            obmc.set_beacon_state(state)
+            result = '%s: %s' % (node, state)
+
+        except (SelfServerException, SelfClientException) as e:
+            result = '%s: %s'  % (node, e.message)
+
+        self.callback.info(result)
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_sensor.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_sensor.py
new file mode 100644
index 000000000..0cc8a7af1
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_sensor.py
@@ -0,0 +1,118 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+
+from __future__ import print_function
+import gevent
+import time
+
+from common.task import ParallelNodesCommand
+from common.exceptions import SelfClientException, SelfServerException
+from hwctl import openbmc_client as openbmc
+from common import utils
+
+import logging
+logger = logging.getLogger('xcatagent')
+
+
+SENSOR_TYPE_UNIT = {
+    "altitude" : "Meters",
+    "fanspeed" : "RPMS",
+    "temp"     : "DegreesC",
+    "voltage"  : "Volts",
+    "wattage"  : "Watts",
+}
+
+SENSOR_POWER_UNITS = ("Amperes", "Joules", "Watts")
+
+
+class OpenBMCSensorTask(ParallelNodesCommand):
+    """Executor for sensor-related actions."""
+
+    def _get_beacon_info(self, beacon_dict):
+
+        info_list = []
+        info_list.append('Front . . . . . : Power:%s Fault:%s Identify:%s' %
+                         (beacon_dict.get('front_power', 'N/A'),
+                          beacon_dict.get('front_fault', 'N/A'),
+                          beacon_dict.get('front_id', 'N/A')))
+        if (beacon_dict.get('fan0', 'N/A') == 'Off' and beacon_dict.get('fan1', 'N/A') == 'Off' and
+            beacon_dict.get('fan2', 'N/A') == 'Off' and beacon_dict.get('fan3', 'N/A') == 'Off'):
+            info_list.append('Front Fans  . . : No LEDs On')
+        else:
+            info_list.append('Front Fans  . . : fan0:%s fan1:%s fan2:%s fan3:%s' %
+                             (beacon_dict.get('fan0', 'N/A'), beacon_dict.get('fan1', 'N/A'),
+                              beacon_dict.get('fan2', 'N/A'), beacon_dict.get('fan3', 'N/A')))
+        info_list.append('Rear  . . . . . : Power:%s Fault:%s Identify:%s' %
+                         (beacon_dict.get('rear_power', 'N/A'),
+                          beacon_dict.get('rear_fault', 'N/A'),
+                          beacon_dict.get('rear_id', 'N/A')))
+        return info_list
+        
+
+    def get_sensor_info(self, sensor_type, **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+
+        sensor_info = []
+        try:
+            obmc.login()
+            sensor_info_dict = obmc.get_sensor_info()
+
+            if sensor_type == 'all' or not sensor_type:
+                for sensor_key in sensor_info_dict:
+                    sensor_info += sensor_info_dict[sensor_key]
+                sensor_info = utils.sort_string_with_numbers(sensor_info)
+                beacon_dict = obmc.get_beacon_info()
+                sensor_info += self._get_beacon_info(beacon_dict)
+            elif sensor_type == 'power':
+                for sensor_key in sensor_info_dict:
+                    if sensor_key in SENSOR_POWER_UNITS:
+                        sensor_info += sensor_info_dict[sensor_key]
+                sensor_info = utils.sort_string_with_numbers(sensor_info)
+            else:
+                sensor_unit = SENSOR_TYPE_UNIT[sensor_type]
+                if sensor_unit in sensor_info_dict:
+                    sensor_info += sensor_info_dict[sensor_unit]
+                    sensor_info = utils.sort_string_with_numbers(sensor_info)
+
+            if not sensor_info:
+                sensor_info = ['No attributes returned from the BMC.']
+
+            for info in sensor_info:
+                self.callback.info( '%s: %s' % (node, info))
+
+        except (SelfServerException, SelfClientException) as e:
+            self.callback.info('%s: %s'  % (node, e.message))
+
+        return sensor_info
+
+    def get_beacon_info(self, **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+
+        beacon_info = []
+        try:
+            obmc.login()
+            beacon_dict = obmc.get_beacon_info()
+            beacon_info = self._get_beacon_info(beacon_dict)
+
+            if not beacon_info:
+                beacon_info = ['No attributes returned from the BMC.']
+
+            for info in beacon_info:
+                self.callback.info( '%s: %s' % (node, info))
+
+        except (SelfServerException, SelfClientException) as e:
+            self.callback.info('%s: %s'  % (node, e.message))
+
+        return beacon_info
+                
+
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index 2211c3981..caa8c3cda 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -19,6 +19,34 @@ HTTP_PROTOCOL = "https://"
 PROJECT_URL = "/xyz/openbmc_project"
 PROJECT_PAYLOAD = "xyz.openbmc_project."
 
+RBEACON_URLS = {
+    "path"      : "/led/groups/enclosure_identify/attr/Asserted",
+    "on"        : {
+        "field" : True,
+    },
+    "off"        : {
+        "field" : False,
+    },
+}
+
+LEDS_URL = "/led/physical/enumerate"
+
+LEDS_KEY_LIST = ("fan0", "fan1", "fan2", "fan3",
+                 "front_id", "front_fault", "front_power",
+                 "rear_id", "rear_fault", "rear_power")
+
+SENSOR_URL = "/sensors/enumerate"
+
+SENSOR_UNITS = {
+    "Amperes"  : "Amps",
+    "DegreesC" : "C",
+    "Joules"   : "Joules",
+    "Meters"   : "Meters",
+    "RPMS"     : "RPMS",
+    "Volts"    : "Volts",
+    "Watts"    : "Watts",
+}
+
 RPOWER_STATES = {
     "on"        : "on",
     "off"       : "off",
@@ -308,6 +336,52 @@ class OpenBMCRest(object):
             error = 'Error: Received wrong format response: %s' % states
             raise SelfServerException(error)
 
+    def get_beacon_info(self):
+
+        beacon_data = self.request('GET', LEDS_URL, cmd='get_beacon_info') 
+        try:
+            beacon_dict = {}
+            for key, value in beacon_data.items():
+                key_id = key.split('/')[-1]
+                if key_id in LEDS_KEY_LIST:
+                    beacon_dict[key_id] = value['State'].split('.')[-1]
+            return beacon_dict
+        except KeyError:
+            error = 'Error: Received wrong format response: %s' % beacon_data
+            raise SelfServerException(error)
+
+    def set_beacon_state(self, state):
+
+        payload = { "data": RBEACON_URLS[state]['field'] }
+        self.request('PUT', RBEACON_URLS['path'], payload=payload, cmd='set_beacon_state')
+
+    def get_sensor_info(self):
+
+        sensor_data = self.request('GET', SENSOR_URL, cmd='get_sensor_info')
+        try:
+            sensor_dict = {}
+            for k, v in sensor_data.items():
+                if 'Unit' in v:
+                    unit = v['Unit'].split('.')[-1]
+                    if unit in SENSOR_UNITS:
+                        label = k.split('/')[-1].replace('_', ' ').title()
+                        value = v['Value']
+                        scale = v['Scale']
+                        value = value * pow(10, scale)
+                        value = '{:g}'.format(value)
+                        if unit not in sensor_dict:
+                            sensor_dict[unit] = []
+                        sensor_dict[unit].append('%s: %s %s' % (label, value, SENSOR_UNITS[unit]))
+                elif 'units' in v and 'value' in v:
+                    label = k.split('/')[-1]
+                    value = v['value']
+                    sensor_dict[label] = ['%s: %s' % (label, value)]
+                    
+            return sensor_dict
+        except KeyError:
+            error = 'Error: Received wrong format response: %s' % sensor_data
+            raise SelfServerException(error)
+
     def list_firmware(self):
 
         data = self.request('GET', FIRM_URLS['list']['path'], cmd='list_firmware')
@@ -347,3 +421,4 @@ class OpenBMCImage(object):
 
     def __str__(self):
         return '%s-%s' % (self.purpose, self.id)
+
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/sensor.py b/xCAT-openbmc-py/lib/python/agent/hwctl/sensor.py
new file mode 100644
index 000000000..ad8727311
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/sensor.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+
+class SensorInterface(object):
+    """Interface for sensor-related actions."""
+    interface_type = 'sensor'
+    version = '1.0'
+
+    def get_sensor_info(self, task, sensor_type=None):
+        """Return the sensor info of the task's nodes.
+
+        :param sensor_type: type of sensor info want to get.
+        :param task: a Task instance containing the nodes to act on.
+        :return: sensor info list
+        """
+        return task.run('get_sensor_info', sensor_type) 
+
+    def get_beacon_info(self, task):
+        """Return the beacon info of the task's nodes.
+
+        :param task: a Task instance containing the nodes to act on.
+        :return: beacon info list
+        """
+        return task.run('get_beacon_info')
+
+class DefaultSensorManager(SensorInterface):
+    """Interface for sensor-related actions."""
+    pass
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index d11f76d51..82ec20b8f 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -13,10 +13,14 @@ from docopt import docopt
 
 from common import utils
 from common import exceptions as xcat_exception
+from hwctl.executor.openbmc_beacon import OpenBMCBeaconTask
 from hwctl.executor.openbmc_power import OpenBMCPowerTask
 from hwctl.executor.openbmc_setboot import OpenBMCBootTask
+from hwctl.executor.openbmc_sensor import OpenBMCSensorTask
+from hwctl.beacon import DefaultBeaconManager
 from hwctl.power import DefaultPowerManager
 from hwctl.setboot import DefaultBootManager
+from hwctl.sensor import DefaultSensorManager
 
 from xcatagent import base
 import openbmc_rest
@@ -36,6 +40,9 @@ VERBOSE = False
 
 all_nodes_result = {}
 
+# global variables of rbeacon
+BEACON_SET_OPTIONS = ('on', 'off')
+
 # global variables of rflash
 RFLASH_OPTIONS = {
     "-a"         : "activate",
@@ -83,6 +90,10 @@ POWER_GET_OPTIONS = ('bmcstate', 'state', 'stat', 'status')
 SETBOOT_GET_OPTIONS = ('stat', '')
 SETBOOT_SET_OPTIONS = ('cd', 'def', 'default', 'hd', 'net')
 
+# global variables of rvitals
+VITALS_OPTIONS = ('all', 'altitude', 'fanspeed', 'leds', 'power',
+                  'temp', 'voltage', 'wattage')
+
 class OpenBMC(base.BaseDriver):
 
     headers = {'Content-Type': 'application/json'}
@@ -541,6 +552,39 @@ class OpenBMCManager(base.BaseManager):
         if self.debugmode:
             logger.setLevel(logging.DEBUG)
 
+    def rbeacon(self, nodesinfo, args):
+
+        # 1, parse args
+        rbeacon_usage = """
+        Usage:
+            rbeacon [-V|--verbose] [on|off]
+
+        Options:
+            -V --verbose   rbeacon verbose mode.
+        """
+
+        try:
+            opts = docopt(rbeacon_usage, argv=args)
+
+            self.verbose = opts.pop('--verbose')
+            action = [k for k,v in opts.items() if v][0]
+        except Exception as e:
+            self.messager.error("Failed to parse arguments for rbeacon: %s" % args)
+            return
+
+        # 2, validate the args
+        if action is None:
+            self.messager.error("Not specify the subcommand for rbeacon")
+            return
+
+        if action not in BEACON_SET_OPTIONS:
+            self.messager.error("Not supported subcommand for rbeacon: %s" % action)
+            return
+
+        # 3, run the subcommands
+        runner = OpenBMCBeaconTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=self.verbose)
+        DefaultBeaconManager().set_beacon_state(runner, beacon_state=action)
+
     def rpower(self, nodesinfo, args):
 
         # 1, parse args
@@ -617,6 +661,41 @@ class OpenBMCManager(base.BaseManager):
         else:
             DefaultBootManager().set_boot_state(runner, setboot_state=action, persistant=action_type)
 
+    def rvitals(self, nodesinfo, args):
+
+        # 1, parse agrs
+        if not args:
+            args = ['all']
+
+        rvitals_usage = """
+        Usage:
+            rvitals [-V|--verbose] [all|altitude|fanspeed|leds|power|temp|voltage|wattage]
+
+        Options:
+            -V --verbose   rvitals verbose mode.
+        """
+
+        try:
+            opts = docopt(rvitals_usage, argv=args)
+
+            self.verbose = opts.pop('--verbose')
+            action = [k for k,v in opts.items() if v][0]
+        except Exception as e:
+            self.messager.error("Failed to parse arguments for rvitals: %s" % args)
+            return
+
+        # 2, validate the args
+        if action not in VITALS_OPTIONS:
+            self.messager.error("Not supported subcommand for rvitals: %s" % action)
+            return
+
+        # 3, run the subcommands
+        runner = OpenBMCSensorTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=self.verbose)
+        if action == 'leds':
+            DefaultSensorManager().get_beacon_info(runner)
+        else:
+            DefaultSensorManager().get_sensor_info(runner, action)
+
 
     def _get_full_path(self,file_path):
         if type(self.cwd) == 'unicode':
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index bc3161e2d..584e801e9 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -30,8 +30,11 @@ use xCAT::OPENBMC;
 
 sub handled_commands {
     return {
+        rbeacon        => 'nodehm:mgt=openbmc',
         rflash         => 'nodehm:mgt=openbmc',
         rpower         => 'nodehm:mgt=openbmc',
+        rsetboot       => 'nodehm:mgt=openbmc',
+        rvitals        => 'nodehm:mgt=openbmc',
     };
 }
 
@@ -144,15 +147,19 @@ sub parse_args {
         return ([ 1, "Error parsing arguments." ]);
     }
 
-    if (scalar(@ARGV) >= 2 and ($command =~ /rpower/)) {
+    if (scalar(@ARGV) >= 2 and ($command =~ /rbeacon|rpower|rvitals/)) {
         return ([ 1, "Only one option is supported at the same time for $command" ]);
-    } elsif (scalar(@ARGV) == 0 and $command =~ /rpower|rflash/) {
+    } elsif (scalar(@ARGV) == 0 and $command =~ /rbeacon|rpower|rflash/) {
         return ([ 1, "No option specified for $command" ]);
     } else {
         $subcommand = $ARGV[0];
     }
 
-    if ($command eq "rflash") {
+    if ($command eq "rbeacon") {
+        unless ($subcommand =~ /^on$|^off$/) {
+            return ([ 1, "Only 'on' or 'off' is supported for OpenBMC managed nodes."]);
+        }
+    } elsif ($command eq "rflash") {
         my ($activate, $check, $delete, $directory, $list, $upload) = (0) x 6;
         my $no_host_reboot;
         GetOptions(
@@ -173,7 +180,7 @@ sub parse_args {
                     return ([ 1, "Unsupported command: $command $arg" ]);
                 }
             }
-            return ([ 1, "No options specified."]);
+            return ([ 1, "No options specified." ]);
         }
         if ($activate or $check or $delete or $upload) {
             return ([ 1, "More than one firmware specified is not supported."]) if ($#ARGV >= 1);
@@ -213,6 +220,11 @@ sub parse_args {
         unless ($subcommand =~ /^net$|^hd$|^cd$|^def$|^default$|^stat$/) {
             return ([ 1, "Unsupported command: $command $subcommand" ]);
         }
+    } elsif ($command eq "rvitals") {
+        $subcommand = "all" if (!defined($ARGV[0]));
+        unless ($subcommand =~ /^all$|^altitude$|^fanspeed$|^leds$|^power$|^temp$|^voltage$|^wattage$/) {
+            return ([ 1, "Unsupported command: $command $subcommand" ]);
+        }
     } else {
         return ([ 1, "Unsupported command: $command" ]);
     }

From 5d1c8c7092616c3e2192c0fc5314372dacd2be3b Mon Sep 17 00:00:00 2001
From: zhao er tao <ertaozh@cn.ibm.com>
Date: Fri, 2 Feb 2018 23:40:37 +0800
Subject: [PATCH 033/100] deal with rspconfig in python

---
 .../lib/python/agent/xcatagent/openbmc.py     |  1 -
 xCAT-server/lib/xcat/plugins/openbmc2.pm      | 32 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index 82ec20b8f..4346cb6f6 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -696,7 +696,6 @@ class OpenBMCManager(base.BaseManager):
         else:
             DefaultSensorManager().get_sensor_info(runner, action)
 
-
     def _get_full_path(self,file_path):
         if type(self.cwd) == 'unicode':
             dir_path = self.cwd
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index 584e801e9..a34626dbd 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -113,6 +113,10 @@ sub process_request {
     $callback = shift;
     my $noderange = $request->{node};
     my $check = parse_node_info($noderange);
+    if (&refactor_args($request)) {
+        xCAT::MsgUtils->message("E", { data => ["Failed to refactor arguments"] }, $callback);
+        return;
+    }
     $callback->({ errorcode => [$check] }) if ($check);
     return unless(%node_info);
     my $pid = xCAT::OPENBMC::start_python_agent();
@@ -298,4 +302,32 @@ sub parse_node_info {
     return $rst;
 }
 
+#-------------------------------------------------------
+
+=head3  refactor_args
+
+  refractor args to be easily dealt by python client
+
+=cut
+
+#-------------------------------------------------------
+
+sub refactor_args {
+    my $request = shift;
+    my $command   = $request->{command}->[0];
+    my $extrargs  = $request->{arg};    
+    if ($command eq "rspconfig") {
+        if ($extrargs->[0] eq "dump") {
+            $request->{arg}->[0] = "--dump";
+        } else {
+            foreach my $arg (@$extrargs) {
+                if ($arg !~ /^-/) {
+                    $arg = "--".$arg;
+                }
+            }
+        }
+    }
+    return 0;
+}
+
 1;

From 862fa5973e3135826353eed093a4991fe998d2f2 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Tue, 6 Feb 2018 18:59:16 -0500
Subject: [PATCH 034/100] Support user defined password from pdu table

---
 xCAT-server/lib/xcat/plugins/pdu.pm           | 109 +++++++++++++-----
 .../lib/xcat/plugins/switchdiscover.pm        |   8 +-
 2 files changed, 81 insertions(+), 36 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/pdu.pm b/xCAT-server/lib/xcat/plugins/pdu.pm
index d2a94ca3f..a0b592797 100644
--- a/xCAT-server/lib/xcat/plugins/pdu.pm
+++ b/xCAT-server/lib/xcat/plugins/pdu.pm
@@ -450,6 +450,7 @@ sub powerstat {
     foreach my $pdu (@$noderange) {
         if ($pduhash->{$pdu}->[0]->{pdutype} eq 'crpdu') {
             my $snmpversion = $pduhash->{$pdu}->[0]->{snmpversion};
+            my $snmpcmd;
             if ($snmpversion =~ /3/) {
                 my $snmpuser = $pduhash->{$pdu}->[0]->{snmpuser};
                 my $seclevel = $pduhash->{$pdu}->[0]->{seclevel};
@@ -469,7 +470,6 @@ sub powerstat {
                             $privkey=$authkey;
                         }
                     }
-                    my $snmpcmd;
                     if ($seclevel eq "authNoPriv") {
                         $snmpcmd = "snmpwalk -v3 -u $snmpuser -a $authtype -A $authkey -l $seclevel"; 
                     } elsif ($seclevel eq "authPriv") {
@@ -477,16 +477,19 @@ sub powerstat {
                     } else {   #default to notAuthNoPriv
                         $snmpcmd = "snmpwalk -v3 -u $snmpuser -l $seclevel"; 
                     }
-
-                    for (my $relay = 1; $relay <= 3; $relay++) {
-                        relaystat($pdu, $relay, $snmpcmd, $callback);
-                    }
+                } else {
+                    xCAT::SvrUtils::sendmsg("ERROR: No snmpuser or Security level defined for snmpV3 configuration", $callback,$pdu);
+                    xCAT::SvrUtils::sendmsg("    use chdef command to add pdu snmpV3 attributes to pdu table", $callback,$pdu);
+                    xCAT::SvrUtils::sendmsg("    then run 'rspconfig $pdu snmpcfg' command ", $callback,$pdu);
                     next;
                 }
-           } 
-            xCAT::SvrUtils::sendmsg("please config snmpv3 to be able to query pdu relay status", $callback,$pdu);
-            xCAT::SvrUtils::sendmsg("    use chdef command to add pdu snmpv3 attributes to pdu table", $callback);
-            xCAT::SvrUtils::sendmsg("    then run 'rspconfig $pdu snmpcfg' command ", $callback);
+            } else { 
+                # use default value
+                $snmpcmd = "snmpwalk -v3 -u admin -a MD5 -A password1 -l authPriv -x DES -X password2";
+            } 
+            for (my $relay = 1; $relay <= 3; $relay++) {
+                relaystat($pdu, $relay, $snmpcmd, $callback);
+            }
             next;
         }
         my $session = connectTopdu($pdu,$callback);
@@ -551,8 +554,18 @@ sub connectTopdu {
     my $pdu = shift;
     my $callback = shift;
 
+    #get community string from pdu table if defined,
+    #otherwise, use default
+    my $community;
+    my $pdutab = xCAT::Table->new('pdu');
+    my $pduent = $pdutab->getNodeAttribs($pdu, ['community']);
+    if ($pduent->{community}) {
+        $community = $pduent->{community};
+    } else {
+        $community = "public";
+    }
+
     my $snmpver = "1";
-    my $community = "public";
     my $session;
     my $msg = "connectTopdu";
     my $versionoid = ".1.3.6.1.4.1.2.6.223.7.3.0";
@@ -628,7 +641,7 @@ sub process_netcfg {
     my $rsp = {};
 
     my $pdutab = xCAT::Table->new('pdu');
-    my $pduhash = $pdutab->getNodesAttribs($nodes, ['pdutype']);
+    my $pduhash = $pdutab->getNodesAttribs($nodes, ['pdutype','username','password']);
 
     my $nodetab = xCAT::Table->new('hosts');
     my $nodehash = $nodetab->getNodesAttribs($nodes,['ip','otherinterfaces']);
@@ -640,9 +653,10 @@ sub process_netcfg {
         return;
     }
 
-
     # connect to PDU
-    ($exp, $errstr) = session_connect($static_ip, $discover_ip);
+    my $username = $pduhash->{$pdu}->[0]->{username};
+    my $password = $pduhash->{$pdu}->[0]->{password};
+    ($exp, $errstr) = session_connect($static_ip, $discover_ip,$username,$password);
     if (defined $errstr) {
         xCAT::SvrUtils::sendmsg("Failed to connect", $callback,$pdu);
         return;
@@ -711,10 +725,6 @@ sub process_sshcfg {
     my $subcmd = shift;
     my $callback = shift;
 
-    #this is default password for CoralPDU
-    my $password = "password8";
-    my $userid = "root";
-    my $timeout = 30;
     my $keyfile = "/root/.ssh/id_rsa.pub";
     my $rootkey = `cat /root/.ssh/id_rsa.pub`;
     my $cmd;
@@ -723,7 +733,7 @@ sub process_sshcfg {
     my $nodehash = $nodetab->getNodesAttribs($noderange,['ip','otherinterfaces']);
 
     my $pdutab = xCAT::Table->new('pdu');
-    my $pduhash = $pdutab->getNodesAttribs($noderange, ['pdutype']);
+    my $pduhash = $pdutab->getNodesAttribs($noderange, ['pdutype','username','password']);
 
     foreach my $pdu (@$noderange) {
         unless ($pduhash->{$pdu}->[0]->{pdutype} eq "crpdu") {
@@ -740,7 +750,10 @@ sub process_sshcfg {
 
         my $static_ip = $nodehash->{$pdu}->[0]->{ip};
         my $discover_ip = $nodehash->{$pdu}->[0]->{otherinterfaces};
-        my ($exp, $errstr) = session_connect($static_ip, $discover_ip);
+        my $username = $pduhash->{$pdu}->[0]->{username};
+        my $password = $pduhash->{$pdu}->[0]->{password};
+
+        my ($exp, $errstr) = session_connect($static_ip, $discover_ip,$username,$password);
         if (!defined $exp) {
             $msg = " Failed to connect $errstr";
             xCAT::SvrUtils::sendmsg($msg, $callback, $pdu, %allerrornodes);
@@ -773,10 +786,17 @@ sub process_sshcfg {
 sub session_connect {
     my $static_ip   = shift;
     my $discover_ip   = shift;
+    my $userid = shift;
+    my $password = shift;
 
     #default password for coral pdu
-    my $password = "password8";
-    my $userid = "root";
+    if (!defined $userid) {
+        $userid = "root";
+    }
+    if (!defined $password) {
+        $password = "password8";
+    }
+
     my $timeout = 30;
 
     my $ssh_ip;
@@ -914,7 +934,7 @@ sub showMFR {
     my $nodehash = $nodetab->getNodesAttribs($noderange,['ip','otherinterfaces']);
 
     my $pdutab = xCAT::Table->new('pdu');
-    my $pduhash = $pdutab->getNodesAttribs($noderange, ['pdutype']);
+    my $pduhash = $pdutab->getNodesAttribs($noderange, ['pdutype','username','password']);
 
     foreach my $pdu (@$noderange) {
         unless ($pduhash->{$pdu}->[0]->{pdutype} eq "crpdu") {
@@ -925,7 +945,10 @@ sub showMFR {
         # connect to PDU
         my $static_ip = $nodehash->{$pdu}->[0]->{ip};
         my $discover_ip = $nodehash->{$pdu}->[0]->{otherinterfaces};
-        my ($exp, $errstr) = session_connect($static_ip, $discover_ip);
+        my $username = $pduhash->{$pdu}->[0]->{username};
+        my $password = $pduhash->{$pdu}->[0]->{password};
+
+        my ($exp, $errstr) = session_connect($static_ip, $discover_ip,$username,$password);
         if (defined $errstr) {
             xCAT::SvrUtils::sendmsg("Failed to connect: $errstr", $callback);
         }
@@ -1021,7 +1044,7 @@ sub showMonitorData {
     my $nodehash = $nodetab->getNodesAttribs($noderange,['ip','otherinterfaces']);
 
     my $pdutab = xCAT::Table->new('pdu');
-    my $pduhash = $pdutab->getNodesAttribs($noderange, ['pdutype']);
+    my $pduhash = $pdutab->getNodesAttribs($noderange, ['pdutype','username','password']);
 
     foreach my $pdu (@$noderange) {
         unless ($pduhash->{$pdu}->[0]->{pdutype} eq "crpdu") {
@@ -1043,7 +1066,10 @@ sub showMonitorData {
         # connect to PDU
         my $static_ip = $nodehash->{$pdu}->[0]->{ip};
         my $discover_ip = $nodehash->{$pdu}->[0]->{otherinterfaces};
-        my ($exp, $errstr) = session_connect($static_ip, $discover_ip);
+        my $username = $pduhash->{$pdu}->[0]->{username};
+        my $password = $pduhash->{$pdu}->[0]->{password};
+
+        my ($exp, $errstr) = session_connect($static_ip, $discover_ip,$username,$password);
 
         my $ret;
         my $err;
@@ -1137,7 +1163,7 @@ sub relaystat {
     } elsif ( $stat eq "0" ) {
         xCAT::SvrUtils::sendmsg(" relay $relay is off", $callback, $pdu, %allerrornodes);
     } else {
-        xCAT::SvrUtils::sendmsg(" relay $relay is unknown", $callback, $pdu, %allerrornodes);
+        xCAT::SvrUtils::sendmsg(" relay $relay is $stat=unknown", $callback, $pdu, %allerrornodes);
     }
 
     return;
@@ -1211,11 +1237,15 @@ sub process_relay {
 
     my $nodetab = xCAT::Table->new('hosts');
     my $nodehash = $nodetab->getNodeAttribs($pdu,['ip','otherinterfaces']);
+    my $pdutab = xCAT::Table->new('pdu');
+    my $pduent = $pdutab->getNodeAttribs($pdu, ['username','password']);
+    my $username = $pduent->{username};
+    my $passwd = $pduent->{password};
 
     # connect to PDU
     my $static_ip = $nodehash->{$pdu}->[0]->{ip};
     my $discover_ip = $nodehash->{$pdu}->[0]->{otherinterfaces};
-    my ($session, $errstr) = session_connect($static_ip, $discover_ip);
+    my ($session, $errstr) = session_connect($static_ip, $discover_ip,$username,$passwd);
 
     my $ret;
     my $err;
@@ -1289,7 +1319,7 @@ sub process_snmpcfg {
     my $nodehash = $nodetab->getNodesAttribs($noderange,['ip','otherinterfaces']);
 
     my $pdutab = xCAT::Table->new('pdu');
-    my $pduhash = $pdutab->getNodesAttribs($noderange, ['pdutype','community','snmpversion','snmpuser','authtype','authkey','privtype','privkey','seclevel']);
+    my $pduhash = $pdutab->getNodesAttribs($noderange, ['pdutype','community','username','password','snmpversion','snmpuser','authtype','authkey','privtype','privkey','seclevel']);
 
     foreach my $pdu (@$noderange) {
         unless ($pduhash->{$pdu}->[0]->{pdutype} eq "crpdu") {
@@ -1320,7 +1350,10 @@ sub process_snmpcfg {
         # connect to PDU
         my $static_ip = $nodehash->{$pdu}->[0]->{ip};
         my $discover_ip = $nodehash->{$pdu}->[0]->{otherinterfaces};
-        my ($exp, $errstr) = session_connect($static_ip, $discover_ip);
+        my $username = $pduhash->{$pdu}->[0]->{username};
+        my $password = $pduhash->{$pdu}->[0]->{password};
+
+        my ($exp, $errstr) = session_connect($static_ip, $discover_ip,$username,$password);
 
         my $ret;
         my $err;
@@ -1390,10 +1423,22 @@ sub netcfg_for_irpdu {
         @exargs = @$extrargs;
     }
 
+    #get user/password from pdu table if defined
     #default password for irpdu
     my $passwd = "1001";
     my $username = "ADMIN";
-    my $timeout = 20;
+    my $pdutab = xCAT::Table->new('pdu');
+    my $pduent = $pdutab->getNodeAttribs($pdu, ['username','password']);
+    if ($pduent) {
+        if ($pduent->{username}) {
+            $username = $pduent->{username};
+        }
+        if ($pduent->{password}) {
+            $passwd = $pduent->{password};
+        }
+    }
+
+    my $timeout = 10;
     my $send_change = "N";
   
     my $login_ip;
@@ -1496,11 +1541,11 @@ sub netcfg_for_irpdu {
         ],
     );
 
-    if (defined($result[1]))
+    if (defined($result[1])) 
     {
         my $errmsg = $result[1];
         $mypdu->soft_close();
-        xCAT::SvrUtils::sendmsg("Failed expect command $errmsg", $callback);
+        xCAT::SvrUtils::sendmsg("Failed expect command: $errmsg", $callback,$pdu);
         return;
     }
     $mypdu->soft_close();
diff --git a/xCAT-server/lib/xcat/plugins/switchdiscover.pm b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
index 24a2f3192..512356939 100644
--- a/xCAT-server/lib/xcat/plugins/switchdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
@@ -1194,9 +1194,9 @@ sub xCATdB {
         # it's attribute 
         ##################################################
         if (exists($globalopt{pdu})) {
-            $ret = xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$host,"groups=$device","ip=$ip","mac=$mac","nodetype=$device","mgt=$device","usercomment=$vendor","pdutype=$stype"] }, $sub_req, 0, 1);
+            $ret = xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$host,"groups=$device","ip=$ip","mac=$mac","nodetype=$device","mgt=$device","usercomment=$vendor","pdutype=$stype","community=$community"] }, $sub_req, 0, 1);
         } else {
-            $ret = xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$host,"groups=$device","ip=$ip","mac=$mac","nodetype=$device","mgt=$device","usercomment=$vendor","switchtype=$stype"] }, $sub_req, 0, 1);
+            $ret = xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$host,"groups=$device","ip=$ip","mac=$mac","nodetype=$device","mgt=$device","usercomment=$vendor","switchtype=$stype","community=$community"] }, $sub_req, 0, 1);
         }
     }
 }
@@ -1407,9 +1407,9 @@ sub matchPredefineSwitch {
         # only write to xcatdb if -w or --setup option specified
         if ( (exists($globalopt{w})) || (exists($globalopt{setup})) ) {
             if (exists($globalopt{pdu})) {
-                xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$node,"otherinterfaces=$ip",'status=Matched',"mac=$mac","usercomment=$vendor","pdutype=$stype"] }, $sub_req, 0, 1);
+                xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$node,"otherinterfaces=$ip",'status=Matched',"mac=$mac","usercomment=$vendor","pdutype=$stype","community=$community"] }, $sub_req, 0, 1);
             } else {
-                xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$node,"otherinterfaces=$ip",'status=Matched',"mac=$mac","switchtype=$stype","usercomment=$vendor"] }, $sub_req, 0, 1);
+                xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$node,"otherinterfaces=$ip",'status=Matched',"mac=$mac","switchtype=$stype","usercomment=$vendor","community=$community"] }, $sub_req, 0, 1);
             }
         }
 

From 28a84fa9978fde10c36bb4cf301ab717f31b8622 Mon Sep 17 00:00:00 2001
From: chenglch <chenglch@cn.ibm.com>
Date: Thu, 1 Feb 2018 18:48:20 +0800
Subject: [PATCH 035/100] List console status with makegocons -q

Add `-q|--query [noderange]` for makegocons to list the console
status and the host server. If node is not registered in
goconserver, the status will be `unregistered`.

If console releated attribute is not defined for the specified
node but it is included in the noderange, error message for that
node will be printed at first.
---
 xCAT-server/lib/perl/xCAT/Goconserver.pm    | 46 +++++++++++++++++++++
 xCAT-server/lib/xcat/plugins/goconserver.pm | 22 +++++++---
 2 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/Goconserver.pm b/xCAT-server/lib/perl/xCAT/Goconserver.pm
index b6a55a390..835ee4e3e 100644
--- a/xCAT-server/lib/perl/xCAT/Goconserver.pm
+++ b/xCAT-server/lib/perl/xCAT/Goconserver.pm
@@ -10,6 +10,7 @@ BEGIN
 use lib "$::XCATROOT/lib/perl";
 use strict;
 use warnings "all";
+use File::Copy qw(move);
 
 use HTTP::Request;
 use HTTP::Headers;
@@ -22,6 +23,7 @@ my $go_api_port = 12429;
 my $go_cons_port = 12430;
 
 use constant CONSOLE_LOG_DIR => "/var/log/consoles";
+use constant PRINT_FORMAT => "%-32s %-32s %-64s";
 unless (-d CONSOLE_LOG_DIR) {
     mkpath(CONSOLE_LOG_DIR, 0, 0755);
 }
@@ -115,6 +117,46 @@ sub create_nodes {
     return $ret;
 }
 
+sub list_nodes {
+    my ($api_url, $node_map, $callback) = @_;
+    my $url = "$api_url/nodes";
+    my $rsp;
+    my $response = http_request("GET", $url);
+    if (!defined($response)) {
+        $rsp->{data}->[0] = "Failed to send list request.";
+        xCAT::MsgUtils->message("E", $rsp, $callback);
+        return 1;
+    }
+    if (!$response->{nodes}) {
+        $rsp->{data}->[0] = "Could not find any node.";
+        xCAT::MsgUtils->message("I", $rsp, $callback);
+        return 0;
+    }
+    $rsp->{data}->[0] = sprintf("\n".PRINT_FORMAT, "NODE", "SERVER", "STATE");
+    xCAT::MsgUtils->message("I", $rsp, $::callback);
+    foreach my $node (sort {$a->{name} cmp $b->{name}} @{$response->{nodes}}) {
+        if (!$node_map->{$node->{name}}) {
+            next;
+        }
+        $node_map->{$node->{name}}->{vis} = 1;
+        if (!$node->{host} || !$node->{state}) {
+            $rsp->{data}->[0] = sprintf(PRINT_FORMAT, $node->{name}, "", "Unable to parse the response message");
+            xCAT::MsgUtils->message("E", $rsp, $callback);
+            next;
+        }
+        $rsp->{data}->[0] = sprintf(PRINT_FORMAT, $node->{name}, $node->{host}, $node->{state});
+        xCAT::MsgUtils->message("I", $rsp, $::callback);
+    }
+    my %node_hash = %{$node_map};
+    for my $node (sort keys %node_hash) {
+        if(!$node_hash{$node}->{vis}) {
+            $rsp->{data}->[0] = sprintf(PRINT_FORMAT, $node, "", "unregistered");
+            xCAT::MsgUtils->message("I", $rsp, $callback);
+        }
+    }
+    return 0;
+}
+
 #-------------------------------------------------------------------------------
 
 =head3  is_xcat_conf_ready
@@ -218,6 +260,8 @@ sub is_conserver_running {
 
 #-------------------------------------------------------------------------------
 sub build_conf {
+    # try to backup the original configuration file, no matter sunccess or not
+    move('/etc/goconserver/server.conf', '/etc/goconserver/server.conf.bak');
     my $config = "#generated by xcat ".xCAT::Utils->Version()."\n".
                  "global:\n".
                  "  host: 0.0.0.0\n".
@@ -231,6 +275,8 @@ sub build_conf {
                  "  datadir: /var/lib/goconserver/                       # the data file to save the hosts\n".
                  "  port: $go_cons_port                                  # the port for console\n".
                  "  log_timestamp: true                                  # log the timestamp at the beginning of line\n".
+                 "  # time precison for tcp or udp logger, precison for file logger is always second\n".
+                 "  time_precision: microsecond                          # Valid options: second, millisecond, microsecond, nanosecond\n".
                  "  reconnect_interval: 10                               # retry interval in second if console could not be connected\n".
                  "  logger:                                              # multiple logger targets could be specified\n".
                  "    file:                                              # file logger, valid fields: name,logdir. Accept array in yaml format\n".
diff --git a/xCAT-server/lib/xcat/plugins/goconserver.pm b/xCAT-server/lib/xcat/plugins/goconserver.pm
index 2cc470b2e..7fb243168 100644
--- a/xCAT-server/lib/xcat/plugins/goconserver.pm
+++ b/xCAT-server/lib/xcat/plugins/goconserver.pm
@@ -19,8 +19,9 @@ my $isSN;
 my $host;
 my $bmc_cons_port = "2200";
 my $usage_string ="   makegocons [-V|--verbose] [-d|--delete] noderange
-    -h|--help        Display this usage statement.
-    -v|--version     Display the version number.";
+    -h|--help                   Display this usage statement.
+    -v|--version                Display the version number.
+    -q|--query  [noderange]     Display the console connection status.";
 
 my $version_string = xCAT::Utils->Version();
 
@@ -86,13 +87,17 @@ sub preprocess_request {
         my $hmcache = $hmtab->getNodesAttribs($noderange, [ 'node', 'serialport', 'cons', 'conserver' ]);
         foreach my $node (@$noderange) {
             my $ent = $hmcache->{$node}->[0]; #$hmtab->getNodeAttribs($node,['node', 'serialport','cons', 'conserver']);
-            push @items, $ent;
+            if ($ent) {
+                push (@items, $ent);
+            } else {
+                my $rsp->{data}->[0] = $node .": ignore, cons attribute or serialport attribute is not specified.";
+                xCAT::MsgUtils->message("I", $rsp, $::callback);
+            }
         }
     } else {
         $allnodes = 1;
         @items = $hmtab->getAllNodeAttribs([ 'node', 'serialport', 'cons', 'conserver' ]);
     }
-
     my @nodes = ();
     foreach (@items) {
         if (((!defined($_->{cons})) || ($_->{cons} eq "")) and !defined($_->{serialport})) {
@@ -314,8 +319,9 @@ sub makegocons {
     }
     @ARGV = @exargs;
     $Getopt::Long::ignorecase = 0;
-    my $delmode;
+    my ($delmode, $querymode);
     GetOptions('d|delete' => \$delmode,
+        'q|query' => \$querymode,
     );
 
     my $svboot = 0;
@@ -329,6 +335,11 @@ sub makegocons {
         xCAT::SvrUtils::sendmsg([ 1, "Could not get any console request entry" ], $::callback);
         return 1;
     }
+    my $api_url = "https://$host:". xCAT::Goconserver::get_api_port();
+    if ($querymode) {
+        return xCAT::Goconserver::list_nodes($api_url, \%cons_map, $::callback)
+    }
+
     my $ret = start_goconserver();
     if ($ret != 0) {
         return 1;
@@ -351,7 +362,6 @@ sub makegocons {
         xCAT::SvrUtils::sendmsg([ 1, "Could not generate the request data" ], $::callback);
         return 1;
     }
-    my $api_url = "https://$host:". xCAT::Goconserver::get_api_port();
     $ret = xCAT::Goconserver::delete_nodes($api_url, $data, $delmode, $::callback);
     if ($delmode) {
         return $ret;

From 6f397510cc0c2a1dcd71805e135689e0e50341b9 Mon Sep 17 00:00:00 2001
From: zhao er tao <ertaozh@cn.ibm.com>
Date: Sun, 4 Feb 2018 23:22:59 +0800
Subject: [PATCH 036/100] rspconfig in python

---
 .../lib/python/agent/hwctl/bmcconfig.py       |  42 ++++
 .../agent/hwctl/executor/openbmc_bmcconfig.py | 198 ++++++++++++++++++
 .../lib/python/agent/xcatagent/openbmc.py     |  96 +++++++++
 xCAT-server/lib/xcat/plugins/openbmc2.pm      |  17 +-
 4 files changed, 346 insertions(+), 7 deletions(-)
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/bmcconfig.py
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/bmcconfig.py
new file mode 100644
index 000000000..5bdb5bc1d
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/bmcconfig.py
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+
+class BmcConfigInterface(object):
+    """Interface for bmc configuration related actions."""
+    interface_type = 'bmcconfig'
+    version = '1.0'
+
+    def dump_list(self, task):
+        return task.run('dump_list')
+
+    def dump_generate(self, task):
+        return task.run("dump_generate")
+
+    def dump_clear(self, task, id):
+        return task.run("dump_clear", id)
+
+    def dump_download(self, task, id):
+        return task.run("dump_download", id)
+
+    def dump_process(self, task):
+        return task.run("dump_process")
+
+    def set_sshcfg(self, task):
+        return task.run("set_sshcfg")
+
+    def set_ipdhcp(self, task):
+        return task.run("set_ipdhcp")
+
+    def get_attributes(self, task, attributes):
+        return task.run("get_attributes", attributes)
+
+    def set_attributes(self, task, attributes):
+        return task.run("set_attributes", attributes)
+
+class DefaultBmcConfigManager(BmcConfigInterface):
+    """Interface for BmcConfig actions."""
+    pass
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
new file mode 100644
index 000000000..b0fe244b3
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
@@ -0,0 +1,198 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+from __future__ import print_function
+import gevent
+import time
+
+from common.task import ParallelNodesCommand
+from common.exceptions import SelfClientException, SelfServerException
+from hwctl import openbmc_client as openbmc
+
+import logging
+logger = logging.getLogger('xcatagent')
+
+RSPCONFIG_GET_NETINFO=['ip', 'netmask', 'gateway', 'vlan', 'ipsrc', 'hostname']
+RSPCONFIG_SET_NETINFO=['ip', 'netmask', 'gateway', 'vlan']
+
+RSPCONFIG_APIS = {
+    'autoreboot' : {
+        'baseurl': "/control/host0/auto_reboot/",
+        'set_url': "attr/AutoReboot",
+        'get_url': "attr/AutoReboot",
+        'display_name': "BMC AutoReboot",
+    },
+    'powersupplyredundancy':{
+        'baseurl': "/sensors/chassis/PowerSupplyRedundancy/",
+        'set_url': "/action/setValue",
+        'get_url': "/action/getValue",
+        'get_method': 'POST',
+        'get_data': '[]',
+        'display_name': "BMC PowerSupplyRedundancy",
+        'attr_values': {
+            'disabled': "Disables",
+            'enabled': "Enabled",
+        },
+    },
+    'powerrestorepolicy': {
+        'baseurl': "/control/host0/power_restore_policy/",
+        'set_url': "attr/PowerRestorePolicy",
+        'get_url': "attr/PowerRestorePolicy",
+        'display_name': "BMC PowerRestorePolicy",
+         'attr_values': {
+             'restore': "xyz.openbmc_project.Control.Power.RestorePolicy.Policy.Restore",
+             'always_on': "xyz.openbmc_project.Control.Power.RestorePolicy.Policy.AlwaysOn",
+             'always_off': "xyz.openbmc_project.Control.Power.RestorePolicy.Policy.AlwaysOff",
+         },
+    },
+    'bootmode': {
+        'baseurl': "/control/host0/boot/",
+        'set_url': "attr/BootMode",
+        'get_url': "attr/BootMode",
+        'display_name':"BMC BootMode",
+        'attr_values': {
+            'regular': "xyz.openbmc_project.Control.Boot.Mode.Modes.Regular",
+            'safe': "xyz.openbmc_project.Control.Boot.Mode.Modes.Safe",
+            'setup': "xyz.openbmc_project.Control.Boot.Mode.Modes.Setup",
+        },
+    },
+}
+
+class OpenBMCBmcConfigTask(ParallelNodesCommand):
+        
+    def dump_list(self, **kw):
+        return self.callback.info('dump_list') 
+
+    def dump_generate(self, **kw):
+        return self.callback.info("dump_generate")
+
+    def dump_clear(self, id, **kw):
+        return self.callback.info("dump_clear id: %s" % id)
+
+    def dump_download(self, id, **kw):
+        return self.callback.info("dump_download id: %s" % id)
+
+    def dump_process(self, **kw):
+        return self.callback.info("dump_process: trigger, list and download")
+
+    def set_sshcfg(self, **kw):
+        return self.callback.info("set_sshcfg")
+
+    def set_ipdhcp(self, **kw):
+        return self.callback.info("set_ipdhcp")
+
+    def get_attributes(self, attributes, **kw):
+        netinfo_dict={'ip':False, 'ipsrc':False, 'netmask':False, 
+                       'gateway':False, 'vlan':False, 'hostname':False}
+        getnet=0
+        for attr in attributes:
+            if attr in RSPCONFIG_GET_NETINFO:
+                netinfo_dict[attr]=True
+                getnet=1
+            elif RSPCONFIG_APIS.has_key(attr):
+                return self._get_apis_values(attr, **kw)
+            else:
+                return self.callback.error("get_attributes can not deal with attr %s" % attr)
+        if getnet:
+            self._get_netinfo(netinfo_dict['ip'], netinfo_dict['ipsrc'], netinfo_dict['netmask'],
+                              netinfo_dict['gateway'], netinfo_dict['vlan'], netinfo_dict['hostname'], **kw)
+
+    def set_attributes(self, attributes, **kw):
+        netinfo_dict={'vlan':False}
+        for attr in attributes:
+            k,v = attr.split('=')
+            if k in RSPCONFIG_SET_NETINFO:
+                netinfo_dict[k] = v
+            elif k == 'hostname':
+                return self._set_hostname(v, **kw)
+            elif RSPCONFIG_APIS.has_key(k):
+                return self._set_apis_values(k, v, **kw)
+            else:
+                return self.callback.error("set_attributes unsupported attribute:%s" % k)
+        if (not netinfo_dict['ip']) or (not netinfo_dict['netmask']) or (not netinfo_dict['gateway']):
+            return self.callback.error("set_attributes miss either ip, netmask or gateway to set network information")
+        else:
+            self._set_netinfo(netinfo_dict['ip'], netinfo_dict['netmask'],
+                              netinfo_dict['gateway'], netinfo_dict['vlan'])
+
+    def _set_hostname(self, hostname, **kw):
+        if hostname == '*':
+            if kw['nodeinfo']['bmc'] != kw['nodeinfo']['bmcip']:
+                hostname = kw['nodeinfo']['bmc']
+            else:
+                hostname = '%s-bmc' % kw['node']
+        return self.callback.info("set_hostname: %s" % hostname)
+
+    def _set_apis_values(self, key, value, **kw):
+        node = kw['node']
+        attr_info = RSPCONFIG_APIS[key]
+        if not attr_info.has_key('set_url'):
+            return self.callback.error("config %s failed, not url available" % key)
+        set_url = attr_info['baseurl']+attr_info['set_url']
+
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+
+        if attr_info.has_key('attr_values') and attr_info['attr_values'].has_key(value):
+            data = attr_info['attr_values'][value]
+        else:
+            data = value
+
+        try:
+            obmc.login()
+            obmc.request('PUT', set_url, payload={"data": data}, cmd="set_%s" % key)
+        except (SelfServerException, SelfClientException) as e:
+            self.callback.info("%s: %s" % (node, e.message))
+
+        self.callback.info("%s: BMC Setting %s..." % (node, attr_info['display_name']))
+
+    def _get_apis_values(self, key, **kw):
+        node = kw['node']
+        attr_info = RSPCONFIG_APIS[key]
+        if not attr_info.has_key('get_url'):
+            return self.callback.error("Reading %s failed, not url available" % key)
+        get_url = attr_info['baseurl']+attr_info['get_url']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+        try:
+            obmc.login()
+            method = 'GET'
+            if attr_info.has_key('get_method'):
+                method = attr_info['get_method']
+            data = None
+            if attr_info.has_key('get_data'):
+                data={"data": attr_info['get_data']}
+            value = obmc.request(method, get_url, payload=data, cmd="get_%s" % key)
+            str_value = '0.'+str(value)
+            result = '%s: %s: %s' % (node, attr_info['display_name'], str_value.split('.')[-1])
+
+        except (SelfServerException, SelfClientException) as e:
+            result = '%s: %s'  % (node, e.message)
+
+        self.callback.info(result)
+
+    def _set_netinfo(self, ip, netmask, gateway, vlan=False, **kw):
+        if vlan:
+            result = "set net(%s, %s, %s) for vlan %s" % (ip, netmask, gateway, vlan)
+        else:
+            result = "set net(%s, %s, %s) for eth0" % (ip, netmask, gateway)
+        return self.callback.info("set_netinfo %s" % result)
+
+    def _get_netinfo(self, ip=False, ipsrc=False, netmask=False, gateway=False, vlan=False, hostname=False, **kw):
+        result = ''
+        if ip:
+            result += "Get IP, "
+        if netmask:
+            result += "Get Mask, "
+        if gateway:
+            result += "Get Gateway, "
+        if ipsrc:
+            result += "Get IP source, "
+        if hostname:
+            result += "Get BMC hostname, "
+        if vlan:
+            result += "Get BMC vlan."
+        return self.callback.info("get_netinfo: %s" % result)
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index 4346cb6f6..b28d27ba2 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -9,6 +9,7 @@ import os
 import time
 import sys
 import gevent
+import re
 from docopt import docopt
 
 from common import utils
@@ -17,10 +18,12 @@ from hwctl.executor.openbmc_beacon import OpenBMCBeaconTask
 from hwctl.executor.openbmc_power import OpenBMCPowerTask
 from hwctl.executor.openbmc_setboot import OpenBMCBootTask
 from hwctl.executor.openbmc_sensor import OpenBMCSensorTask
+from hwctl.executor.openbmc_bmcconfig import OpenBMCBmcConfigTask
 from hwctl.beacon import DefaultBeaconManager
 from hwctl.power import DefaultPowerManager
 from hwctl.setboot import DefaultBootManager
 from hwctl.sensor import DefaultSensorManager
+from hwctl.bmcconfig import DefaultBmcConfigManager
 
 from xcatagent import base
 import openbmc_rest
@@ -75,6 +78,46 @@ RFLASH_URLS = {
     }
 }
 
+RSPCONFIG_GET_OPTIONS = ['ip','ipsrc','netmask','gateway','vlan','hostname','bootmode','autoreboot','powersupplyredundancy','powerrestorepolicy']
+RSPCONFIG_SET_OPTIONS = {
+    'ip':'.*',
+    'netmask':'.*',
+    'gateway':'.*',
+    'vlan':'\d+',
+    'hostname':"\*|.*",
+    'autoreboot':"^0|1$",
+    'powersupplyredundancy':"^enabled$|^disabled$",
+    'powerrestorepolicy':"^always_on$|^always_off$|^restore$",
+    'bootmode':"^regular$|^safe$|^setup$",
+}
+RSPCONFIG_USAGE = """
+Handle rspconfig operations.
+
+Usage:
+       rspconfig -h|--help
+       rspconfig -V|--verbose
+       rspconfig dump [[-l|--list] | [-g|--generate] | [-c|--clear <arg>] | [-d|--download <arg>]]
+       rspconfig sshcfg
+       rspconfig ip=dhcp
+       rspconfig get [<args>...]
+       rspconfig set [<args>...]
+
+Options:
+  -l,--list           List are dump files
+  -g,--generate       Trigger a new dump file
+  -c,--clear <arg>    The id of file to clear or all if specify 'all'
+  -d,--download <arg> The id of file to download or all if specify 'all'
+
+The supported attributes to get are: %s
+
+The supported attributes and its values to set are:
+   ip=<ip address> netmask=<mask> gateway=<gateway> [vlan=<vlanid>]
+   hostname=*|<string>
+   autoreboot={0|1}
+   powersupplyredundancy={enabled|disabled}
+   powerrestorepolicy={always_on|always_off|restore}
+""" % RSPCONFIG_GET_OPTIONS
+
 XCAT_LOG_DIR = "/var/log/xcat"
 XCAT_LOG_RFLASH_DIR = XCAT_LOG_DIR + "/rflash/"
 
@@ -623,7 +666,60 @@ class OpenBMCManager(base.BaseManager):
             DefaultPowerManager().reboot(runner, optype=action)
         else:
             DefaultPowerManager().set_power_state(runner, power_state=action)
+    def rspconfig(self, nodesinfo, args):
+        try:
+            new_args=[]
+            for a in args:
+               new_a = a.encode('utf-8')
+               new_args.append(new_a)
+            opts=docopt(RSPCONFIG_USAGE, argv=new_args)
+            self.verbose=opts.pop('--verbose')
+        except Exception as e:
+            self.messager.error("Failed to parse arguments for rspconfig: %s" % args)
+            return
 
+        runner = OpenBMCBmcConfigTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=self.verbose)
+
+        if opts['dump']:
+            if opts['--list']:
+                DefaultBmcConfigManager().dump_list(runner)
+            elif opts['--generate']:
+                DefaultBmcConfigManager().dump_generate(runner)
+            elif opts['--clear']:
+                DefaultBmcConfigManager().dump_clear(runner, opts['--clear'])
+            elif opts['--download']:
+                DefaultBmcConfigManager().dump_download(runner, opts['--download'])
+            else:
+                DefaultBmcConfigManager().dump_process(runner)
+        elif opts['sshcfg']:
+            DefaultBmcConfigManager().set_sshcfg(runner)
+        elif opts['ip=dhcp']:
+            DefaultBmcConfigManager().set_ipdhcp(runner)
+        elif opts['get']:
+            unsupport_list=list(set(opts['<args>']) - set(RSPCONFIG_GET_OPTIONS))
+            for attr in opts['<args>']:
+                if attr not in RSPCONFIG_GET_OPTIONS:
+                    self.messager.error("The attribute %s is not supported to get" % attr)
+            if len(unsupport_list) > 0:
+                return
+            else:
+                DefaultBmcConfigManager().get_attributes(runner, opts['<args>'])
+        elif opts['set']:
+            rc=0
+            for attr in opts['<args>']:
+                k,v = attr.split('=')
+                if not RSPCONFIG_SET_OPTIONS.has_key(k):
+                    self.messager.error("The attribute %s is not support to set" % k)
+                    rc=1
+                elif not re.match(RSPCONFIG_SET_OPTIONS[k], v):
+                    self.messager.error("The value %s is invalid for %s" %(v, k))
+                    rc=1
+            if rc:
+                return
+            else:
+                DefaultBmcConfigManager().set_attributes(runner, opts['<args>'])
+        else:
+            self.messager.error("Failed to deal with rspconfig: %s" % args)
     def rsetboot(self, nodesinfo, args):
 
         # 1, parse args
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index a34626dbd..aded16a45 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -17,6 +17,7 @@ use xCAT::Utils;
 use xCAT::Usage;
 use xCAT::SvrUtils;
 use xCAT::OPENBMC;
+use xCAT_plugin::openbmc;
 
 #-------------------------------------------------------
 
@@ -35,6 +36,7 @@ sub handled_commands {
         rpower         => 'nodehm:mgt=openbmc',
         rsetboot       => 'nodehm:mgt=openbmc',
         rvitals        => 'nodehm:mgt=openbmc',
+        rspconfig      => 'nodehm:mgt=openbmc',
     };
 }
 
@@ -229,6 +231,8 @@ sub parse_args {
         unless ($subcommand =~ /^all$|^altitude$|^fanspeed$|^leds$|^power$|^temp$|^voltage$|^wattage$/) {
             return ([ 1, "Unsupported command: $command $subcommand" ]);
         }
+    } elsif ($command eq 'rspconfig') {
+        xCAT_plugin::openbmc::parse_args('rspconfig', $extrargs, $noderange);
     } else {
         return ([ 1, "Unsupported command: $command" ]);
     }
@@ -317,13 +321,12 @@ sub refactor_args {
     my $command   = $request->{command}->[0];
     my $extrargs  = $request->{arg};    
     if ($command eq "rspconfig") {
-        if ($extrargs->[0] eq "dump") {
-            $request->{arg}->[0] = "--dump";
-        } else {
-            foreach my $arg (@$extrargs) {
-                if ($arg !~ /^-/) {
-                    $arg = "--".$arg;
-                }
+        my $subcommand = $extrargs->[0];
+        if ($subcommand !~ /^dump$|^sshcfg$|^ip=dhcp$/) {
+            if (grep /=/, @$extrargs) {
+                unshift @$extrargs, "set";
+            } else {
+                unshift @$extrargs, "get";
             }
         }
     }

From cdd89cf9703ad8b3a7d8e163f038de626dae461a Mon Sep 17 00:00:00 2001
From: xuweibj <xwbj@cn.ibm.com>
Date: Wed, 7 Feb 2018 17:04:04 +0800
Subject: [PATCH 037/100] rinv for openbmc in python (#4802)

* rinv for openbmc in python
---
 .../agent/hwctl/executor/openbmc_inventory.py | 122 ++++++++++++++++++
 .../lib/python/agent/hwctl/inventory.py       |  32 +++++
 .../lib/python/agent/hwctl/openbmc_client.py  |  43 ++++++
 .../lib/python/agent/xcatagent/openbmc.py     |  44 ++++++-
 xCAT-server/lib/xcat/plugins/openbmc2.pm      |   8 +-
 5 files changed, 246 insertions(+), 3 deletions(-)
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_inventory.py
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/inventory.py

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_inventory.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_inventory.py
new file mode 100644
index 000000000..58e3fc906
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_inventory.py
@@ -0,0 +1,122 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+
+from __future__ import print_function
+import gevent
+import time
+
+from common.task import ParallelNodesCommand
+from common.exceptions import SelfClientException, SelfServerException
+from hwctl import openbmc_client as openbmc
+from common import utils
+
+import logging
+logger = logging.getLogger('xcatagent')
+
+class OpenBMCInventoryTask(ParallelNodesCommand):
+    """Executor for inventory-related actions."""
+
+    def _get_firm_info(self, firm_info_list):
+        (has_functional, firm_obj_dict) = firm_info_list
+        firm_info = []
+        keys = firm_obj_dict.keys()
+        keys.sort()
+        for key in keys:
+            flag = ''
+            if firm_obj_dict[key].functional:
+                flag = '*'
+	    elif firm_obj_dict[key].priority == 0:
+                if not has_functional:
+                    flag = '*'
+                else:
+                    flag = '+'
+
+            if flag != '*' and not self.verbose:
+                continue
+
+            firm_info.append('%s Firmware Product: %s (%s)%s' %
+                              (firm_obj_dict[key].purpose,
+                               firm_obj_dict[key].version,
+                               firm_obj_dict[key].active,
+                               flag))
+            if firm_obj_dict[key].extver:
+                extendeds = firm_obj_dict[key].extver.split(',')
+                extendeds.sort()
+                for extended in extendeds:
+                    firm_info.append('%s Firmware Product: ' \
+                                     '-- additional info: %s' % \
+                                      (firm_obj_dict[key].purpose, extended))
+
+        return firm_info
+
+    def get_info(self, inventory_type, **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+
+        inventory_info = []
+        try:
+            obmc.login()
+            inventory_info_dict = obmc.get_inventory_info()
+
+            if inventory_type == 'all' or not inventory_type:
+                keys = inventory_info_dict.keys()
+                keys.sort()
+                for key in keys:
+                    inventory_info += utils.sort_string_with_numbers(inventory_info_dict[key])
+
+                firm_dict_list = obmc.list_firmware()
+                firm_info = self._get_firm_info(firm_dict_list)
+
+                inventory_info += firm_info
+            elif inventory_type == 'model' or inventory_type == 'serial':
+                key = 'Model' if inventory_type == 'model' else 'SerialNumber'
+                if 'SYSTEM' in inventory_info_dict:
+                    for system_info in inventory_info_dict['SYSTEM']:
+                        if key in system_info:
+                            inventory_info = [system_info]
+                            break
+            else:
+                key = inventory_type.upper()
+                if key in inventory_info_dict:
+                    inventory_info = utils.sort_string_with_numbers(inventory_info_dict[key])
+
+            if not inventory_info:
+                inventory_info = ['No attributes returned from the BMC.']
+
+            for info in inventory_info:
+                self.callback.info( '%s: %s' % (node, info))
+
+        except (SelfServerException, SelfClientException) as e:
+            self.callback.info('%s: %s'  % (node, e.message))
+
+        return inventory_info 
+
+    def get_firm_info(self, **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+
+        firm_info = []
+        try:
+            obmc.login()
+            firm_dict_list = obmc.list_firmware()
+            firm_info = self._get_firm_info(firm_dict_list)
+
+            for info in firm_info:
+                self.callback.info( '%s: %s' % (node, info))
+
+        except (SelfServerException, SelfClientException) as e:
+            self.callback.info('%s: %s'  % (node, e.message))
+
+        return firm_info
+
+
+            
+
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/inventory.py b/xCAT-openbmc-py/lib/python/agent/hwctl/inventory.py
new file mode 100644
index 000000000..9a85daa09
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/inventory.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+
+class InventoryInterface(object):
+    """Interface for inventory-related actions."""
+    interface_type = 'inventory'
+    version = '1.0'
+
+    def get_inventory_info(self, task, inventory_type=None):
+        """Return the inventory info of the task's nodes.
+
+        :param inventory_type: type of inventory info want to get.
+        :param task: a Task instance containing the nodes to act on.
+        :return inventory info list
+        """
+        return task.run('get_info', inventory_type)
+
+    def get_firm_info(self, task):
+        """Return the firm info of the task's nodes.
+
+        :param task: a Task instance containing the nodes to act on.
+        :return firm info list
+        """
+        return task.run('get_firm_info')
+
+class DefaultInventoryManager(InventoryInterface):
+    """Interface for inventory-related actions."""
+    pass
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index caa8c3cda..94ba4ea60 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -29,6 +29,8 @@ RBEACON_URLS = {
     },
 }
 
+INVENTORY_URL = "/inventory/enumerate"
+
 LEDS_URL = "/led/physical/enumerate"
 
 LEDS_KEY_LIST = ("fan0", "fan1", "fan2", "fan3",
@@ -382,6 +384,43 @@ class OpenBMCRest(object):
             error = 'Error: Received wrong format response: %s' % sensor_data
             raise SelfServerException(error)
 
+    def get_inventory_info(self):
+
+        inventory_data = self.request('GET', INVENTORY_URL, cmd='get_inventory_info')
+        try:
+            inverntory_dict = {}
+            for key, value in inventory_data.items():
+                if 'Present' not in value:
+                    logger.debug('Not "Present" for %s' % key)
+                    continue
+
+                key_list = key.split('/')
+                try:
+                    key_id = key_list[-1]
+                    key_tmp = key_list[-2]
+                except IndexError:
+                    logger.debug('IndexError (-2) for %s' % key)
+                    continue
+
+                key_type = filter(lambda x:x not in '0123456789', key_id).upper()
+
+                if key_type == 'CORE':
+                    key_type = 'CPU'
+                    source = '%s %s' % (key_tmp, key_id)
+                else:
+                    source = key_id
+
+                if key_type not in inverntory_dict:
+                    inverntory_dict[key_type] = []
+
+                for (sub_key, v) in value.items():
+                    inverntory_dict[key_type].append('%s %s : %s' % (source.upper(), sub_key, v))
+
+            return inverntory_dict
+        except KeyError:
+            error = 'Error: Received wrong format response: %s' % inventory_data
+            raise SelfServerException(error)
+
     def list_firmware(self):
 
         data = self.request('GET', FIRM_URLS['list']['path'], cmd='list_firmware')
@@ -407,8 +446,12 @@ class OpenBMCRest(object):
 class OpenBMCImage(object):
     def __init__(self, rawid, data=None):
         self.id = rawid.split('/')[-1]
+        self.extver = None
         self.functional = False
+        self.priority = None
+        self.progress = None
         self.purpose = 'Unknown'
+
         if data:
             self.version = data.get('Version')
             self.purpose = data.get('Purpose', self.purpose).split('.')[-1]
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index 82ec20b8f..0591a217d 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -14,12 +14,14 @@ from docopt import docopt
 from common import utils
 from common import exceptions as xcat_exception
 from hwctl.executor.openbmc_beacon import OpenBMCBeaconTask
-from hwctl.executor.openbmc_power import OpenBMCPowerTask
 from hwctl.executor.openbmc_setboot import OpenBMCBootTask
+from hwctl.executor.openbmc_inventory import OpenBMCInventoryTask
+from hwctl.executor.openbmc_power import OpenBMCPowerTask
 from hwctl.executor.openbmc_sensor import OpenBMCSensorTask
 from hwctl.beacon import DefaultBeaconManager
-from hwctl.power import DefaultPowerManager
 from hwctl.setboot import DefaultBootManager
+from hwctl.inventory import DefaultInventoryManager
+from hwctl.power import DefaultPowerManager
 from hwctl.sensor import DefaultSensorManager
 
 from xcatagent import base
@@ -81,6 +83,9 @@ XCAT_LOG_RFLASH_DIR = XCAT_LOG_DIR + "/rflash/"
 # global variable of firmware information
 FIRM_URL = PROJECT_URL + "/software/enumerate"
 
+#global variables of rinv
+INVENTORY_OPTIONS = ('all', 'cpu', 'dimm', 'firm', 'model', 'serial')
+
 # global variables of rpower
 POWER_REBOOT_OPTIONS = ('boot', 'reset')
 POWER_SET_OPTIONS = ('on', 'off', 'bmcreboot', 'softoff')
@@ -585,6 +590,41 @@ class OpenBMCManager(base.BaseManager):
         runner = OpenBMCBeaconTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=self.verbose)
         DefaultBeaconManager().set_beacon_state(runner, beacon_state=action)
 
+    def rinv(self, nodesinfo, args):
+
+        # 1, parse agrs
+        if not args:
+            args = ['all']
+
+        rinv_usage = """
+        Usage:
+            rinv [-V|--verbose] [all|cpu|dimm|firm|model|serial]
+
+        Options:
+            -V --verbose   rinv verbose mode.
+        """
+
+        try:
+            opts = docopt(rinv_usage, argv=args)
+
+            self.verbose = opts.pop('--verbose')
+            action = [k for k,v in opts.items() if v][0]
+        except Exception as e:
+            self.messager.error("Failed to parse arguments for rinv: %s" % args)
+            return
+
+        # 2, validate the args
+        if action not in INVENTORY_OPTIONS:
+            self.messager.error("Not supported subcommand for rinv: %s" % action)
+            return
+
+        # 3, run the subcommands
+        runner = OpenBMCInventoryTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=self.verbose)
+        if action == 'firm':
+            DefaultInventoryManager().get_firm_info(runner)
+        else:
+            DefaultInventoryManager().get_inventory_info(runner, action)
+
     def rpower(self, nodesinfo, args):
 
         # 1, parse args
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index 584e801e9..98be371f6 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -32,6 +32,7 @@ sub handled_commands {
     return {
         rbeacon        => 'nodehm:mgt=openbmc',
         rflash         => 'nodehm:mgt=openbmc',
+        rinv           => 'nodehm:mgt=openbmc',
         rpower         => 'nodehm:mgt=openbmc',
         rsetboot       => 'nodehm:mgt=openbmc',
         rvitals        => 'nodehm:mgt=openbmc',
@@ -147,7 +148,7 @@ sub parse_args {
         return ([ 1, "Error parsing arguments." ]);
     }
 
-    if (scalar(@ARGV) >= 2 and ($command =~ /rbeacon|rpower|rvitals/)) {
+    if (scalar(@ARGV) >= 2 and ($command =~ /rbeacon|rinv|rpower|rvitals/)) {
         return ([ 1, "Only one option is supported at the same time for $command" ]);
     } elsif (scalar(@ARGV) == 0 and $command =~ /rbeacon|rpower|rflash/) {
         return ([ 1, "No option specified for $command" ]);
@@ -208,6 +209,11 @@ sub parse_args {
         if ($list) {
             return ([ 1, "Invalid option specified with '-l|--list'."]) if (@ARGV);
         }
+    } elsif ($command eq "rinv") {
+        $subcommand = "all" if (!defined($ARGV[0]));
+        unless ($subcommand =~ /^all$|^cpu$|^dimm$|^firm$|^model$|^serial$/) {
+            return ([ 1, "Unsupported command: $command $subcommand" ]);
+        }
     } elsif ($command eq "rpower") {
         unless ($subcommand =~ /^on$|^off$|^softoff$|^reset$|^boot$|^bmcreboot$|^bmcstate$|^status$|^stat$|^state$/) {
             return ([ 1, "Unsupported command: $command $subcommand" ]);

From 580c6bf5bdc14c159c71927e6a4f4aba8596b8cb Mon Sep 17 00:00:00 2001
From: Kilian Cavalotti <kilian@stanford.edu>
Date: Wed, 7 Feb 2018 09:36:01 -0800
Subject: [PATCH 038/100] routeop: support setting the default route

---
 xCAT/postscripts/routeop | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/xCAT/postscripts/routeop b/xCAT/postscripts/routeop
index 9ee356107..22a357ead 100755
--- a/xCAT/postscripts/routeop
+++ b/xCAT/postscripts/routeop
@@ -269,7 +269,7 @@ replace_persistent_route()
 
         redhat)
             #echo "rh/fedora/centos"
-            if [ -z "$ifname" ]; then
+            if [ -z "$ifname" -a "$net" != "default" ]; then
                 echo "Error: the device name is necessary to configure static route."
                 return
             fi
@@ -296,6 +296,12 @@ replace_persistent_route()
                     route1="$net\/$mask via $gw"
                 fi
             fi
+            # default route is handled separately
+            if [ "$net" = "default" ]; then
+                filename="/etc/sysconfig/network"
+                route="GATEWAY=$gw"
+                routedest="$route"
+            fi
             if [ -f $filename ]; then
                 egrep "^$routedest" $filename 2>&1 1>/dev/null
                 if [ $? -ne 0 ]; then #route does not exist

From fa85934d5c98706ff138bbb2f1f34072e238529d Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Wed, 7 Feb 2018 21:34:47 -0500
Subject: [PATCH 039/100] fix issue 4805, support rspconfig openbmc in
 hierarchy

---
 xCAT-server/lib/xcat/plugins/openbmc.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 6b197c243..34d424f98 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -1199,6 +1199,7 @@ sub parse_args {
         foreach $subcommand (@ARGV) {
             $::RSPCONFIG_CONFIGURED_API_KEY = &is_valid_config_api($subcommand, $callback);
             if ($::RSPCONFIG_CONFIGURED_API_KEY ne -1) {
+                return ([ 1, "Can not query $api_config_info{$::RSPCONFIG_CONFIGURED_API_KEY}{subcommand} information with other options at the same time" ]) if ($#ARGV > 1);
                 # subcommand defined in the configured API hash, return from here, the RSPCONFIG_CONFIGURED_API_KEY is the key into the hash
                 return;
             }
@@ -1601,8 +1602,9 @@ sub parse_command_status {
         my @options = ();
         my $num_subcommand = @$subcommands;
         #Setup chain to process the configured command
+        $subcommand = $$subcommands[0];
+        $::RSPCONFIG_CONFIGURED_API_KEY = &is_valid_config_api($subcommand, $callback);
         if ($::RSPCONFIG_CONFIGURED_API_KEY ne -1) {
-            $subcommand = $$subcommands[0];
             # Check if setting or quering
             if ($subcommand =~ /^(\w+)=(.*)/) {
                 # setting

From b88f6e60f7805941ae03af57a1727a551aa06cee Mon Sep 17 00:00:00 2001
From: zhao er tao <ertaozh@cn.ibm.com>
Date: Wed, 7 Feb 2018 16:51:28 +0800
Subject: [PATCH 040/100] update rspconfig framework,1: deal with unicode
 string for args, 2. move set/get attribute to openbmc_client class

---
 .../agent/hwctl/executor/openbmc_bmcconfig.py | 102 ++++--------------
 .../lib/python/agent/hwctl/openbmc_client.py  |  68 ++++++++++++
 .../lib/python/agent/xcatagent/openbmc.py     |  30 +++---
 .../lib/python/agent/xcatagent/server.py      |   6 +-
 4 files changed, 104 insertions(+), 102 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
index b0fe244b3..b7ae94bed 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
@@ -18,49 +18,6 @@ logger = logging.getLogger('xcatagent')
 RSPCONFIG_GET_NETINFO=['ip', 'netmask', 'gateway', 'vlan', 'ipsrc', 'hostname']
 RSPCONFIG_SET_NETINFO=['ip', 'netmask', 'gateway', 'vlan']
 
-RSPCONFIG_APIS = {
-    'autoreboot' : {
-        'baseurl': "/control/host0/auto_reboot/",
-        'set_url': "attr/AutoReboot",
-        'get_url': "attr/AutoReboot",
-        'display_name': "BMC AutoReboot",
-    },
-    'powersupplyredundancy':{
-        'baseurl': "/sensors/chassis/PowerSupplyRedundancy/",
-        'set_url': "/action/setValue",
-        'get_url': "/action/getValue",
-        'get_method': 'POST',
-        'get_data': '[]',
-        'display_name': "BMC PowerSupplyRedundancy",
-        'attr_values': {
-            'disabled': "Disables",
-            'enabled': "Enabled",
-        },
-    },
-    'powerrestorepolicy': {
-        'baseurl': "/control/host0/power_restore_policy/",
-        'set_url': "attr/PowerRestorePolicy",
-        'get_url': "attr/PowerRestorePolicy",
-        'display_name': "BMC PowerRestorePolicy",
-         'attr_values': {
-             'restore': "xyz.openbmc_project.Control.Power.RestorePolicy.Policy.Restore",
-             'always_on': "xyz.openbmc_project.Control.Power.RestorePolicy.Policy.AlwaysOn",
-             'always_off': "xyz.openbmc_project.Control.Power.RestorePolicy.Policy.AlwaysOff",
-         },
-    },
-    'bootmode': {
-        'baseurl': "/control/host0/boot/",
-        'set_url': "attr/BootMode",
-        'get_url': "attr/BootMode",
-        'display_name':"BMC BootMode",
-        'attr_values': {
-            'regular': "xyz.openbmc_project.Control.Boot.Mode.Modes.Regular",
-            'safe': "xyz.openbmc_project.Control.Boot.Mode.Modes.Safe",
-            'setup': "xyz.openbmc_project.Control.Boot.Mode.Modes.Setup",
-        },
-    },
-}
-
 class OpenBMCBmcConfigTask(ParallelNodesCommand):
         
     def dump_list(self, **kw):
@@ -85,20 +42,18 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
         return self.callback.info("set_ipdhcp")
 
     def get_attributes(self, attributes, **kw):
-        netinfo_dict={'ip':False, 'ipsrc':False, 'netmask':False, 
-                       'gateway':False, 'vlan':False, 'hostname':False}
-        getnet=0
+        netinfo_dict={}
         for attr in attributes:
             if attr in RSPCONFIG_GET_NETINFO:
                 netinfo_dict[attr]=True
                 getnet=1
-            elif RSPCONFIG_APIS.has_key(attr):
-                return self._get_apis_values(attr, **kw)
+            elif openbmc.RSPCONFIG_APIS.has_key(attr):
+                self._get_apis_values(attr, **kw)
             else:
-                return self.callback.error("get_attributes can not deal with attr %s" % attr)
-        if getnet:
-            self._get_netinfo(netinfo_dict['ip'], netinfo_dict['ipsrc'], netinfo_dict['netmask'],
-                              netinfo_dict['gateway'], netinfo_dict['vlan'], netinfo_dict['hostname'], **kw)
+                self.callback.error("get_attributes can not deal with attr %s" % attr)
+        if len(netinfo_dict):
+            self._get_netinfo(netinfo_dict.has_key('ip'), netinfo_dict.has_key('ipsrc'), netinfo_dict.has_key('netmask'),
+                              netinfo_dict.has_key('gateway'), netinfo_dict.has_key('vlan'), netinfo_dict.has_key('hostname'), **kw)
 
     def set_attributes(self, attributes, **kw):
         netinfo_dict={'vlan':False}
@@ -107,13 +62,13 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
             if k in RSPCONFIG_SET_NETINFO:
                 netinfo_dict[k] = v
             elif k == 'hostname':
-                return self._set_hostname(v, **kw)
-            elif RSPCONFIG_APIS.has_key(k):
-                return self._set_apis_values(k, v, **kw)
+                self._set_hostname(v, **kw)
+            elif openbmc.RSPCONFIG_APIS.has_key(k):
+                self._set_apis_values(k, v, **kw)
             else:
                 return self.callback.error("set_attributes unsupported attribute:%s" % k)
-        if (not netinfo_dict['ip']) or (not netinfo_dict['netmask']) or (not netinfo_dict['gateway']):
-            return self.callback.error("set_attributes miss either ip, netmask or gateway to set network information")
+        if len(netinfo_dict) > 1 and (not netinfo_dict.has_key('ip') or not netinfo_dict.has_key('netmask') or not netinfo_dict.has_key('gateway')):
+            self.callback.info("set_attributes miss either ip, netmask or gateway to set network information")
         else:
             self._set_netinfo(netinfo_dict['ip'], netinfo_dict['netmask'],
                               netinfo_dict['gateway'], netinfo_dict['vlan'])
@@ -128,50 +83,29 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
 
     def _set_apis_values(self, key, value, **kw):
         node = kw['node']
-        attr_info = RSPCONFIG_APIS[key]
-        if not attr_info.has_key('set_url'):
-            return self.callback.error("config %s failed, not url available" % key)
-        set_url = attr_info['baseurl']+attr_info['set_url']
-
         obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
                                    debugmode=self.debugmode, verbose=self.verbose)
-
-        if attr_info.has_key('attr_values') and attr_info['attr_values'].has_key(value):
-            data = attr_info['attr_values'][value]
-        else:
-            data = value
-
         try:
             obmc.login()
-            obmc.request('PUT', set_url, payload={"data": data}, cmd="set_%s" % key)
+            obmc.set_apis_values(key, value)
         except (SelfServerException, SelfClientException) as e:
             self.callback.info("%s: %s" % (node, e.message))
 
-        self.callback.info("%s: BMC Setting %s..." % (node, attr_info['display_name']))
+        self.callback.info("%s: BMC Setting %s..." % (node, openbmc.RSPCONFIG_APIS[key]['display_name']))
 
     def _get_apis_values(self, key, **kw):
         node = kw['node']
-        attr_info = RSPCONFIG_APIS[key]
-        if not attr_info.has_key('get_url'):
-            return self.callback.error("Reading %s failed, not url available" % key)
-        get_url = attr_info['baseurl']+attr_info['get_url']
         obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
                                    debugmode=self.debugmode, verbose=self.verbose)
         try:
             obmc.login()
-            method = 'GET'
-            if attr_info.has_key('get_method'):
-                method = attr_info['get_method']
-            data = None
-            if attr_info.has_key('get_data'):
-                data={"data": attr_info['get_data']}
-            value = obmc.request(method, get_url, payload=data, cmd="get_%s" % key)
-            str_value = '0.'+str(value)
-            result = '%s: %s: %s' % (node, attr_info['display_name'], str_value.split('.')[-1])
+            value = obmc.get_apis_values(key)
 
         except (SelfServerException, SelfClientException) as e:
-            result = '%s: %s'  % (node, e.message)
+            self.callback.info('%s: %s' % (node, e.message))
 
+        str_value = '0.'+str(value)
+        result = '%s: %s: %s' % (node, openbmc.RSPCONFIG_APIS[key]['display_name'], str_value.split('.')[-1])
         self.callback.info(result)
 
     def _set_netinfo(self, ip, netmask, gateway, vlan=False, **kw):
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index caa8c3cda..f4dc3e3a0 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -139,6 +139,49 @@ FIRM_URLS = {
     }
 }
 
+RSPCONFIG_APIS = {
+    'autoreboot' : {
+        'baseurl': "/control/host0/auto_reboot/",
+        'set_url': "attr/AutoReboot",
+        'get_url': "attr/AutoReboot",
+        'display_name': "BMC AutoReboot",
+    },
+    'powersupplyredundancy':{
+        'baseurl': "/sensors/chassis/PowerSupplyRedundancy/",
+        'set_url': "/action/setValue",
+        'get_url': "/action/getValue",
+        'get_method': 'POST',
+        'get_data': '[]',
+        'display_name': "BMC PowerSupplyRedundancy",
+        'attr_values': {
+            'disabled': "Disables",
+            'enabled': "Enabled",
+        },
+    },
+    'powerrestorepolicy': {
+        'baseurl': "/control/host0/power_restore_policy/",
+        'set_url': "attr/PowerRestorePolicy",
+        'get_url': "attr/PowerRestorePolicy",
+        'display_name': "BMC PowerRestorePolicy",
+         'attr_values': {
+             'restore': "xyz.openbmc_project.Control.Power.RestorePolicy.Policy.Restore",
+             'always_on': "xyz.openbmc_project.Control.Power.RestorePolicy.Policy.AlwaysOn",
+             'always_off': "xyz.openbmc_project.Control.Power.RestorePolicy.Policy.AlwaysOff",
+         },
+    },
+    'bootmode': {
+        'baseurl': "/control/host0/boot/",
+        'set_url': "attr/BootMode",
+        'get_url': "attr/BootMode",
+        'display_name':"BMC BootMode",
+        'attr_values': {
+            'regular': "xyz.openbmc_project.Control.Boot.Mode.Modes.Regular",
+            'safe': "xyz.openbmc_project.Control.Boot.Mode.Modes.Safe",
+            'setup': "xyz.openbmc_project.Control.Boot.Mode.Modes.Setup",
+        },
+    },
+}
+
 RESULT_OK = 'ok'
 RESULT_FAIL = 'fail'
 
@@ -404,6 +447,31 @@ class OpenBMCRest(object):
 
         return bool(func_list), fw_dict
 
+    def set_apis_values(self, key, value):
+        attr_info = RSPCONFIG_APIS[key]
+        if not attr_info.has_key('set_url'):
+            raise SelfServerException("config %s failed, not url available" % key)
+        set_url = attr_info['baseurl']+attr_info['set_url']
+        if attr_info.has_key('attr_values') and attr_info['attr_values'].has_key(value):
+            data = attr_info['attr_values'][value]
+        else:
+            data = value
+        self.request('PUT', set_url, payload={"data": data}, cmd="set_%s" % key)
+
+    def get_apis_values(self, key):
+        attr_info = RSPCONFIG_APIS[key]
+        if not attr_info.has_key('get_url'):
+            raise SelfServerException("Reading %s failed, not url available" % key)
+        get_url = attr_info['baseurl']+attr_info['get_url']
+
+        method = 'GET'
+        if attr_info.has_key('get_method'):
+            method = attr_info['get_method']
+        data = None
+        if attr_info.has_key('get_data'):
+            data={"data": attr_info['get_data']}
+        return self.request(method, get_url, payload=data, cmd="get_%s" % key)
+
 class OpenBMCImage(object):
     def __init__(self, rawid, data=None):
         self.id = rawid.split('/')[-1]
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index b28d27ba2..6f56625cc 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -10,7 +10,7 @@ import time
 import sys
 import gevent
 import re
-from docopt import docopt
+from docopt import docopt,DocoptExit
 
 from common import utils
 from common import exceptions as xcat_exception
@@ -95,14 +95,14 @@ Handle rspconfig operations.
 
 Usage:
        rspconfig -h|--help
-       rspconfig -V|--verbose
-       rspconfig dump [[-l|--list] | [-g|--generate] | [-c|--clear <arg>] | [-d|--download <arg>]]
-       rspconfig sshcfg
-       rspconfig ip=dhcp
-       rspconfig get [<args>...]
-       rspconfig set [<args>...]
+       rspconfig dump [[-l|--list] | [-g|--generate] | [-c|--clear <arg>] | [-d|--download <arg>]] [-V|--verbose]
+       rspconfig sshcfg [-V|--verbose]
+       rspconfig ip=dhcp [-V|--verbose]
+       rspconfig get [<args>...] [-V|--verbose]
+       rspconfig set [<args>...] [-V|--verbose]
 
 Options:
+  -V,--verbose        Show verbose message
   -l,--list           List are dump files
   -g,--generate       Trigger a new dump file
   -c,--clear <arg>    The id of file to clear or all if specify 'all'
@@ -668,16 +668,14 @@ class OpenBMCManager(base.BaseManager):
             DefaultPowerManager().set_power_state(runner, power_state=action)
     def rspconfig(self, nodesinfo, args):
         try:
-            new_args=[]
-            for a in args:
-               new_a = a.encode('utf-8')
-               new_args.append(new_a)
-            opts=docopt(RSPCONFIG_USAGE, argv=new_args)
-            self.verbose=opts.pop('--verbose')
+            opts=docopt(RSPCONFIG_USAGE, argv=args)
+        except DocoptExit as e:
+            self.messager.error("Failed to parse args by docopt: %s" % e)
+            return
         except Exception as e:
             self.messager.error("Failed to parse arguments for rspconfig: %s" % args)
             return
-
+        self.verbose=opts.pop('--verbose')
         runner = OpenBMCBmcConfigTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=self.verbose)
 
         if opts['dump']:
@@ -697,10 +695,8 @@ class OpenBMCManager(base.BaseManager):
             DefaultBmcConfigManager().set_ipdhcp(runner)
         elif opts['get']:
             unsupport_list=list(set(opts['<args>']) - set(RSPCONFIG_GET_OPTIONS))
-            for attr in opts['<args>']:
-                if attr not in RSPCONFIG_GET_OPTIONS:
-                    self.messager.error("The attribute %s is not supported to get" % attr)
             if len(unsupport_list) > 0:
+                self.messager.error("Have unsupported option: %s" % unsupport_args)
                 return
             else:
                 DefaultBmcConfigManager().get_attributes(runner, opts['<args>'])
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
index 86a6867de..f9b16bda4 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
@@ -92,8 +92,12 @@ class Server(object):
             if not hasattr(manager, req['command']):
                 messager.error("command %s is not supported" % req['command'])
             func = getattr(manager, req['command'])
+            # translate unicode string to normal string to avoid docopt error
+            new_args=[]
+            for a in req['args']:
+                new_args.append(a.encode('utf-8'))
             # call the function in the specified manager
-            func(req['nodeinfo'], req['args'])
+            func(req['nodeinfo'], new_args)
             # after the method returns, the request should be handled
             # completely, close the socket for client
             if not self.standalone:

From f06b0e09eab6c72f2dd95b102fa33805cd4001c6 Mon Sep 17 00:00:00 2001
From: Yuan Bai <bybai@cn.ibm.com>
Date: Thu, 8 Feb 2018 13:14:33 +0800
Subject: [PATCH 041/100] routeop: support remove GATEWAY from
 /etc/sysconfig/network (#4807)

* remove GATEWAY from /etc/sysconfig/network

* polished
---
 xCAT/postscripts/routeop | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xCAT/postscripts/routeop b/xCAT/postscripts/routeop
index 236453aab..66c58808f 100755
--- a/xCAT/postscripts/routeop
+++ b/xCAT/postscripts/routeop
@@ -756,6 +756,14 @@ rm_persistent_route()
         else
             echo "Persistent route file $filename does not exist."
         fi
+        filename="/etc/sysconfig/network";
+        if [ "$net" = "default" -a -f $filename ]; then
+            grep "GATEWAY=$gw" $filename >/dev/null 2>&1
+            if [ $? -eq 0 ]; then
+                sed -i '/GATEWAY=/d' $filename
+                echo "Persistent GATEWAY=$gw removed from $filename."
+            fi
+        fi
         ;;
     esac
     else #AIX

From cb78be8f4d7e8fea7a69f53ff6ec22e0c2b882e0 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Thu, 8 Feb 2018 01:40:59 -0500
Subject: [PATCH 042/100] fix issue 3913: support rpower cycle for ipmi
 managing severs

---
 docs/source/guides/admin-guides/references/man1/rpower.1.rst | 2 +-
 perl-xCAT/xCAT/Usage.pm                                      | 2 +-
 xCAT-client/pods/man1/rpower.1.pod                           | 2 +-
 xCAT-server/lib/xcat/plugins/ipmi.pm                         | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man1/rpower.1.rst b/docs/source/guides/admin-guides/references/man1/rpower.1.rst
index 1dee1d74a..71bdc73a8 100644
--- a/docs/source/guides/admin-guides/references/man1/rpower.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rpower.1.rst
@@ -27,7 +27,7 @@ BMC (using IPMI):
 =================
 
 
-\ **rpower**\  \ *noderange*\  [\ **on | off | softoff | reset | boot | stat | state | status | wake | suspend**\  [\ **-w**\  \ *timeout*\ ] [\ **-o**\ ] [\ **-r**\ ]]
+\ **rpower**\  \ *noderange*\  [\ **on | off | softoff | reset | boot | cycle | stat | state | status | wake | suspend**\  [\ **-w**\  \ *timeout*\ ] [\ **-o**\ ] [\ **-r**\ ]]
 
 \ **rpower**\  \ *noderange*\  [\ **pduon | pduoff | pdustat | pdureset**\ ]
 
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 70a0646b9..1a3afa25b 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -26,7 +26,7 @@ my %usage = (
 "Usage: rpower <noderange> [--nodeps] [on|onstandby|off|suspend|reset|stat|state|boot] [-V|--verbose] [-m table.colum==expectedstatus][-m table.colum==expectedstatus...] [-r <retrycount>] [-t <timeout>]
        rpower [-h|--help|-v|--version]
      BMC (using IPMI):
-       rpower noderange [on|off|softoff|reset|boot|stat|state|status|wake|suspend [-w timeout] [-o] [-r]]
+       rpower noderange [on|off|softoff|reset|boot|cycle|stat|state|status|wake|suspend [-w timeout] [-o] [-r]]
        rpower noderange [pduon|pduoff|pdustat]
      OpenPOWER BMC:
        rpower noderange [on|off|reset|boot|stat|state|status]
diff --git a/xCAT-client/pods/man1/rpower.1.pod b/xCAT-client/pods/man1/rpower.1.pod
index 2c5683fb1..6d7a0933c 100644
--- a/xCAT-client/pods/man1/rpower.1.pod
+++ b/xCAT-client/pods/man1/rpower.1.pod
@@ -10,7 +10,7 @@ B<rpower> [B<-h>|B<--help>|B<-v>|B<--version>]
 
 =head2 BMC (using IPMI):
 
-B<rpower> I<noderange> [B<on>|B<off>|B<softoff>|B<reset>|B<boot>|B<stat>|B<state>|B<status>|B<wake>|B<suspend> [B<-w> I<timeout>] [B<-o>] [B<-r>]] 
+B<rpower> I<noderange> [B<on>|B<off>|B<softoff>|B<reset>|B<boot>|B<cycle>|B<stat>|B<state>|B<status>|B<wake>|B<suspend> [B<-w> I<timeout>] [B<-o>] [B<-r>]] 
 
 B<rpower> I<noderange> [B<pduon>|B<pduoff>|B<pdustat>|B<pdureset>]
 
diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 112f51390..a47df379a 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -2849,7 +2849,8 @@ sub power_with_context {
         "off"     => 0,
         "softoff" => 5,
         "reset"   => 3,
-        "nmi"     => 4
+        "nmi"     => 4,
+        "cycle"   => 2,
     );
     if ($subcommand eq "on") {
         if ($sessdata->{powerstatus} eq "on") {

From 9efd298ccb23a90685bfc8709d48377364e1b1e4 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Thu, 8 Feb 2018 02:23:20 -0500
Subject: [PATCH 043/100] script to build openbmc python deb package

---
 build-python-deb | 107 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100755 build-python-deb

diff --git a/build-python-deb b/build-python-deb
new file mode 100755
index 000000000..a6173d87a
--- /dev/null
+++ b/build-python-deb
@@ -0,0 +1,107 @@
+#!/bin/bash
+#
+# Author: Yuan Bai (bybai@cn.ibm.com)
+#
+#
+printusage()
+{
+    echo "Usage : build-python-deb xcat-openbmc-py"
+}
+# For the purpose of getting the distribution name
+if [[ ! -f /etc/lsb-release ]]; then
+    echo "ERROR: Could not find /etc/lsb-release, is this script executed on a Ubuntu machine?"
+    exit 1
+fi
+. /etc/lsb-release
+# Check the necessary packages before starting the build
+declare -a packages=( "reprepro" "devscripts" "debhelper" "quilt" )
+
+for package in ${packages[@]}; do
+    RC=`dpkg -l | grep $package >> /dev/null 2>&1; echo $?`
+    if [[ ${RC} != 0 ]]; then
+        echo "ERROR: Could not find $package, install using 'apt-get install $package' to continue"
+        exit 1
+    fi
+done
+
+# Supported distributions
+dists="saucy trusty utopic xenial"
+pkg_name=$1
+
+if [ -z "$pkg_name" ] || [ "$pkg_name" != "xcat-openbmc-py" ]; then
+    printusage
+    exit 1
+fi
+
+# Find where this script is located to set some build variables
+old_pwd=`pwd`
+cd `dirname $0`
+curdir=`pwd`
+export HOME=/root
+
+WGET_CMD="wget"
+if [ ! -z ${LOG} ]; then
+    WGET_CMD="wget -o ${LOG}"
+fi
+
+if [ -z "$REL" ]; then
+    t=${curdir%/src/xcat-core}
+    REL=`basename $t`
+fi
+
+if [ "$PROMOTE" != 1 ]; then
+    code_change=1
+    ver=`cat Version`
+    short_ver=`cat Version|cut -d. -f 1,2`
+    short_short_ver=`cat Version|cut -d. -f 1`
+    build_time=`date`
+    build_machine=`hostname`
+    commit_id=`git rev-parse --short HEAD`
+    commit_id_long=`git rev-parse HEAD`
+
+    echo "###############################"
+    echo "# Building xcat-openbmc-py package #"
+    echo "###############################"
+
+    #the package type:  local | snap | alpha
+    #the build introduce string
+    build_string="Snap_Build"
+    xcat_release="snap$(date '+%Y%m%d%H%M')"
+    pkg_version="${ver}-${xcat_release}"
+    packages="xCAT-openbmc-py"
+    target_archs=(all)
+    for file in $packages
+    do
+        file_low=`echo $file | tr '[A-Z]' '[a-z]'`
+        target_archs="all"
+        for target_arch in $target_archs
+        do
+            cd $file
+            CURDIR=$(pwd)
+            dch -v $pkg_version -b -c debian/changelog $build_string
+            if [ "$target_arch" = "all" ]; then
+                CURDIR=$(pwd)
+                cp ${CURDIR}/debian/control ${CURDIR}/debian/control.save.998
+                sed -i -e "s#>= 2.13-snap000000000000#= ${pkg_version}#g" ${CURDIR}/debian/control
+                dpkg-buildpackage -rfakeroot -uc -us
+                mv ${CURDIR}/debian/control.save.998 ${CURDIR}/debian/control
+                dh_testdir
+                dh_testroot
+                dh_clean -d
+            fi
+            rc=$?
+            if [ $rc -gt 0 ]; then
+                echo "Error: $file build package failed exit code $rc"
+                exit $rc
+            fi
+            rm -f debian/files
+            rm -f debian/xcat-openbmc-py.debhelper.log
+            rm -f debian/xcat-openbmc-py.substvars
+            sed -i -e "s/* Snap_Build//g" debian/changelog
+            cd -
+            rm -f ${file_low}_*.tar.gz
+            rm -f ${file_low}_*.changes
+            rm -f ${file_low}_*.dsc
+        done
+    done
+fi

From 28586e3a83eaab97d5d8a6c268c83a69e8a16c20 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Thu, 8 Feb 2018 02:23:59 -0500
Subject: [PATCH 044/100] files for build openbmc python deb package

---
 xCAT-openbmc-py/debian/changelog     |  6 ++
 xCAT-openbmc-py/debian/compat        |  1 +
 xCAT-openbmc-py/debian/control       | 12 ++++
 xCAT-openbmc-py/debian/copyright     | 88 ++++++++++++++++++++++++++++
 xCAT-openbmc-py/debian/dirs          |  5 ++
 xCAT-openbmc-py/debian/docs          |  0
 xCAT-openbmc-py/debian/install       |  5 ++
 xCAT-openbmc-py/debian/postinst      | 39 ++++++++++++
 xCAT-openbmc-py/debian/rules         | 41 +++++++++++++
 xCAT-openbmc-py/debian/source/format |  1 +
 10 files changed, 198 insertions(+)
 create mode 100644 xCAT-openbmc-py/debian/changelog
 create mode 100644 xCAT-openbmc-py/debian/compat
 create mode 100644 xCAT-openbmc-py/debian/control
 create mode 100644 xCAT-openbmc-py/debian/copyright
 create mode 100644 xCAT-openbmc-py/debian/dirs
 create mode 100644 xCAT-openbmc-py/debian/docs
 create mode 100644 xCAT-openbmc-py/debian/install
 create mode 100644 xCAT-openbmc-py/debian/postinst
 create mode 100755 xCAT-openbmc-py/debian/rules
 create mode 100644 xCAT-openbmc-py/debian/source/format

diff --git a/xCAT-openbmc-py/debian/changelog b/xCAT-openbmc-py/debian/changelog
new file mode 100644
index 000000000..581c4d50e
--- /dev/null
+++ b/xCAT-openbmc-py/debian/changelog
@@ -0,0 +1,6 @@
+xcat-openbmc-py (2.13.11-snap201802080225) UNRELEASED; urgency=medium
+ 
+  
+  
+
+ -- root <root@c910f03c05k10>  Thu, 08 Feb 2018 02:25:50 -0500
diff --git a/xCAT-openbmc-py/debian/compat b/xCAT-openbmc-py/debian/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/xCAT-openbmc-py/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/xCAT-openbmc-py/debian/control b/xCAT-openbmc-py/debian/control
new file mode 100644
index 000000000..36244cb89
--- /dev/null
+++ b/xCAT-openbmc-py/debian/control
@@ -0,0 +1,12 @@
+Source: xcat-openbmc-py
+Section: admin
+Priority: extra
+Maintainer: xCAT <xcat-user@lists.sourceforge.net>
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.4
+Homepage: https://xcat.org/
+
+Package: xcat-openbmc-py
+Architecture: all
+Depends:
+Description: xcat openbmc python
diff --git a/xCAT-openbmc-py/debian/copyright b/xCAT-openbmc-py/debian/copyright
new file mode 100644
index 000000000..87e60f492
--- /dev/null
+++ b/xCAT-openbmc-py/debian/copyright
@@ -0,0 +1,88 @@
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+
diff --git a/xCAT-openbmc-py/debian/dirs b/xCAT-openbmc-py/debian/dirs
new file mode 100644
index 000000000..305257b08
--- /dev/null
+++ b/xCAT-openbmc-py/debian/dirs
@@ -0,0 +1,5 @@
+opt/xcat/lib/python/agent
+opt/xcat/lib/python/agent/xcatagent
+opt/xcat/lib/python/agent/common
+opt/xcat/lib/python/agent/hwctl
+opt/xcat/lib/python/agent/hwctl/executor
diff --git a/xCAT-openbmc-py/debian/docs b/xCAT-openbmc-py/debian/docs
new file mode 100644
index 000000000..e69de29bb
diff --git a/xCAT-openbmc-py/debian/install b/xCAT-openbmc-py/debian/install
new file mode 100644
index 000000000..5767a09a9
--- /dev/null
+++ b/xCAT-openbmc-py/debian/install
@@ -0,0 +1,5 @@
+lib/python/agent/*.py /opt/xcat/lib/python/agent
+lib/python/agent/xcatagent/*.py /opt/xcat/lib/python/agent/xcatagent
+lib/python/agent/common/*.py /opt/xcat/lib/python/agent/common
+lib/python/agent/hwctl/*.py /opt/xcat/lib/python/agent/hwctl
+lib/python/agent/hwctl/executor/*.py /opt/xcat/lib/python/agent/hwctl/executor
diff --git a/xCAT-openbmc-py/debian/postinst b/xCAT-openbmc-py/debian/postinst
new file mode 100644
index 000000000..12c7842af
--- /dev/null
+++ b/xCAT-openbmc-py/debian/postinst
@@ -0,0 +1,39 @@
+#!/bin/sh
+# postinst script for xcat-openstack-baremetal
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/xCAT-openbmc-py/debian/rules b/xCAT-openbmc-py/debian/rules
new file mode 100755
index 000000000..b2a8bca0f
--- /dev/null
+++ b/xCAT-openbmc-py/debian/rules
@@ -0,0 +1,41 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+build:
+	pwd
+
+clean:
+	dh_testdir
+	dh_testroot
+	dh_clean -d
+
+install:
+	pwd
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	dh_install -X".svn"
+	dh_link
+
+binary-indep: build install
+	pwd
+	export
+	dh_installman
+	dh_compress
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary-arch:
+	pwd
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/xCAT-openbmc-py/debian/source/format b/xCAT-openbmc-py/debian/source/format
new file mode 100644
index 000000000..d3827e75a
--- /dev/null
+++ b/xCAT-openbmc-py/debian/source/format
@@ -0,0 +1 @@
+1.0

From 7722c15b18b3013477346dba0425bc3d53aa6160 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Thu, 8 Feb 2018 15:25:56 -0500
Subject: [PATCH 045/100] Allow choosing individual openbmc commands to use
 Python

---
 xCAT-server/lib/perl/xCAT/OPENBMC.pm     | 22 ++++++++++++++++++----
 xCAT-server/lib/xcat/plugins/openbmc.pm  | 11 +++++++----
 xCAT-server/lib/xcat/plugins/openbmc2.pm |  8 ++++++--
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/OPENBMC.pm b/xCAT-server/lib/perl/xCAT/OPENBMC.pm
index 64fd999d5..783a9e30e 100644
--- a/xCAT-server/lib/perl/xCAT/OPENBMC.pm
+++ b/xCAT-server/lib/perl/xCAT/OPENBMC.pm
@@ -201,7 +201,13 @@ sub wait_agent {
 sub is_openbmc_python {
     my $environment = shift;
     $environment = shift if (($environment) && ($environment =~ /OPENBMC/));
-    # If XCAT_OPENBMC_PYTHON is YES, will run openbmc2.pm. If not, run openbmc.pm
+    # If XCAT_OPENBMC_PYTHON is YES, 
+    # will return "ALL" and caller will run openbmc2.pm. 
+    # If XCAT_OPENBMC_PYTHON is not set or is set to NO, return "NO" and caller
+    # will run openbmc.pm
+    # If XCAT_OPENBMC_PYTHON is a list of commands, return that list and caller
+    # will run openbmc2.pm if the command is on the list, caller will run
+    # openbmc.pm if command is not on the list
     if (ref($environment) eq 'ARRAY' and ref($environment->[0]->{XCAT_OPENBMC_PYTHON}) eq 'ARRAY') {
         $::OPENBMC_PYTHON = $environment->[0]->{XCAT_OPENBMC_PYTHON}->[0];
     } elsif (ref($environment) eq 'ARRAY') {
@@ -209,11 +215,19 @@ sub is_openbmc_python {
     } else {
         $::OPENBMC_PYTHON = $environment->{XCAT_OPENBMC_PYTHON};
     }
-    if (defined($::OPENBMC_PYTHON) and $::OPENBMC_PYTHON eq "YES") {
-        return 1;
+    if (defined($::OPENBMC_PYTHON)) { 
+        if ($::OPENBMC_PYTHON eq "YES") {
+            return "ALL";
+        }
+        elsif ($::OPENBMC_PYTHON eq "NO") {
+            return "NO";
+        }
+        else {
+            return $::OPENBMC_PYTHON;
+        }
     }
 
-    return 0;
+    return "NO";
 }
 
 1;
diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 34d424f98..53fd31c9b 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -756,20 +756,23 @@ sub preprocess_request {
     }
     ##############################################
 
-    if (xCAT::OPENBMC->is_openbmc_python($request->{environment})) {
+    $callback  = shift;
+    my $command   = $request->{command}->[0];
+    my $python_env = xCAT::OPENBMC->is_openbmc_python($request->{environment});
+    # Process command in this module only if PYTHON env is not ALL or command is
+    # listed in the PYTHON env list. All other cases => return
+    if (($python_env eq "ALL") ||
+       (($python_env ne "NO") && ($python_env =~ $command))) {
         $request = {};
         return;
     }
 
-    $callback  = shift;
-
     if ($::XCATSITEVALS{xcatdebugmode}) { $xcatdebugmode = $::XCATSITEVALS{xcatdebugmode} }
 
     if ($xcatdebugmode) {
         process_debug_info("OpenBMC");
     }
 
-    my $command   = $request->{command}->[0];
     my $noderange = $request->{node};
     my $extrargs  = $request->{arg};
     my @exargs    = ($request->{arg});
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index 92ce69da9..69820a057 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -57,12 +57,16 @@ sub preprocess_request {
     my $request = shift;
     $callback  = shift;
 
-    if (!xCAT::OPENBMC->is_openbmc_python($request->{environment})) {
+    my $command   = $request->{command}->[0];
+    my $python_env = xCAT::OPENBMC->is_openbmc_python($request->{environment});
+    # Process command in this module only if PYTHON env is not NO or 
+    # command is listed in the PYTHON env list. All other cases => return
+    if (($python_env eq "NO") || 
+       (($python_env ne "ALL") && ($python_env !~ $command))) {
         $request = {};
         return;
     }
 
-    my $command   = $request->{command}->[0];
     my $noderange = $request->{node};
     my $extrargs  = $request->{arg};
     my @exargs    = ($request->{arg});

From dd7e1d51df314189d52a59587f6d6082c4953806 Mon Sep 17 00:00:00 2001
From: chenglch <chenglch@cn.ibm.com>
Date: Wed, 7 Feb 2018 19:06:37 +0800
Subject: [PATCH 046/100] Add consoleenabled column to help store the console
 status
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On diskless SN, the nodes file of goconserver is missing when
reinstalling. This patch add a column in nodehm table to help
recover the console information on service node.

```
[root@c910f03c09k04 ~]# makegocons -q

NODE                             SERVER                           STATE
c910f03c09k05                    c910f03c09k04.pok.stglabs.ibm.com error
node-7912ac1-06vag36             c910f03c09k04.pok.stglabs.ibm.com error

NODE                             SERVER                           STATE
c910f03c09k04                    c910f03c09k03.pok.stglabs.ibm.com connected
[root@c910f03c09k04 ~]# rm /var/lib/goconserver/*
rm: remove regular file ‘/var/lib/goconserver/nodes.json’? y
rm: remove regular file ‘/var/lib/goconserver/nodes.json.bak’? y
[root@c910f03c09k04 ~]# service xcatd restart
Restarting xcatd (via systemctl):                          [  OK  ]
[root@c910f03c09k04 ~]# makegocons -q

NODE                             SERVER                           STATE
c910f03c09k05                    c910f03c09k04.pok.stglabs.ibm.com error
node-7912ac1-06vag36             c910f03c09k04.pok.stglabs.ibm.com error

NODE                             SERVER                           STATE
c910f03c09k04                    c910f03c09k03.pok.stglabs.ibm.com connected
```
---
 .../admin-guides/references/man5/nodehm.5.rst |   8 +-
 perl-xCAT/xCAT/Schema.pm                      |   7 +-
 xCAT-server/lib/perl/xCAT/Goconserver.pm      | 270 +++++++++++++++++-
 xCAT-server/lib/xcat/plugins/AAsn.pm          |   1 +
 xCAT-server/lib/xcat/plugins/goconserver.pm   |  88 +-----
 5 files changed, 270 insertions(+), 104 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man5/nodehm.5.rst b/docs/source/guides/admin-guides/references/man5/nodehm.5.rst
index ef568e90f..aa12ce4b2 100644
--- a/docs/source/guides/admin-guides/references/man5/nodehm.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/nodehm.5.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **nodehm Attributes:**\   \ *node*\ , \ *power*\ , \ *mgt*\ , \ *cons*\ , \ *termserver*\ , \ *termport*\ , \ *conserver*\ , \ *serialport*\ , \ *serialspeed*\ , \ *serialflow*\ , \ *getmac*\ , \ *cmdmapping*\ , \ *consoleondemand*\ , \ *comments*\ , \ *disable*\ 
+\ **nodehm Attributes:**\   \ *node*\ , \ *power*\ , \ *mgt*\ , \ *cons*\ , \ *termserver*\ , \ *termport*\ , \ *conserver*\ , \ *serialport*\ , \ *serialspeed*\ , \ *serialflow*\ , \ *getmac*\ , \ *cmdmapping*\ , \ *consoleondemand*\ , \ *consoleenabled*\ , \ *comments*\ , \ *disable*\ 
 
 
 ***********
@@ -114,6 +114,12 @@ nodehm Attributes:
  
 
 
+\ **consoleenabled**\ 
+ 
+ A flag field to indicate whether the node is registered in the console server. If '1', console is enabled, if not set, console is not enabled.
+ 
+
+
 \ **comments**\ 
  
  Any user-written notes.
diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index 2639cba81..d06d4c780 100755
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -594,7 +594,7 @@ passed as argument rather than by table value',
         },
     },
     nodehm => {
-        cols => [qw(node power mgt cons termserver termport conserver serialport serialspeed serialflow getmac cmdmapping consoleondemand comments disable)],
+        cols => [qw(node power mgt cons termserver termport conserver serialport serialspeed serialflow getmac cmdmapping consoleondemand consoleenabled comments disable)],
         keys       => [qw(node)],
         tablespace => 'XCATTBS16K',
         table_desc => "Settings that control how each node's hardware is managed.  Typically, an additional table that is specific to the hardware type of the node contains additional info.  E.g. the ipmi, mp, and ppc tables.",
@@ -612,6 +612,7 @@ passed as argument rather than by table value',
             getmac => 'The method to use to get MAC address of the node with the getmac command. If not set, the mgt attribute will be used.  Valid values: same as values for mgmt attribute.',
             cmdmapping => 'The fully qualified name of the file that stores the mapping between PCM hardware management commands and xCAT/third-party hardware management commands for a particular type of hardware device.  Only used by PCM.',
             consoleondemand => "This overrides the value from site.consoleondemand. Set to 'yes', 'no', '1' (equivalent to 'yes'), or '0' (equivalent to 'no'). If not set, the default is the value from site.consoleondemand.",
+            consoleenabled => "A flag field to indicate whether the node is registered in the console server. If '1', console is enabled, if not set, console is not enabled.",
             comments => 'Any user-written notes.',
             disable  => "Set to 'yes' or '1' to comment out this row.",
         },
@@ -2184,6 +2185,10 @@ my @nodeattrs = (
         tabentry        => 'nodehm.consoleondemand',
         access_tabentry => 'nodehm.node=attr:node',
     },
+    { attr_name => 'consoleenabled',
+        tabentry        => 'nodehm.consoleenabled',
+        access_tabentry => 'nodehm.node=attr:node',
+    },
 ##################
     #  vpd table     #
 ##################
diff --git a/xCAT-server/lib/perl/xCAT/Goconserver.pm b/xCAT-server/lib/perl/xCAT/Goconserver.pm
index 835ee4e3e..0e3906def 100644
--- a/xCAT-server/lib/perl/xCAT/Goconserver.pm
+++ b/xCAT-server/lib/perl/xCAT/Goconserver.pm
@@ -21,6 +21,7 @@ use IO::Socket::SSL qw( SSL_VERIFY_PEER );
 
 my $go_api_port = 12429;
 my $go_cons_port = 12430;
+my $bmc_cons_port = "2200";
 
 use constant CONSOLE_LOG_DIR => "/var/log/consoles";
 use constant PRINT_FORMAT => "%-32s %-32s %-64s";
@@ -56,11 +57,210 @@ sub http_request {
     return "";
 }
 
+sub gen_request_data {
+    my ($cons_map, $siteondemand, $isSN, $callback) = @_;
+    my (@openbmc_nodes, $data);
+    while (my ($k, $v) = each %{$cons_map}) {
+        my $ondemand;
+        if ($siteondemand) {
+            $ondemand = \1;
+        } else {
+            $ondemand = \0;
+        }
+        my $cmd;
+        my $cmeth  = $v->{cons};
+        if ($cmeth eq "openbmc") {
+            push @openbmc_nodes, $k;
+        }  else {
+            $cmd = $::XCATROOT . "/share/xcat/cons/$cmeth"." ".$k;
+            if (!(!$isSN && $v->{conserver} && xCAT::NetworkUtils->thishostisnot($v->{conserver}))) {
+                my $env;
+                my $locerror = $isSN ? "PERL_BADLANG=0 " : '';
+                if (defined($ENV{'XCATSSLVER'})) {
+                    $env = "XCATSSLVER=$ENV{'XCATSSLVER'} ";
+                }
+                $cmd = $locerror.$env.$cmd;
+            }
+            $data->{$k}->{driver} = "cmd";
+            $data->{$k}->{params}->{cmd} = $cmd;
+            $data->{$k}->{name} = $k;
+        }
+        if (defined($v->{consoleondemand})) {
+            # consoleondemand attribute for node can be "1", "yes", "0" and "no"
+            if (($v->{consoleondemand} eq "1") || lc($v->{consoleondemand}) eq "yes") {
+                $ondemand = \1;
+            }
+            elsif (($v->{consoleondemand} eq "0") || lc($v->{consoleondemand}) eq "no") {
+                $ondemand = \0;
+            }
+        }
+        $data->{$k}->{ondemand} = $ondemand;
+    }
+    if (@openbmc_nodes) {
+        my $passwd_table = xCAT::Table->new('passwd');
+        my $passwd_hash = $passwd_table->getAttribs({ 'key' => 'openbmc' }, qw(username password));
+        $passwd_table->close();
+        my $openbmc_table = xCAT::Table->new('openbmc');
+        my $openbmc_hash = $openbmc_table->getNodesAttribs(\@openbmc_nodes, ['bmc','consport', 'username', 'password']);
+        $openbmc_table->close();
+        foreach my $node (@openbmc_nodes) {
+            if (defined($openbmc_hash->{$node}->[0])) {
+                if (!$openbmc_hash->{$node}->[0]->{'bmc'}) {
+                    if($callback) {
+                        xCAT::SvrUtils::sendmsg("Error: Unable to get attribute bmc", $callback, $node);
+                    } else {
+                        xCAT::MsgUtils->message("S", "$node: Error: Unable to get attribute bmc");
+                    }
+                    delete $data->{$node};
+                    next;
+                }
+                $data->{$node}->{params}->{host} = $openbmc_hash->{$node}->[0]->{'bmc'};
+                if ($openbmc_hash->{$node}->[0]->{'username'}) {
+                    $data->{$node}->{params}->{user} = $openbmc_hash->{$node}->[0]->{'username'};
+                } elsif ($passwd_hash and $passwd_hash->{username}) {
+                    $data->{$node}->{params}->{user} = $passwd_hash->{username};
+                } else {
+                    if ($callback) {
+                        xCAT::SvrUtils::sendmsg("Error: Unable to get attribute username", $callback, $node)
+                    } else {
+                        xCAT::MsgUtils->message("S", "$node: Error: Unable to get attribute username");
+                    }
+                    delete $data->{$node};
+                    next;
+                }
+                if ($openbmc_hash->{$node}->[0]->{'password'}) {
+                    $data->{$node}->{params}->{password} = $openbmc_hash->{$node}->[0]->{'password'};
+                } elsif ($passwd_hash and $passwd_hash->{password}) {
+                    $data->{$node}->{params}->{password} = $passwd_hash->{password};
+                } else {
+                    if ($callback) {
+                        xCAT::SvrUtils::sendmsg("Error: Unable to get attribute password", $callback, $node)
+                    } else {
+                        xCAT::MsgUtils->message("S", "$node: Error: Unable to get attribute password");
+                    }
+                    delete $data->{$node};
+                    next;
+                }
+                if ($openbmc_hash->{$node}->[0]->{'consport'}) {
+                    $data->{$node}->{params}->{consport} = $openbmc_hash->{$node}->[0]->{'consport'};
+                } else {
+                    $data->{$node}->{params}->{port} = $bmc_cons_port;
+                }
+                $data->{$node}->{name} = $node;
+                $data->{$node}->{driver} = "ssh";
+            }
+        }
+    }
+    return $data;
+}
+
+#-------------------------------------------------------------------------------
+
+=head3  init_local_console
+        Init console nodes on service node locally.
+
+    Globals:
+        none
+    Example:
+         my $ready=(xCAT::Goconserver::init_local_console()
+    Comments:
+        none
+
+=cut
+
+#-------------------------------------------------------------------------------
+sub init_local_console {
+    my @hostinfo = xCAT::NetworkUtils->determinehostname();
+    my %iphash   = ();
+    my %cons_map;
+    my $ret;
+    my $host = $hostinfo[-1];
+    foreach (@hostinfo) {
+        $iphash{$_} = 1;
+    }
+    my $retry = 0;
+    my $api_url = "https://$host:". get_api_port();
+    my $response = http_request("GET", $api_url."/nodes");
+    while(!defined($response) && $retry < 3) {
+        $response = http_request("GET", $api_url."/nodes");
+        $retry ++;
+        sleep 1;
+    }
+    if (!defined($response)) {
+        xCAT::MsgUtils->message("S", "Could not connect to goconserver after trying 3 times.");
+        return;
+    }
+    if ($response->{nodes}->[0]) {
+        # node data exist, maybe this is not diskless sn.
+        return;
+    }
+    my $nodehmtab = xCAT::Table->new('nodehm', -create => 1);
+    if (!$nodehmtab) {
+        return;
+    }
+    my @cons_nodes = $nodehmtab->getAllNodeAttribs([ 'node', 'cons', 'serialport', 'mgt', 'conserver', 'consoleondemand', 'consoleenabled' ]);
+    $nodehmtab->close();
+    my @nodes = ();
+    foreach (@cons_nodes) {
+        if ($_->{consoleenabled} && ($_->{cons} or defined($_->{'serialport'}))) {
+            unless ($_->{cons}) {
+                $_->{cons} = $_->{mgt};
+            }
+            if ($_->{conserver} && exists($iphash{ $_->{conserver} })) {
+                $cons_map{ $_->{node} } = $_;
+            }
+        }
+    }
+    my @entries    = xCAT::TableUtils->get_site_attribute("consoleondemand");
+    my $site_entry = $entries[0];
+    my $siteondemand = 0;
+    if (defined($site_entry)) {
+        if (lc($site_entry) eq "yes") {
+            $siteondemand = 1;
+        }
+        elsif (lc($site_entry) ne "no") {
+            xCAT::MsgUtils->message("S", $host.": Unexpected value $site_entry for consoleondemand attribute in site table");
+        }
+    }
+    my $data = gen_request_data(\%cons_map, $siteondemand, 1, undef);
+    if (! $data) {
+        xCAT::MsgUtils->message("S", $host.": Could not generate the request data");
+        return;
+    }
+    if (create_nodes($api_url, $data, undef)) {
+        xCAT::MsgUtils->message("S", $host.": Failed to create console entry in goconserver. ");
+    }
+}
+
+sub disable_nodes_in_db {
+    my $nodes = shift;
+    my $nodehmtab = xCAT::Table->new('nodehm', -create => 1);
+    if (!$nodehmtab) {
+        return 1;
+    }
+    my $updateattribs->{consoleenabled} = undef;
+    $nodehmtab->setNodesAttribs($nodes, $updateattribs);
+    $nodehmtab->close();
+    return 0;
+}
+
+sub enable_nodes_in_db {
+    my $nodes = shift;
+    my $nodehmtab = xCAT::Table->new('nodehm', -create => 1);
+    if (!$nodehmtab) {
+        return 1;
+    }
+    my $updateattribs->{consoleenabled} = '1';
+    $nodehmtab->setNodesAttribs($nodes, $updateattribs);
+    $nodehmtab->close();
+    return 0;
+}
+
 sub delete_nodes {
     my ($api_url, $node_map, $delmode, $callback) = @_;
     my $url = "$api_url/bulk/nodes";
     my @a = ();
-    my ($data, $rsp, $ret);
+    my ($data, $rsp, $ret, @update_nodes);
     $data->{nodes} = \@a;
     foreach my $node (keys %{$node_map}) {
         my $temp;
@@ -70,18 +270,39 @@ sub delete_nodes {
     $ret = 0;
     my $response = http_request("DELETE", $url, $data);
     if (!defined($response)) {
-        $rsp->{data}->[0] = "Failed to send delete request.";
-        xCAT::MsgUtils->message("E", $rsp, $callback);
+        if ($callback) {
+            $rsp->{data}->[0] = "Failed to send delete request.";
+            xCAT::MsgUtils->message("E", $rsp, $callback)
+        } else {
+            xCAT::MsgUtils->message("S", "Failed to send delete request.");
+        }
         return 1;
     } elsif ($delmode) {
         while (my ($k, $v) = each %{$response}) {
             if ($v ne "Deleted") {
-                $rsp->{data}->[0] = "$k: Failed to delete entry in goconserver: $v";
-                xCAT::MsgUtils->message("E", $rsp, $callback);
+                if ($callback) {
+                    $rsp->{data}->[0] = "$k: Failed to delete entry in goconserver: $v";
+                    xCAT::MsgUtils->message("E", $rsp, $callback)
+                } else {
+                    xCAT::MsgUtils->message("S", "$k: Failed to delete entry in goconserver: $v");
+                }
                 $ret = 1;
             } else {
-                $rsp->{data}->[0] = "$k: $v";
-                xCAT::MsgUtils->message("I", $rsp, $callback);
+                if ($callback) {
+                    $rsp->{data}->[0] = "$k: $v";
+                    xCAT::MsgUtils->message("I", $rsp, $callback);
+                }
+                push(@update_nodes, $k);
+            }
+        }
+    }
+    if (@update_nodes) {
+        if (disable_nodes_in_db(\@update_nodes)) {
+            if ($callback) {
+                $rsp->{data}->[0] = "Failed to update consoleenabled status in db.";
+                xCAT::MsgUtils->message("E", $rsp, $callback);
+            } else {
+                xCAT::MsgUtils->message("S", "Failed to update consoleenabled status in db.");
             }
         }
     }
@@ -91,7 +312,7 @@ sub delete_nodes {
 sub create_nodes {
     my ($api_url, $node_map, $callback) = @_;
     my $url = "$api_url/bulk/nodes";
-    my ($data, $rsp, @a, $ret);
+    my ($data, $rsp, @a, $ret, @update_nodes);
     $data->{nodes} = \@a;
     while (my ($k, $v) = each %{$node_map}) {
         push @a, $v;
@@ -99,18 +320,37 @@ sub create_nodes {
     $ret = 0;
     my $response = http_request("POST", $url, $data);
     if (!defined($response)) {
-        $rsp->{data}->[0] = "Failed to send create request.";
-        xCAT::MsgUtils->message("E", $rsp, $callback);
+        if ($callback) {
+            $rsp->{data}->[0] = "Failed to send create request.";
+            xCAT::MsgUtils->message("E", $rsp, $callback)
+        } else {
+            xCAT::MsgUtils->message("S", "Failed to send create request.");
+        }
         return 1;
     } elsif ($response) {
         while (my ($k, $v) = each %{$response}) {
             if ($v ne "Created") {
-                $rsp->{data}->[0] = "$k: Failed to create console entry in goconserver: $v";
-                xCAT::MsgUtils->message("E", $rsp, $::callback);
+                if ($callback) {
+                    $rsp->{data}->[0] = "$k: Failed to create console entry in goconserver: $v";
+                    xCAT::MsgUtils->message("E", $rsp, $callback);
+                } else {
+                    xCAT::MsgUtils->message("S", "$k: Failed to create console entry in goconserver: $v");
+                }
                 $ret = 1;
             } else {
                 $rsp->{data}->[0] = "$k: $v";
-                xCAT::MsgUtils->message("I", $rsp, $::callback);
+                xCAT::MsgUtils->message("I", $rsp, $callback) if $callback;
+                push(@update_nodes, $k);
+            }
+        }
+    }
+    if (@update_nodes) {
+        if (enable_nodes_in_db(\@update_nodes)) {
+            if ($callback) {
+                $rsp->{data}->[0] = "Failed to update consoleenabled status in db.";
+                xCAT::MsgUtils->message("E", $rsp, $callback);
+            } else {
+                CAT::MsgUtils->message("S", "Failed to update consoleenabled status in db.");
             }
         }
     }
@@ -133,7 +373,7 @@ sub list_nodes {
         return 0;
     }
     $rsp->{data}->[0] = sprintf("\n".PRINT_FORMAT, "NODE", "SERVER", "STATE");
-    xCAT::MsgUtils->message("I", $rsp, $::callback);
+    xCAT::MsgUtils->message("I", $rsp, $callback);
     foreach my $node (sort {$a->{name} cmp $b->{name}} @{$response->{nodes}}) {
         if (!$node_map->{$node->{name}}) {
             next;
@@ -145,7 +385,7 @@ sub list_nodes {
             next;
         }
         $rsp->{data}->[0] = sprintf(PRINT_FORMAT, $node->{name}, $node->{host}, $node->{state});
-        xCAT::MsgUtils->message("I", $rsp, $::callback);
+        xCAT::MsgUtils->message("I", $rsp, $callback);
     }
     my %node_hash = %{$node_map};
     for my $node (sort keys %node_hash) {
diff --git a/xCAT-server/lib/xcat/plugins/AAsn.pm b/xCAT-server/lib/xcat/plugins/AAsn.pm
index e941c12fc..d7c63fa02 100755
--- a/xCAT-server/lib/xcat/plugins/AAsn.pm
+++ b/xCAT-server/lib/xcat/plugins/AAsn.pm
@@ -587,6 +587,7 @@ sub setup_GOCONS
         xCAT::MsgUtils->message("S", "Error: failed to start goconserver service.");
         return 1;
     }
+    xCAT::Goconserver::init_local_console();
     return 0;
 }
 
diff --git a/xCAT-server/lib/xcat/plugins/goconserver.pm b/xCAT-server/lib/xcat/plugins/goconserver.pm
index 7fb243168..b3487e81a 100644
--- a/xCAT-server/lib/xcat/plugins/goconserver.pm
+++ b/xCAT-server/lib/xcat/plugins/goconserver.pm
@@ -17,7 +17,6 @@ use Data::Dumper;
 
 my $isSN;
 my $host;
-my $bmc_cons_port = "2200";
 my $usage_string ="   makegocons [-V|--verbose] [-d|--delete] noderange
     -h|--help                   Display this usage statement.
     -v|--version                Display the version number.
@@ -183,91 +182,6 @@ sub get_cons_map {
     return %cons_map;
 }
 
-sub gen_request_data {
-    my ($cons_map, $siteondemand) = @_;
-    my (@openbmc_nodes, $data);
-    while (my ($k, $v) = each %{$cons_map}) {
-        my $ondemand;
-        if ($siteondemand) {
-            $ondemand = \1;
-        } else {
-            $ondemand = \0;
-        }
-        my $cmd;
-        my $cmeth  = $v->{cons};
-        if ($cmeth eq "openbmc") {
-            push @openbmc_nodes, $k;
-        }  else {
-            $cmd = $::XCATROOT . "/share/xcat/cons/$cmeth"." ".$k;
-            if (!(!$isSN && $v->{conserver} && xCAT::NetworkUtils->thishostisnot($v->{conserver}))) {
-                my $env;
-                my $locerror = $isSN ? "PERL_BADLANG=0 " : '';
-                if (defined($ENV{'XCATSSLVER'})) {
-                    $env = "XCATSSLVER=$ENV{'XCATSSLVER'} ";
-                }
-                $cmd = $locerror.$env.$cmd;
-            }
-            $data->{$k}->{driver} = "cmd";
-            $data->{$k}->{params}->{cmd} = $cmd;
-            $data->{$k}->{name} = $k;
-        }
-        if (defined($v->{consoleondemand})) {
-            # consoleondemand attribute for node can be "1", "yes", "0" and "no"
-            if (($v->{consoleondemand} eq "1") || lc($v->{consoleondemand}) eq "yes") {
-                $ondemand = \1;
-            }
-            elsif (($v->{consoleondemand} eq "0") || lc($v->{consoleondemand}) eq "no") {
-                $ondemand = \0;
-            }
-        }
-        $data->{$k}->{ondemand} = $ondemand;
-    }
-    if (@openbmc_nodes) {
-        my $passwd_table = xCAT::Table->new('passwd');
-        my $passwd_hash = $passwd_table->getAttribs({ 'key' => 'openbmc' }, qw(username password));
-        $passwd_table->close();
-        my $openbmc_table = xCAT::Table->new('openbmc');
-        my $openbmc_hash = $openbmc_table->getNodesAttribs(\@openbmc_nodes, ['bmc','consport', 'username', 'password']);
-        $openbmc_table->close();
-        foreach my $node (@openbmc_nodes) {
-            if (defined($openbmc_hash->{$node}->[0])) {
-                if (!$openbmc_hash->{$node}->[0]->{'bmc'}) {
-                    xCAT::SvrUtils::sendmsg("Error: Unable to get attribute bmc", $::callback, $node);
-                    delete $data->{$node};
-                    next;
-                }
-                $data->{$node}->{params}->{host} = $openbmc_hash->{$node}->[0]->{'bmc'};
-                if ($openbmc_hash->{$node}->[0]->{'username'}) {
-                    $data->{$node}->{params}->{user} = $openbmc_hash->{$node}->[0]->{'username'};
-                } elsif ($passwd_hash and $passwd_hash->{username}) {
-                    $data->{$node}->{params}->{user} = $passwd_hash->{username};
-                } else {
-                    xCAT::SvrUtils::sendmsg("Error: Unable to get attribute username", $::callback, $node);
-                    delete $data->{$node};
-                    next;
-                }
-                if ($openbmc_hash->{$node}->[0]->{'password'}) {
-                    $data->{$node}->{params}->{password} = $openbmc_hash->{$node}->[0]->{'password'};
-                } elsif ($passwd_hash and $passwd_hash->{password}) {
-                    $data->{$node}->{params}->{password} = $passwd_hash->{password};
-                } else {
-                    xCAT::SvrUtils::sendmsg("Error: Unable to get attribute password", $::callback, $node);
-                    delete $data->{$node};
-                    next;
-                }
-                if ($openbmc_hash->{$node}->[0]->{'consport'}) {
-                    $data->{$node}->{params}->{consport} = $openbmc_hash->{$node}->[0]->{'consport'};
-                } else {
-                    $data->{$node}->{params}->{port} = $bmc_cons_port;
-                }
-                $data->{$node}->{name} = $node;
-                $data->{$node}->{driver} = "ssh";
-            }
-        }
-    }
-    return $data;
-}
-
 sub start_goconserver {
     my ($rsp, $running, $ready, $ret);
     unless (-x "/usr/bin/goconserver") {
@@ -357,7 +271,7 @@ sub makegocons {
         }
     }
     my (@nodes);
-    my $data = gen_request_data(\%cons_map, $siteondemand);
+    my $data = xCAT::Goconserver::gen_request_data(\%cons_map, $siteondemand, $isSN, $::callback);
     if (! $data) {
         xCAT::SvrUtils::sendmsg([ 1, "Could not generate the request data" ], $::callback);
         return 1;

From 2da3f5140d9e34966aae56c82dd85c37e860fedc Mon Sep 17 00:00:00 2001
From: chenglch <chenglch@cn.ibm.com>
Date: Tue, 6 Feb 2018 17:43:16 +0800
Subject: [PATCH 047/100] Move sleep retry from xcat to goconserver

If cons script is waiting, goconserver could not aware of
the status of the console connection. This patch check
the environment when running the script, if it is gocons
and retrying is needed, exit immediately.
---
 perl-xCAT/xCAT/Utils.pm              | 20 +++++++++++++++++++
 xCAT-server/share/xcat/cons/blade    | 25 ++++++++++-------------
 xCAT-server/share/xcat/cons/hmc      | 22 ++++++++++----------
 xCAT-server/share/xcat/cons/hpblade  | 22 ++++++++++----------
 xCAT-server/share/xcat/cons/ipmi     | 23 +++++++++------------
 xCAT-server/share/xcat/cons/ivm      | 30 +++++++++++-----------------
 xCAT-server/share/xcat/cons/kvm      | 23 ++++++++++-----------
 xCAT-server/share/xcat/cons/multiple | 21 ++++++++++---------
 xCAT-server/share/xcat/cons/xen      | 23 ++++++++++-----------
 9 files changed, 103 insertions(+), 106 deletions(-)

diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm
index 6a7f12c3a..530bc0d5a 100644
--- a/perl-xCAT/xCAT/Utils.pm
+++ b/perl-xCAT/xCAT/Utils.pm
@@ -4949,4 +4949,24 @@ sub natural_sort_cmp($$) {
     }
 }
 
+#--------------------------------------------------------------------------------
+
+=head3  console_sleep
+      A wrap for sleep subroutine, if goconserver is used, just exit immidiately
+      as goconserver has its own sleep mechanism.
+=cut
+
+#--------------------------------------------------------------------------------
+sub console_sleep {
+    my $time = shift;
+    my $message = shift;
+    if($ENV{CONSOLE_TYPE} && $ENV{CONSOLE_TYPE} eq "gocons") {
+        # sleep time is handled by goconserver itself
+        exit(1);
+    }
+    print $message if $message;
+    sleep($time);
+}
+
+
 1;
diff --git a/xCAT-server/share/xcat/cons/blade b/xCAT-server/share/xcat/cons/blade
index cb4bb08d5..c7f081b46 100755
--- a/xCAT-server/share/xcat/cons/blade
+++ b/xCAT-server/share/xcat/cons/blade
@@ -24,21 +24,20 @@ BEGIN
     use File::Path;
     use Fcntl qw(:DEFAULT :flock);
     $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
-    umask 0077;
-    mkpath("/tmp/xcat/");
-    unless (sysopen(LOCKHANDLE, "/tmp/xcat/consolelock", O_WRONLY | O_CREAT)) {
-        sleep 15;
-        print "Unable to open lock file";
-        exit 0;
-    }
-    get_lock();
 }
 my $sleepint = int(rand(10)); #Stagger start to avoid overwhelming conserver/xCATd
 use lib "$::XCATROOT/lib/perl";
 require xCAT::Client;
+require xCAT::Utils;
 require File::Basename;
-import File::Basename;
-my $scriptname = $0;
+
+umask 0077;
+mkpath("/tmp/xcat/");
+unless (sysopen(LOCKHANDLE, "/tmp/xcat/consolelock", O_WRONLY | O_CREAT)) {
+    xCAT::Utils::console_sleep(15, "Unable to open lock file");
+    exit 0;
+}
+get_lock();
 
 my $username  = "USERID";
 my $passsword = "PASSW0RD";
@@ -63,8 +62,7 @@ xCAT::Client::submit_request($cmdref, \&getans);
 until ($mm and $username and $slot) {
     release_lock();          #Let other clients have a go
     $sleepint = 10 + int(rand(20)); #Stagger to minimize lock collisions, but no big deal when it does happen
-    print "Console not ready, retrying in $sleepint seconds (Hit Ctrl-E,c,o to skip delay)\n";
-    sleep $sleepint;
+    xCAT::Utils::console_sleep($sleepint, "Console not ready, retrying in $sleepint seconds (Hit Ctrl-E,c,o to skip delay)\n");
     get_lock();
     xCAT::Client::submit_request($cmdref, \&getans);
 }
@@ -73,8 +71,7 @@ my $solchkcmd = "ssh -t $username" . "@" . "$mm sol -T blade[$slot]";
 my $solstatus = `$solchkcmd`;
 while ($solstatus !~ /SOL Session: Ready/ and $solstatus !~ /SOL Session: Active/) {
     $sleepint = 60 + int(rand(30)); #Stagger sleep to take it easy on AMM/hosting server
-    print "SOL unavailable, retrying in $sleepint seconds (hit Ctrl-E,c,o to skip)\n";
-    sleep $sleepint;
+    xCAT::Utils::console_sleep($sleepint, "SOL unavailable, retrying in $sleepint seconds (hit Ctrl-E,c,o to skip)\n");
     $solstatus = `$solchkcmd`;
 }
 exec "ssh -t $username" . "@" . "$mm console -o -T blade[$slot]";
diff --git a/xCAT-server/share/xcat/cons/hmc b/xCAT-server/share/xcat/cons/hmc
index ae0425731..ede40d325 100644
--- a/xCAT-server/share/xcat/cons/hmc
+++ b/xCAT-server/share/xcat/cons/hmc
@@ -24,24 +24,23 @@ BEGIN
     use File::Path;
     use Fcntl qw(:DEFAULT :flock);
     $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
-    umask 0077;
-    mkpath("/tmp/xcat/");
-    unless (sysopen(LOCKHANDLE, "/tmp/xcat/consolelock", O_WRONLY | O_CREAT)) {
-        sleep 15;
-        print "Unable to open lock file";
-        exit 0;
-    }
-    get_lock();
 }
 my $sleepint = int(rand(10));
 use lib "$::XCATROOT/lib/perl";
 require xCAT::Client;
+require xCAT::Utils;
 use strict;
 use xCAT::PPCcli qw(SUCCESS EXPECT_ERROR RC_ERROR NR_ERROR);
 use Data::Dumper;
 require File::Basename;
-import File::Basename;
-my $scriptname = $0;
+
+umask 0077;
+mkpath("/tmp/xcat/");
+unless (sysopen(LOCKHANDLE, "/tmp/xcat/consolelock", O_WRONLY | O_CREAT)) {
+    xCAT::Utils::console_sleep(15, "Unable to open lock file");
+    exit 0;
+}
+get_lock();
 
 ##############################################
 # Globals
@@ -109,8 +108,7 @@ xCAT::Client::submit_request($cmdref, \&getans);
 until ($lparid and $host and $mtms) {
     release_lock();    #Let other clients have a go
     $sleepint = 10 + int(rand(20)); #Stagger to minimize lock collisions, but no big deal when it does happen
-    print "Console not ready, retrying in $sleepint seconds (Hit Ctrl-E,c,o to skip delay)\n";
-    sleep $sleepint;
+    xCAT::Utils::console_sleep($sleepint, "Console not ready, retrying in $sleepint seconds (Hit Ctrl-E,c,o to skip delay)\n");
     get_lock();
     xCAT::Client::submit_request($cmdref, \&getans);
 }
diff --git a/xCAT-server/share/xcat/cons/hpblade b/xCAT-server/share/xcat/cons/hpblade
index 1a63bfd6e..641fe4ec0 100755
--- a/xCAT-server/share/xcat/cons/hpblade
+++ b/xCAT-server/share/xcat/cons/hpblade
@@ -30,22 +30,21 @@ BEGIN
     use File::Path;
     use Fcntl qw(:DEFAULT :flock);
     $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
-    umask 0077;
-    mkpath("/tmp/xcat/");
-    unless (sysopen(LOCKHANDLE, "/tmp/xcat/consolelock", O_WRONLY | O_CREAT)) {
-        sleep 15;
-        print "Unable to open lock file";
-        exit 0;
-    }
-    get_lock();
 }
 my $sleepint = int(rand(10)); #Stagger start to avoid overwhelming conserver/xCATd
 use lib "$::XCATROOT/lib/perl";
 $ENV{HOME} = '/root/';
 require xCAT::Client;
-
+require xCAT::Utils;
 require File::Basename;
-import File::Basename;
+umask 0077;
+mkpath("/tmp/xcat/");
+unless (sysopen(LOCKHANDLE, "/tmp/xcat/consolelock", O_WRONLY | O_CREAT)) {
+    xCAT::Utils::console_sleep(15, "Unable to open lock file");
+    exit 0;
+}
+get_lock();
+
 my $scriptname = $0;
 my $username  = "admin";
 my $passsword = "PASSW0RD";
@@ -69,8 +68,7 @@ xCAT::Client::submit_request($cmdref, \&getans);
 until ($mm and $username and $slot) {
     release_lock();    #Let other clients have a go
     $sleepint = 10 + int(rand(20)); #Stagger to minimize lock collisions, but no big deal when it does happen
-    print "Console not ready, retrying in $sleepint seconds (Hit Ctrl-E,c,o to skip delay)\n";
-    sleep $sleepint;
+    xCAT::Utils::console_sleep($sleepint, "Console not ready, retrying in $sleepint seconds (Hit Ctrl-E,c,o to skip delay)\n");
     get_lock();
     xCAT::Client::submit_request($cmdref, \&getans);
 }
diff --git a/xCAT-server/share/xcat/cons/ipmi b/xCAT-server/share/xcat/cons/ipmi
index 631e7200a..7d6750b7a 100755
--- a/xCAT-server/share/xcat/cons/ipmi
+++ b/xCAT-server/share/xcat/cons/ipmi
@@ -6,6 +6,10 @@ use File::Path;
 BEGIN {
     $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr';
 }
+use lib "$::XCATROOT/lib/perl";
+require xCAT::Client;
+require xCAT::Utils;
+
 my $sleepint = int(rand(10)); #Stagger start to avoid overwhelming conserver/xCATd
 my ($lockfd, $bmc);
 my $username = 'USERID';
@@ -20,21 +24,18 @@ sub acquire_lock {
     mkpath(CONSOLE_LOCK_DIR);
     print "Acquiring startup lock...";
     unless (sysopen($lockfd, CONSOLE_LOCK_FILE, O_WRONLY | O_CREAT)) {
-        print "Unable to open file ".CONSOLE_LOCK_FILE."\n";
-        sleep(15);
+        xCAT::Utils::console_sleep(15, "Unable to open file ".CONSOLE_LOCK_FILE."\n");
         exit 1;
     }
     unless (flock($lockfd, LOCK_EX)) {
-        print "Unable to lock file ".CONSOLE_LOCK_FILE."\n";
         close($lockfd);
-        sleep(15);
+        xCAT::Utils::console_sleep(15, "Unable to lock file ".CONSOLE_LOCK_FILE."\n");
         exit 1;
     }
     print "done\n";
     unless (syswrite($lockfd, $$, length($$))) {
-        print "Unable to write file ".CONSOLE_LOCK_FILE."\n";
         close($lockfd);
-        sleep(15);
+        xCAT::Utils::console_sleep(15, "Unable to write file ".CONSOLE_LOCK_FILE."\n");
         exit 1;
     }
 }
@@ -44,10 +45,6 @@ sub release_lock {
     close($lockfd);
 }
 
-
-use lib "$::XCATROOT/lib/perl";
-require xCAT::Client;
-
 sub getans {
     my $rsp = shift;
     if ($rsp->{node}) {
@@ -74,8 +71,7 @@ xCAT::Client::submit_request($cmdref, \&getans);
 until (($username or $password) and $bmc) {
     #Let other clients have a go
     $sleepint = 10 + int(rand(20));
-    print "Console not ready, retrying in $sleepint seconds (Ctrl-e,c,o to skip delay) \n";
-    sleep ($sleepint);
+    xCAT::Utils::console_sleep($sleepint, "Console not ready, retrying in $sleepint seconds (Ctrl-e,c,o to skip delay) \n");
     acquire_lock();
     sleep(0.1);
     release_lock();
@@ -109,8 +105,7 @@ if ($rc) { #some shoddy vendors ignore the IPMI 2.0 requirement to support IPMI
 }
 while ($rc != 0) {
     $sleepint = 10 + int(rand(20));
-    print "Failure to reach IPMI device, retrying in $sleepint seconds (Hit Ctrl-E,c,o to skip)\n";
-    sleep ($sleepint);
+    xCAT::Utils::console_sleep($sleepint, "Failure to reach IPMI device, retrying in $sleepint seconds (Hit Ctrl-E,c,o to skip)\n");
     @mcinfo = `$ipmitool -I lanplus $user $pass -H $bmc mc info`;
     $rc     = $?;
     if ($rc) {    #repeat workaround for shoddy vendors
diff --git a/xCAT-server/share/xcat/cons/ivm b/xCAT-server/share/xcat/cons/ivm
index a84e7f659..63d6d90d7 100755
--- a/xCAT-server/share/xcat/cons/ivm
+++ b/xCAT-server/share/xcat/cons/ivm
@@ -25,31 +25,17 @@ BEGIN
     use File::Path;
     use Fcntl qw(:DEFAULT :flock);
     $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
-    umask 0077;
-    mkpath("/tmp/xcat/");
-    unless (sysopen(LOCKHANDLE, "/tmp/xcat/consolelock", O_WRONLY | O_CREAT)) {
-        sleep 15;
-        print "Unable to open lock file";
-        exit 0;
-    }
-    get_lock();
-    my $sleepint = int(rand(10)); #Stagger start to avoid overwhelming conserver/xCATd
-    print "Opening console in " . (2 + (0.5 * $sleepint)) . " seconds...\n";
-    sleep $sleepint;
+
 }
 my $sleepint = int(rand(10));
 use lib "$::XCATROOT/lib/perl";
 require xCAT::Client;
+require xCAT::Utils;
 use strict;
 
-#use Getopt::Long;
-#use xCAT::Table;
-#use xCAT::PPCdb;
 use xCAT::PPCcli qw(SUCCESS EXPECT_ERROR RC_ERROR NR_ERROR);
 use Data::Dumper;
 require File::Basename;
-import File::Basename;
-my $scriptname = $0;
 
 ##############################################
 # Globals
@@ -61,6 +47,15 @@ my $lparid;
 my $mtms;
 my @cred;
 my $credencial;
+umask 0077;
+mkpath("/tmp/xcat/");
+unless (sysopen(LOCKHANDLE, "/tmp/xcat/consolelock", O_WRONLY | O_CREAT)) {
+    xCAT::Utils::console_sleep(15, "Unable to open lock file");
+    exit 0;
+}
+get_lock();
+my $sleepint = int(rand(10)); #Stagger start to avoid overwhelming conserver/xCATd
+xCAT::Utils::console_sleep($sleepint, "Opening console in " . (2 + (0.5 * $sleepint)) . " seconds...\n");
 
 ##########################################################################
 # Open remote console
@@ -121,8 +116,7 @@ xCAT::Client::submit_request($cmdref, \&getans);
 until ($lparid and $host and $mtms) {
     release_lock();    #Let other clients have a go
     $sleepint = 10 + int(rand(20)); #Stagger to minimize lock collisions, but no big deal when it does happen
-    print "Console not ready, retrying in $sleepint seconds (Hit Ctrl-E,c,o to skip delay)\n";
-    sleep $sleepint;
+    xCAT::Utils::console_sleep($sleepint, "Console not ready, retrying in $sleepint seconds (Hit Ctrl-E,c,o to skip delay)\n");
     get_lock();
     xCAT::Client::submit_request($cmdref, \&getans);
 }
diff --git a/xCAT-server/share/xcat/cons/kvm b/xCAT-server/share/xcat/cons/kvm
index c5b9899cd..4a8d07ce2 100755
--- a/xCAT-server/share/xcat/cons/kvm
+++ b/xCAT-server/share/xcat/cons/kvm
@@ -1,5 +1,6 @@
 #!/usr/bin/env perl
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
+use strict;
 use Fcntl qw(:DEFAULT :flock);
 
 sub get_lock {
@@ -25,24 +26,23 @@ BEGIN
     use Fcntl qw(:DEFAULT :flock);
     $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
     umask 0077;
-    mkpath("/tmp/xcat/");
-    unless (sysopen(LOCKHANDLE, "/tmp/xcat/consolelock", O_WRONLY | O_CREAT)) {
-        sleep 15;
-        print "Unable to open lock file";
-        exit 0;
-    }
-    get_lock();
-
 }
 
 my $sleepint;
 use lib "$::XCATROOT/lib/perl";
 require xCAT::Client;
-
+require xCAT::Utils;
 require File::Basename;
-import File::Basename;
+
 my $scriptname = $0;
 
+mkpath("/tmp/xcat/");
+unless (sysopen(LOCKHANDLE, "/tmp/xcat/consolelock", O_WRONLY | O_CREAT)) {
+    xCAT::Utils::console_sleep(15, "Unable to open lock file");
+    exit 0;
+}
+get_lock();
+
 my $cmdref = {
     command   => ["getcons"],
     arg       => ["text"],
@@ -65,8 +65,7 @@ xCAT::Client::submit_request($cmdref, \&getans);
 until ($dsthost and $speed and $dstty) {
     release_lock();
     $sleepint = int(rand(30)) + 60;
-    print "Console not ready, retrying in $sleepint seconds (Ctrl-C to skip delay)\n";
-    exec "sleep $sleepint";
+    xCAT::Utils::console_sleep($sleepint, "Console not ready, retrying in $sleepint seconds ( Ctrl-E c o to skip delay)\n");
 }
 release_lock();
 
diff --git a/xCAT-server/share/xcat/cons/multiple b/xCAT-server/share/xcat/cons/multiple
index 8e7d41f1e..3bab58441 100755
--- a/xCAT-server/share/xcat/cons/multiple
+++ b/xCAT-server/share/xcat/cons/multiple
@@ -24,23 +24,23 @@ BEGIN
     use File::Path;
     use Fcntl qw(:DEFAULT :flock);
     $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
-    umask 0077;
-    mkpath("/tmp/xcat/");
-    unless (sysopen(LOCKHANDLE, "/tmp/xcat/consolelock", O_WRONLY | O_CREAT)) {
-        sleep 15;
-        print "Unable to open lock file";
-        exit 0;
-    }
-    get_lock();
 }
 my $sleepint = int(rand(10));
 use lib "$::XCATROOT/lib/perl";
 require xCAT::Client;
+require xCAT::Utils;
 use strict;
 use Expect;
 use xCAT::PPCcli qw(SUCCESS EXPECT_ERROR RC_ERROR NR_ERROR);
 require File::Basename;
-import File::Basename;
+
+umask 0077;
+mkpath("/tmp/xcat/");
+unless (sysopen(LOCKHANDLE, "/tmp/xcat/consolelock", O_WRONLY | O_CREAT)) {
+    xCAT::Utils::console_sleep(15, "Unable to open lock file");
+    exit 0;
+}
+get_lock();
 
 ##############################################
 # Globals
@@ -182,8 +182,7 @@ xCAT::Client::submit_request($cmdref, \&getans);
 until ($hcps) {
     release_lock();    #Let other clients have a go
     $sleepint = 10 + int(rand(20)); #Stagger to minimize lock collisions, but no big deal when it does happen
-    print "Console not ready, retrying in $sleepint seconds (Hit Ctrl-E,c,o to skip delay)\n";
-    sleep $sleepint;
+    xCAT::Utils::console_sleep($sleepint, "Console not ready, retrying in $sleepint seconds (Hit Ctrl-E,c,o to skip delay)\n");
     get_lock();
     xCAT::Client::submit_request($cmdref, \&getans);
 }
diff --git a/xCAT-server/share/xcat/cons/xen b/xCAT-server/share/xcat/cons/xen
index 0d475b039..0896f99f9 100755
--- a/xCAT-server/share/xcat/cons/xen
+++ b/xCAT-server/share/xcat/cons/xen
@@ -24,23 +24,21 @@ BEGIN
     use File::Path;
     use Fcntl qw(:DEFAULT :flock);
     $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
-    umask 0077;
-    mkpath("/tmp/xcat/");
-    unless (sysopen(LOCKHANDLE, "/tmp/xcat/consolelock", O_WRONLY | O_CREAT)) {
-        sleep 15;
-        print "Unable to open lock file";
-        exit 0;
-    }
-    get_lock();
 }
 
 my $sleepint;
 use lib "$::XCATROOT/lib/perl";
 require xCAT::Client;
-
+require xCAT::Utils;
 require File::Basename;
-import File::Basename;
-my $scriptname = $0;
+
+umask 0077;
+mkpath("/tmp/xcat/");
+unless (sysopen(LOCKHANDLE, "/tmp/xcat/consolelock", O_WRONLY | O_CREAT)) {
+    xCAT::Utils::console_sleep(15, "Unable to open lock file");
+    exit 0;
+}
+get_lock();
 
 my $cmdref = {
     command   => "getxencons",
@@ -64,8 +62,7 @@ xCAT::Client::submit_request($cmdref, \&getans);
 until ($dsthost and $speed and $dstty) {
     release_lock();
     $sleepint = int(rand(30)) + 60;
-    print "Console not ready, retrying in $sleepint seconds (Ctrl-C to skip delay)\n";
-    exec "sleep $sleepint";
+    xCAT::Utils::console_sleep($sleepint, "Console not ready, retrying in $sleepint seconds (Ctrl-C to skip delay)\n");
 }
 release_lock();
 exec "ssh -t $dsthost screen -U -a -O -e ^]a -d -R -S serial-" . $ARGV[0] . "-cons -A $dstty $speed";

From 094d15e69c74657d2d808cb55d975695bec54fdf Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Fri, 9 Feb 2018 00:54:37 -0500
Subject: [PATCH 048/100] polished

---
 build-python-deb                | 32 +++++++--------------------
 xCAT-openbmc-py/debian/postinst | 39 ---------------------------------
 2 files changed, 8 insertions(+), 63 deletions(-)
 delete mode 100644 xCAT-openbmc-py/debian/postinst

diff --git a/build-python-deb b/build-python-deb
index a6173d87a..be24ebeed 100755
--- a/build-python-deb
+++ b/build-python-deb
@@ -13,22 +13,20 @@ if [[ ! -f /etc/lsb-release ]]; then
     exit 1
 fi
 . /etc/lsb-release
-# Check the necessary packages before starting the build
-declare -a packages=( "reprepro" "devscripts" "debhelper" "quilt" )
-
-for package in ${packages[@]}; do
-    RC=`dpkg -l | grep $package >> /dev/null 2>&1; echo $?`
-    if [[ ${RC} != 0 ]]; then
-        echo "ERROR: Could not find $package, install using 'apt-get install $package' to continue"
+# Check the necessary commands before starting the build
+for cmd in dh dpkg-buildpackage
+do
+    if ! type "$cmd" >/dev/null 2>&1
+    then
+        echo "ERROR: Required command, $package, not found." >&2
         exit 1
     fi
 done
 
 # Supported distributions
-dists="saucy trusty utopic xenial"
 pkg_name=$1
 
-if [ -z "$pkg_name" ] || [ "$pkg_name" != "xcat-openbmc-py" ]; then
+if [ "$pkg_name" != "xcat-openbmc-py" ]; then
     printusage
     exit 1
 fi
@@ -37,12 +35,6 @@ fi
 old_pwd=`pwd`
 cd `dirname $0`
 curdir=`pwd`
-export HOME=/root
-
-WGET_CMD="wget"
-if [ ! -z ${LOG} ]; then
-    WGET_CMD="wget -o ${LOG}"
-fi
 
 if [ -z "$REL" ]; then
     t=${curdir%/src/xcat-core}
@@ -50,14 +42,7 @@ if [ -z "$REL" ]; then
 fi
 
 if [ "$PROMOTE" != 1 ]; then
-    code_change=1
     ver=`cat Version`
-    short_ver=`cat Version|cut -d. -f 1,2`
-    short_short_ver=`cat Version|cut -d. -f 1`
-    build_time=`date`
-    build_machine=`hostname`
-    commit_id=`git rev-parse --short HEAD`
-    commit_id_long=`git rev-parse HEAD`
 
     echo "###############################"
     echo "# Building xcat-openbmc-py package #"
@@ -69,10 +54,9 @@ if [ "$PROMOTE" != 1 ]; then
     xcat_release="snap$(date '+%Y%m%d%H%M')"
     pkg_version="${ver}-${xcat_release}"
     packages="xCAT-openbmc-py"
-    target_archs=(all)
     for file in $packages
     do
-        file_low=`echo $file | tr '[A-Z]' '[a-z]'`
+        file_low="${file,,}"
         target_archs="all"
         for target_arch in $target_archs
         do
diff --git a/xCAT-openbmc-py/debian/postinst b/xCAT-openbmc-py/debian/postinst
deleted file mode 100644
index 12c7842af..000000000
--- a/xCAT-openbmc-py/debian/postinst
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# postinst script for xcat-openstack-baremetal
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure)
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

From 4a66b00c38e2d7b787e782d28978a820b3fa2039 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Fri, 9 Feb 2018 01:03:46 -0500
Subject: [PATCH 049/100] polished

---
 build-python-deb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-python-deb b/build-python-deb
index be24ebeed..50148e301 100755
--- a/build-python-deb
+++ b/build-python-deb
@@ -14,7 +14,7 @@ if [[ ! -f /etc/lsb-release ]]; then
 fi
 . /etc/lsb-release
 # Check the necessary commands before starting the build
-for cmd in dh dpkg-buildpackage
+for cmd in dch dpkg-buildpackage
 do
     if ! type "$cmd" >/dev/null 2>&1
     then

From a222012bdc17684044f34d62353b4b01fc64b581 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Fri, 9 Feb 2018 11:35:17 -0500
Subject: [PATCH 050/100] Add EXCEPT: prefix

---
 xCAT-server/lib/xcat/plugins/openbmc.pm  | 18 +++++++++++++-----
 xCAT-server/lib/xcat/plugins/openbmc2.pm | 19 ++++++++++++++-----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 53fd31c9b..7587f4fb2 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -760,11 +760,19 @@ sub preprocess_request {
     my $command   = $request->{command}->[0];
     my $python_env = xCAT::OPENBMC->is_openbmc_python($request->{environment});
     # Process command in this module only if PYTHON env is not ALL or command is
-    # listed in the PYTHON env list. All other cases => return
-    if (($python_env eq "ALL") ||
-       (($python_env ne "NO") && ($python_env =~ $command))) {
-        $request = {};
-        return;
+    # listed in the PYTHON env list (without EXCEPT: prefix. 
+    # All other cases => return
+    SWITCH: {
+        if ($python_env eq "ALL") {$request = {}; return;}
+        if ($python_env eq "NO")  {last SWITCH;}
+        if ($python_env !~ $command) {
+            if ($python_env =~ /^EXCEPT:/) {$request = {}; return;}
+            else {last SWITCH;}
+        }
+        if ($python_env =~ $command) {
+            if ($python_env =~ /^EXCEPT:/) {last SWITCH;}
+            else {$request = {}; return;}
+        }
     }
 
     if ($::XCATSITEVALS{xcatdebugmode}) { $xcatdebugmode = $::XCATSITEVALS{xcatdebugmode} }
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index 69820a057..efd38e9e0 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -60,11 +60,20 @@ sub preprocess_request {
     my $command   = $request->{command}->[0];
     my $python_env = xCAT::OPENBMC->is_openbmc_python($request->{environment});
     # Process command in this module only if PYTHON env is not NO or 
-    # command is listed in the PYTHON env list. All other cases => return
-    if (($python_env eq "NO") || 
-       (($python_env ne "ALL") && ($python_env !~ $command))) {
-        $request = {};
-        return;
+    # command is listed in the PYTHON env list (without EXCEPT: prefix). 
+    # All other cases => return
+
+    SWITCH: {
+        if ($python_env eq "NO")  {$request = {}; return;}
+        if ($python_env eq "ALL") {last SWITCH;}
+        if ($python_env !~ $command) {
+            if ($python_env =~ /^EXCEPT:/) {last SWITCH}
+            else {$request = {}; return;}
+        }
+        if ($python_env =~ $command) {
+            if ($python_env =~ /^EXCEPT:/) {$request = {}; return;}
+            else {last SWITCH;}
+        }
     }
 
     my $noderange = $request->{node};

From 79df80057c8eed0a95c86b99e5d62cf17cf50829 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Fri, 9 Feb 2018 13:41:38 -0500
Subject: [PATCH 051/100] add example of snmpv3 configuration for chdef

---
 xCAT-server/lib/xcat/plugins/pdu.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xCAT-server/lib/xcat/plugins/pdu.pm b/xCAT-server/lib/xcat/plugins/pdu.pm
index a0b592797..e5193d711 100644
--- a/xCAT-server/lib/xcat/plugins/pdu.pm
+++ b/xCAT-server/lib/xcat/plugins/pdu.pm
@@ -480,6 +480,7 @@ sub powerstat {
                 } else {
                     xCAT::SvrUtils::sendmsg("ERROR: No snmpuser or Security level defined for snmpV3 configuration", $callback,$pdu);
                     xCAT::SvrUtils::sendmsg("    use chdef command to add pdu snmpV3 attributes to pdu table", $callback,$pdu);
+                    xCAT::SvrUtils::sendmsg("    ex:  chdef coral-pdu snmpversion=3, snmpuser=admin, authtype=MD5 authkey=password1 privtype=DES privkey=password2 seclevel=authPriv", $callback,$pdu);
                     xCAT::SvrUtils::sendmsg("    then run 'rspconfig $pdu snmpcfg' command ", $callback,$pdu);
                     next;
                 }

From 41b68a1478926ef60d5b03484253a85615272799 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Sat, 10 Feb 2018 08:52:45 -0500
Subject: [PATCH 052/100] add libnss_dns to xcat-genesis-base

---
 xCAT-genesis-builder/buildrpm                  | 12 ++++++++----
 xCAT-genesis-builder/install                   |  2 ++
 xCAT-genesis-builder/xCAT-genesis-builder.spec |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/xCAT-genesis-builder/buildrpm b/xCAT-genesis-builder/buildrpm
index dfd318818..c4fb822a0 100755
--- a/xCAT-genesis-builder/buildrpm
+++ b/xCAT-genesis-builder/buildrpm
@@ -130,10 +130,10 @@ if [ "$HOSTOS" = "mcp" ]; then
 # # and some files are in different directories
 elif [ $BUILDARCH = "ppc64" ]; then
         if [ "$HOSTOS" = "Pegas1.0" ]; then
-	    sed -i 's/ mkreiserfs//' $DRACUTMODDIR/install
-	    sed -i 's/ reiserfstune//' $DRACUTMODDIR/install
-	    sed -i 's/ vconfig//' $DRACUTMODDIR/install
-	    sed -i 's/ ntp-wait//' $DRACUTMODDIR/install
+           sed -i 's/ mkreiserfs//' $DRACUTMODDIR/install
+           sed -i 's/ reiserfstune//' $DRACUTMODDIR/install
+           sed -i 's/ vconfig//' $DRACUTMODDIR/install
+           sed -i 's/ ntp-wait//' $DRACUTMODDIR/install
         fi
         sed -i 's/ efibootmgr//' $DRACUTMODDIR/install
         sed -i 's/ dmidecode//' $DRACUTMODDIR/install
@@ -141,6 +141,10 @@ elif [ $BUILDARCH = "ppc64" ]; then
         sed -i 's/\/lib\/terminfo\/v\/vt100/\/usr\/share\/terminfo\/v\/vt100/g' $DRACUTMODDIR/install
 fi
 
+libnss_pkgname=`find /usr/lib64/ -name libnss_dns-2*.so | xargs basename`
+sed -i "s/\/lib64\/libnss_dns-2.12.so/\/usr\/lib64\/$libnss_pkgname/g" $DRACUTMODDIR/install
+sed -i 's/\/lib64\/libnss_dns.so.2/\/usr\/lib64\/libnss_dns.so.2/' $DRACUTMODDIR/install
+
 mkdir -p /tmp/xcatgenesis.$$/opt/xcat/share/xcat/netboot/genesis/$BUILDARCH/fs 
 
 # run dracut
diff --git a/xCAT-genesis-builder/install b/xCAT-genesis-builder/install
index f1042fe61..564d50883 100755
--- a/xCAT-genesis-builder/install
+++ b/xCAT-genesis-builder/install
@@ -7,6 +7,7 @@ dracut_install grep ip hostname /usr/bin/awk egrep grep dirname expr
 dracut_install mount.nfs sshd vi reboot lspci parted screen mkfs mkfs.ext4 mkfs.xfs xfs_db #mkfs.btrfs removed
 #dracut_install libvirtd /usr/share/libvirt/cpu_map.xml /usr/bin/qemu-img /usr/libexec/qemu-kvm
 dracut_install mkswap df brctl vconfig ifenslave ssh-keygen scp clear dhclient lldpad
+dracut_install /lib64/libnss_dns-2.12.so /lib64/libnss_dns.so.2
 dracut_install poweroff ntpq ntpd ntp-wait hwclock date /usr/share/terminfo/x/xterm /usr/share/terminfo/s/screen /etc/nsswitch.conf /etc/services
 dracut_install /sbin/rsyslogd /etc/protocols umount /bin/rpm /usr/lib/rpm/rpmrc
 dracut_install chmod /sbin/route /sbin/ifconfig /usr/bin/whoami /usr/bin/head /usr/bin/tail basename /etc/redhat-release ping tr lsusb /usr/share/hwdata/usb.ids #ibm fw wrapper requirements
@@ -587,6 +588,7 @@ inst_dir /var/lib/nfs/statd/sm
 inst_dir /var/lib/nfs/statd/sm.bak
 inst_dir /var/lib/nfs/rpc_pipefs/nfs
 inst "/bin/bash" "/bin/sh"
+inst "/lib64/libnss_dns-2.12.so"
 inst "/lib/terminfo/l/linux" "/lib/terminfo/l/linux"
 inst "/lib/terminfo/v/vt100" "/lib/terminfo/v/vt100"
 inst_hook cmdline 10 "$moddir/xcat-cmdline.sh" 
diff --git a/xCAT-genesis-builder/xCAT-genesis-builder.spec b/xCAT-genesis-builder/xCAT-genesis-builder.spec
index 3a9b428a1..3fbde6cbb 100644
--- a/xCAT-genesis-builder/xCAT-genesis-builder.spec
+++ b/xCAT-genesis-builder/xCAT-genesis-builder.spec
@@ -4,7 +4,7 @@ Version: %{?version:%{version}}%{!?version:%(cat Version)}
 Release: %{?release:%{release}}%{!?release:%(cat Release)}
 Epoch: 1
 AutoReq: false
-Requires: ipmitool screen btrfs-progs lldpad rpm-build mstflint xfsprogs nc rpmdevtools libstdc++-devel pciutils bridge-utils ntp ntp-perl iprutils psmisc mdadm bind-utils dosfstools usbutils libusbx
+Requires: ipmitool screen btrfs-progs lldpad rpm-build mstflint xfsprogs nc rpmdevtools libstdc++-devel pciutils bridge-utils ntp ntp-perl iprutils psmisc mdadm bind-utils dosfstools usbutils libusbx bc
 Prefix: /opt/xcat
 AutoProv: false
 

From 7d2c0e192659a48c25eb44fe37a96908a185388a Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Mon, 12 Feb 2018 08:40:56 -0500
Subject: [PATCH 053/100] fix issue error message improvement when adding users
 in hierarchical configuration #4820

---
 perl-xCAT/xCAT/RemoteShellExp.pm | 13 +++++++++----
 perl-xCAT/xCAT/TableUtils.pm     | 31 ++++++++++++++++++++++++++++---
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/perl-xCAT/xCAT/RemoteShellExp.pm b/perl-xCAT/xCAT/RemoteShellExp.pm
index 959405f35..a9388d512 100755
--- a/perl-xCAT/xCAT/RemoteShellExp.pm
+++ b/perl-xCAT/xCAT/RemoteShellExp.pm
@@ -541,7 +541,7 @@ sub sendnodeskeys
 
         # command to make the temp directory on the node
         my $spawnmkdir =
-          "$remoteshell $node -l $to_userid /bin/mkdir -p /tmp/$to_userid/.ssh";
+          "$remoteshell -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null $node -l $to_userid  /bin/mkdir -p /tmp/$to_userid/.ssh";
 
         # command to copy the needed files to the node
 
@@ -588,6 +588,11 @@ sub sendnodeskeys
         ##########################################
         # Expect error - report
         ##########################################
+        if($rc==1){
+            my $rsp = {};
+            $rsp->{error}->[0] = "Permission denied, please make sure the user $to_userid has been created on the node $node and the input password is right\n";
+            xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
+        }        
         if (defined($result[1]))
         {
             my $msg = $result[1];
@@ -629,11 +634,11 @@ sub sendnodeskeys
         my $spawncopyfiles;
         if ($ENV{'DSH_ENABLE_SSH'}) {    # we will enable node to node ssh
             $spawncopyfiles =
-"$remotecopy $home/.ssh/id_rsa $home/.ssh/id_rsa.pub $home/.ssh/copy.sh $home/.ssh/tmp/authorized_keys $to_userid\@$node:/tmp/$to_userid/.ssh";
+"$remotecopy -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null  $home/.ssh/id_rsa $home/.ssh/id_rsa.pub $home/.ssh/copy.sh $home/.ssh/tmp/authorized_keys $to_userid\@$node:/tmp/$to_userid/.ssh";
 
         } else {    # no node to node ssh ( don't send private key)
             $spawncopyfiles =
-"$remotecopy $home/.ssh/id_rsa.pub $home/.ssh/copy.sh $home/.ssh/tmp/authorized_keys $to_userid\@$node:/tmp/$to_userid/.ssh";
+"$remotecopy -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null $home/.ssh/id_rsa.pub $home/.ssh/copy.sh $home/.ssh/tmp/authorized_keys $to_userid\@$node:/tmp/$to_userid/.ssh";
         }
 
         # send copy command
@@ -715,7 +720,7 @@ sub sendnodeskeys
 
         # command to run copy.sh
         my $spawnruncopy =
-          "$remoteshell $node -l $to_userid /tmp/$to_userid/.ssh/copy.sh $to_userid";
+          "$remoteshell -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null  $node -l $to_userid /tmp/$to_userid/.ssh/copy.sh $to_userid";
 
         # send mkdir command
         unless ($sendkeys->spawn($spawnruncopy))
diff --git a/perl-xCAT/xCAT/TableUtils.pm b/perl-xCAT/xCAT/TableUtils.pm
index a84c90b8b..ffe5d88e3 100755
--- a/perl-xCAT/xCAT/TableUtils.pm
+++ b/perl-xCAT/xCAT/TableUtils.pm
@@ -186,6 +186,8 @@ sub bldnonrootSSHFiles
     if (xCAT::Utils->isMN()) {    # if on Management Node
         if (!(-e "$home/.ssh/id_rsa.pub"))
         {
+            $rsp->{data}->[0] = "$home/.ssh/id_rsa.pub does not exist!";
+            xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);            
             return 1;
         }
     }
@@ -208,6 +210,11 @@ sub bldnonrootSSHFiles
     if (xCAT::Utils->isMN()) {    # if on Management Node
         $cmd = " cp $home/.ssh/id_rsa.pub $home/.ssh/tmp/authorized_keys";
     } else {                      # SN
+        if(!(-e "$home/.ssh/authorized_keys")){
+            $rsp->{data}->[0] = "$home/.ssh/authorized_keys does not exist, make sure you have setup the ssh-keys on this service node.\n";
+            xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
+            return (1);   
+        }
         $cmd = " cp $home/.ssh/authorized_keys $home/.ssh/tmp/authorized_keys";
     }
     xCAT::Utils->runcmd($cmd, 0);
@@ -344,6 +351,11 @@ sub setupSSH
 
     # Get the home directory
     my $home = xCAT::Utils->getHomeDir($from_userid);
+    unless($home){
+        $rsp->{data}->[0] = "Cannot get the home directory for user \"$from_userid\", please make sure \"$from_userid\" user exists!";
+        xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
+        return 1;
+    }
     $ENV{'DSH_FROM_USERID_HOME'} = $home;
     if ($from_userid eq "root")
     {
@@ -356,6 +368,10 @@ sub setupSSH
         # generates new keys for root, if they do not already exist ~/.ssh
 
         # nodes not used on this option but in there to preserve the interface
+        if($::VERBOSE){
+            $rsp->{data}->[0] = "Generating SSH keys for $from_userid.\n";
+            xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
+        }
         my $rc =
           xCAT::RemoteShellExp->remoteshellexp("k", $::CALLBACK, $::REMOTE_SHELL, $n_str, $expecttimeout);
         if ($rc != 0) {
@@ -363,11 +379,20 @@ sub setupSSH
             xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
         }
     }
-
     # build the shell copy script, needed Perl not always there
     # for root and non-root ids
-    open(FILE, ">$home/.ssh/copy.sh")
-      or die "cannot open file $home/.ssh/copy.sh\n";
+    if($::VERBOSE){
+        $rsp->{data}->[0] = "Creating helper script \"$home/.ssh/copy.sh\" to install the ssh key files, which will be sent and invoked to target node then.\n";
+        xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
+    }
+
+
+    unless(open(FILE, ">$home/.ssh/copy.sh"))
+    { 
+        $rsp->{data}->[0] ="cannot create file $home/.ssh/copy.sh, please make sure the directory \"$home/.ssh\" exists and ssh keys have been setup on this node!\n";
+        xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
+        return 1;
+    }
     print FILE "#!/bin/sh
 umask 0077
 home=`egrep \"^$to_userid:\" /etc/passwd | cut -f6 -d :`

From 5de4e26a5976413b1f7aa2c79ffab4069b7b9836 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Mon, 12 Feb 2018 14:30:24 -0500
Subject: [PATCH 054/100] Better handling multiple dots in copycds name

---
 xCAT-server/lib/perl/xCAT/SvrUtils.pm | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/SvrUtils.pm b/xCAT-server/lib/perl/xCAT/SvrUtils.pm
index 01b9a06f3..37dab6083 100755
--- a/xCAT-server/lib/perl/xCAT/SvrUtils.pm
+++ b/xCAT-server/lib/perl/xCAT/SvrUtils.pm
@@ -469,13 +469,25 @@ sub get_file_name {
     elsif (($genos) && (-r "$searchpath/$profile.$genos.$extension")) {
         return "$searchpath/$profile.$genos.$extension";
     }
-    elsif (-r "$searchpath/$profile.$osbase.$arch.$extension") {
-        return "$searchpath/$profile.$osbase.$arch.$extension";
+    # If the osimge name was specified with -n, the name might contain multiple "."
+    # Chop them off one at a time until filename match is found
+    else {
+        while ($dotpos > 0) {
+
+            if (-r "$searchpath/$profile.$osbase.$arch.$extension") {
+                return "$searchpath/$profile.$osbase.$arch.$extension";
+            }
+            elsif (-r "$searchpath/$profile.$osbase.$extension") {
+                return "$searchpath/$profile.$osbase.$extension";
+            }
+            # Chop off "." from the end and try again
+            $dotpos = rindex($osbase, ".");
+            $osbase = substr($osbase, 0, $dotpos);
+        }
     }
-    elsif (-r "$searchpath/$profile.$osbase.$extension") {
-        return "$searchpath/$profile.$osbase.$extension";
-    }
-    elsif (-r "$searchpath/$profile.$arch.$extension") {
+
+    # No file matching OS name was found, next try just arch, if still nothing -> default to just profile
+    if (-r "$searchpath/$profile.$arch.$extension") {
         return "$searchpath/$profile.$arch.$extension";
     }
     elsif (-r "$searchpath/$profile.$extension") {

From 60e3eb2566d915a3d3b2948d83a9a96e12fa3dac Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Mon, 12 Feb 2018 22:15:03 -0500
Subject: [PATCH 055/100] ange pduhash to global value

---
 xCAT-server/lib/xcat/plugins/pdu.pm | 67 +++++++++++------------------
 1 file changed, 24 insertions(+), 43 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/pdu.pm b/xCAT-server/lib/xcat/plugins/pdu.pm
index e5193d711..5d7857991 100644
--- a/xCAT-server/lib/xcat/plugins/pdu.pm
+++ b/xCAT-server/lib/xcat/plugins/pdu.pm
@@ -44,9 +44,7 @@ my $VERBOSE = 0;
 my %allerrornodes = ();
 my $callback;
 my $pdutab;
-my @pduents;
-my $pdunodes;
-
+my $pduhash;
 
 
 #-------------------------------------------------------
@@ -170,6 +168,19 @@ sub process_request
         @exargs = @$extrargs;
     }
 
+    # get all entries from pdu table
+    my @attrs=();
+    my $schema = xCAT::Table->getTableSchema('pdu');
+    my $desc   = $schema->{descriptions};
+    foreach my $c (@{ $schema->{cols} }) {
+        push @attrs, $c;
+    }
+
+    $pdutab = xCAT::Table->new('pdu');
+    if ($pdutab) {
+        $pduhash = $pdutab->getAllNodeAttribs(\@attrs, 1);
+    }
+
     if( $command eq "rinv") {
         #for higher performance, handle node in batch
         return showMFR($noderange, $callback);
@@ -279,9 +290,6 @@ sub powerpdu {
         return powerstat($noderange, $callback);
     }
 
-    my $pdutab = xCAT::Table->new('pdu');
-    my $pduhash = $pdutab->getNodesAttribs($noderange, ['pdutype','outlet']);
-
     foreach my $node (@$noderange) {
         if ($pduhash->{$node}->[0]->{pdutype} eq 'crpdu') {
             process_relay($node,$subcmd,$callback,1,3);
@@ -346,8 +354,6 @@ sub powerpduoutlet {
 
     my $nodetab = xCAT::Table->new('pduoutlet');
     my $nodepdu = $nodetab->getNodesAttribs($noderange,['pdu']);
-    my $pdutab = xCAT::Table->new('pdu');
-    my $pduhash = $pdutab->getNodesAttribs($noderange, ['pdutype','outlet']);
 
     foreach my $node (@$noderange) {
         # the pdu attribute needs to be set
@@ -444,9 +450,6 @@ sub powerstat {
     my $callback = shift;
     my $output;
 
-    my $pdutab = xCAT::Table->new('pdu');
-    my $pduhash = $pdutab->getNodesAttribs($noderange, ['pdutype','outlet','snmpversion','snmpuser','authtype','authkey','privtype','privkey','seclevel']);
-
     foreach my $pdu (@$noderange) {
         if ($pduhash->{$pdu}->[0]->{pdutype} eq 'crpdu') {
             my $snmpversion = $pduhash->{$pdu}->[0]->{snmpversion};
@@ -558,10 +561,8 @@ sub connectTopdu {
     #get community string from pdu table if defined,
     #otherwise, use default
     my $community;
-    my $pdutab = xCAT::Table->new('pdu');
-    my $pduent = $pdutab->getNodeAttribs($pdu, ['community']);
-    if ($pduent->{community}) {
-        $community = $pduent->{community};
+    if ($pduhash->{$pdu}->[0]->{community}) {
+        $community = $pduhash->{$pdu}->[0]->{community};
     } else {
         $community = "public";
     }
@@ -641,9 +642,6 @@ sub process_netcfg {
     my $pdu = @$nodes[0];
     my $rsp = {};
 
-    my $pdutab = xCAT::Table->new('pdu');
-    my $pduhash = $pdutab->getNodesAttribs($nodes, ['pdutype','username','password']);
-
     my $nodetab = xCAT::Table->new('hosts');
     my $nodehash = $nodetab->getNodesAttribs($nodes,['ip','otherinterfaces']);
     my $static_ip = $nodehash->{$pdu}->[0]->{ip};
@@ -733,9 +731,6 @@ sub process_sshcfg {
     my $nodetab = xCAT::Table->new('hosts');
     my $nodehash = $nodetab->getNodesAttribs($noderange,['ip','otherinterfaces']);
 
-    my $pdutab = xCAT::Table->new('pdu');
-    my $pduhash = $pdutab->getNodesAttribs($noderange, ['pdutype','username','password']);
-
     foreach my $pdu (@$noderange) {
         unless ($pduhash->{$pdu}->[0]->{pdutype} eq "crpdu") {
             xCAT::SvrUtils::sendmsg("This command only supports CONSTELLATION PDU with pdutype=crpdu", $callback,$pdu);
@@ -934,9 +929,6 @@ sub showMFR {
     my $nodetab = xCAT::Table->new('hosts');
     my $nodehash = $nodetab->getNodesAttribs($noderange,['ip','otherinterfaces']);
 
-    my $pdutab = xCAT::Table->new('pdu');
-    my $pduhash = $pdutab->getNodesAttribs($noderange, ['pdutype','username','password']);
-
     foreach my $pdu (@$noderange) {
         unless ($pduhash->{$pdu}->[0]->{pdutype} eq "crpdu") {
             rinv_for_irpdu($pdu, $callback);
@@ -1044,9 +1036,6 @@ sub showMonitorData {
     my $nodetab = xCAT::Table->new('hosts');
     my $nodehash = $nodetab->getNodesAttribs($noderange,['ip','otherinterfaces']);
 
-    my $pdutab = xCAT::Table->new('pdu');
-    my $pduhash = $pdutab->getNodesAttribs($noderange, ['pdutype','username','password']);
-
     foreach my $pdu (@$noderange) {
         unless ($pduhash->{$pdu}->[0]->{pdutype} eq "crpdu") {
             my $session = connectTopdu($pdu,$callback);
@@ -1238,10 +1227,8 @@ sub process_relay {
 
     my $nodetab = xCAT::Table->new('hosts');
     my $nodehash = $nodetab->getNodeAttribs($pdu,['ip','otherinterfaces']);
-    my $pdutab = xCAT::Table->new('pdu');
-    my $pduent = $pdutab->getNodeAttribs($pdu, ['username','password']);
-    my $username = $pduent->{username};
-    my $passwd = $pduent->{password};
+    my $username = $pduhash->{$pdu}->[0]->{username};
+    my $passwd = $pduhash->{$pdu}->[0]->{password};
 
     # connect to PDU
     my $static_ip = $nodehash->{$pdu}->[0]->{ip};
@@ -1319,9 +1306,6 @@ sub process_snmpcfg {
     my $nodetab = xCAT::Table->new('hosts');
     my $nodehash = $nodetab->getNodesAttribs($noderange,['ip','otherinterfaces']);
 
-    my $pdutab = xCAT::Table->new('pdu');
-    my $pduhash = $pdutab->getNodesAttribs($noderange, ['pdutype','community','username','password','snmpversion','snmpuser','authtype','authkey','privtype','privkey','seclevel']);
-
     foreach my $pdu (@$noderange) {
         unless ($pduhash->{$pdu}->[0]->{pdutype} eq "crpdu") {
             xCAT::SvrUtils::sendmsg("This command only supports CONSTELLATION PDU with pdutype=crpdu", $callback,$pdu);
@@ -1428,15 +1412,12 @@ sub netcfg_for_irpdu {
     #default password for irpdu
     my $passwd = "1001";
     my $username = "ADMIN";
-    my $pdutab = xCAT::Table->new('pdu');
-    my $pduent = $pdutab->getNodeAttribs($pdu, ['username','password']);
-    if ($pduent) {
-        if ($pduent->{username}) {
-            $username = $pduent->{username};
-        }
-        if ($pduent->{password}) {
-            $passwd = $pduent->{password};
-        }
+
+    if ($pduhash->{$pdu}->[0]->{username}) {
+        $username = $pduhash->{$pdu}->[0]->{username};
+    }
+    if ($pduhash->{$pdu}->[0]->{password}) {
+        $passwd = $pduhash->{$pdu}->[0]->{password};
     }
 
     my $timeout = 10;

From 7ff4d02fcb6576dc38df2f0b6f8882d4c9c0c489 Mon Sep 17 00:00:00 2001
From: Weihua Hu <huweihua@cn.ibm.com>
Date: Tue, 13 Feb 2018 15:52:36 +0800
Subject: [PATCH 056/100] Add milestone and labels checking in the CI test
 system (#4825)

* Add milestone checking

* test for labels, please ignore this commit

* add labels checking

* test for labels, please ignore
---
 travis.pl | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/travis.pl b/travis.pl
index 785879435..9478ab275 100644
--- a/travis.pl
+++ b/travis.pl
@@ -101,6 +101,8 @@ sub check_pr_format{
         my $pr_content = decode_json($pr_url_resp);
         my $pr_title = $pr_content->{title};
         my $pr_body  = $pr_content->{body};
+        my $pr_milestone = $pr_content->{milestone};
+        my $pr_labels_len = @{$pr_content->{labels}};
 
         #print "[check_pr_format] Dumper pr_content:\n";
         #print Dumper $pr_content;
@@ -115,6 +117,14 @@ sub check_pr_format{
              $checkrst.="Miss description.";
         }
         
+        if(! $pr_milestone){
+             $checkrst.="Miss milestone.";
+        }
+
+        if(! $pr_labels_len){
+             $checkrst.="Miss labels.";
+        }
+
         if(length($checkrst) == 0){
             $check_result_str .= "> **PR FORMAT CORRECT**";
             send_back_comment("$check_result_str"); 

From d1946af0d57f2fd7b17076acc4b6e38247111a44 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Tue, 13 Feb 2018 09:19:08 -0500
Subject: [PATCH 057/100] add rspconfig get network information

---
 .../agent/hwctl/executor/openbmc_bmcconfig.py | 177 ++++++++++++++++--
 .../lib/python/agent/hwctl/openbmc_client.py  |  12 ++
 2 files changed, 171 insertions(+), 18 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
index b7ae94bed..565a7d312 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
@@ -5,12 +5,15 @@
 # -*- coding: utf-8 -*-
 #
 from __future__ import print_function
-import gevent
-import time
+import os, stat
 
+from common import utils
 from common.task import ParallelNodesCommand
 from common.exceptions import SelfClientException, SelfServerException
 from hwctl import openbmc_client as openbmc
+#from paramiko import SSHClient
+from pssh.pssh_client import ParallelSSHClient
+from gevent import joinall
 
 import logging
 logger = logging.getLogger('xcatagent')
@@ -18,6 +21,8 @@ logger = logging.getLogger('xcatagent')
 RSPCONFIG_GET_NETINFO=['ip', 'netmask', 'gateway', 'vlan', 'ipsrc', 'hostname']
 RSPCONFIG_SET_NETINFO=['ip', 'netmask', 'gateway', 'vlan']
 
+
+
 class OpenBMCBmcConfigTask(ParallelNodesCommand):
         
     def dump_list(self, **kw):
@@ -35,8 +40,65 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
     def dump_process(self, **kw):
         return self.callback.info("dump_process: trigger, list and download")
 
+    def _create_copy_file(self, filename):
+        f = open(filename, 'w')
+        f.write("#!/bin/sh \n\
+umask 0077 \n\
+userid=$1 \n\
+home=`egrep \"^$userid:\" /etc/passwd | cut -f6 -d :` \n\
+if [ -n \"$home\" ]; then \n\
+  dest_dir=\"$home/.ssh\" \n\
+else \n\
+  home=`su - root -c pwd` \n\
+  dest_dir=\"$home/.ssh\" \n\
+fi \n\
+mkdir -p $dest_dir \n\
+cat /tmp/$userid/.ssh/id_rsa.pub >> $dest_dir/authorized_keys 2>&1 \n\
+rm -f /tmp/$userid/.ssh/* 2>&1 \n\
+rmdir \"/tmp/$userid/.ssh\" \n\
+rmdir \"/tmp/$userid\" \n")
+
+        f.close()
+        os.chmod(filename,stat.S_IRWXU)
+        return
+
+    def _prepare_hosts_cfg(self, nodesinfo):
+        host_config = {}
+        for node in nodesinfo.keys():
+            nodeinfo = nodesinfo[node]
+            utils.update2Ddict(host_config, nodeinfo['bmcip'], 'user', nodeinfo['username'])
+            utils.update2Ddict(host_config, nodeinfo['bmcip'], 'password', nodeinfo['password'])
+        return host_config 
+
+    def pre_set_sshcfg(self, *arg, **kw):
+        self.callback.syslog("Run into pre_set_sshcfg")
+        local_home_dir=os.path.expanduser('~')
+        local_ssh_dir = local_home_dir + "/.ssh/"
+        local_public_key = local_ssh_dir + "id_rsa.pub"
+        copy_sh_file = local_ssh_dir + "./copy.sh"
+        tmp_remote_dir = "/tmp/root/.ssh/"
+        self._create_copy_file(copy_sh_file) 
+        self.callback.syslog("Generate %s file done" % copy_sh_file)
+        hosts_config = self._prepare_hosts_cfg(self.inventory)
+
+        self.callback.syslog("Start to run SSH parallelly")
+        client = ParallelSSHClient(hosts_config.keys(), host_config=hosts_config)
+        self.callback.syslog("mkdir -p %s" % tmp_remote_dir)
+        client.run_command("/bin/mkdir -p %s" % tmp_remote_dir)
+        self.callback.info("Copy files to remote hosts: %s-->%s" % (local_ssh_dir, tmp_remote_dir))
+        nodes_copy = client.copy_file(local_ssh_dir, tmp_remote_dir, recurse=True)
+        try:
+            joinall(nodes_copy, raise_error=True)
+        except Exception as e:
+            self.callback.info("Error: %s" % e)
+        self.callback.info("run copy.sh")
+        client.run_command("%s/copy.sh root" %(tmp_remote_dir, )) 
+        return
+
     def set_sshcfg(self, **kw):
-        return self.callback.info("set_sshcfg")
+        node = kw['node']
+        nodeinfo = kw['nodeinfo']
+        return self.callback.info("%s: ssh keys copied to %s" %(node, nodeinfo['bmcip']))
 
     def set_ipdhcp(self, **kw):
         return self.callback.info("set_ipdhcp")
@@ -52,8 +114,9 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
             else:
                 self.callback.error("get_attributes can not deal with attr %s" % attr)
         if len(netinfo_dict):
-            self._get_netinfo(netinfo_dict.has_key('ip'), netinfo_dict.has_key('ipsrc'), netinfo_dict.has_key('netmask'),
-                              netinfo_dict.has_key('gateway'), netinfo_dict.has_key('vlan'), netinfo_dict.has_key('hostname'), **kw)
+            self._get_netinfo(ip=netinfo_dict.has_key('ip'), ipsrc=netinfo_dict.has_key('ipsrc'), netmask=netinfo_dict.has_key('netmask'),
+                              gateway=netinfo_dict.has_key('gateway'),vlan= netinfo_dict.has_key('vlan'), 
+                              hostname=netinfo_dict.has_key('hostname'), **kw)
 
     def set_attributes(self, attributes, **kw):
         netinfo_dict={'vlan':False}
@@ -115,18 +178,96 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
             result = "set net(%s, %s, %s) for eth0" % (ip, netmask, gateway)
         return self.callback.info("set_netinfo %s" % result)
 
-    def _get_netinfo(self, ip=False, ipsrc=False, netmask=False, gateway=False, vlan=False, hostname=False, **kw):
-        result = ''
-        if ip:
-            result += "Get IP, "
-        if netmask:
-            result += "Get Mask, "
-        if gateway:
-            result += "Get Gateway, "
-        if ipsrc:
-            result += "Get IP source, "
+    def _get_and_parse_netinfo(self, **kw):
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+        try:
+            obmc.login()
+            data = obmc.get_netinfo()
+        except (SelfServerException, SelfClientException) as e:
+            self.callback.info('%s: %s' % (node, e.message))
+            return
+        netinfo = {}
+        for k, v in data.items():
+            if k.find("network/config") >= 0:
+                if v.has_key("HostName"):
+                    netinfo["hostname"] = v["HostName"]
+                if v.has_key("DefaultGateway"):
+                    netinfo["defaultgateway"] = v["DefaultGateway"]
+                continue
+            dev,match,netid = k.partition("/ipv4/")
+            if netid:
+                if v["Origin"].find("LinkLocal") >= 0 or v["Address"].startswith("169.254"):
+                    self.callback.info("%s: Found LinkLocal address %s for interface %s, Ignoring..." % (node, v["Address"], dev))
+                    continue
+                nicid = dev.split('/')[-1]
+                if not netinfo.has_key(nicid):
+                    netinfo[nicid] = {}
+                if netinfo[nicid].has_key("ip"):
+                    self.callback.error("%s: Another valid ip %s found." % (node, v["Address"]))
+                    continue
+                utils.update2Ddict(netinfo, nicid, "ipsrc", v["Origin"].split('.')[-1])
+                utils.update2Ddict(netinfo, nicid, "netmask", v["PrefixLength"])
+                utils.update2Ddict(netinfo, nicid, "gateway", v["Gateway"])
+                utils.update2Ddict(netinfo, nicid, "ip", v["Address"])
+                if data.has_key(dev):
+                    info = data[dev]
+                    utils.update2Ddict(netinfo, nicid, "vlanid", info["Id"])
+                    utils.update2Ddict(netinfo, nicid, "mac", info["MACAddress"])
+                    utils.update2Ddict(netinfo, nicid, "ntpservers", info["NTPServers"])
+        self.callback.info("Netinfo: %s" % netinfo) 
+        return netinfo
+    def _get_netinfo(self, ip=False, ipsrc=False, netmask=False, gateway=False, vlan=False, hostname=False, ntpserver=True, **kw):
+        node = kw["node"]
+        netinfo = self._get_and_parse_netinfo(**kw)
+        if not netinfo:
+            return self.callback.error("%s: No network information get" % node)
+        defaultgateway = "n/a"
+        bmchostname = ""
+        if netinfo.has_key("defaultgateway"):
+            defaultgateway = netinfo["defaultgateway"]
+            del netinfo["defaultgateway"]
+        if netinfo.has_key("hostname"):
+            bmchostname = netinfo["hostname"]
+            del netinfo["hostname"]
+
         if hostname:
-            result += "Get BMC hostname, "
+            self.callback.info("%s: BMC Hostname: %s" %(node, bmchostname))
+        dic_length = len(netinfo) 
+        self.callback.info("dic_length: %s: %s" %(dic_length, netinfo))
+        ip_list = []
+        ipsrc_list = []
+        netmask_list = []
+        gateway_list = []
+        vlan_list = []
+        ntpserver_list = []
+        for nic,attrs in netinfo.items():
+            addon_string = ''
+            if dic_length > 1:
+                addon_string = " for %s" % nic
+            ip_list.append("BMC IP"+addon_string+": %s" % attrs["ip"])
+            netmask_list.append("BMC Netmask"+addon_string+": %s" % attrs["netmask"])
+            gateway_list.append("BMC Gateway"+addon_string+": %s (default: %s)" % (attrs["gateway"], defaultgateway))
+            vlan_list.append("BMC VLAN ID"+addon_string+": %s" % attrs["vlanid"])
+            ipsrc_list.append("BMC IP Source"+addon_string+": %s" % attrs["ipsrc"])
+            ntpserver_list.append("BMC NTP Servers"+addon_string+": %s" % attrs["ntpservers"])
+        if ip:
+            for i in ip_list:
+                self.callback.info("%s: %s" % (node, i))
+        if netmask:
+            for i in netmask_list:
+                self.callback.info("%s: %s" % (node, i))
+        if gateway:
+            for i in gateway_list:
+                self.callback.info("%s: %s" % (node, i))
+        if ipsrc:
+            for i in ipsrc_list:
+                self.callback.info("%s: %s" % (node, i))
         if vlan:
-            result += "Get BMC vlan."
-        return self.callback.info("get_netinfo: %s" % result)
+            for i in vlan_list:
+                self.callback.info("%s: %s" % (node, i))
+        if ntpserver:
+            for i in ntpserver_list:
+                self.callback.info("%s: %s" % (node, i))
+        return
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index f1fa55057..64d07dd9b 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -141,6 +141,15 @@ FIRM_URLS = {
     }
 }
 
+RSPCONFIG_NETINFO_URL = {
+    'get_netinfo': "/network/enumerate",
+    'hostname': "/network/config/attr/HostName",
+    'nic_ip': "/network/#NIC#/action/IP",
+    'vlan': "/network/action/VLAN",
+    'ipdhcp': "/network/action/Reset",
+    'ntpserver': "/network/#NIC#/attr/NTPServers",
+}
+
 RSPCONFIG_APIS = {
     'autoreboot' : {
         'baseurl': "/control/host0/auto_reboot/",
@@ -511,6 +520,9 @@ class OpenBMCRest(object):
             data={"data": attr_info['get_data']}
         return self.request(method, get_url, payload=data, cmd="get_%s" % key)
 
+    def get_netinfo(self):
+        return self.request('GET', RSPCONFIG_NETINFO_URL['get_netinfo'], cmd="get_netinfo")
+
 class OpenBMCImage(object):
     def __init__(self, rawid, data=None):
         self.id = rawid.split('/')[-1]

From 3dc366336a54fc0019e0f5f885956a1a895066ee Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Tue, 13 Feb 2018 13:15:55 -0500
Subject: [PATCH 058/100] Display usage for openbmc commands

---
 perl-xCAT/xCAT/Usage.pm | 161 ++++++++++++++++++++++++++++------------
 1 file changed, 113 insertions(+), 48 deletions(-)

diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 1a3afa25b..140258560 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -22,88 +22,111 @@ my %usage = (
        rnetboot [-h|--help|-v|--version]
      zVM specific:
        rnetboot <noderange> [ipl= address]",
-    "rpower" =>
-"Usage: rpower <noderange> [--nodeps] [on|onstandby|off|suspend|reset|stat|state|boot] [-V|--verbose] [-m table.colum==expectedstatus][-m table.colum==expectedstatus...] [-r <retrycount>] [-t <timeout>]
+    "rpower" => "",
+    "rpower.common" =>
+    "Usage: 
+    Common:
+       rpower <noderange> [--nodeps] [on|onstandby|off|suspend|reset|stat|state|boot] [-V|--verbose] [-m table.colum==expectedstatus][-m table.colum==expectedstatus...] [-r <retrycount>] [-t <timeout>]
        rpower [-h|--help|-v|--version]
-     BMC (using IPMI):
+    ",
+    "rpower.begin" =>
+    "BMC (using IPMI):
        rpower noderange [on|off|softoff|reset|boot|cycle|stat|state|status|wake|suspend [-w timeout] [-o] [-r]]
        rpower noderange [pduon|pduoff|pdustat]
-     OpenPOWER BMC:
+    OpenPOWER BMC:
        rpower noderange [on|off|reset|boot|stat|state|status]
        rpower noderange [pduon|pduoff|pdustat]
-     OpenPOWER OpenBMC:
+    ",
+    "rpower.openbmc" =>
+    "OpenPOWER OpenBMC:
        rpower noderange [on|off|softoff|reset|boot|bmcreboot|bmcstate|stat|state|status]
-     KVM Virtualization specific:
+    ",
+    "rpower.end" =>
+    "KVM Virtualization specific:
        rpower <noderange> [boot] [ -c <path to iso> ]
-     PPC (with IVM or HMC) specific:
+    PPC (with IVM or HMC) specific:
        rpower <noderange> [--nodeps] [of] [-V|--verbose]
-     CEC (with HMC) specific:
+    CEC (with HMC) specific:
        rpower <noderange> [on|off|reset|boot|onstandby]
-     LPAR(with HMC) specific:
+    LPAR(with HMC) specific:
        rpower <noderange> [on|off|reset|stat|state|boot|of|sms|softoff]
-     CEC(using Direct FSP Management) specific:
+    CEC(using Direct FSP Management) specific:
        rpower <noderange> [on|onstandby|off|stat|state|resetsp]
-     Frame(using Direct FSP Management) specific:
+    Frame(using Direct FSP Management) specific:
        rpower <noderange> [stat|state|rackstandby|exit_rackstandby|resetsp]
-     LPAR(using Direct FSP Management) specific:
+    LPAR(using Direct FSP Management) specific:
        rpower <noderange> [on|off|reset|stat|state|boot|of|sms]
-     Blade(using Direct FSP Management) specific:
+    Blade(using Direct FSP Management) specific:
        rpower <noderange> [on|onstandby|off|cycle|state|sms]
-     Blade(using AMM) specific:
+    Blade(using AMM) specific:
        rpower <noderange> [cycle|softoff] [-V|--verbose]
     Lenovo high-density server specific:
        rpower <noderange> [on|off|reset|boot|reseat]
-     zVM specific:
+    zVM specific:
        rpower noderange [on|off|reset|stat|softoff]
-     MIC specific:
+    MIC specific:
        rpower noderange [stat|state|on|off|reset|boot]
-     docker specific:
+    docker specific:
        rpower noderange [start|stop|restart|pause|unpause|state]
-     pdu specific:
+    pdu specific:
        rpower noderange [off|on|stat|status|reset]
        rpower noderange [pduoff|pduon|pdustat|pdustatus|pdureset]
 ",
     "rbeacon" =>
       "Usage: rbeacon <noderange> [on|off|stat] [-V|--verbose]
        rbeacon [-h|--help|-v|--version]",
-    "rvitals" =>
+    "rvitals" => "",
+    "rvitals.common" =>
       "Usage:
-  Common:
-      rvitals [-h|--help|-v|--version]
-  FSP/LPAR (with HMC) specific:
-      rvitals noderange {temp|voltage|lcds|all}
-  CEC/LPAR/Frame (using Direct FSP Management) specific:
-      rvitals noderange {rackenv|lcds|all}
-  MPA specific:
-      rvitals noderange {temp|voltage|wattage|fanspeed|power|leds|summary|all}
-  Blade specific:
-      rvitals noderange {temp|wattage|fanspeed|leds|summary|all}
-  BMC specific:
-      rvitals noderange {temp|voltage|wattage|fanspeed|power|leds|all}
-  OpenPOWER (IPMI) specific:
-      rvitals noderange [temp|voltage|wattage|fanspeed|power|leds|chassis|all]
-  OpenPOWER (OpenBMC) specific:
-      rvitals noderange [temp|voltage|wattage|fanspeed|power|leds|altitude|all]
-  MIC specific:
-      rvitals noderange {thermal|all}
-  pdu specific:
-      rvitals noderange ",
+    Common:
+       rvitals [-h|--help|-v|--version]
+    ",
+    "rvitals.begin" =>
+    "FSP/LPAR (with HMC) specific:
+       rvitals noderange {temp|voltage|lcds|all}
+    CEC/LPAR/Frame (using Direct FSP Management) specific:
+       rvitals noderange {rackenv|lcds|all}
+    MPA specific:
+       rvitals noderange {temp|voltage|wattage|fanspeed|power|leds|summary|all}
+    Blade specific:
+       rvitals noderange {temp|wattage|fanspeed|leds|summary|all}
+    BMC specific:
+       rvitals noderange {temp|voltage|wattage|fanspeed|power|leds|all}
+    OpenPOWER (IPMI) specific:
+       rvitals noderange [temp|voltage|wattage|fanspeed|power|leds|chassis|all]
+    ",
+    "rvitals.openbmc" =>
+    "OpenPOWER (OpenBMC) specific:
+       rvitals noderange [temp|voltage|wattage|fanspeed|power|leds|altitude|all]
+    ",
+    "rvitals.end" =>
+    "MIC specific:
+       rvitals noderange {thermal|all}
+    pdu specific:
+       rvitals noderange ",
     "reventlog" =>
 "Usage: reventlog <noderange> [all [-s]|clear|<number of entries to retrieve> [-s]] [-V|--verbose]
        reventlog <noderange> [resolved={<id list>|LED}]
        reventlog [-h|--help|-v|--version]",
-    "rinv" =>
+    "rinv" => "",
+    "rinv.common" =>
       "Usage: 
     Common:
        rinv <noderange> [all|model|serial] [-V|--verbose]
        rinv [-h|--help|-v|--version]
-    BMC/MPA specific:
+    ",
+    "rinv.begin" =>
+    "BMC/MPA specific:
        rinv <noderange> [model|serial|asset|vpd|deviceid|guid|firm|dimm|mprom|all]
     OpenPOWER (IPMI) server specific:
        rinv <noderange> [model|serial|deviceid|uuid|guid|vpd|mprom|firm|all] 
-    OpenPOWER (OpenBMC) server specific:
+    ",
+    "rinv.openbmc" =>
+    "OpenPOWER (OpenBMC) server specific:
        rinv <noderange> [model|serial|firm|cpu|dimm|all] [-V|--verbose]
-    PPC specific(with HMC):
+    ", 
+    "rinv.end" =>
+    "PPC specific(with HMC):
        rinv <noderange> [all|bus|config|serial|model|firm]
     PPC specific(using Direct FSP Management):
        rinv <noderange> [firm]
@@ -349,10 +372,14 @@ my %usage = (
     "makentp" =>
       "Usage: makentp [-h|--help|-v|--version]
        makentp [-a|--all] [-V|--verbose]",
-    "rflash" =>
-      "Usage: 
-    rflash [ -h|--help|-v|--version|-V|--verbose]
-    PPC (with HMC) specific:
+    "rflash" => "",
+    "rflash.common" =>
+    "Usage: 
+    Common:
+        rflash [ -h|--help|-v|--version|-V|--verbose]
+    ",
+    "rflash.begin" =>
+    "PPC (with HMC) specific:
 	rflash <noderange> -p <rpm_directory> [--activate {concurrent | disruptive}] 
 	rflash <noderange> {--commit | --recover}
     PPC (using Direct FSP Management) specific:
@@ -362,7 +389,9 @@ my %usage = (
     OpenPOWER BMC specific (using IPMI):
         rflash <noderange> [<hpm_file_path>|-d <data_directory>] [-c|--check] [--retry=<count>]
         rflash <noderange> --recover <bmc_file_path>
-    OpenPOWER OpenBMC specific:
+    ",
+    "rflash.openbmc" =>
+    "OpenPOWER OpenBMC specific:
         rflash <noderange> {[-c|--check] | [-l|--list]}
         rflash <noderange> <tar_file_path> {[-c|--check] | [-a|--activate] | [-u|--upload]}
         rflash <noderange> <tar_file_diretory> [-d] [--no-host-reboot]
@@ -556,6 +585,42 @@ $usage{"rspconfig"} = $usage{"rspconfig.common"} .
 $usage{"rspconfig.openbmc"} = $usage{"rspconfig.common"} .
                       $usage{"rspconfig.openbmc"};
 
+$usage{"rinv"} = $usage{"rinv.common"} . 
+                      $usage{"rinv.begin"} .
+                      $usage{"rinv.openbmc"} .
+                      "   " .
+                      $usage{"rinv.end"};
+
+$usage{"rinv.openbmc"} = $usage{"rinv.common"} .
+                      $usage{"rinv.openbmc"};
+
+$usage{"rvitals"} = $usage{"rvitals.common"} . 
+                      $usage{"rvitals.begin"} .
+                      $usage{"rvitals.openbmc"} .
+                      "   " .
+                      $usage{"rvitals.end"};
+
+$usage{"rvitals.openbmc"} = $usage{"rvitals.common"} .
+                      $usage{"rvitals.openbmc"};
+
+$usage{"rflash"} = $usage{"rflash.common"} . 
+                      $usage{"rflash.begin"} .
+                      $usage{"rflash.openbmc"} .
+                      "   " .
+                      $usage{"rflash.end"};
+
+$usage{"rflash.openbmc"} = $usage{"rflash.common"} .
+                      $usage{"rflash.openbmc"};
+
+$usage{"rpower"} = $usage{"rpower.common"} . 
+                      $usage{"rpower.begin"} .
+                      $usage{"rpower.openbmc"} .
+                      "   " .
+                      $usage{"rpower.end"};
+
+$usage{"rpower.openbmc"} = $usage{"rpower.common"} .
+                      $usage{"rpower.openbmc"};
+
 my $vers    = xCAT::Utils->Version();
 my %version = (
     "rnetboot"       => "$vers",

From a21a1e3b861c0c0c89a6a22bdb0824aa76b4ef37 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Wed, 14 Feb 2018 03:07:39 -0500
Subject: [PATCH 059/100] use parallel-ssh: ssh client + scp to deal with
 rspconfig sshcfg

---
 .../agent/hwctl/executor/openbmc_bmcconfig.py | 79 +++++++++----------
 1 file changed, 37 insertions(+), 42 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
index 565a7d312..1e19efe84 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
@@ -11,9 +11,12 @@ from common import utils
 from common.task import ParallelNodesCommand
 from common.exceptions import SelfClientException, SelfServerException
 from hwctl import openbmc_client as openbmc
-#from paramiko import SSHClient
-from pssh.pssh_client import ParallelSSHClient
-from gevent import joinall
+
+#For rspconfig sshcfg
+from pssh.ssh_client import SSHClient
+from pssh.exceptions import UnknownHostException, AuthenticationException, \
+     ConnectionErrorException, SSHException
+from scp import SCPClient
 
 import logging
 logger = logging.getLogger('xcatagent')
@@ -40,8 +43,12 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
     def dump_process(self, **kw):
         return self.callback.info("dump_process: trigger, list and download")
 
-    def _create_copy_file(self, filename):
-        f = open(filename, 'w')
+    def pre_set_sshcfg(self, *arg, **kw):
+        local_home_dir=os.path.expanduser('~')
+        self.local_ssh_dir = local_home_dir + "/.ssh/"
+        self.local_public_key = self.local_ssh_dir + "id_rsa.pub"
+        self.copy_sh_file = self.local_ssh_dir + "./copy.sh"
+        f = open(self.copy_sh_file, 'w')
         f.write("#!/bin/sh \n\
 umask 0077 \n\
 userid=$1 \n\
@@ -53,52 +60,40 @@ else \n\
   dest_dir=\"$home/.ssh\" \n\
 fi \n\
 mkdir -p $dest_dir \n\
-cat /tmp/$userid/.ssh/id_rsa.pub >> $dest_dir/authorized_keys 2>&1 \n\
+cat /tmp/$userid/.ssh/id_rsa.pub >> $home/.ssh/authorized_keys 2>&1 \n\
 rm -f /tmp/$userid/.ssh/* 2>&1 \n\
 rmdir \"/tmp/$userid/.ssh\" \n\
 rmdir \"/tmp/$userid\" \n")
 
         f.close()
-        os.chmod(filename,stat.S_IRWXU)
-        return
-
-    def _prepare_hosts_cfg(self, nodesinfo):
-        host_config = {}
-        for node in nodesinfo.keys():
-            nodeinfo = nodesinfo[node]
-            utils.update2Ddict(host_config, nodeinfo['bmcip'], 'user', nodeinfo['username'])
-            utils.update2Ddict(host_config, nodeinfo['bmcip'], 'password', nodeinfo['password'])
-        return host_config 
-
-    def pre_set_sshcfg(self, *arg, **kw):
-        self.callback.syslog("Run into pre_set_sshcfg")
-        local_home_dir=os.path.expanduser('~')
-        local_ssh_dir = local_home_dir + "/.ssh/"
-        local_public_key = local_ssh_dir + "id_rsa.pub"
-        copy_sh_file = local_ssh_dir + "./copy.sh"
-        tmp_remote_dir = "/tmp/root/.ssh/"
-        self._create_copy_file(copy_sh_file) 
-        self.callback.syslog("Generate %s file done" % copy_sh_file)
-        hosts_config = self._prepare_hosts_cfg(self.inventory)
-
-        self.callback.syslog("Start to run SSH parallelly")
-        client = ParallelSSHClient(hosts_config.keys(), host_config=hosts_config)
-        self.callback.syslog("mkdir -p %s" % tmp_remote_dir)
-        client.run_command("/bin/mkdir -p %s" % tmp_remote_dir)
-        self.callback.info("Copy files to remote hosts: %s-->%s" % (local_ssh_dir, tmp_remote_dir))
-        nodes_copy = client.copy_file(local_ssh_dir, tmp_remote_dir, recurse=True)
-        try:
-            joinall(nodes_copy, raise_error=True)
-        except Exception as e:
-            self.callback.info("Error: %s" % e)
-        self.callback.info("run copy.sh")
-        client.run_command("%s/copy.sh root" %(tmp_remote_dir, )) 
-        return
+        os.chmod(self.copy_sh_file,stat.S_IRWXU)
+        self.callback.info("Prepared %s file done" % self.copy_sh_file)
 
     def set_sshcfg(self, **kw):
         node = kw['node']
         nodeinfo = kw['nodeinfo']
-        return self.callback.info("%s: ssh keys copied to %s" %(node, nodeinfo['bmcip']))
+        tmp_remote_dir = "/tmp/%s/.ssh/" % nodeinfo['username']
+        #try: 
+        ssh_client = SSHClient(nodeinfo['bmcip'], user=nodeinfo['username'], password=nodeinfo['password'])
+        #except (SSHException, NoValidConnectionsError,BadHostKeyException) as e: 
+        #    self.callback.info("%s: %s" % (node, e))
+        self.callback.info("ip: %s, name: %s, ps: %s" % (nodeinfo['bmcip'], nodeinfo['username'], nodeinfo['password']))
+        if not ssh_client.client.get_transport().is_active():
+            self.callback.info("SSH session is not active")
+        if not ssh_client.client.get_transport().is_authenticated():
+            self.callback.info("SSH session is not authenticated")
+        try:
+            ssh_client.client.exec_command("/bin/mkdir -p %s\n" % tmp_remote_dir)
+        except (SSHException, ConnectionErrorException) as e: 
+            self.callback.info("%s: ----%s------" % (host, e))
+        scp = SCPClient(ssh_client.client.get_transport()) 
+        scp.put(self.copy_sh_file, tmp_remote_dir + "copy.sh")
+        scp.put(self.local_public_key, tmp_remote_dir + "id_rsa.pub")
+        ssh_client.client.exec_command("%s/copy.sh %s" % (tmp_remote_dir, nodeinfo['username']))
+        ssh_client.client.close()
+        return self.callback.info("ssh keys copied to %s" % nodeinfo['bmcip'])
+
+
 
     def set_ipdhcp(self, **kw):
         return self.callback.info("set_ipdhcp")

From f499b21f67a179856a9f23bb66804962b855cb60 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Tue, 20 Feb 2018 16:03:57 -0500
Subject: [PATCH 060/100] Initial pass for Python reventlog

---
 .../lib/python/agent/hwctl/eventlog.py        | 24 +++++++++++
 .../agent/hwctl/executor/openbmc_eventlog.py  | 32 +++++++++++++++
 .../lib/python/agent/hwctl/openbmc_client.py  | 14 +++++++
 .../lib/python/agent/xcatagent/openbmc.py     | 40 +++++++++++++++++++
 .../lib/python/agent/xcatagent/server.py      |  5 ++-
 xCAT-server/lib/xcat/plugins/openbmc2.pm      | 26 ++++++++++++
 6 files changed, 139 insertions(+), 2 deletions(-)
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/eventlog.py
 create mode 100644 xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/eventlog.py b/xCAT-openbmc-py/lib/python/agent/hwctl/eventlog.py
new file mode 100644
index 000000000..e5e644f17
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/eventlog.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+
+class EventlogInterface(object):
+    """Interface for eventlog-related actions."""
+    interface_type = 'eventlog'
+    version = '1.0'
+
+    def get_eventlog_info(self, task, eventlog_type=None):
+        """Return the eventlog info of the task's nodes.
+
+        :param eventlog_type: type of eventlog info want to get.
+        :param task: a Task instance containing the nodes to act on.
+        :return eventlog list
+        """
+        return task.run('get_ev_info', eventlog_type)
+
+class DefaultEventlogManager(EventlogInterface):
+    """Interface for eventlog-related actions."""
+    pass
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py
new file mode 100644
index 000000000..6d5497251
--- /dev/null
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+###############################################################################
+# IBM(c) 2018 EPL license http://www.eclipse.org/legal/epl-v10.html
+###############################################################################
+# -*- coding: utf-8 -*-
+#
+
+from __future__ import print_function
+import gevent
+import time
+
+from common.task import ParallelNodesCommand
+from common.exceptions import SelfClientException, SelfServerException
+from hwctl import openbmc_client as openbmc
+from common import utils
+
+import logging
+logger = logging.getLogger('xcatagent')
+
+class OpenBMCEventlogTask(ParallelNodesCommand):
+    """Executor for eventlog-related actions."""
+
+    def get_ev_info(self, eventlog_type, **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback, debugmode=self.debugmode, verbose=self.verbose) 
+        eventlog_info = []
+        try:
+            obmc.login()
+            eventlog_info_dict = obmc.get_eventlog_info()
+        except (SelfServerException, SelfClientException) as e:
+            self.callback.info('%s: %s'  % (node, e.message))
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index f1fa55057..82983b296 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -141,6 +141,8 @@ FIRM_URLS = {
     }
 }
 
+EVENTLOG_URL = "/logging/enumerate"
+
 RSPCONFIG_APIS = {
     'autoreboot' : {
         'baseurl': "/control/host0/auto_reboot/",
@@ -486,6 +488,18 @@ class OpenBMCRest(object):
 
         return bool(func_list), fw_dict
 
+    def get_eventlog_info(self):
+
+        eventlog_data = self.request('GET', EVENTLOG_URL, cmd='get_eventlog_info')
+        try:
+            eventlog_dict = {}
+            for key, value in eventlog_data.items():
+                self.messager.info("EVENTLOG DATA: key=%s" %key)
+        except KeyError:
+            error = 'Error: Received wrong format response: %s' % eventlog_data
+            raise SelfServerException(error)
+
+
     def set_apis_values(self, key, value):
         attr_info = RSPCONFIG_APIS[key]
         if not attr_info.has_key('set_url'):
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index 621e7301f..85c26306a 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -20,12 +20,14 @@ from hwctl.executor.openbmc_inventory import OpenBMCInventoryTask
 from hwctl.executor.openbmc_power import OpenBMCPowerTask
 from hwctl.executor.openbmc_sensor import OpenBMCSensorTask
 from hwctl.executor.openbmc_bmcconfig import OpenBMCBmcConfigTask
+from hwctl.executor.openbmc_eventlog import OpenBMCEventlogTask
 from hwctl.beacon import DefaultBeaconManager
 from hwctl.setboot import DefaultBootManager
 from hwctl.inventory import DefaultInventoryManager
 from hwctl.power import DefaultPowerManager
 from hwctl.sensor import DefaultSensorManager
 from hwctl.bmcconfig import DefaultBmcConfigManager
+from hwctl.eventlog import DefaultEventlogManager
 
 from xcatagent import base
 import openbmc_rest
@@ -142,6 +144,9 @@ SETBOOT_SET_OPTIONS = ('cd', 'def', 'default', 'hd', 'net')
 VITALS_OPTIONS = ('all', 'altitude', 'fanspeed', 'leds', 'power',
                   'temp', 'voltage', 'wattage')
 
+# global variables of reventlog
+EVENTLOG_OPTIONS = ('all', 'clear', 'resolved')
+
 class OpenBMC(base.BaseDriver):
 
     headers = {'Content-Type': 'application/json'}
@@ -828,6 +833,41 @@ class OpenBMCManager(base.BaseManager):
         else:
             DefaultSensorManager().get_sensor_info(runner, action)
 
+    def reventlog(self, nodesinfo, args):
+
+        # 1, parse agrs
+        if not args:
+            args = ['all']
+
+        reventlog_usage = """
+        Usage:
+            eventlog [-V|--verbose] [all|clear|resolved]
+
+        Options:
+            -V --verbose   eventlog verbose mode.
+        """
+
+        try:
+            opts = docopt(reventlog_usage, argv=args)
+
+            self.verbose = opts.pop('--verbose')
+            action = [k for k,v in opts.items() if v][0]
+        except Exception as e:
+            self.messager.error("Failed to parse arguments for reventlog: %s" % args)
+            return
+
+        # 2, validate the args
+        if action not in EVENTLOG_OPTIONS:
+            self.messager.error("Not supported subcommand for reventlog: %s" % action)
+            return
+
+        # 3, run the subcommands
+        runner = OpenBMCEventlogTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=self.verbose)
+        if action == 'resolved':
+            DefaultEventlogManager().get_eventlog_info(runner)
+        else:
+            DefaultEventlogManager().get_eventlog_info(runner, action)
+
     def _get_full_path(self,file_path):
         if type(self.cwd) == 'unicode':
             dir_path = self.cwd
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
index f9b16bda4..cb6ba5a41 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
@@ -94,8 +94,9 @@ class Server(object):
             func = getattr(manager, req['command'])
             # translate unicode string to normal string to avoid docopt error
             new_args=[]
-            for a in req['args']:
-                new_args.append(a.encode('utf-8'))
+            if req['args']:
+                for a in req['args']:
+                    new_args.append(a.encode('utf-8'))
             # call the function in the specified manager
             func(req['nodeinfo'], new_args)
             # after the method returns, the request should be handled
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index efd38e9e0..d788b82c6 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -38,9 +38,14 @@ sub handled_commands {
         rsetboot       => 'nodehm:mgt=openbmc',
         rvitals        => 'nodehm:mgt=openbmc',
         rspconfig      => 'nodehm:mgt=openbmc',
+        reventlog      => 'nodehm:mgt=openbmc',
     };
 }
 
+# Common logging messages:
+my $usage_errormsg = "Usage error.";
+my $reventlog_no_id_resolved_errormsg = "Provide a comma separated list of IDs to be resolved. Example: 'resolved=x,y,z'";
+
 my %node_info = ();
 my $callback;
 
@@ -252,6 +257,27 @@ sub parse_args {
         }
     } elsif ($command eq 'rspconfig') {
         xCAT_plugin::openbmc::parse_args('rspconfig', $extrargs, $noderange);
+    } elsif ($command eq "reventlog") {
+        $subcommand = "all" if (!defined($ARGV[0]));
+        if ($subcommand =~ /^(\w+)=(.*)/) {
+            my $key = $1;
+            my $value = $2;
+            if (not $value) {
+                return ([ 1, "$usage_errormsg $reventlog_no_id_resolved_errormsg" ]);
+            }
+
+            my $nodes_num = @$noderange;
+            if (@$noderange > 1) {
+                return ([ 1, "Resolving faults over a xCAT noderange is not recommended." ]);
+            }
+
+            xCAT::SvrUtils::sendmsg("Attempting to resolve the following log entries: $value...", $callback);
+        } elsif ($subcommand !~ /^\d$|^\d+$|^all$|^clear$/) {
+            if ($subcommand =~ "resolved") {
+                return ([ 1, "$usage_errormsg $reventlog_no_id_resolved_errormsg" ]);
+            }
+            return ([ 1, "Unsupported command: $command $subcommand" ]);
+        }
     } else {
         return ([ 1, "Unsupported command: $command" ]);
     }

From 79fc3de99857647772f5834e72ef151a346c3f8c Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Tue, 20 Feb 2018 16:19:31 -0500
Subject: [PATCH 061/100] Build xCAT-openbmc-py with the makerpm script, it is
 identical to the makerpm-python.

---
 buildcore.sh   |  4 ++--
 makerpm-python | 38 --------------------------------------
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100755 makerpm-python

diff --git a/buildcore.sh b/buildcore.sh
index bab8ce3b0..1b41b4b1c 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -70,7 +70,7 @@ if [ -z "$UP" ]; then
 fi
 
 # These are the rpms that should be built for each kind of xcat build
-ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe xCAT-csm"
+ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe xCAT-csm xCAT-openbmc-py"
 ZVMBUILD="perl-xCAT xCAT-server xCAT-UI"
 ZVMLINK="xCAT-client xCAT xCATsn"
 # xCAT and xCATsn have PCM specific configuration - conserver-xcat, syslinux-xcat
@@ -323,7 +323,7 @@ if [ "$OSNAME" = "AIX" ]; then
 fi
 
 # Build the rest of the noarch rpms
-for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe xCAT-csm; do
+for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT-SoftLayer xCAT-vlan xCAT-confluent xCAT-probe xCAT-csm xCAT-openbmc-py; do
     if [[ " $EMBEDBUILD " != *\ $rpmname\ * ]]; then continue; fi
     if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-buildkit" ]; then continue; fi  # do not build xCAT-buildkit on aix
     if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-SoftLayer" ]; then continue; fi # do not build xCAT-softlayer on aix
diff --git a/makerpm-python b/makerpm-python
deleted file mode 100755
index 8718e7ae5..000000000
--- a/makerpm-python
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
-
-function makepythonrpm {
-    RPMNAME="$1"
-    SPEC_FILE="$RPMNAME/$RPMNAME.spec"
-    RPMROOT=`rpmbuild --eval '%_topdir' ${SPEC_FILE}`
-    mkdir -p $RPMROOT/SOURCES
-    tar --exclude .svn -czvf $RPMROOT/SOURCES/$RPMNAME-${VER}.tar.gz $RPMNAME
-    rm -f $RPMROOT/SRPMS/$RPMNAME-$VER*rpm $RPMROOT/RPMS/noarch/$RPMNAME-$VER*rpm
-    echo "Building $RPMROOT/RPMS/noarch/$RPMNAME-$VER-snap*.noarch.rpm $EMBEDTXT..."
-    rpmbuild --quiet -ta $RPMROOT/SOURCES/$RPMNAME-${VER}.tar.gz --define "version $VER" $REL "$EASE"
-    if [ $? -eq 0 ]; then
-        exit 0
-    else  
-        exit 1
-    fi
-}	
-
-# Main code....
-OSNAME=$(uname)
-VER=`cat Version`
-REL="--define"
-EASE='usedate 1'
-rpmbuild --version > /dev/null
-if [ $? -gt 0 ]; then
-    echo "Error: rpmbuild does not appear to be installed or working."
-    exit 2
-fi
-
-if [ -n "$1" -a "$1" = "xCAT-openbmc-py" ]; then
-    makepythonrpm $1
-else
-    echo 'Usage: makepythonrpm xCAT-openbmc-py'
-    exit 1
-fi
-

From f19c936638c72ecc98cc51ca6eaa228379652691 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Tue, 20 Feb 2018 16:20:13 -0500
Subject: [PATCH 062/100] Change some code in the python framework so that it's
 easier to debug issues in configuration when moving to python for OpenBMC

---
 xCAT-openbmc-py/lib/python/agent/xcatagent/base.py |  4 ++--
 xCAT-server/lib/perl/xCAT/OPENBMC.pm               | 10 +++++-----
 xCAT-server/lib/xcat/plugins/openbmc2.pm           | 13 ++++++++-----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/base.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/base.py
index bf58ef628..d75bd7f00 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/base.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/base.py
@@ -14,8 +14,8 @@ class BaseManager(object):
         module_name = 'xcatagent.%s' % name
         try:
             __import__(module_name)
-        except ImportError:
-            return None
+        except ImportError as err:
+            raise ImportError(err) 
 
         class_name = MODULE_MAP[name]
         return utils.class_func(module_name, class_name)
diff --git a/xCAT-server/lib/perl/xCAT/OPENBMC.pm b/xCAT-server/lib/perl/xCAT/OPENBMC.pm
index 783a9e30e..3fc6fc1aa 100644
--- a/xCAT-server/lib/perl/xCAT/OPENBMC.pm
+++ b/xCAT-server/lib/perl/xCAT/OPENBMC.pm
@@ -70,19 +70,19 @@ sub acquire_lock {
 }
 sub start_python_agent {
     if (! -e $PYTHON_AGENT_FILE) {
-        xCAT::MsgUtils->message("S", "'$PYTHON_AGENT_FILE' does not exist");
+        xCAT::MsgUtils->message("S", "start_python_agent() Error: '$PYTHON_AGENT_FILE' does not exist");
         return undef;
     }
 
     if (!defined(acquire_lock())) {
-        xCAT::MsgUtils->message("S", "Error: Faild to require lock");
+        xCAT::MsgUtils->message("S", "start_python_agent() Error: Failed to acquire lock");
         return undef;
     }
     my $fd;
     open($fd, '>', $AGENT_SOCK_PATH) && close($fd);
     my $pid = fork;
     if (!defined $pid) {
-        xCAT::MsgUtils->message("S", "Error: Unable to fork process");
+        xCAT::MsgUtils->message("S", "start_python_agent() Error: Unable to fork process");
         return undef;
     }
     $SIG{CHLD} = 'DEFAULT';
@@ -93,7 +93,7 @@ sub start_python_agent {
         open(STDERR, '>>&', \*STDOUT) or die("open: $!");
         my $ret = exec ($PYTHON_AGENT_FILE);
         if (!defined($ret)) {
-            xCAT::MsgUtils->message("S", "Error: Failed to start python agent");
+            xCAT::MsgUtils->message("S", "start_python_agent() Error: Failed to start the xCAT Python agent.");
             exit(1);
         }
     }
@@ -194,7 +194,7 @@ sub wait_agent {
     my ($pid, $callback) = @_;
     waitpid($pid, 0);
     if ($? >> 8 != 0) {
-        xCAT::MsgUtils->message("E", { data => ["python agent exited unexpectedly"] }, $callback);
+        xCAT::MsgUtils->message("E", { data => ["python agent exited unexpectedly. See $PYTHON_LOG_PATH for more details."] }, $callback);
     }
 }
 
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index efd38e9e0..439c99dc6 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -127,6 +127,14 @@ sub preprocess_request {
 sub process_request {
     my $request = shift;
     $callback = shift;
+
+    # If we can't start the python agent, exit immediately
+    my $pid = xCAT::OPENBMC::start_python_agent();
+    if (!defined($pid)) {
+        xCAT::MsgUtils->message("E", { data => ["Failed to start the xCAT Python agent. Check /var/log/xcat/cluster.log for more information."] }, $callback);
+        return;
+    }
+
     my $noderange = $request->{node};
     my $check = parse_node_info($noderange);
     if (&refactor_args($request)) {
@@ -135,11 +143,6 @@ sub process_request {
     }
     $callback->({ errorcode => [$check] }) if ($check);
     return unless(%node_info);
-    my $pid = xCAT::OPENBMC::start_python_agent();
-    if (!defined($pid)) {
-        xCAT::MsgUtils->message("E", { data => ["Failed to start python agent"] }, $callback);
-        return;
-    }
 
     xCAT::OPENBMC::submit_agent_request($pid, $request, \%node_info, $callback);
     xCAT::OPENBMC::wait_agent($pid, $callback);

From c655395d6067b43de5aa34a323e86c7e1dcf712a Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Thu, 22 Feb 2018 02:16:28 -0500
Subject: [PATCH 063/100] when no domain defined, should print error

---
 xCAT-server/lib/xcat/plugins/dhcp.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index c824641be..449cbb561 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -2440,9 +2440,10 @@ sub addnet
             } else {
                 $callback->(
                     {
-                        warning => [
+                        error => [
                             "No $net specific entry for domain, and no domain defined in site table."
-                          ]
+                          ],
+                        errorcode => [1]
                     });
             }
 

From d864d9efdc00ba81124f1d2d76cd86349b3c1b78 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Wed, 14 Feb 2018 03:44:09 -0500
Subject: [PATCH 064/100] add set bmc hostname

---
 .../agent/hwctl/executor/openbmc_bmcconfig.py | 33 +++++++++++++++----
 .../lib/python/agent/hwctl/openbmc_client.py  |  9 ++++-
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
index 1e19efe84..1817e50c9 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
@@ -96,7 +96,20 @@ rmdir \"/tmp/$userid\" \n")
 
 
     def set_ipdhcp(self, **kw):
-        return self.callback.info("set_ipdhcp")
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+        try:
+            obmc.login()
+            obmc.set_ipdhcp(key)
+        except (SelfServerException, SelfClientException) as e:
+            self.callback.info("%s: %s" % (node, e.message))
+
+        self.callback.info("%s: BMC Setting IP to DHCP..." % (node))
+        try:
+            obmc.reboot_bmc()
+        except (SelfServerException, SelfClientException) as e:
+            self.callback.info("%s: %s" % (node, e.message))
 
     def get_attributes(self, attributes, **kw):
         netinfo_dict={}
@@ -127,18 +140,22 @@ rmdir \"/tmp/$userid\" \n")
                 return self.callback.error("set_attributes unsupported attribute:%s" % k)
         if len(netinfo_dict) > 1 and (not netinfo_dict.has_key('ip') or not netinfo_dict.has_key('netmask') or not netinfo_dict.has_key('gateway')):
             self.callback.info("set_attributes miss either ip, netmask or gateway to set network information")
+        elif len(netinfo_dict) <= 1:
+            return
         else:
             self._set_netinfo(netinfo_dict['ip'], netinfo_dict['netmask'],
                               netinfo_dict['gateway'], netinfo_dict['vlan'])
 
     def _set_hostname(self, hostname, **kw):
+        node = kw['node']
         if hostname == '*':
-            if kw['nodeinfo']['bmc'] != kw['nodeinfo']['bmcip']:
-                hostname = kw['nodeinfo']['bmc']
-            else:
-                hostname = '%s-bmc' % kw['node']
-        return self.callback.info("set_hostname: %s" % hostname)
-
+            if kw['nodeinfo']['bmc'] == kw['nodeinfo']['bmcip']:
+                self.callback.info("%s: set BMC ip as BMC Hostname" % node)
+            hostname = kw['nodeinfo']['bmc']
+        self._set_apis_values("hostname", hostname, **kw)
+        self._get_netinfo(hostname=True, ntpserver=False, **kw) 
+        return
+        
     def _set_apis_values(self, key, value, **kw):
         node = kw['node']
         obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
@@ -266,3 +283,5 @@ rmdir \"/tmp/$userid\" \n")
             for i in ntpserver_list:
                 self.callback.info("%s: %s" % (node, i))
         return
+    def get_netinfo(self, ip=False, ipsrc=False, netmask=False, gateway=False, vlan=False, hostname=False, ntpserver=True, **kw):
+
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index 64d07dd9b..d8468f14a 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -143,7 +143,6 @@ FIRM_URLS = {
 
 RSPCONFIG_NETINFO_URL = {
     'get_netinfo': "/network/enumerate",
-    'hostname': "/network/config/attr/HostName",
     'nic_ip': "/network/#NIC#/action/IP",
     'vlan': "/network/action/VLAN",
     'ipdhcp': "/network/action/Reset",
@@ -151,6 +150,11 @@ RSPCONFIG_NETINFO_URL = {
 }
 
 RSPCONFIG_APIS = {
+    'hostname': {
+        'baseurl': "/network/config/",
+        'set_url': "attr/HostName",
+        'display_name': "BMC Hostname",
+    },
     'autoreboot' : {
         'baseurl': "/control/host0/auto_reboot/",
         'set_url': "attr/AutoReboot",
@@ -523,6 +527,9 @@ class OpenBMCRest(object):
     def get_netinfo(self):
         return self.request('GET', RSPCONFIG_NETINFO_URL['get_netinfo'], cmd="get_netinfo")
 
+    def set_ipdhcp(self):
+        return self.request('PUT', RSPCONFIG_NETINFO_URL['ipdhcp'], cmd="set_bmcip_dhcp")
+
 class OpenBMCImage(object):
     def __init__(self, rawid, data=None):
         self.id = rawid.split('/')[-1]

From 6ed2e68c5917ddea230fc7ca7e11c09b455c7711 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Thu, 22 Feb 2018 04:24:35 -0500
Subject: [PATCH 065/100] update rspconfig in python based on Mark and XuWei's
 comments

---
 .../agent/hwctl/executor/openbmc_bmcconfig.py | 62 ++++---------------
 .../lib/python/agent/hwctl/openbmc_client.py  | 50 ++++++++++++---
 .../lib/python/agent/xcatagent/openbmc.py     |  4 +-
 3 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
index 1817e50c9..d88dc5429 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
@@ -67,7 +67,8 @@ rmdir \"/tmp/$userid\" \n")
 
         f.close()
         os.chmod(self.copy_sh_file,stat.S_IRWXU)
-        self.callback.info("Prepared %s file done" % self.copy_sh_file)
+        if self.verbose:
+            self.callback.info("Prepared %s file done" % self.copy_sh_file)
 
     def set_sshcfg(self, **kw):
         node = kw['node']
@@ -77,7 +78,6 @@ rmdir \"/tmp/$userid\" \n")
         ssh_client = SSHClient(nodeinfo['bmcip'], user=nodeinfo['username'], password=nodeinfo['password'])
         #except (SSHException, NoValidConnectionsError,BadHostKeyException) as e: 
         #    self.callback.info("%s: %s" % (node, e))
-        self.callback.info("ip: %s, name: %s, ps: %s" % (nodeinfo['bmcip'], nodeinfo['username'], nodeinfo['password']))
         if not ssh_client.client.get_transport().is_active():
             self.callback.info("SSH session is not active")
         if not ssh_client.client.get_transport().is_authenticated():
@@ -117,14 +117,14 @@ rmdir \"/tmp/$userid\" \n")
             if attr in RSPCONFIG_GET_NETINFO:
                 netinfo_dict[attr]=True
                 getnet=1
-            elif openbmc.RSPCONFIG_APIS.has_key(attr):
+            elif attr in openbmc.RSPCONFIG_APIS:
                 self._get_apis_values(attr, **kw)
             else:
                 self.callback.error("get_attributes can not deal with attr %s" % attr)
         if len(netinfo_dict):
-            self._get_netinfo(ip=netinfo_dict.has_key('ip'), ipsrc=netinfo_dict.has_key('ipsrc'), netmask=netinfo_dict.has_key('netmask'),
-                              gateway=netinfo_dict.has_key('gateway'),vlan= netinfo_dict.has_key('vlan'), 
-                              hostname=netinfo_dict.has_key('hostname'), **kw)
+            self._get_netinfo(ip=netinfo_dict.get('ip', False), ipsrc=netinfo_dict.get('ipsrc', False), netmask=netinfo_dict.get('netmask', False),
+                              gateway=netinfo_dict.get('gateway', False),vlan= netinfo_dict.get('vlan', False), 
+                              hostname=netinfo_dict.get('hostname', False), **kw)
 
     def set_attributes(self, attributes, **kw):
         netinfo_dict={'vlan':False}
@@ -134,11 +134,11 @@ rmdir \"/tmp/$userid\" \n")
                 netinfo_dict[k] = v
             elif k == 'hostname':
                 self._set_hostname(v, **kw)
-            elif openbmc.RSPCONFIG_APIS.has_key(k):
+            elif k in openbmc.RSPCONFIG_APIS:
                 self._set_apis_values(k, v, **kw)
             else:
                 return self.callback.error("set_attributes unsupported attribute:%s" % k)
-        if len(netinfo_dict) > 1 and (not netinfo_dict.has_key('ip') or not netinfo_dict.has_key('netmask') or not netinfo_dict.has_key('gateway')):
+        if len(netinfo_dict) > 1 and ('ip' not in netinfo_dict or 'netmask' not in netinfo_dict or 'gateway' not in netinfo_dict):
             self.callback.info("set_attributes miss either ip, netmask or gateway to set network information")
         elif len(netinfo_dict) <= 1:
             return
@@ -190,64 +190,30 @@ rmdir \"/tmp/$userid\" \n")
             result = "set net(%s, %s, %s) for eth0" % (ip, netmask, gateway)
         return self.callback.info("set_netinfo %s" % result)
 
-    def _get_and_parse_netinfo(self, **kw):
+    def _get_netinfo(self, ip=False, ipsrc=False, netmask=False, gateway=False, vlan=False, hostname=False, ntpserver=True, **kw):
         node = kw['node']
         obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
                                    debugmode=self.debugmode, verbose=self.verbose)
         try:
             obmc.login()
-            data = obmc.get_netinfo()
+            netinfo = obmc.get_netinfo()
         except (SelfServerException, SelfClientException) as e:
             self.callback.info('%s: %s' % (node, e.message))
             return
-        netinfo = {}
-        for k, v in data.items():
-            if k.find("network/config") >= 0:
-                if v.has_key("HostName"):
-                    netinfo["hostname"] = v["HostName"]
-                if v.has_key("DefaultGateway"):
-                    netinfo["defaultgateway"] = v["DefaultGateway"]
-                continue
-            dev,match,netid = k.partition("/ipv4/")
-            if netid:
-                if v["Origin"].find("LinkLocal") >= 0 or v["Address"].startswith("169.254"):
-                    self.callback.info("%s: Found LinkLocal address %s for interface %s, Ignoring..." % (node, v["Address"], dev))
-                    continue
-                nicid = dev.split('/')[-1]
-                if not netinfo.has_key(nicid):
-                    netinfo[nicid] = {}
-                if netinfo[nicid].has_key("ip"):
-                    self.callback.error("%s: Another valid ip %s found." % (node, v["Address"]))
-                    continue
-                utils.update2Ddict(netinfo, nicid, "ipsrc", v["Origin"].split('.')[-1])
-                utils.update2Ddict(netinfo, nicid, "netmask", v["PrefixLength"])
-                utils.update2Ddict(netinfo, nicid, "gateway", v["Gateway"])
-                utils.update2Ddict(netinfo, nicid, "ip", v["Address"])
-                if data.has_key(dev):
-                    info = data[dev]
-                    utils.update2Ddict(netinfo, nicid, "vlanid", info["Id"])
-                    utils.update2Ddict(netinfo, nicid, "mac", info["MACAddress"])
-                    utils.update2Ddict(netinfo, nicid, "ntpservers", info["NTPServers"])
-        self.callback.info("Netinfo: %s" % netinfo) 
-        return netinfo
-    def _get_netinfo(self, ip=False, ipsrc=False, netmask=False, gateway=False, vlan=False, hostname=False, ntpserver=True, **kw):
-        node = kw["node"]
-        netinfo = self._get_and_parse_netinfo(**kw)
         if not netinfo:
             return self.callback.error("%s: No network information get" % node)
         defaultgateway = "n/a"
         bmchostname = ""
-        if netinfo.has_key("defaultgateway"):
+        if 'defaultgateway' in netinfo:
             defaultgateway = netinfo["defaultgateway"]
             del netinfo["defaultgateway"]
-        if netinfo.has_key("hostname"):
+        if 'hostname' in netinfo:
             bmchostname = netinfo["hostname"]
             del netinfo["hostname"]
 
         if hostname:
             self.callback.info("%s: BMC Hostname: %s" %(node, bmchostname))
         dic_length = len(netinfo) 
-        self.callback.info("dic_length: %s: %s" %(dic_length, netinfo))
         ip_list = []
         ipsrc_list = []
         netmask_list = []
@@ -282,6 +248,4 @@ rmdir \"/tmp/$userid\" \n")
         if ntpserver:
             for i in ntpserver_list:
                 self.callback.info("%s: %s" % (node, i))
-        return
-    def get_netinfo(self, ip=False, ipsrc=False, netmask=False, gateway=False, vlan=False, hostname=False, ntpserver=True, **kw):
-
+        return netinfo
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index d8468f14a..6d4ae216e 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -9,7 +9,7 @@ import requests
 import json
 import time
 
-from common import rest
+from common import utils, rest
 from common.exceptions import SelfClientException, SelfServerException
 
 import logging
@@ -501,10 +501,10 @@ class OpenBMCRest(object):
 
     def set_apis_values(self, key, value):
         attr_info = RSPCONFIG_APIS[key]
-        if not attr_info.has_key('set_url'):
+        if 'set_url' not in attr_info:
             raise SelfServerException("config %s failed, not url available" % key)
         set_url = attr_info['baseurl']+attr_info['set_url']
-        if attr_info.has_key('attr_values') and attr_info['attr_values'].has_key(value):
+        if 'attr_values' in attr_info and value in attr_info['attr_values']:
             data = attr_info['attr_values'][value]
         else:
             data = value
@@ -512,20 +512,56 @@ class OpenBMCRest(object):
 
     def get_apis_values(self, key):
         attr_info = RSPCONFIG_APIS[key]
-        if not attr_info.has_key('get_url'):
+        if 'get_url' not in attr_info:
             raise SelfServerException("Reading %s failed, not url available" % key)
         get_url = attr_info['baseurl']+attr_info['get_url']
 
         method = 'GET'
-        if attr_info.has_key('get_method'):
+        if 'get_method' in attr_info:
             method = attr_info['get_method']
         data = None
-        if attr_info.has_key('get_data'):
+        if 'get_data' in attr_info:
             data={"data": attr_info['get_data']}
         return self.request(method, get_url, payload=data, cmd="get_%s" % key)
 
     def get_netinfo(self):
-        return self.request('GET', RSPCONFIG_NETINFO_URL['get_netinfo'], cmd="get_netinfo")
+        data = self.request('GET', RSPCONFIG_NETINFO_URL['get_netinfo'], cmd="get_netinfo")
+        try:
+            netinfo = {}
+            for k, v in data.items():
+                if 'network/config' in k:
+                    if 'HostName' in v:
+                        netinfo["hostname"] = v["HostName"]
+                    if 'DefaultGateway' in v:
+                        netinfo["defaultgateway"] = v["DefaultGateway"]
+                    continue
+                dev,match,netid = k.partition("/ipv4/")
+                if netid:
+                    if 'LinkLocal' in v["Origin"] or v["Address"].startswith("169.254"):
+                        msg = "Found LinkLocal address %s for interface %s, Ignoring..." % (v["Address"], dev)
+                        self._print_record_log(msg, 'get_netinfo')
+                        continue
+                    nicid = dev.split('/')[-1]
+                    if nicid not in netinfo:
+                        netinfo[nicid] = {}
+                    if 'ip' in netinfo[nicid]:
+                        msg = "%s: Another valid ip %s found." % (node, v["Address"])
+                        self._print_record_log(msg, 'get_netinfo')
+                        continue
+                    utils.update2Ddict(netinfo, nicid, "ipsrc", v["Origin"].split('.')[-1])
+                    utils.update2Ddict(netinfo, nicid, "netmask", v["PrefixLength"])
+                    utils.update2Ddict(netinfo, nicid, "gateway", v["Gateway"])
+                    utils.update2Ddict(netinfo, nicid, "ip", v["Address"])
+                    if dev in data:
+                        info = data[dev]
+                        utils.update2Ddict(netinfo, nicid, "vlanid", info["Id"])
+                        utils.update2Ddict(netinfo, nicid, "mac", info["MACAddress"])
+                        utils.update2Ddict(netinfo, nicid, "ntpservers", info["NTPServers"])            
+            return netinfo
+        except KeyError:
+            error = 'Error: Received wrong format response: %s' % data
+            raise SelfServerException(error)
+        
 
     def set_ipdhcp(self):
         return self.request('PUT', RSPCONFIG_NETINFO_URL['ipdhcp'], cmd="set_bmcip_dhcp")
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index 621e7301f..d6442e8e3 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -736,7 +736,7 @@ class OpenBMCManager(base.BaseManager):
         elif opts['get']:
             unsupport_list=list(set(opts['<args>']) - set(RSPCONFIG_GET_OPTIONS))
             if len(unsupport_list) > 0:
-                self.messager.error("Have unsupported option: %s" % unsupport_args)
+                self.messager.error("Have unsupported option: %s" % unsupport_list)
                 return
             else:
                 DefaultBmcConfigManager().get_attributes(runner, opts['<args>'])
@@ -744,7 +744,7 @@ class OpenBMCManager(base.BaseManager):
             rc=0
             for attr in opts['<args>']:
                 k,v = attr.split('=')
-                if not RSPCONFIG_SET_OPTIONS.has_key(k):
+                if k not in RSPCONFIG_SET_OPTIONS:
                     self.messager.error("The attribute %s is not support to set" % k)
                     rc=1
                 elif not re.match(RSPCONFIG_SET_OPTIONS[k], v):

From d84895a3d1eb8b949451cf23a655fd325958d202 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Thu, 22 Feb 2018 14:00:56 -0500
Subject: [PATCH 066/100] openbmc eventlog in python, phase 2

---
 .../agent/hwctl/executor/openbmc_eventlog.py  | 24 +++++++-
 .../lib/python/agent/hwctl/openbmc_client.py  | 55 ++++++++++++++++++-
 .../lib/python/agent/xcatagent/openbmc.py     | 15 +++--
 3 files changed, 83 insertions(+), 11 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py
index 6d5497251..f0d417a31 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py
@@ -20,13 +20,35 @@ logger = logging.getLogger('xcatagent')
 class OpenBMCEventlogTask(ParallelNodesCommand):
     """Executor for eventlog-related actions."""
 
-    def get_ev_info(self, eventlog_type, **kw):
+    def get_ev_info(self, args, **kw):
 
         node = kw['node']
+        number_to_display = 0
+        try:
+            # Number of records to display from the end
+            number_to_display = 0-int(args[0])
+        except Exception:
+            # All records to display
+            number_to_display = 0
+
         obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback, debugmode=self.debugmode, verbose=self.verbose) 
         eventlog_info = []
         try:
             obmc.login()
+
+            # Get all eventlog records
             eventlog_info_dict = obmc.get_eventlog_info()
+
+            keys = eventlog_info_dict.keys()
+            # Sort thy keys in natural order
+            keys.sort(key=lambda x : int(x[0:]))
+
+            # Display all, or specified number of records from the end
+            for key in list(keys)[number_to_display:]:
+                self.callback.info('%s: %s'  % (node, eventlog_info_dict[key]))
+                eventlog_info += eventlog_info_dict[key]
+
         except (SelfServerException, SelfClientException) as e:
             self.callback.info('%s: %s'  % (node, e.message))
+
+        return eventlog_info
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index 82983b296..70b69eaeb 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -488,17 +488,68 @@ class OpenBMCRest(object):
 
         return bool(func_list), fw_dict
 
+    # Extract all eventlog info and build a dictionary with eventid as a key
     def get_eventlog_info(self):
 
         eventlog_data = self.request('GET', EVENTLOG_URL, cmd='get_eventlog_info')
         try:
             eventlog_dict = {}
-            for key, value in eventlog_data.items():
-                self.messager.info("EVENTLOG DATA: key=%s" %key)
+            for key, value in sorted(eventlog_data.items()):
+                id, event_log_line = self.parse_event_data(value)
+                if int(id) != 0:
+                    eventlog_dict[str(id)] = event_log_line
+            return eventlog_dict
         except KeyError:
             error = 'Error: Received wrong format response: %s' % eventlog_data
             raise SelfServerException(error)
 
+    # Parse a single eventlog entry and return data in formatted string
+    def parse_event_data(self, event_log_entry):
+        formatted_line = ""
+        LED_tag = " [LED]"
+        timestamp_str = ""
+        message_str = ""
+        pid_str = ""
+        resolved_str = ""
+        id_str = "0"
+        callout = False
+        for (sub_key, v) in event_log_entry.items():
+            if sub_key == 'AdditionalData':
+                for (data_key) in v:
+                    additional_data = data_key.split("=");
+                    if additional_data[0] == 'ESEL':
+                        #self.messager.info('        ESEL : <long data string>')
+                        info = additional_data[0].split('=')
+                        #esel = info[1]
+                    elif additional_data[0] == '_PID':
+                        pid_str = " (PID: " + str(additional_data[1]) + ")"
+                    elif 'CALLOUT_DEVICE_PATH' in additional_data[0]:
+                        callout = True
+                        info = additional_data[0].split('=')
+                        #callout_data = info[1]
+                    elif 'CALLOUT_INVENTORY_PATH' in additional_data[0]:
+                        callout = True
+                        callout_data="I2C"
+                    elif 'CALLOUT' in additional_data[0]:
+                        callout = True
+                    #else:
+                    #    self.messager.info('        %s : %s' % (additional_data[0], additional_data[1]))
+            elif sub_key == 'Timestamp':
+                timestamp = time.localtime(v / 1000)
+                timestamp_str = time.strftime("%m/%d/%Y %T", timestamp)
+            elif sub_key == 'Id':
+                #id_str = " [{0}]".format(v)
+                id_str = str(v)
+            elif sub_key == 'Resolved':
+                resolved_str = " Resolved: " + str(v)
+            elif sub_key == 'Message':
+                message_str = " " + v
+            #else:
+            #    self.messager.info('    %s : %s' % (sub_key, v))
+        formatted_line = timestamp_str + " [" + id_str +"]" + ":" + message_str + pid_str + resolved_str
+        if callout:
+            formatted_line += LED_tag
+        return id_str, formatted_line
 
     def set_apis_values(self, key, value):
         attr_info = RSPCONFIG_APIS[key]
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index 85c26306a..63f6abff9 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -841,7 +841,7 @@ class OpenBMCManager(base.BaseManager):
 
         reventlog_usage = """
         Usage:
-            eventlog [-V|--verbose] [all|clear|resolved]
+            eventlog [-V|--verbose] [<number>|all|clear|resolved=(<id>|LED)]
 
         Options:
             -V --verbose   eventlog verbose mode.
@@ -857,16 +857,15 @@ class OpenBMCManager(base.BaseManager):
             return
 
         # 2, validate the args
-        if action not in EVENTLOG_OPTIONS:
-            self.messager.error("Not supported subcommand for reventlog: %s" % action)
-            return
+        self.messager.error("reventlog action: %s" % action)
+        self.messager.error("reventlog args: %s" % args)
+        #if action not in EVENTLOG_OPTIONS:
+        #    self.messager.error("Not supported subcommand for reventlog: %s" % action)
+        #    return
 
         # 3, run the subcommands
         runner = OpenBMCEventlogTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=self.verbose)
-        if action == 'resolved':
-            DefaultEventlogManager().get_eventlog_info(runner)
-        else:
-            DefaultEventlogManager().get_eventlog_info(runner, action)
+        DefaultEventlogManager().get_eventlog_info(runner, args)
 
     def _get_full_path(self,file_path):
         if type(self.cwd) == 'unicode':

From 96a34d972fbfea9500b436746826e7bc5bcd541f Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Thu, 22 Feb 2018 14:15:39 -0500
Subject: [PATCH 067/100] Make reventlog resplved=LED case insensitive

---
 xCAT-server/lib/xcat/plugins/openbmc.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 7587f4fb2..02fc8598a 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -1581,7 +1581,7 @@ sub parse_command_status {
         if ($subcommand eq "clear") {
             $next_status{LOGIN_RESPONSE} = "REVENTLOG_CLEAR_REQUEST";
             $next_status{REVENTLOG_CLEAR_REQUEST} = "REVENTLOG_CLEAR_RESPONSE";
-        } elsif ($subcommand =~ /resolved=LED/) {
+        } elsif (uc($subcommand) =~ /RESOLVED=LED/) {
             $next_status{LOGIN_RESPONSE} = "REVENTLOG_REQUEST";
             $next_status{REVENTLOG_REQUEST} = "REVENTLOG_RESOLVED_RESPONSE_LED";
         } elsif ($subcommand =~ /resolved=(.+)/) {

From 74d9eba9440267f8501ad76391851ae60ad3e1a7 Mon Sep 17 00:00:00 2001
From: Yuan Bai <bybai@cn.ibm.com>
Date: Fri, 23 Feb 2018 10:05:01 +0800
Subject: [PATCH 068/100] Update dhcp.pm

---
 xCAT-server/lib/xcat/plugins/dhcp.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 449cbb561..49e21ef95 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -2441,7 +2441,7 @@ sub addnet
                 $callback->(
                     {
                         error => [
-                            "No $net specific entry for domain, and no domain defined in site table."
+                            "No domain defined for $net entry in networks table, and no domain defined in site table."
                           ],
                         errorcode => [1]
                     });

From 2ca56404d9ad53af4d6f390bc8d0cd9409f340b6 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Thu, 22 Feb 2018 21:32:34 -0500
Subject: [PATCH 069/100] Add boot nvme support and filter small devices
 (#4778)

nvme devices were not autosensed as install candidates.

Also, devices smaller than 128 MB are filtered out, as they are likely
to be some media or similar.
---
 xCAT-server/share/xcat/install/scripts/getinstdisk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/share/xcat/install/scripts/getinstdisk b/xCAT-server/share/xcat/install/scripts/getinstdisk
index fcc517565..20c64f426 100644
--- a/xCAT-server/share/xcat/install/scripts/getinstdisk
+++ b/xCAT-server/share/xcat/install/scripts/getinstdisk
@@ -37,13 +37,19 @@ if [ -z "$install_disk" ]; then
 
     # Get all partitions and disks from /proc/partitions file
     if [ -z "$has_awk" ]; then
-        entries=$(cat /proc/partitions | sed 's/  */ /g' | cut -d " " -f5 | grep -v "name" | grep -e "[s|h|v]d.*$")
+        entries=$(cat /proc/partitions | sed 's/  */ /g' | cut -d " " -f5 | grep -v "name" | grep -E '^[s|h|v]d|nvme')
     else
-        entries=$(awk -F ' '  '{print $4}' /proc/partitions | grep -v "name" | grep -e "[s|h|v]d.*$")
+        entries=$(awk -F ' '  '{print $4}' /proc/partitions | grep -v "name" | grep -E '^[s|h|v]d|nvme')
     fi    
 
     # Classify entries by DEVTYPE
     for entry in $entries; do
+        DEVSIZE=$(udevadm info --attribute-walk --name=$entry|grep size| sed -e 's/[^"]*"//' -e 's/"//'|tail -n 1)
+        if [ -z "$DEVSIZE" -o $DEVSIZE -lt 262144 ]; then
+            # ignore small devices, that are likely remote media or similar
+            continue
+        fi
+
         if [ -z "$has_awk" ]; then
             dev_type=$(udevadm info --query=property --name=/dev/$entry | grep -i "DEVTYPE" | cut -d "=" -f2 | $utolcmd)
         else

From a81b6e2728c81b84fb40d8cdaa258289050f8f74 Mon Sep 17 00:00:00 2001
From: cxhong <abcdqiu@gmail.com>
Date: Thu, 22 Feb 2018 21:42:42 -0500
Subject: [PATCH 070/100] Get xCAT MASTER from dhcpclient lease file for
 configinterface postscripts (#4834)

* Get MASTER from dhcp identifier for configinterface postscripts

* modify MASTER line
---
 xCAT/postscripts/configinterface | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xCAT/postscripts/configinterface b/xCAT/postscripts/configinterface
index 4c99ec2aa..25e465d5e 100755
--- a/xCAT/postscripts/configinterface
+++ b/xCAT/postscripts/configinterface
@@ -9,6 +9,7 @@ fi
 
 xcat_intf="/etc/network/interfaces.d/xCAT.intf"
 
+MASTER=$(cat /var/lib/dhcp/dhclient.eth0.leases|sed -n 's/.*cumulus-provision-url.*http:\/\+\([^\/]\+\)\/.*/\1/p'|tail -1)
 if [ -z "$MASTER" ]; then
     echo "xCAT Master unset! Cannot download interface description"
     exit 2

From 01f80c52f9ac0d6841a4a6e2e3206dd37663b19c Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Thu, 22 Feb 2018 23:18:55 -0500
Subject: [PATCH 071/100] Update rspconfig in python PR based on comments

---
 .../agent/hwctl/executor/openbmc_bmcconfig.py | 35 +++++++++----------
 .../lib/python/agent/hwctl/openbmc_client.py  |  2 +-
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
index d88dc5429..8b9c90f81 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
@@ -101,9 +101,10 @@ rmdir \"/tmp/$userid\" \n")
                                    debugmode=self.debugmode, verbose=self.verbose)
         try:
             obmc.login()
-            obmc.set_ipdhcp(key)
+            obmc.set_ipdhcp()
         except (SelfServerException, SelfClientException) as e:
             self.callback.info("%s: %s" % (node, e.message))
+            return
 
         self.callback.info("%s: BMC Setting IP to DHCP..." % (node))
         try:
@@ -214,38 +215,34 @@ rmdir \"/tmp/$userid\" \n")
         if hostname:
             self.callback.info("%s: BMC Hostname: %s" %(node, bmchostname))
         dic_length = len(netinfo) 
-        ip_list = []
-        ipsrc_list = []
-        netmask_list = []
-        gateway_list = []
-        vlan_list = []
-        ntpserver_list = []
+        netinfodict = {'ip':[], 'netmask':[], 'gateway':[],
+                   'vlan':[], 'ipsrc':[], 'ntpserver':[]}
         for nic,attrs in netinfo.items():
             addon_string = ''
             if dic_length > 1:
                 addon_string = " for %s" % nic
-            ip_list.append("BMC IP"+addon_string+": %s" % attrs["ip"])
-            netmask_list.append("BMC Netmask"+addon_string+": %s" % attrs["netmask"])
-            gateway_list.append("BMC Gateway"+addon_string+": %s (default: %s)" % (attrs["gateway"], defaultgateway))
-            vlan_list.append("BMC VLAN ID"+addon_string+": %s" % attrs["vlanid"])
-            ipsrc_list.append("BMC IP Source"+addon_string+": %s" % attrs["ipsrc"])
-            ntpserver_list.append("BMC NTP Servers"+addon_string+": %s" % attrs["ntpservers"])
+            netinfodict['ip'].append("BMC IP"+addon_string+": %s" % attrs["ip"])
+            netinfodict['netmask'].append("BMC Netmask"+addon_string+": %s" % attrs["netmask"])
+            netinfodict['gateway'].append("BMC Gateway"+addon_string+": %s (default: %s)" % (attrs["gateway"], defaultgateway))
+            netinfodict['vlan'].append("BMC VLAN ID"+addon_string+": %s" % attrs["vlanid"])
+            netinfodict['ipsrc'].append("BMC IP Source"+addon_string+": %s" % attrs["ipsrc"])
+            netinfodict['ntpserver'].append("BMC NTP Servers"+addon_string+": %s" % attrs["ntpservers"])
         if ip:
-            for i in ip_list:
+            for i in netinfodict['ip']:
                 self.callback.info("%s: %s" % (node, i))
         if netmask:
-            for i in netmask_list:
+            for i in netinfodict['netmask']:
                 self.callback.info("%s: %s" % (node, i))
         if gateway:
-            for i in gateway_list:
+            for i in netinfodict['gateway']:
                 self.callback.info("%s: %s" % (node, i))
         if ipsrc:
-            for i in ipsrc_list:
+            for i in netinfodict['ipsrc']:
                 self.callback.info("%s: %s" % (node, i))
         if vlan:
-            for i in vlan_list:
+            for i in netinfodict['vlan']:
                 self.callback.info("%s: %s" % (node, i))
         if ntpserver:
-            for i in ntpserver_list:
+            for i in netinfodict['netserver']:
                 self.callback.info("%s: %s" % (node, i))
         return netinfo
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index 6d4ae216e..8ebfc7831 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -554,7 +554,7 @@ class OpenBMCRest(object):
                     utils.update2Ddict(netinfo, nicid, "ip", v["Address"])
                     if dev in data:
                         info = data[dev]
-                        utils.update2Ddict(netinfo, nicid, "vlanid", info["Id"])
+                        utils.update2Ddict(netinfo, nicid, "vlanid", info.get("Id", "Disable"))
                         utils.update2Ddict(netinfo, nicid, "mac", info["MACAddress"])
                         utils.update2Ddict(netinfo, nicid, "ntpservers", info["NTPServers"])            
             return netinfo

From bfc367cb8834cbb0557f99c4f9231e9800248682 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Thu, 22 Feb 2018 02:01:41 -0500
Subject: [PATCH 072/100] rspconfig dump in python

---
 .../lib/python/agent/common/rest.py           |  23 +++
 .../lib/python/agent/hwctl/bmcconfig.py       |   8 +-
 .../agent/hwctl/executor/openbmc_bmcconfig.py | 152 +++++++++++++++++-
 .../lib/python/agent/hwctl/openbmc_client.py  |  93 ++++++++++-
 .../lib/python/agent/xcatagent/openbmc.py     |   4 +-
 5 files changed, 264 insertions(+), 16 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/common/rest.py b/xCAT-openbmc-py/lib/python/agent/common/rest.py
index 8a49016c7..cafc2e742 100644
--- a/xCAT-openbmc-py/lib/python/agent/common/rest.py
+++ b/xCAT-openbmc-py/lib/python/agent/common/rest.py
@@ -37,6 +37,29 @@ class RestSession(object):
 
         return response
 
+    def request_download(self, method, url, headers, file_path, using_curl=False):
+
+        if using_curl:
+            response = self._download_by_curl(method, url, headers, file_path)
+        else:
+            response = self.session.request('GET', url, headers=headers)
+            file_handle = open(file_path, "wb")
+            for chunk in response.iter_content(chunk_size=1024):
+                if chunk:
+                    file_handle.write(chunk)
+
+        return response
+
+    def _download_by_curl(self, method, url, headers, file_path):
+
+        header_str = ' '.join([ "%s: %s" % (k, v) for k,v in headers.items() ])
+        request_cmd = 'curl -J -k -b sid=%s -H "%s" -X %s -o %s %s -s' % \
+                      (self.cookies['sid'], header_str, method, file_path, url)
+
+        sub = Popen(request_cmd, stdout=PIPE, shell=True)
+        response, err = sub.communicate()
+        return response
+
     def request_upload(self, method, url, headers, files, using_curl=True):
         if using_curl:
             return self._upload_by_curl(method, url, headers, files)
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/bmcconfig.py
index 5bdb5bc1d..ec19b596c 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/bmcconfig.py
@@ -16,11 +16,11 @@ class BmcConfigInterface(object):
     def dump_generate(self, task):
         return task.run("dump_generate")
 
-    def dump_clear(self, task, id):
-        return task.run("dump_clear", id)
+    def dump_clear(self, task, clear_arg):
+        return task.run("dump_clear", clear_arg)
 
-    def dump_download(self, task, id):
-        return task.run("dump_download", id)
+    def dump_download(self, task, download_arg):
+        return task.run("dump_download", download_arg)
 
     def dump_process(self, task):
         return task.run("dump_process")
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
index b7ae94bed..412ddfb37 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
@@ -5,6 +5,7 @@
 # -*- coding: utf-8 -*-
 #
 from __future__ import print_function
+import os, stat
 import gevent
 import time
 
@@ -18,22 +19,157 @@ logger = logging.getLogger('xcatagent')
 RSPCONFIG_GET_NETINFO=['ip', 'netmask', 'gateway', 'vlan', 'ipsrc', 'hostname']
 RSPCONFIG_SET_NETINFO=['ip', 'netmask', 'gateway', 'vlan']
 
+XCAT_LOG_DUMP_DIR = "/var/log/xcat/dump/"
+
 class OpenBMCBmcConfigTask(ParallelNodesCommand):
-        
+
+    def pre_dump_download(self, task, download_arg, **kw):
+
+       if download_arg == 'all':
+            self.callback.info('Downloading all dumps...')
+       if not os.path.exists(XCAT_LOG_DUMP_DIR):
+            os.makedirs(XCAT_LOG_DUMP_DIR) 
+
+    def pre_dump_process(self, task, **kw):
+
+        self.callback.info('Capturing BMC Diagnostic information, this will take some time...')
+
+    def _dump_download(self, obmc, node, download_id, flag_dump_process=False):
+
+        formatted_time = time.strftime("%Y%m%d-%H%M", time.localtime(time.time()))
+        dump_log_file = '%s%s_%s_dump_%s.tar.xz' % (XCAT_LOG_DUMP_DIR, formatted_time, node, download_id)
+        if flag_dump_process:
+            self.callback.info('%s: Downloading dump %s to %s' % (node, download_id, dump_log_file))
+
+        obmc.download_dump(download_id, dump_log_file)
+        if os.path.exists(dump_log_file):
+            grep_cmd = '/usr/bin/grep -a'
+            path_not_found = '"Path not found"'
+            check_cmd = grep_cmd + ' ' + path_not_found + ' ' + dump_log_file
+            grep_string = os.popen(check_cmd).readlines()
+            if grep_string:
+                result = 'Invalid dump %s was specified. Use -l option to list.' % download_id
+            else:
+                result = 'Downloaded dump %s to %s.' % (download_id, dump_log_file)
+        else:
+            result = 'Failed to download dump %s to %s.' % (download_id, dump_log_file)
+        return result
+
     def dump_list(self, **kw):
-        return self.callback.info('dump_list') 
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+
+        dump_info = []
+        try:
+            obmc.login()
+            dump_dict = obmc.list_dump_info()
+
+            if not dump_dict:
+                self.callback.info('%s: No attributes returned from the BMC.' % node)
+
+            keys = dump_dict.keys()
+            keys.sort()
+            for key in keys:
+                info = '[%d] Generated: %s, Size: %s' % \
+                       (key, dump_dict[key]['Generated'], dump_dict[key]['Size'])
+                dump_info += info
+                self.callback.info('%s: %s'  % (node, info))
+
+        except (SelfServerException, SelfClientException) as e:
+            self.callback.info('%s: %s'  % (node, e.message))
+
+        return dump_info
 
     def dump_generate(self, **kw):
-        return self.callback.info("dump_generate")
 
-    def dump_clear(self, id, **kw):
-        return self.callback.info("dump_clear id: %s" % id)
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
 
-    def dump_download(self, id, **kw):
-        return self.callback.info("dump_download id: %s" % id)
+        dump_id = None
+        try:
+            obmc.login()
+            dump_id = obmc.create_dump()
+            if not dump_id:
+                self.callback.info('%s: BMC returned 200 OK but no ID was returned.  Verify manually on the BMC.' % node)
+            else:
+                self.callback.info('%s: [%s] success'  % (node, dump_id))
+        except (SelfServerException, SelfClientException) as e:
+            self.callback.info('%s: %s'  % (node, e.message))
+
+        return dump_id
+
+    def dump_clear(self, clear_arg, **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+
+        try:
+            obmc.login()
+            obmc.clear_dump(clear_arg)
+
+            result = '%s: [%s] clear' % (node, clear_arg)  
+        except (SelfServerException, SelfClientException) as e:
+            result = '%s: %s'  % (node, e.message)
+
+        self.callback.info(result) 
+
+    def dump_download(self, download_arg, **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+
+        try:
+            obmc.login()
+            if download_arg != 'all':
+                result = self._dump_download(obmc, node, download_arg)
+                self.callback.info('%s: %s'  % (node, result))
+                return
+
+            dump_dict = obmc.list_dump_info()
+            keys = dump_dict.keys()
+            keys.sort()
+
+            for key in keys:
+                result = self._dump_download(obmc, node, str(key))
+                self.callback.info('%s: %s'  % (node, result))
+        except SelfServerException as e:
+            self.callback.info('%s: %s'  % (node, e.message))
 
     def dump_process(self, **kw):
-        return self.callback.info("dump_process: trigger, list and download")
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+
+        try:
+            obmc.login()
+            flag = False
+            dump_id = obmc.create_dump()
+            self.callback.info('%s: Dump requested. Target ID is %s, waiting for BMC to generate...'  % (node, dump_id)) 
+            for i in range(20):
+                dump_dict = obmc.list_dump_info()            
+                if dump_id in dump_dict:
+                    flag = True
+                    break
+                if (20-i) % 8 == 0:
+                    self.callback.info('%s: Still waiting for dump %s to be generated... '  % (node, dump_id))
+
+                gevent.sleep( 15 )
+
+            if flag: 
+                result = self._dump_download(obmc, node, str(dump_id), flag_dump_process=True)
+            else:
+                result = 'Could not find dump %s after waiting %d seconds.' % (dump_id, 20 * 15) 
+
+            self.callback.info('%s: %s'  % (node, result))
+
+        except SelfServerException as e:
+            self.callback.info('%s: %s'  % (node, e.message))
 
     def set_sshcfg(self, **kw):
         return self.callback.info("set_sshcfg")
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index f1fa55057..1f9500791 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -9,7 +9,7 @@ import requests
 import json
 import time
 
-from common import rest
+from common import utils, rest
 from common.exceptions import SelfClientException, SelfServerException
 
 import logging
@@ -29,6 +29,23 @@ RBEACON_URLS = {
     },
 }
 
+DUMP_URLS = {
+    "clear"     : {
+        "path"  : "/dump/entry/#ID#/action/Delete",
+        "field" : [],
+    },
+    "clear_all" : {
+        "path"  : "/dump/action/DeleteAll",
+        "field" : [],
+    },
+    "create"    : {
+        "path"  : "/dump/action/CreateDump",
+        "field" : [],
+    },
+    "download"  : "download/dump/#ID#",
+    "list"      : "/dump/enumerate", 
+}
+
 INVENTORY_URL = "/inventory/enumerate"
 
 LEDS_URL = "/led/physical/enumerate"
@@ -209,6 +226,7 @@ class OpenBMCRest(object):
 
         self.session = rest.RestSession()
         self.root_url = HTTP_PROTOCOL + self.bmcip + PROJECT_URL
+        self.download_root_url = HTTP_PROTOCOL + self.bmcip + '/'
 
     def _print_record_log (self, msg, cmd):
 
@@ -218,13 +236,16 @@ class OpenBMCRest(object):
             self.messager.info(localtime + ' ' + log)
             logger.debug(log)
 
-    def _log_request (self, method, url, headers, data=None, files=None, cmd=''):
+    def _log_request (self, method, url, headers, data=None, files=None, file_path=None, cmd=''):
 
         header_str = ' '.join([ "%s: %s" % (k, v) for k,v in headers.items() ])
         msg = 'curl -k -c cjar -b cjar -X %s -H \"%s\" ' % (method, header_str)
 
         if files:
             msg += '-T \'%s\' %s -s' % (files, url)
+        elif file_path:
+            msg = 'curl -J -k -c cjar -b cjar -X %s -H \"%s\" %s -o %s' % \
+                  (method, header_str, url, file_path)
         elif data:
             if cmd == 'login':
                 data = data.replace(self.password, "xxxxxx")
@@ -273,6 +294,32 @@ class OpenBMCRest(object):
             self._print_record_log(error, cmd)
             raise SelfServerException(error)
 
+    def download(self, method, resource, file_path, headers=None, cmd=''):
+
+        httpheaders = headers or OpenBMCRest.headers
+        url = resource
+        if not url.startswith(HTTP_PROTOCOL):
+            url = self.download_root_url + resource
+
+        request_cmd = self._log_request(method, url, httpheaders, file_path=file_path, cmd=cmd)
+
+        try:
+            response = self.session.request_download(method, url, httpheaders, file_path)
+        except SelfServerException as e:
+            self._print_record_log(e.message, cmd=cmd)
+            raise
+        except SelfClientException as e:
+            error = e.message
+            self._print_record_log(error, cmd=cmd)
+            raise
+
+        if not response:
+            self._print_record_log('No response received', cmd=cmd)
+            return True
+
+        self._print_record_log(str(response.status_code), cmd=cmd)
+        return True
+
     def upload (self, method, resource, files, headers=None, cmd=''):
 
         httpheaders = headers or OpenBMCRest.headers
@@ -511,6 +558,48 @@ class OpenBMCRest(object):
             data={"data": attr_info['get_data']}
         return self.request(method, get_url, payload=data, cmd="get_%s" % key)
 
+    def clear_dump(self, clear_arg):
+
+        if clear_arg == 'all':
+            payload = { "data": DUMP_URLS['clear_all']['field'] }
+            self.request('POST', DUMP_URLS['clear_all']['path'], payload=payload, cmd='clear_dump_all')
+        else: 
+            path = DUMP_URLS['clear']['path'].replace('#ID#', clear_arg)
+            payload = { "data": DUMP_URLS['clear']['field'] }
+            self.request('POST', path, payload=payload, cmd='clear_dump')
+
+    def create_dump(self):
+
+        payload = payload = { "data": DUMP_URLS['create']['field'] }
+        return self.request('POST', DUMP_URLS['create']['path'], payload=payload, cmd='create_dump')
+
+    def list_dump_info(self):
+
+        dump_data = self.request('GET', DUMP_URLS['list'], cmd='list_dump_info')
+
+        try:
+            dump_dict = {}
+            for key, value in dump_data.items():
+                if 'Size' not in value or 'Elapsed' not in value:
+                    continue
+
+                key_id = int(key.split('/')[-1])
+                timestamp = value['Elapsed']
+                gen_time = time.strftime("%m/%d/%Y %H:%M:%S", time.localtime(timestamp))
+                dump_dict.update({key_id: {'Size': value['Size'], 'Generated': gen_time}})
+
+            return dump_dict
+        except KeyError:
+            error = 'Error: Received wrong format response: %s' % inventory_data
+            raise SelfServerException(error) 
+
+    def download_dump(self, download_id, file_path):
+
+        headers = {'Content-Type': 'application/octet-stream'}
+        path = DUMP_URLS['download'].replace('#ID#', download_id)
+        self.download('GET', path, file_path, headers=headers, cmd='download_dump')
+
+
 class OpenBMCImage(object):
     def __init__(self, rawid, data=None):
         self.id = rawid.split('/')[-1]
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index 621e7301f..f29caf871 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -724,9 +724,9 @@ class OpenBMCManager(base.BaseManager):
             elif opts['--generate']:
                 DefaultBmcConfigManager().dump_generate(runner)
             elif opts['--clear']:
-                DefaultBmcConfigManager().dump_clear(runner, opts['--clear'])
+                DefaultBmcConfigManager().dump_clear(runner, opts['--clear'][0])
             elif opts['--download']:
-                DefaultBmcConfigManager().dump_download(runner, opts['--download'])
+                DefaultBmcConfigManager().dump_download(runner, opts['--download'][0])
             else:
                 DefaultBmcConfigManager().dump_process(runner)
         elif opts['sshcfg']:

From 989a4775edfd7abda8d0890161d2f68a970601d6 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Fri, 23 Feb 2018 01:58:47 -0500
Subject: [PATCH 073/100] take get_netinfo back

---
 .../lib/python/agent/common/rest.py           |  2 +-
 .../lib/python/agent/hwctl/openbmc_client.py  | 46 ++++++++++++++++++-
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/common/rest.py b/xCAT-openbmc-py/lib/python/agent/common/rest.py
index cafc2e742..250fea527 100644
--- a/xCAT-openbmc-py/lib/python/agent/common/rest.py
+++ b/xCAT-openbmc-py/lib/python/agent/common/rest.py
@@ -37,7 +37,7 @@ class RestSession(object):
 
         return response
 
-    def request_download(self, method, url, headers, file_path, using_curl=False):
+    def request_download(self, method, url, headers, file_path, using_curl=True):
 
         if using_curl:
             response = self._download_by_curl(method, url, headers, file_path)
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index bb3bee3e1..39297f2c8 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -583,7 +583,7 @@ class OpenBMCRest(object):
 
     def create_dump(self):
 
-        payload = payload = { "data": DUMP_URLS['create']['field'] }
+        payload = { "data": DUMP_URLS['create']['field'] }
         return self.request('POST', DUMP_URLS['create']['path'], payload=payload, cmd='create_dump')
 
     def list_dump_info(self):
@@ -612,6 +612,50 @@ class OpenBMCRest(object):
         path = DUMP_URLS['download'].replace('#ID#', download_id)
         self.download('GET', path, file_path, headers=headers, cmd='download_dump')
 
+    def get_netinfo(self):
+        data = self.request('GET', RSPCONFIG_NETINFO_URL['get_netinfo'], cmd="get_netinfo")
+        try:
+            netinfo = {}
+            for k, v in data.items():
+                if 'network/config' in k:
+                    if 'HostName' in v:
+                        netinfo["hostname"] = v["HostName"]
+                    if 'DefaultGateway' in v:
+                        netinfo["defaultgateway"] = v["DefaultGateway"]
+                    continue
+                dev,match,netid = k.partition("/ipv4/")
+                if netid:
+                    if 'LinkLocal' in v["Origin"] or v["Address"].startswith("169.254"):
+                        msg = "Found LinkLocal address %s for interface %s, Ignoring..." % (v["Address"], dev)
+                        self._print_record_log(msg, 'get_netinfo')
+                        continue
+                    nicid = dev.split('/')[-1]
+                    if nicid not in netinfo:
+                        netinfo[nicid] = {}
+                    if 'ip' in netinfo[nicid]:
+                        msg = "%s: Another valid ip %s found." % (node, v["Address"])
+                        self._print_record_log(msg, 'get_netinfo')
+                        continue
+                    utils.update2Ddict(netinfo, nicid, "ipsrc", v["Origin"].split('.')[-1])
+                    utils.update2Ddict(netinfo, nicid, "netmask", v["PrefixLength"])
+                    utils.update2Ddict(netinfo, nicid, "gateway", v["Gateway"])
+                    utils.update2Ddict(netinfo, nicid, "ip", v["Address"])
+                    if dev in data:
+                        info = data[dev]
+                        utils.update2Ddict(netinfo, nicid, "vlanid", info.get("Id", "Disable"))
+                        utils.update2Ddict(netinfo, nicid, "mac", info["MACAddress"])
+                        utils.update2Ddict(netinfo, nicid, "ntpservers", info["NTPServers"])            
+            return netinfo
+        except KeyError:
+            error = 'Error: Received wrong format response: %s' % data
+            raise SelfServerException(error)
+        
+
+    def set_ipdhcp(self):
+        payload = { "data": [] }
+        return self.request('PUT', RSPCONFIG_NETINFO_URL['ipdhcp'], payload=payload, cmd="set_bmcip_dhcp")
+
+
 class OpenBMCImage(object):
     def __init__(self, rawid, data=None):
         self.id = rawid.split('/')[-1]

From d68a68a260bb2f957c9070075a50b4de5fa59d69 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Fri, 23 Feb 2018 02:26:42 -0500
Subject: [PATCH 074/100] modified depending on comments

---
 .../lib/python/agent/hwctl/executor/openbmc_bmcconfig.py      | 1 +
 xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
index 1a9a1727c..a3240bc48 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
@@ -75,6 +75,7 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
 
             if not dump_dict:
                 self.callback.info('%s: No attributes returned from the BMC.' % node)
+                return dump_info
 
             keys = dump_dict.keys()
             keys.sort()
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index 39297f2c8..29169ff8a 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -327,7 +327,7 @@ class OpenBMCRest(object):
             raise
 
         if not response:
-            self._print_record_log('No response received', cmd=cmd)
+            self._print_record_log('No response received for command %s' % request_cmd, cmd=cmd)
             return True
 
         self._print_record_log(str(response.status_code), cmd=cmd)
@@ -603,7 +603,7 @@ class OpenBMCRest(object):
 
             return dump_dict
         except KeyError:
-            error = 'Error: Received wrong format response: %s' % inventory_data
+            error = 'Error: Received wrong format response: %s' % dump_data
             raise SelfServerException(error) 
 
     def download_dump(self, download_id, file_path):

From 0e8fb75d3aee558725dd59bdb137a3585bb30f89 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Fri, 23 Feb 2018 13:02:50 -0500
Subject: [PATCH 075/100] eventlog in Python RAS policy support

---
 .../lib/python/agent/hwctl/openbmc_client.py  | 65 ++++++++++++++-----
 .../lib/python/agent/xcatagent/openbmc.py     |  6 +-
 xCAT-server/lib/xcat/plugins/openbmc2.pm      |  7 +-
 3 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index 70b69eaeb..ca456abab 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -5,6 +5,7 @@
 # -*- coding: utf-8 -*-
 #
 
+import os
 import requests
 import json
 import time
@@ -141,8 +142,6 @@ FIRM_URLS = {
     }
 }
 
-EVENTLOG_URL = "/logging/enumerate"
-
 RSPCONFIG_APIS = {
     'autoreboot' : {
         'baseurl': "/control/host0/auto_reboot/",
@@ -186,6 +185,11 @@ RSPCONFIG_APIS = {
     },
 }
 
+EVENTLOG_URL      = "/logging/enumerate"
+RAS_POLICY_TABLE  = "/opt/ibm/ras/lib/policyTable.json"
+RAS_POLICY_MSG    = "Install the OpenBMC RAS package to obtain more details logging messages."
+RAS_NOT_FOUND_MSG = " Not found in policy table: "
+
 RESULT_OK = 'ok'
 RESULT_FAIL = 'fail'
 
@@ -492,10 +496,23 @@ class OpenBMCRest(object):
     def get_eventlog_info(self):
 
         eventlog_data = self.request('GET', EVENTLOG_URL, cmd='get_eventlog_info')
+
+        # Check if policy table file is there
+        ras_event_mapping = {}
+        if os.path.isfile(RAS_POLICY_TABLE):
+            with open(RAS_POLICY_TABLE, "r") as data_file:
+                policy_hash = json.load(data_file)
+                if policy_hash:
+                    ras_event_mapping = policy_hash['events']
+                else:
+                    self.messager.info(RAS_POLICY_MSG)
+                data_file.close()
+        else:
+            self.messager.info(RAS_POLICY_MSG)
         try:
             eventlog_dict = {}
             for key, value in sorted(eventlog_data.items()):
-                id, event_log_line = self.parse_event_data(value)
+                id, event_log_line = self.parse_event_data(value, ras_event_mapping)
                 if int(id) != 0:
                     eventlog_dict[str(id)] = event_log_line
             return eventlog_dict
@@ -504,8 +521,9 @@ class OpenBMCRest(object):
             raise SelfServerException(error)
 
     # Parse a single eventlog entry and return data in formatted string
-    def parse_event_data(self, event_log_entry):
+    def parse_event_data(self, event_log_entry, ras_event_mapping):
         formatted_line = ""
+        callout_data = ""
         LED_tag = " [LED]"
         timestamp_str = ""
         message_str = ""
@@ -518,35 +536,46 @@ class OpenBMCRest(object):
                 for (data_key) in v:
                     additional_data = data_key.split("=");
                     if additional_data[0] == 'ESEL':
-                        #self.messager.info('        ESEL : <long data string>')
-                        info = additional_data[0].split('=')
-                        #esel = info[1]
+                        esel = additional_data[1]
+                        # Placeholder, not currently used
                     elif additional_data[0] == '_PID':
-                        pid_str = " (PID: " + str(additional_data[1]) + ")"
+                        pid_str = "PID: " + str(additional_data[1]) + "),"
                     elif 'CALLOUT_DEVICE_PATH' in additional_data[0]:
                         callout = True
-                        info = additional_data[0].split('=')
-                        #callout_data = info[1]
+                        callout_data = "I2C"
                     elif 'CALLOUT_INVENTORY_PATH' in additional_data[0]:
                         callout = True
-                        callout_data="I2C"
+                        callout_data = additional_data[1]
                     elif 'CALLOUT' in additional_data[0]:
                         callout = True
-                    #else:
-                    #    self.messager.info('        %s : %s' % (additional_data[0], additional_data[1]))
+                    elif 'GPU' in additional_data[0]:
+                        callout_data="/xyz/openbmc_project/inventory/system/chassis/motherboard/gpu"
+                    elif 'PROCEDURE' in additional_data[0]:
+                        callout_data = '{:x}'.format(int(additional_data[1])) #Convert to hext
             elif sub_key == 'Timestamp':
                 timestamp = time.localtime(v / 1000)
                 timestamp_str = time.strftime("%m/%d/%Y %T", timestamp)
             elif sub_key == 'Id':
-                #id_str = " [{0}]".format(v)
                 id_str = str(v)
             elif sub_key == 'Resolved':
                 resolved_str = " Resolved: " + str(v)
             elif sub_key == 'Message':
-                message_str = " " + v
-            #else:
-            #    self.messager.info('    %s : %s' % (sub_key, v))
-        formatted_line = timestamp_str + " [" + id_str +"]" + ":" + message_str + pid_str + resolved_str
+                message_str = v
+        if callout_data:
+            message_str += "||" + callout_data
+
+        # If event data mapping was read in from RAS policy table, display a more detailed message
+        if ras_event_mapping:
+            if message_str in ras_event_mapping:
+                event_type = ras_event_mapping[message_str]['EventType']
+                event_message = ras_event_mapping[message_str]['Message']
+                severity = ras_event_mapping[message_str]['Severity']
+                affect = ras_event_mapping[message_str]['AffectedSubsystem']
+                formatted_line = timestamp_str + " [" + id_str +"]" + ": " + event_type + ", " + "(" + severity + ") " + event_message + " (AffectedSubsystem: " + affect + ", " + pid_str + resolved_str
+            else:
+                formatted_line = timestamp_str + " [" + id_str +"]" + ":" + RAS_NOT_FOUND_MSG + message_str + " (" + pid_str + resolved_str
+        else:
+            formatted_line = timestamp_str + " [" + id_str +"]" + ": " + message_str + " (" + pid_str + resolved_str
         if callout:
             formatted_line += LED_tag
         return id_str, formatted_line
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index 63f6abff9..16d20823a 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -841,7 +841,9 @@ class OpenBMCManager(base.BaseManager):
 
         reventlog_usage = """
         Usage:
-            eventlog [-V|--verbose] [<number>|all|clear|resolved=(<id>|LED)]
+            reventlog [-V|--verbose] [resolved=LED|resolved=<num>]
+            reventlog [-V|--verbose] [clear|all]
+            reventlog [-V|--verbose] [<number>]
 
         Options:
             -V --verbose   eventlog verbose mode.
@@ -857,8 +859,6 @@ class OpenBMCManager(base.BaseManager):
             return
 
         # 2, validate the args
-        self.messager.error("reventlog action: %s" % action)
-        self.messager.error("reventlog args: %s" % args)
         #if action not in EVENTLOG_OPTIONS:
         #    self.messager.error("Not supported subcommand for reventlog: %s" % action)
         #    return
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index d788b82c6..84cc74df2 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -259,9 +259,8 @@ sub parse_args {
         xCAT_plugin::openbmc::parse_args('rspconfig', $extrargs, $noderange);
     } elsif ($command eq "reventlog") {
         $subcommand = "all" if (!defined($ARGV[0]));
-        if ($subcommand =~ /^(\w+)=(.*)/) {
-            my $key = $1;
-            my $value = $2;
+        if ($subcommand =~ /^resolved=(.*)/) {
+            my $value = $1;
             if (not $value) {
                 return ([ 1, "$usage_errormsg $reventlog_no_id_resolved_errormsg" ]);
             }
@@ -272,7 +271,7 @@ sub parse_args {
             }
 
             xCAT::SvrUtils::sendmsg("Attempting to resolve the following log entries: $value...", $callback);
-        } elsif ($subcommand !~ /^\d$|^\d+$|^all$|^clear$/) {
+        } elsif ($subcommand !~ /^\d+$|^all$|^clear$/) {
             if ($subcommand =~ "resolved") {
                 return ([ 1, "$usage_errormsg $reventlog_no_id_resolved_errormsg" ]);
             }

From 29f6fa75cfa0dd6e2d98a07891fc4d7f295f7e3b Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Mon, 26 Feb 2018 03:37:08 -0500
Subject: [PATCH 076/100] rspconfig gard&admin_passwd in python

---
 .../lib/python/agent/hwctl/bmcconfig.py       |  3 ++
 .../agent/hwctl/executor/openbmc_bmcconfig.py | 37 ++++++++++++++++++-
 .../lib/python/agent/hwctl/openbmc_client.py  | 15 ++++++++
 .../lib/python/agent/xcatagent/openbmc.py     | 16 +++++---
 xCAT-server/lib/xcat/plugins/openbmc2.pm      |  7 +++-
 5 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/bmcconfig.py
index ec19b596c..76355be85 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/bmcconfig.py
@@ -25,6 +25,9 @@ class BmcConfigInterface(object):
     def dump_process(self, task):
         return task.run("dump_process")
 
+    def gard_clear(self, task):
+        return task.run("gard_clear")
+
     def set_sshcfg(self, task):
         return task.run("set_sshcfg")
 
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
index a3240bc48..5b29ced08 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
@@ -179,6 +179,20 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
         except SelfServerException as e:
             self.callback.info('%s: %s'  % (node, e.message))
 
+    def gard_clear(self, **kw):
+
+        node = kw['node']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+
+        try:
+            obmc.login()
+            obmc.clear_gard()
+            self.callback.info('%s: GARD cleared' % node)
+
+        except SelfServerException as e:
+            self.callback.info('%s: %s'  % (node, e.message))
+
     def pre_set_sshcfg(self, *arg, **kw):
         local_home_dir=os.path.expanduser('~')
         self.local_ssh_dir = local_home_dir + "/.ssh/"
@@ -271,6 +285,8 @@ rmdir \"/tmp/$userid\" \n")
                 netinfo_dict[k] = v
             elif k == 'hostname':
                 self._set_hostname(v, **kw)
+            elif k == 'admin_passwd':
+                self._set_admin_password(v, **kw)
             elif k in openbmc.RSPCONFIG_APIS:
                 self._set_apis_values(k, v, **kw)
             else:
@@ -292,7 +308,26 @@ rmdir \"/tmp/$userid\" \n")
         self._set_apis_values("hostname", hostname, **kw)
         self._get_netinfo(hostname=True, ntpserver=False, **kw) 
         return
-        
+
+    def _set_admin_password(self, admin_passwd, **kw):
+        node = kw['node']
+        node_info = kw['nodeinfo']
+
+        origin_passwd, new_passwd = admin_passwd.split(',')
+
+        if origin_passwd != node_info['password']:
+            self.callback.info('%s: Current BMC password is incorrect, cannot set the new password.' % node)
+            return
+
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=node_info, messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+        try:
+            obmc.login()
+            obmc.set_admin_passwd(new_passwd)
+            self.callback.info("%s: BMC Setting Password..." % node)
+        except (SelfServerException, SelfClientException) as e:
+            self.callback.info("%s: %s" % (node, e.message))
+
     def _set_apis_values(self, key, value, **kw):
         node = kw['node']
         obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index 29169ff8a..55ced2396 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -46,6 +46,8 @@ DUMP_URLS = {
     "list"      : "/dump/enumerate", 
 }
 
+GARD_CLEAR_URL = "/org/open_power/control/gard/action/Reset"
+
 INVENTORY_URL = "/inventory/enumerate"
 
 LEDS_URL = "/led/physical/enumerate"
@@ -166,6 +168,8 @@ RSPCONFIG_NETINFO_URL = {
     'ntpserver': "/network/#NIC#/attr/NTPServers",
 }
 
+PASSWD_URL = '/user/root/action/SetPassword'
+
 RSPCONFIG_APIS = {
     'hostname': {
         'baseurl': "/network/config/",
@@ -571,6 +575,11 @@ class OpenBMCRest(object):
             data={"data": attr_info['get_data']}
         return self.request(method, get_url, payload=data, cmd="get_%s" % key)
 
+    def set_admin_passwd(self, passwd):
+
+        payload = { "data": [passwd] }
+        self.request('POST', PASSWD_URL, payload=payload, cmd='set_admin_password')
+
     def clear_dump(self, clear_arg):
 
         if clear_arg == 'all':
@@ -612,6 +621,12 @@ class OpenBMCRest(object):
         path = DUMP_URLS['download'].replace('#ID#', download_id)
         self.download('GET', path, file_path, headers=headers, cmd='download_dump')
 
+    def clear_gard(self):
+
+        payload = { "data": [] }
+        url = HTTP_PROTOCOL + self.bmcip + GARD_CLEAR_URL
+        return self.request('POST', url, payload=payload, cmd='clear_gard')
+
     def get_netinfo(self):
         data = self.request('GET', RSPCONFIG_NETINFO_URL['get_netinfo'], cmd="get_netinfo")
         try:
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index 4d089d1c8..29ca44559 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -91,13 +91,15 @@ RSPCONFIG_SET_OPTIONS = {
     'powersupplyredundancy':"^enabled$|^disabled$",
     'powerrestorepolicy':"^always_on$|^always_off$|^restore$",
     'bootmode':"^regular$|^safe$|^setup$",
+    'admin_passwd':'.*,.*',
 }
 RSPCONFIG_USAGE = """
 Handle rspconfig operations.
 
 Usage:
        rspconfig -h|--help
-       rspconfig dump [[-l|--list] | [-g|--generate] | [-c|--clear <arg>] | [-d|--download <arg>]] [-V|--verbose]
+       rspconfig dump [[-l|--list] | [-g|--generate] | [-c|--clear --id <arg>] | [-d|--download --id <arg>]] [-V|--verbose]
+       rspconfig gard -c|--clear [-V|--verbose]
        rspconfig sshcfg [-V|--verbose]
        rspconfig ip=dhcp [-V|--verbose]
        rspconfig get [<args>...] [-V|--verbose]
@@ -107,8 +109,9 @@ Options:
   -V,--verbose        Show verbose message
   -l,--list           List are dump files
   -g,--generate       Trigger a new dump file
-  -c,--clear <arg>    The id of file to clear or all if specify 'all'
-  -d,--download <arg> The id of file to download or all if specify 'all'
+  -c,--clear          To clear the specified dump file
+  -d,--download       To download specified dump file
+  --id <arg>          The dump file id or 'all'
 
 The supported attributes to get are: %s
 
@@ -724,11 +727,14 @@ class OpenBMCManager(base.BaseManager):
             elif opts['--generate']:
                 DefaultBmcConfigManager().dump_generate(runner)
             elif opts['--clear']:
-                DefaultBmcConfigManager().dump_clear(runner, opts['--clear'][0])
+                DefaultBmcConfigManager().dump_clear(runner, opts['--id'])
             elif opts['--download']:
-                DefaultBmcConfigManager().dump_download(runner, opts['--download'][0])
+                DefaultBmcConfigManager().dump_download(runner, opts['--id'])
             else:
                 DefaultBmcConfigManager().dump_process(runner)
+        elif opts['gard']:
+            if opts['--clear']:
+                DefaultBmcConfigManager().gard_clear(runner)
         elif opts['sshcfg']:
             DefaultBmcConfigManager().set_sshcfg(runner)
         elif opts['ip=dhcp']:
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index 439c99dc6..8a29ae223 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -344,13 +344,18 @@ sub refactor_args {
     my $extrargs  = $request->{arg};    
     if ($command eq "rspconfig") {
         my $subcommand = $extrargs->[0];
-        if ($subcommand !~ /^dump$|^sshcfg$|^ip=dhcp$/) {
+        if ($subcommand !~ /^dump$|^sshcfg$|^ip=dhcp$|^gard$/) {
             if (grep /=/, @$extrargs) {
                 unshift @$extrargs, "set";
             } else {
                 unshift @$extrargs, "get";
             }
         }
+        if ($subcommand eq "dump") {
+            if (defined($extrargs->[1]) and $extrargs->[1] =~ /-c|--clear|-d|--download/){
+                splice(@$extrargs, 2, 0, "--id");
+            }
+        }
     }
     return 0;
 }

From d60477b1f95f45e0b42616b3e3aec7065527ea8f Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Mon, 26 Feb 2018 22:37:31 -0500
Subject: [PATCH 077/100] enhance

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

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 49e21ef95..0eb224ba7 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -59,6 +59,7 @@ my $dhcpconffile = $^O eq 'aix' ? '/etc/dhcpsd.cnf' : '/etc/dhcpd.conf';
 my %dynamicranges; #track dynamic ranges defined to see if a host that resolves is actually a dynamic address
 my %netcfgs;
 my $distro = xCAT::Utils->osver();
+my $checkdomain=0;
 
 # dhcp 4.x will use /etc/dhcp/dhcpd.conf as the config file
 my $dhcp6conffile;
@@ -1931,6 +1932,14 @@ sub process_request
             addnet($line[0], $line[2]);
         }
     }
+    if ($checkdomain)
+    {
+         $callback->({ error => [ "above error fail to generate new dhcp configuration file, restore dhcp configuration file $dhcpconffile" ], errorcode => [1] });
+         my $backupfile = $dhcpconffile.".xcatbak";
+         rename("$backupfile", $dhcpconffile);
+         xCAT::MsgUtils->trace($verbose_on_off, "d", "dhcp: Restore dhcp configuration file to  $dhcpconffile"); 
+         exit 1;
+    }
     foreach (@nrn6) {    #do the ipv6 networks
         addnet6($_);     #already did all the filtering before putting into nrn6
     }
@@ -2445,6 +2454,7 @@ sub addnet
                           ],
                         errorcode => [1]
                     });
+                $checkdomain=1;
             }
 
             if ($ent and $ent->{nameservers})

From 999298fdd6021089cacb46be7484a835193c3b5c Mon Sep 17 00:00:00 2001
From: chenglch <chenglch@cn.ibm.com>
Date: Thu, 8 Feb 2018 15:41:03 +0800
Subject: [PATCH 078/100] Add makegocons -q in the man page

Update the manpage for makegocons.
---
 .../references/man8/makegocons.8.rst          | 37 +++++++++++++------
 xCAT-client/pods/man8/makegocons.8.pod        | 25 ++++++++++---
 2 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man8/makegocons.8.rst b/docs/source/guides/admin-guides/references/man8/makegocons.8.rst
index 76eb7a5fc..6ceff8ae6 100644
--- a/docs/source/guides/admin-guides/references/man8/makegocons.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/makegocons.8.rst
@@ -19,9 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **makegocons**\  [\ **-V|-**\ **-verbose**\ ] [\ **-d|-**\ **-delete**\ ] [\ *noderange*\ ]
-
-\ **makeconservercf**\  [\ **-h|-**\ **-help|-v|-**\ **-version**\ ]
+\ **makegocons**\  [\ **-V|-**\ **-verbose**\ ] [\ **-d|-**\ **-delete**\ ] [\ **-q|-**\ **-query**\ ] [\ *noderange*\ ]
 
 
 ***********
@@ -46,17 +44,18 @@ In the case of a hierarchical cluster (i.e. one with service nodes) \ **makegoco
 which nodes will have their consoles accessed from the management node and which from a service node
 (based on the nodehm.conserver attribute).
 
+To start goconserver on the specified service node, setup goconserver package on that service node, then set
+the \ **console**\  column of \ **servicenode**\  table to \ **2**\ .
+
+To support diskless service node, a new column \ **consoleenabled**\  has been added in \ **nodehm**\  table, it is used by \ **makegocons**\ 
+command to save the current console state for the node. After reinstalling the service node, the console storage file which maintain
+the console nodes for goconserver is lost, xCAT would register the console nodes into goconserver based on \ **consoleenabled**\  attribute
+when restarting xcatd service.
+
 For openbmc which uses ssh as the terminal session connection method, goconserver can help save the system
 resources as goconserver could handle the ssh connection within goroutine which is more light-weighted than the command process.
 
-\ **Note:**\  goconserver is an experimental feature, it will not be installed with xcat and will only support the systemd based systems.
-Download and setup the rpm or deb package manually. Release link:
-
-
-.. code-block:: perl
-
-  https://github.com/chenglch/goconserver/releases
-
+\ **Note:**\  goconserver only support the systemd based systems. It has been integrated with xCAT as a recommended package.
 
 
 *******
@@ -71,6 +70,12 @@ OPTIONS
  
 
 
+\ **-q|-**\ **-query**\ 
+ 
+ List the console connection of the nodes. If noderange is not specified, all of the console nodes will be displayed.
+ 
+
+
 \ **-v|-**\ **-version**\ 
  
  Display version.
@@ -141,6 +146,16 @@ EXAMPLES
  
 
 
+4. To list console connection for node01.
+ 
+ 
+ .. code-block:: perl
+ 
+   makegocons -q node01
+ 
+ 
+
+
 
 ********
 SEE ALSO
diff --git a/xCAT-client/pods/man8/makegocons.8.pod b/xCAT-client/pods/man8/makegocons.8.pod
index 504c9dd69..ca17bb122 100644
--- a/xCAT-client/pods/man8/makegocons.8.pod
+++ b/xCAT-client/pods/man8/makegocons.8.pod
@@ -4,9 +4,7 @@ B<makegocons> - Register or unregister the node in the goconserver service
 
 =head1 SYNOPSIS
 
-B<makegocons> [B<-V|--verbose>] [B<-d|--delete>] [I<noderange>]
-
-B<makeconservercf> [B<-h|--help|-v|--version>]
+B<makegocons> [B<-V|--verbose>] [B<-d|--delete>] [B<-q|--query>] [I<noderange>]
 
 
 =head1 DESCRIPTION
@@ -28,13 +26,19 @@ In the case of a hierarchical cluster (i.e. one with service nodes) B<makegocons
 which nodes will have their consoles accessed from the management node and which from a service node
 (based on the nodehm.conserver attribute).
 
+To start goconserver on the specified service node, setup goconserver package on that service node, then set
+the B<console> column of B<servicenode> table to B<2>.
+
+To support diskless service node, a new column B<consoleenabled> has been added in B<nodehm> table, it is used by B<makegocons>
+command to save the current console state for the node. After reinstalling the service node, the console storage file which maintain
+the console nodes by goconserver is lost, xCAT would register the console nodes into goconserver based on B<consoleenabled> attribute
+when restarting xcatd service.
+
 For openbmc which uses ssh as the terminal session connection method, goconserver can help save the system
 resources as goconserver could handle the ssh connection within goroutine which is more light-weighted than the command process.
 
-B<Note:> goconserver is an experimental feature, it will not be installed with xcat and will only support the systemd based systems.
-Download and setup the rpm or deb package manually. Release link:
+B<Note:> goconserver only support the systemd based systems. It has been integrated with xCAT as a recommended package.
 
- https://github.com/chenglch/goconserver/releases
 
 =head1 OPTIONS
 
@@ -44,6 +48,10 @@ Download and setup the rpm or deb package manually. Release link:
 
 Delete rather than add or refresh the nodes specified as a noderange.
 
+=item B<-q|--query>
+
+List the console connection of the nodes. If noderange is not specified, all of the console nodes will be displayed.
+
 =item B<-v|--version>
 
 Display version.
@@ -90,6 +98,11 @@ To remove goconserver configuration for node01.
 
  makegocons -d node01
 
+=item 4.
+To list console connection for node01.
+
+ makegocons -q node01
+
 =back
 
 =head1 SEE ALSO

From a641e78f73554c54f5502297d05e456e8999bcc6 Mon Sep 17 00:00:00 2001
From: Yuan Bai <bybai@cn.ibm.com>
Date: Tue, 27 Feb 2018 13:28:58 +0800
Subject: [PATCH 079/100] enhance kdump doc crashkernelsize section (#4846)

---
 .../manage_clusters/common/deployment/enable_kdump.rst | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst
index a6c0765d2..8a6158914 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst
@@ -108,7 +108,7 @@ For system x machine, on sles10 set the crashkernelsize attribute like this: ::
 
     chdef -t osimage <image name> crashkernelsize=<size>M@16M
 
-On sles11 and rhels6 set the crashkernelsize attribute like this: ::
+On sles11, rhels6 and above set the crashkernelsize attribute like this: ::
 
     chdef -t osimage <image name> crashkernelsize=<size>M
 
@@ -118,13 +118,21 @@ Where <size> recommended value is 256. For more information about the size can r
     `<http://www.novell.com/support/kb/doc.php?id=3374462>`_.  
     
     `<https://access.redhat.com/knowledge/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Deployment_Guide/s2-kdump-configuration-cli.html>`_.  
+
+    `<https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/kernel_crash_dump_guide/sect-kdump-config-cli>`_.
     
 For system p machine, set the crashkernelsize attribute to this: ::
 
     chdef -t osimage <image name> crashkernelsize=<size>@32M
 
+For Power System AC922, set the crashkernelsize attribute to this: ::
+    
+    chdef -t osimage <image name> crashkernelsize=<size>M
+
 Where <size> recommended value is 256, more information can refer the kdump document for the system x.
 
+**Notes**: The ``crashkernel=`` option can be defined in multiple ways. If it is hard to decide the specific crashkernelsize, auto value can be used, the auto value enables automatic configuration of reserved memory based on the total amount of memory in the system like ``crashkernel=auto``. 
+
 When your node starts, and you get a kdump start error like this: ::
 
     Your running kernel is using more than 70% of the amount of space you reserved for kdump, you should consider increasing your crashkernel

From f306d645e48fb8771503a0214377b22734346af1 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Tue, 27 Feb 2018 00:30:09 -0500
Subject: [PATCH 080/100] fix bug for case
 rspconfig_set_hostname_equal_star_with_bmc_is_hostname

---
 xCAT-test/autotest/testcase/rspconfig/cases0 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xCAT-test/autotest/testcase/rspconfig/cases0 b/xCAT-test/autotest/testcase/rspconfig/cases0
index c5c0a8183..5dc0ee6a8 100644
--- a/xCAT-test/autotest/testcase/rspconfig/cases0
+++ b/xCAT-test/autotest/testcase/rspconfig/cases0
@@ -269,7 +269,9 @@ cmd:mkdir -p /tmp/rspconfig_set_hostname_equal_star_with_bmc_is_hostname
 check:rc == 0
 cmd:lsdef $$CN -z > /tmp/rspconfig_set_hostname_equal_star_with_bmc_is_hostname/$$CN.stanza
 check:rc == 0
-cmd:chdef -t node -o bogus_bmc_hostname groups=bmc ip=10.6.17.100
+cmd:chdef -t node -o bogus_bmc_hostname groups=bmc ip=__GETNODEATTR($$CN,bmc)__
+check:rc == 0
+cmd:lsdef bogus_bmc_hostname
 check:rc == 0
 cmd:makehosts bogus_bmc_hostname
 check:rc == 0

From 172b14cd17af48a5b9a68a70df7d369011a94c96 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Tue, 27 Feb 2018 00:45:18 -0500
Subject: [PATCH 081/100] modify reventlog cases for matching the output of
 openbmc

---
 xCAT-test/autotest/testcase/reventlog/cases0 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xCAT-test/autotest/testcase/reventlog/cases0 b/xCAT-test/autotest/testcase/reventlog/cases0
index 7a1e7a1a1..82fa7cc30 100644
--- a/xCAT-test/autotest/testcase/reventlog/cases0
+++ b/xCAT-test/autotest/testcase/reventlog/cases0
@@ -7,7 +7,7 @@ end
 start:reventlog_all
 cmd:reventlog $$CN all
 check:rc==0
-check:output=~$$CN\s*:\s*.*\d\d/\d\d/\d\d\s*\S+
+check:output=~$$CN\s*:\s*.*\d\d/\d\d/\d\d\s*\S+|No attributes returned from the BMC
 end
 
 start:reventlog_clear
@@ -19,7 +19,7 @@ end
 start:reventlog_numofentries
 cmd:reventlog $$CN 5
 check:rc==0
-check:output=~$$CN\s*:\s*.*\d\d/\d\d/\d\d\s*\S+|$$CN: no SEL entries|Entry 
+check:output=~$$CN\s*:\s*.*\d\d/\d\d/\d\d\s*\S+|$$CN: no SEL entries|Entry|No attributes returned from the BMC 
 end
 
 start:reventlog_s_openbmc

From b56da57f77b284ba7c38ecc6c443dfbbbdfe0a7c Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Tue, 27 Feb 2018 10:40:52 -0500
Subject: [PATCH 082/100] Changes for review comments

---
 .../lib/python/agent/hwctl/eventlog.py        | 23 +++++++++++++---
 .../agent/hwctl/executor/openbmc_eventlog.py  | 12 +++++++--
 .../lib/python/agent/hwctl/openbmc_client.py  | 11 +++++---
 .../lib/python/agent/xcatagent/openbmc.py     | 26 +++++++++++++------
 xCAT-server/lib/xcat/plugins/openbmc2.pm      | 21 ++++++++++++++-
 5 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/eventlog.py b/xCAT-openbmc-py/lib/python/agent/hwctl/eventlog.py
index e5e644f17..0c8f6378d 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/eventlog.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/eventlog.py
@@ -10,14 +10,31 @@ class EventlogInterface(object):
     interface_type = 'eventlog'
     version = '1.0'
 
-    def get_eventlog_info(self, task, eventlog_type=None):
+    def get_eventlog_info(self, task, number_of_records="all"):
         """Return the eventlog info of the task's nodes.
 
-        :param eventlog_type: type of eventlog info want to get.
+        :param number_of_records: number of records to display.
         :param task: a Task instance containing the nodes to act on.
         :return eventlog list
         """
-        return task.run('get_ev_info', eventlog_type)
+        return task.run('get_ev_info', number_of_records)
+
+    def clear_all_eventlog_records(self, task):
+        """Clear all eventlog records.
+
+        :param task: a Task instance containing the nodes to act on.
+        :return
+        """
+        return task.run('clear_all_ev_records')
+
+    def resolve_eventlog_records(self, task, resolve_list="LED"):
+        """Return the eventlog info of the task's nodes.
+
+        :param resolve: list of eventlog ids to resolve or LED label.
+        :param task: a Task instance containing the nodes to act on.
+        :return eventlog list of resolved entries
+        """
+        return task.run('resolve_ev_records', resolve_list)
 
 class DefaultEventlogManager(EventlogInterface):
     """Interface for eventlog-related actions."""
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py
index f0d417a31..243b469f7 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py
@@ -20,13 +20,13 @@ logger = logging.getLogger('xcatagent')
 class OpenBMCEventlogTask(ParallelNodesCommand):
     """Executor for eventlog-related actions."""
 
-    def get_ev_info(self, args, **kw):
+    def get_ev_info(self, num_to_display, **kw):
 
         node = kw['node']
         number_to_display = 0
         try:
             # Number of records to display from the end
-            number_to_display = 0-int(args[0])
+            number_to_display = 0-int(num_to_display[0])
         except Exception:
             # All records to display
             number_to_display = 0
@@ -52,3 +52,11 @@ class OpenBMCEventlogTask(ParallelNodesCommand):
             self.callback.info('%s: %s'  % (node, e.message))
 
         return eventlog_info
+
+    def clear_all_ev_records(self, **kw):
+
+        node = kw['node']
+
+    def resolve_ev_records(self, resolve_list, **kw):
+
+        node = kw['node']
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index ca456abab..7911e5a77 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -492,11 +492,16 @@ class OpenBMCRest(object):
 
         return bool(func_list), fw_dict
 
-    # Extract all eventlog info and build a dictionary with eventid as a key
+    # Extract all eventlog info and parse it
     def get_eventlog_info(self):
 
         eventlog_data = self.request('GET', EVENTLOG_URL, cmd='get_eventlog_info')
 
+        return self.parse_eventlog_data(eventlog_data)
+
+    # Parse eventlog data and build a dictionary with eventid as a key
+    def parse_eventlog_data(self, eventlog_data):
+
         # Check if policy table file is there
         ras_event_mapping = {}
         if os.path.isfile(RAS_POLICY_TABLE):
@@ -512,7 +517,7 @@ class OpenBMCRest(object):
         try:
             eventlog_dict = {}
             for key, value in sorted(eventlog_data.items()):
-                id, event_log_line = self.parse_event_data(value, ras_event_mapping)
+                id, event_log_line = self.parse_eventlog_data_record(value, ras_event_mapping)
                 if int(id) != 0:
                     eventlog_dict[str(id)] = event_log_line
             return eventlog_dict
@@ -521,7 +526,7 @@ class OpenBMCRest(object):
             raise SelfServerException(error)
 
     # Parse a single eventlog entry and return data in formatted string
-    def parse_event_data(self, event_log_entry, ras_event_mapping):
+    def parse_eventlog_data_record(self, event_log_entry, ras_event_mapping):
         formatted_line = ""
         callout_data = ""
         LED_tag = " [LED]"
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index 16d20823a..65c52a701 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -145,7 +145,7 @@ VITALS_OPTIONS = ('all', 'altitude', 'fanspeed', 'leds', 'power',
                   'temp', 'voltage', 'wattage')
 
 # global variables of reventlog
-EVENTLOG_OPTIONS = ('all', 'clear', 'resolved')
+EVENTLOG_OPTIONS = ('list', 'clear', 'resolved')
 
 class OpenBMC(base.BaseDriver):
 
@@ -841,9 +841,9 @@ class OpenBMCManager(base.BaseManager):
 
         reventlog_usage = """
         Usage:
-            reventlog [-V|--verbose] [resolved=LED|resolved=<num>]
-            reventlog [-V|--verbose] [clear|all]
-            reventlog [-V|--verbose] [<number>]
+            reventlog [-V|--verbose] resolved <id_list>
+            reventlog [-V|--verbose] clear
+            reventlog [-V|--verbose] list <number_of_records>
 
         Options:
             -V --verbose   eventlog verbose mode.
@@ -859,13 +859,23 @@ class OpenBMCManager(base.BaseManager):
             return
 
         # 2, validate the args
-        #if action not in EVENTLOG_OPTIONS:
-        #    self.messager.error("Not supported subcommand for reventlog: %s" % action)
-        #    return
+        if action not in EVENTLOG_OPTIONS:
+            self.messager.error("Not supported subcommand for reventlog: %s" % action)
+            return
 
         # 3, run the subcommands
         runner = OpenBMCEventlogTask(nodesinfo, callback=self.messager, debugmode=self.debugmode, verbose=self.verbose)
-        DefaultEventlogManager().get_eventlog_info(runner, args)
+        self.messager.info('revetlog.py processing action=%s args=%s' % (action, args))
+        if action == 'clear':
+            DefaultEventlogManager().clear_all_eventlog_records(runner)
+        elif action == 'resolved':
+            eventlog_id_list = opts.pop('<id_list>')
+            DefaultEventlogManager().resolve_eventlog_records(runner, eventlog_id_list)
+        elif action == 'list':
+            eventlog_number_of_records = opts.pop('<number_of_records>')
+            DefaultEventlogManager().get_eventlog_info(runner, eventlog_number_of_records)
+        else:
+            DefaultEventlogManager().get_eventlog_info(runner, "all")
 
     def _get_full_path(self,file_path):
         if type(self.cwd) == 'unicode':
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index 84cc74df2..8375793d1 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -364,8 +364,9 @@ sub refactor_args {
     my $request = shift;
     my $command   = $request->{command}->[0];
     my $extrargs  = $request->{arg};    
+    my $subcommand;
     if ($command eq "rspconfig") {
-        my $subcommand = $extrargs->[0];
+        $subcommand = $extrargs->[0];
         if ($subcommand !~ /^dump$|^sshcfg$|^ip=dhcp$/) {
             if (grep /=/, @$extrargs) {
                 unshift @$extrargs, "set";
@@ -374,6 +375,24 @@ sub refactor_args {
             }
         }
     }
+    if ($command eq "reventlog") {
+        if (!defined($extrargs->[0])) {
+            # If no parameters are passed, default to list all records
+            $request->{arg} = ["list","all"];
+        }
+        else {
+            $subcommand = $extrargs->[0];
+        }
+        if ($subcommand =~ /^\d+$/) {
+            unshift @$extrargs, "list";
+        }
+        elsif ($subcommand =~/^resolved=(.*)/) {
+            unshift @$extrargs, "resolved";
+        }
+        elsif ($subcommand =~/^all$/) {
+            unshift @$extrargs, "list";
+        }
+    }
     return 0;
 }
 

From 721d77b6bc8e352f89e47b337e473dafc4fca0ef Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Tue, 27 Feb 2018 16:42:14 -0500
Subject: [PATCH 083/100] Remove "dynamic" checking in the doxcat scripts

---
 xCAT-genesis-scripts/usr/bin/doxcat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-genesis-scripts/usr/bin/doxcat b/xCAT-genesis-scripts/usr/bin/doxcat
index 940ebd909..e5bbe71b0 100755
--- a/xCAT-genesis-scripts/usr/bin/doxcat
+++ b/xCAT-genesis-scripts/usr/bin/doxcat
@@ -247,7 +247,7 @@ else
 
             gripeiter=101
             logger -s -t $log_label -p local4.info "Acquiring network addresses.."
-            while ! ip -4 -o a show dev $bootnic|grep -v 'scope link'|grep -v 'dynamic'|grep -q inet; do
+            while ! ip -4 -o a show dev $bootnic|grep -v 'scope link'|grep -q inet; do
                 sleep 0.1
                 if [ $gripeiter = 1 ]; then
                     logger -s -t $log_label -p local4.info "It seems to be taking a while to acquire an IPv4 address, you may want to check spanning tree..."

From 24cd358a62153b8ece2eab4bf9c629ef9e31057b Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Wed, 28 Feb 2018 01:56:57 -0500
Subject: [PATCH 084/100] modify usage and manpage for openbmc

---
 .../references/man1/rbeacon.1.rst             | 21 +++++++++-
 .../references/man1/rsetboot.1.rst            |  2 +-
 .../references/man1/rspconfig.1.rst           | 42 +++++++++++++++----
 perl-xCAT/xCAT/Usage.pm                       | 33 +++++++++++++--
 xCAT-client/pods/man1/rbeacon.1.pod           | 12 +++++-
 xCAT-client/pods/man1/rsetboot.1.pod          |  2 +-
 xCAT-client/pods/man1/rspconfig.1.pod         | 38 +++++++++++++----
 7 files changed, 126 insertions(+), 24 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man1/rbeacon.1.rst b/docs/source/guides/admin-guides/references/man1/rbeacon.1.rst
index 800f7e553..79790d901 100644
--- a/docs/source/guides/admin-guides/references/man1/rbeacon.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rbeacon.1.rst
@@ -11,11 +11,28 @@ SYNOPSIS
 ********
 
 
+\ **rbeacon**\  [\ **-h | -**\ **-help | -v | -**\ **-version**\ ]
+
+BMC (using IPMI):
+=================
+
+
 \ **rbeacon**\  \ *noderange*\  {\ **on | blink | off | stat**\ }
 
-\ **rbeacon**\  [\ **-h | -**\ **-help**\ ]
 
-\ **rbeacon**\  {\ **-v | -**\ **-version**\ }
+OpenPOWER BMC (using IPMI):
+===========================
+
+
+\ **rbeacon**\  \ *noderange*\  {\ **on | blink | off | stat**\ }
+
+
+OpenPOWER OpenBMC:
+==================
+
+
+\ **rbeacon**\  \ *noderange*\  {\ **on | off**\ }
+
 
 
 ***********
diff --git a/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst b/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst
index da5c3876e..6807ce6af 100644
--- a/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst
@@ -62,7 +62,7 @@ OPTIONS
 
 \ **-u**\ 
  
- To specify the next boot mode to be "UEFI Mode".
+ To specify the next boot mode to be "UEFI Mode". (Not supported for OpenBMC)
  
 
 
diff --git a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
index ebd4923f4..ab6875b30 100644
--- a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
@@ -47,7 +47,9 @@ OpenBMC specific:
 =================
 
 
-\ **rspconfig**\  \ *noderange*\  {\ **ipsrc | ip | netmask | gateway | hostname | vlan | sshcfg**\ }
+\ **rspconfig**\  \ *noderange*\  {\ **ipsrc | ip | netmask | gateway | vlan**\ }
+
+\ **rspconfig**\  \ *noderange*\  \ **admin_passwd**\ ={\ *currentpasswd,newpasswd*\ }
 
 \ **rspconfig**\  \ *noderange*\  \ **autoreboot**\ 
 
@@ -59,6 +61,18 @@ OpenBMC specific:
 
 \ **rspconfig**\  \ *noderange*\  \ **dump**\  [\ **-l | -**\ **-list**\ ] [\ **-g | -**\ **-generate**\ ] [\ **-c | -**\ **-clear**\  {\ *id*\  | \ **all**\ }] [\ **-d | -**\ **-download**\  {\ *id*\  | \ **all**\ }]
 
+\ **rspconfig**\  \ *noderange*\  \ **gard -c|-**\ **-clear**\ 
+
+\ **rspconfig**\  \ *noderange*\  \ **ip=dhcp**\ 
+
+\ **rspconfig**\  \ *noderange*\  \ **hostname**\ 
+
+\ **rspconfig**\  \ *noderange*\  \ **hostname**\ ={\* | \ *name*\ }
+
+\ **rspconfig**\  \ *noderange*\  \ **ntpservers**\ 
+
+\ **rspconfig**\  \ *noderange*\  \ **ntpservers**\ ={\ *ntpservers*\ }
+
 \ **rspconfig**\  \ *noderange*\  \ **powerrestorepolicy**\ 
 
 \ **rspconfig**\  \ *noderange*\  \ **powerrestorepolicy={always_on|restore|always_off}**\ 
@@ -67,6 +81,8 @@ OpenBMC specific:
 
 \ **rspconfig**\  \ *noderange*\  \ **powersupplyredundancy={disabled|enabled}**\ 
 
+\ **rspconfig**\  \ *noderange*\  \ **sshcfg**\ 
+
 \ **rspconfig**\  \ *noderange*\  \ **timesyncmethod**\ 
 
 \ **rspconfig**\  \ *noderange*\  \ **timesyncmethod={manual|ntp}**\ 
@@ -135,9 +151,9 @@ FSP/CEC specific:
 
 \ **rspconfig**\  \ *noderange*\  \ **admin_passwd**\ ={\ *currentpasswd,newpasswd*\ }
 
-\ **rspconfig**\  \ *noderange*\  \ **general_passwd**\ ={\ **currentpasswd,newpasswd**\ }
+\ **rspconfig**\  \ *noderange*\  \ **general_passwd**\ ={\ *currentpasswd,newpasswd*\ }
 
-\ **rspconfig**\  \ *noderange*\  \*\ **_passwd**\ ={\ **currentpasswd,newpasswd**\ }
+\ **rspconfig**\  \ *noderange*\  \*\ **_passwd**\ ={\ *currentpasswd,newpasswd*\ }
 
 \ **rspconfig**\  \ *noderange*\  {\ *hostname*\ }
 
@@ -198,9 +214,9 @@ FSP/CEC (using Direct FSP Management) Specific:
 
 \ **rspconfig**\  \ *noderange*\  \ **admin_passwd**\ ={\ *currentpasswd,newpasswd*\ }
 
-\ **rspconfig**\  \ *noderange*\  \ **general_passwd**\ ={\ **currentpasswd,newpasswd**\ }
+\ **rspconfig**\  \ *noderange*\  \ **general_passwd**\ ={\ *currentpasswd,newpasswd*\ }
 
-\ **rspconfig**\  \ *noderange*\  \*\ **_passwd**\ ={\ **currentpasswd,newpasswd**\ }
+\ **rspconfig**\  \ *noderange*\  \*\ **_passwd**\ ={\ *currentpasswd,newpasswd*\ }
 
 \ **rspconfig**\  \ *noderange*\  {\ **sysname**\ }
 
@@ -237,9 +253,9 @@ BPA/Frame (using Direct FSP Management) Specific:
 
 \ **rspconfig**\  \ *noderange*\  \ **admin_passwd**\ ={\ *currentpasswd,newpasswd*\ }
 
-\ **rspconfig**\  \ *noderange*\  \ **general_passwd**\ ={\ **currentpasswd,newpasswd**\ }
+\ **rspconfig**\  \ *noderange*\  \ **general_passwd**\ ={\ *currentpasswd,newpasswd*\ }
 
-\ **rspconfig**\  \ *noderange*\  \*\ **_passwd**\ ={\ **currentpasswd,newpasswd**\ }
+\ **rspconfig**\  \ *noderange*\  \*\ **_passwd**\ ={\ *currentpasswd,newpasswd*\ }
 
 \ **rspconfig**\  \ *noderange*\  {\ **frame**\ }
 
@@ -362,6 +378,12 @@ OPTIONS
  
 
 
+\ **gard -c|-**\ **-clear**\ 
+ 
+ Clear gard file. [OpenBMC]
+ 
+
+
 \ **garp**\ =\ *time*\ 
  
  Get or set Gratuitous ARP generation interval. The unit is number of 1/2 second.
@@ -552,6 +574,12 @@ OPTIONS
  
 
 
+\ **ntpservers**\ 
+ 
+ Get or set NTP servers name. [OpenBMC]
+ 
+
+
 \ **pd1**\ ={\ **nonred | redwoperf | redwperf**\ }
  
  Power Domain 1 - determines how an MPA responds to a loss of redundant power.
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 140258560..a5394e099 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -72,9 +72,22 @@ my %usage = (
        rpower noderange [off|on|stat|status|reset]
        rpower noderange [pduoff|pduon|pdustat|pdustatus|pdureset]
 ",
-    "rbeacon" =>
-      "Usage: rbeacon <noderange> [on|off|stat] [-V|--verbose]
-       rbeacon [-h|--help|-v|--version]",
+    "rbeacon" =>"",
+    "rbeacon.common" =>
+      "Usage: 
+    Common:
+       rbeacon [-h|--help|-v|--version]
+    ",
+    "rbeacon.begin" =>
+    "BMC specific:
+       rbeacon [on|blink|off|stat]
+    OpenPOWER (IPMI) specific:
+       rbeacon [on|blink|off|stat]
+    ",
+    "rbeacon.openbmc" =>
+    "OpenPOWER (OpenBMC) specific:
+       rbeacon [on|off]
+    ",    
     "rvitals" => "",
     "rvitals.common" =>
       "Usage:
@@ -165,8 +178,13 @@ my %usage = (
    ",
     "rspconfig.openbmc" =>
       "OpenBMC specific:
-       rspconfig <noderange> [ipsrc|ip|netmask|gateway|hostname|vlan]
+       rspconfig <noderange> [ipsrc|ip|netmask|gateway|vlan]
+       rspconfig <noderange> admin_passwd=<currentpasswd,newpasswd>
        rspconfig <noderange> dump [-l|--list] [-g|--generate] [-c|--clear {<id>|all}] [-d|--download {<id>|all}]
+       rspconfig <noderange> gard -c|--clear
+       rspconfig <noderange> [hostname|ntpservers]
+       rspconfig <noderange> [hostname=<*|hostname>|ntpservers=<ntpservers>]
+       rspconfig <noderange> sshcfg
 ",
     "rspconfig.begin" =>
    "BMC/MPA Common:
@@ -594,6 +612,13 @@ $usage{"rinv"} = $usage{"rinv.common"} .
 $usage{"rinv.openbmc"} = $usage{"rinv.common"} .
                       $usage{"rinv.openbmc"};
 
+$usage{"rbeacon"} = $usage{"rbeacon.common"} .
+                      $usage{"rbeacon.begin"} .
+                      $usage{"rbeacon.openbmc"};
+
+$usage{"rbeacon.openbmc"} = $usage{"rbeacon.common"} .
+                      $usage{"rbeacon.openbmc"};
+
 $usage{"rvitals"} = $usage{"rvitals.common"} . 
                       $usage{"rvitals.begin"} .
                       $usage{"rvitals.openbmc"} .
diff --git a/xCAT-client/pods/man1/rbeacon.1.pod b/xCAT-client/pods/man1/rbeacon.1.pod
index 7f2de147d..32725cd7b 100644
--- a/xCAT-client/pods/man1/rbeacon.1.pod
+++ b/xCAT-client/pods/man1/rbeacon.1.pod
@@ -5,11 +5,19 @@ B<rbeacon> - Turns beacon on/off/blink or gives status of a node or noderange.
 
 =head1 SYNOPSIS
 
+B<rbeacon> [B<-h>|B<--help>|B<-v>|B<--version>]
+
+=head2 BMC (using IPMI):
+
 B<rbeacon> I<noderange> {B<on>|B<blink>|B<off>|B<stat>}
 
-B<rbeacon> [B<-h>|B<--help>]
+=head2 OpenPOWER BMC (using IPMI):
 
-B<rbeacon> {B<-v>|B<--version>}
+B<rbeacon> I<noderange> {B<on>|B<blink>|B<off>|B<stat>}
+
+=head2 OpenPOWER OpenBMC:
+
+B<rbeacon> I<noderange> {B<on>|B<off>}
 
 
 =head1 DESCRIPTION
diff --git a/xCAT-client/pods/man1/rsetboot.1.pod b/xCAT-client/pods/man1/rsetboot.1.pod
index 75a2e9ef7..8a94b5f90 100644
--- a/xCAT-client/pods/man1/rsetboot.1.pod
+++ b/xCAT-client/pods/man1/rsetboot.1.pod
@@ -40,7 +40,7 @@ Display the current boot setting.
 
 =item B<-u>
 
-To specify the next boot mode to be "UEFI Mode". 
+To specify the next boot mode to be "UEFI Mode". (Not supported for OpenBMC)
 
 =item B<-p>
 
diff --git a/xCAT-client/pods/man1/rspconfig.1.pod b/xCAT-client/pods/man1/rspconfig.1.pod
index ee0dc98f4..e9d21e60d 100644
--- a/xCAT-client/pods/man1/rspconfig.1.pod
+++ b/xCAT-client/pods/man1/rspconfig.1.pod
@@ -24,7 +24,9 @@ B<rspconfig> I<noderange> B<garp>=I<time>
 
 =head2 OpenBMC specific:
 
-B<rspconfig> I<noderange> {B<ipsrc>|B<ip>|B<netmask>|B<gateway>|B<hostname>|B<vlan>|B<sshcfg>}
+B<rspconfig> I<noderange> {B<ipsrc>|B<ip>|B<netmask>|B<gateway>|B<vlan>}
+
+B<rspconfig> I<noderange> B<admin_passwd>={I<currentpasswd,newpasswd>}
 
 B<rspconfig> I<noderange> B<autoreboot>
 
@@ -36,6 +38,18 @@ B<rspconfig> I<noderange> B<bootmode={safe|regular|setup}>
 
 B<rspconfig> I<noderange> B<dump> [B<-l>|B<--list>] [B<-g>|B<--generate>] [B<-c>|B<--clear> {I<id> | B<all>}] [B<-d>|B<--download> {I<id> | B<all>}]
 
+B<rspconfig> I<noderange> B<gard -c|--clear>
+
+B<rspconfig> I<noderange> B<ip=dhcp>
+
+B<rspconfig> I<noderange> B<hostname>
+
+B<rspconfig> I<noderange> B<hostname>={* | I<name>}
+
+B<rspconfig> I<noderange> B<ntpservers>
+
+B<rspconfig> I<noderange> B<ntpservers>={I<ntpservers>}
+
 B<rspconfig> I<noderange> B<powerrestorepolicy>
 
 B<rspconfig> I<noderange> B<powerrestorepolicy={always_on|restore|always_off}>
@@ -44,6 +58,8 @@ B<rspconfig> I<noderange> B<powersupplyredundancy>
 
 B<rspconfig> I<noderange> B<powersupplyredundancy={disabled|enabled}>
 
+B<rspconfig> I<noderange> B<sshcfg>
+
 B<rspconfig> I<noderange> B<timesyncmethod>
 
 B<rspconfig> I<noderange> B<timesyncmethod={manual|ntp}>
@@ -106,9 +122,9 @@ B<rspconfig> I<noderange> B<HMC_passwd>={I<currentpasswd,newpasswd>}
 
 B<rspconfig> I<noderange> B<admin_passwd>={I<currentpasswd,newpasswd>}
 
-B<rspconfig> I<noderange> B<general_passwd>={B<currentpasswd,newpasswd>}
+B<rspconfig> I<noderange> B<general_passwd>={I<currentpasswd,newpasswd>}
 
-B<rspconfig> I<noderange> *B<_passwd>={B<currentpasswd,newpasswd>}
+B<rspconfig> I<noderange> *B<_passwd>={I<currentpasswd,newpasswd>}
 
 B<rspconfig> I<noderange> {I<hostname>}
 
@@ -161,9 +177,9 @@ B<rspconfig> I<noderange> B<HMC_passwd>={I<currentpasswd,newpasswd>}
 
 B<rspconfig> I<noderange> B<admin_passwd>={I<currentpasswd,newpasswd>}
 
-B<rspconfig> I<noderange> B<general_passwd>={B<currentpasswd,newpasswd>}
+B<rspconfig> I<noderange> B<general_passwd>={I<currentpasswd,newpasswd>}
 
-B<rspconfig> I<noderange> *B<_passwd>={B<currentpasswd,newpasswd>}
+B<rspconfig> I<noderange> *B<_passwd>={I<currentpasswd,newpasswd>}
 
 B<rspconfig> I<noderange> {B<sysname>}
 
@@ -197,9 +213,9 @@ B<rspconfig> I<noderange> B<HMC_passwd>={I<currentpasswd,newpasswd>}
 
 B<rspconfig> I<noderange> B<admin_passwd>={I<currentpasswd,newpasswd>}
 
-B<rspconfig> I<noderange> B<general_passwd>={B<currentpasswd,newpasswd>}
+B<rspconfig> I<noderange> B<general_passwd>={I<currentpasswd,newpasswd>}
 
-B<rspconfig> I<noderange> *B<_passwd>={B<currentpasswd,newpasswd>}
+B<rspconfig> I<noderange> *B<_passwd>={I<currentpasswd,newpasswd>}
 
 B<rspconfig> I<noderange> {B<frame>}
 
@@ -286,6 +302,10 @@ Change the passwords of the userids B<HMC>, B<admin> and B<general> for CEC/Fram
 
 The NTP update frequency (in minutes).
 
+=item B<gard -c|--clear>
+
+Clear gard file. [OpenBMC]
+
 =item B<garp>=I<time>
 
 Get or set Gratuitous ARP generation interval. The unit is number of 1/2 second.
@@ -419,6 +439,10 @@ Enable or disable NTP (enable|disable).
 
 Get or set NTP server IP address or name.
 
+=item B<ntpservers>
+
+Get or set NTP servers name. [OpenBMC]
+
 =item B<pd1>={B<nonred>|B<redwoperf>|B<redwperf>}
 
 Power Domain 1 - determines how an MPA responds to a loss of redundant power.

From bc3f98a144039b09a6f65144a56c73d5ee7f917c Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Wed, 28 Feb 2018 03:06:13 -0500
Subject: [PATCH 085/100] add -V for all commands

---
 docs/source/guides/admin-guides/references/man1/rbeacon.1.rst   | 2 +-
 docs/source/guides/admin-guides/references/man1/rsetboot.1.rst  | 2 +-
 docs/source/guides/admin-guides/references/man1/rspconfig.1.rst | 2 +-
 perl-xCAT/xCAT/Usage.pm                                         | 2 +-
 xCAT-client/pods/man1/rbeacon.1.pod                             | 2 +-
 xCAT-client/pods/man1/rsetboot.1.pod                            | 2 +-
 xCAT-client/pods/man1/rspconfig.1.pod                           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man1/rbeacon.1.rst b/docs/source/guides/admin-guides/references/man1/rbeacon.1.rst
index 79790d901..8ace5fc08 100644
--- a/docs/source/guides/admin-guides/references/man1/rbeacon.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rbeacon.1.rst
@@ -11,7 +11,7 @@ SYNOPSIS
 ********
 
 
-\ **rbeacon**\  [\ **-h | -**\ **-help | -v | -**\ **-version**\ ]
+\ **rbeacon**\  [\ **-h | -**\ **-help | -v | -**\ **-version | -V | -**\ **-verbose**\ ]
 
 BMC (using IPMI):
 =================
diff --git a/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst b/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst
index 6807ce6af..f25aa0bed 100644
--- a/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rsetboot.1.rst
@@ -13,7 +13,7 @@ SYNOPSIS
 
 \ **rsetboot**\  \ *noderange*\  [\ **hd | net | cd | default | stat**\ ] [\ **-u**\ ] [\ **-p**\ ]
 
-\ **rsetboot**\  [\ **-h | -**\ **-help | -v | -**\ **-version**\ ]
+\ **rsetboot**\  [\ **-h | -**\ **-help | -v | -**\ **-version | -V | -**\ **-verbose**\ ]
 
 
 ***********
diff --git a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
index ab6875b30..3e61e08ba 100644
--- a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
@@ -19,7 +19,7 @@ SYNOPSIS
 ********
 
 
-\ **rspconfig**\  [\ **-h | -**\ **-help | -v | -**\ **-version**\ ]
+\ **rspconfig**\  [\ **-h | -**\ **-help | -v | -**\ **-version | -V | -**\ **-verbose**\ ]
 
 BMC/MPA specific:
 =================
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index a5394e099..14052c8be 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -76,7 +76,7 @@ my %usage = (
     "rbeacon.common" =>
       "Usage: 
     Common:
-       rbeacon [-h|--help|-v|--version]
+       rbeacon [-h|--help|-v|--version|-V|--verbose]
     ",
     "rbeacon.begin" =>
     "BMC specific:
diff --git a/xCAT-client/pods/man1/rbeacon.1.pod b/xCAT-client/pods/man1/rbeacon.1.pod
index 32725cd7b..8fc04ad4e 100644
--- a/xCAT-client/pods/man1/rbeacon.1.pod
+++ b/xCAT-client/pods/man1/rbeacon.1.pod
@@ -5,7 +5,7 @@ B<rbeacon> - Turns beacon on/off/blink or gives status of a node or noderange.
 
 =head1 SYNOPSIS
 
-B<rbeacon> [B<-h>|B<--help>|B<-v>|B<--version>]
+B<rbeacon> [B<-h>|B<--help>|B<-v>|B<--version>|B<-V>|B<--verbose>]
 
 =head2 BMC (using IPMI):
 
diff --git a/xCAT-client/pods/man1/rsetboot.1.pod b/xCAT-client/pods/man1/rsetboot.1.pod
index 8a94b5f90..fea274f5d 100644
--- a/xCAT-client/pods/man1/rsetboot.1.pod
+++ b/xCAT-client/pods/man1/rsetboot.1.pod
@@ -7,7 +7,7 @@ B<rsetboot> - Sets the boot device to be used for BMC-based servers for the next
 
 B<rsetboot> I<noderange> [B<hd>|B<net>|B<cd>|B<default>|B<stat>] [B<-u>] [B<-p>]
 
-B<rsetboot> [B<-h>|B<--help>|B<-v>|B<--version>]
+B<rsetboot> [B<-h>|B<--help>|B<-v>|B<--version>|B<-V>|B<--verbose>]
 
 
 =head1 DESCRIPTION
diff --git a/xCAT-client/pods/man1/rspconfig.1.pod b/xCAT-client/pods/man1/rspconfig.1.pod
index e9d21e60d..e05e4ae9c 100644
--- a/xCAT-client/pods/man1/rspconfig.1.pod
+++ b/xCAT-client/pods/man1/rspconfig.1.pod
@@ -4,7 +4,7 @@ B<rspconfig> - Configures nodes' service processors
 
 =head1 SYNOPSIS
 
-B<rspconfig> [B<-h>|B<--help>|B<-v>|B<--version>]
+B<rspconfig> [B<-h>|B<--help>|B<-v>|B<--version>|B<-V>|B<--verbose>]
 
 =head2 BMC/MPA specific:
 

From d914a4a09cdb3b0e1a034382462db00afdac8245 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Tue, 27 Feb 2018 01:42:35 -0500
Subject: [PATCH 086/100] rspconfig ntpservers

---
 .../agent/hwctl/executor/openbmc_bmcconfig.py | 51 ++++++++++++++++---
 .../lib/python/agent/hwctl/openbmc_client.py  | 14 ++++-
 .../lib/python/agent/xcatagent/openbmc.py     |  3 +-
 xCAT-server/lib/xcat/plugins/openbmc2.pm      |  3 +-
 4 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
index 5b29ced08..9524b0d1b 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
@@ -23,7 +23,7 @@ from scp import SCPClient
 import logging
 logger = logging.getLogger('xcatagent')
 
-RSPCONFIG_GET_NETINFO=['ip', 'netmask', 'gateway', 'vlan', 'ipsrc', 'hostname']
+RSPCONFIG_GET_NETINFO=['ip', 'netmask', 'gateway', 'vlan', 'ipsrc', 'hostname', 'ntpservers']
 RSPCONFIG_SET_NETINFO=['ip', 'netmask', 'gateway', 'vlan']
 
 XCAT_LOG_DUMP_DIR = "/var/log/xcat/dump/"
@@ -275,7 +275,8 @@ rmdir \"/tmp/$userid\" \n")
         if len(netinfo_dict):
             self._get_netinfo(ip=netinfo_dict.get('ip', False), ipsrc=netinfo_dict.get('ipsrc', False), netmask=netinfo_dict.get('netmask', False),
                               gateway=netinfo_dict.get('gateway', False),vlan= netinfo_dict.get('vlan', False), 
-                              hostname=netinfo_dict.get('hostname', False), **kw)
+                              hostname=netinfo_dict.get('hostname', False),
+                              ntpservers=netinfo_dict.get('ntpservers', False), **kw)
 
     def set_attributes(self, attributes, **kw):
         netinfo_dict={'vlan':False}
@@ -287,6 +288,8 @@ rmdir \"/tmp/$userid\" \n")
                 self._set_hostname(v, **kw)
             elif k == 'admin_passwd':
                 self._set_admin_password(v, **kw)
+            elif k == 'ntpservers':
+                self._set_ntp_servers(v, **kw)
             elif k in openbmc.RSPCONFIG_APIS:
                 self._set_apis_values(k, v, **kw)
             else:
@@ -309,6 +312,40 @@ rmdir \"/tmp/$userid\" \n")
         self._get_netinfo(hostname=True, ntpserver=False, **kw) 
         return
 
+    def _set_ntp_servers(self, servers, **kw):
+        node = kw['node']
+        node_info = kw['nodeinfo']
+        obmc = openbmc.OpenBMCRest(name=node, nodeinfo=node_info, messager=self.callback,
+                                   debugmode=self.debugmode, verbose=self.verbose)
+
+        try:
+            obmc.login()
+            netinfo = obmc.get_netinfo()
+        except (SelfServerException, SelfClientException) as e:
+            self.callback.info('%s: %s' % (node, e.message))
+            return
+
+        if not netinfo:
+            return self.callback.error("%s: No network information get" % node)
+
+        nic = None
+        for k,v in netinfo.items():
+            if 'ip' in v and v['ip'] == node_info['bmcip']:
+                nic = k
+
+        try:
+            obmc.set_ntp_servers(nic, servers)
+            self.callback.info('%s: BMC Setting NTPServers...' % node)
+            netinfo = obmc.get_netinfo()
+        except (SelfServerException, SelfClientException) as e:
+            self.callback.info('%s: %s' % (node, e.message))
+            return
+
+        ntpservers = None
+        if nic in netinfo:
+            ntpservers = netinfo[nic]['ntpservers']
+        self.callback.info('%s: BMC NTP Servers: %s' % (node, ntpservers))
+
     def _set_admin_password(self, admin_passwd, **kw):
         node = kw['node']
         node_info = kw['nodeinfo']
@@ -362,7 +399,7 @@ rmdir \"/tmp/$userid\" \n")
             result = "set net(%s, %s, %s) for eth0" % (ip, netmask, gateway)
         return self.callback.info("set_netinfo %s" % result)
 
-    def _get_netinfo(self, ip=False, ipsrc=False, netmask=False, gateway=False, vlan=False, hostname=False, ntpserver=True, **kw):
+    def _get_netinfo(self, ip=False, ipsrc=False, netmask=False, gateway=False, vlan=False, hostname=False, ntpservers=False, **kw):
         node = kw['node']
         obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,
                                    debugmode=self.debugmode, verbose=self.verbose)
@@ -387,7 +424,7 @@ rmdir \"/tmp/$userid\" \n")
             self.callback.info("%s: BMC Hostname: %s" %(node, bmchostname))
         dic_length = len(netinfo) 
         netinfodict = {'ip':[], 'netmask':[], 'gateway':[],
-                   'vlan':[], 'ipsrc':[], 'ntpserver':[]}
+                   'vlan':[], 'ipsrc':[], 'ntpservers':[]}
         for nic,attrs in netinfo.items():
             addon_string = ''
             if dic_length > 1:
@@ -397,7 +434,7 @@ rmdir \"/tmp/$userid\" \n")
             netinfodict['gateway'].append("BMC Gateway"+addon_string+": %s (default: %s)" % (attrs["gateway"], defaultgateway))
             netinfodict['vlan'].append("BMC VLAN ID"+addon_string+": %s" % attrs["vlanid"])
             netinfodict['ipsrc'].append("BMC IP Source"+addon_string+": %s" % attrs["ipsrc"])
-            netinfodict['ntpserver'].append("BMC NTP Servers"+addon_string+": %s" % attrs["ntpservers"])
+            netinfodict['ntpservers'].append("BMC NTP Servers"+addon_string+": %s" % attrs["ntpservers"])
         if ip:
             for i in netinfodict['ip']:
                 self.callback.info("%s: %s" % (node, i))
@@ -413,7 +450,7 @@ rmdir \"/tmp/$userid\" \n")
         if vlan:
             for i in netinfodict['vlan']:
                 self.callback.info("%s: %s" % (node, i))
-        if ntpserver:
-            for i in netinfodict['netserver']:
+        if ntpservers:
+            for i in netinfodict['ntpservers']:
                 self.callback.info("%s: %s" % (node, i))
         return netinfo
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index 55ced2396..7c0e6e974 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -165,7 +165,7 @@ RSPCONFIG_NETINFO_URL = {
     'nic_ip': "/network/#NIC#/action/IP",
     'vlan': "/network/action/VLAN",
     'ipdhcp': "/network/action/Reset",
-    'ntpserver': "/network/#NIC#/attr/NTPServers",
+    'ntpservers': "/network/#NIC#/attr/NTPServers",
 }
 
 PASSWD_URL = '/user/root/action/SetPassword'
@@ -580,6 +580,12 @@ class OpenBMCRest(object):
         payload = { "data": [passwd] }
         self.request('POST', PASSWD_URL, payload=payload, cmd='set_admin_password')
 
+    def set_ntp_servers(self, nic, servers):
+
+        payload = { "data": [servers] }
+        url = RSPCONFIG_NETINFO_URL['ntpservers'].replace('#NIC#', nic)
+        self.request('PUT', url, payload=payload, cmd='set_ntp_servers')
+
     def clear_dump(self, clear_arg):
 
         if clear_arg == 'all':
@@ -659,7 +665,11 @@ class OpenBMCRest(object):
                         info = data[dev]
                         utils.update2Ddict(netinfo, nicid, "vlanid", info.get("Id", "Disable"))
                         utils.update2Ddict(netinfo, nicid, "mac", info["MACAddress"])
-                        utils.update2Ddict(netinfo, nicid, "ntpservers", info["NTPServers"])            
+                        ntpservers = None
+                        tmp_ntpservers = ''.join(info["NTPServers"])
+                        if tmp_ntpservers:
+                            ntpservers = tmp_ntpservers
+                        utils.update2Ddict(netinfo, nicid, "ntpservers", ntpservers)            
             return netinfo
         except KeyError:
             error = 'Error: Received wrong format response: %s' % data
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
index 29ca44559..19e8e9726 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/openbmc.py
@@ -80,13 +80,14 @@ RFLASH_URLS = {
     }
 }
 
-RSPCONFIG_GET_OPTIONS = ['ip','ipsrc','netmask','gateway','vlan','hostname','bootmode','autoreboot','powersupplyredundancy','powerrestorepolicy']
+RSPCONFIG_GET_OPTIONS = ['ip','ipsrc','netmask','gateway','vlan','ntpservers','hostname','bootmode','autoreboot','powersupplyredundancy','powerrestorepolicy']
 RSPCONFIG_SET_OPTIONS = {
     'ip':'.*',
     'netmask':'.*',
     'gateway':'.*',
     'vlan':'\d+',
     'hostname':"\*|.*",
+    'ntpservers':'.*',
     'autoreboot':"^0|1$",
     'powersupplyredundancy':"^enabled$|^disabled$",
     'powerrestorepolicy':"^always_on$|^always_off$|^restore$",
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index 8a29ae223..975cafaaf 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -342,8 +342,9 @@ sub refactor_args {
     my $request = shift;
     my $command   = $request->{command}->[0];
     my $extrargs  = $request->{arg};    
+    my $subcommand; 
     if ($command eq "rspconfig") {
-        my $subcommand = $extrargs->[0];
+        $subcommand = $extrargs->[0];
         if ($subcommand !~ /^dump$|^sshcfg$|^ip=dhcp$|^gard$/) {
             if (grep /=/, @$extrargs) {
                 unshift @$extrargs, "set";

From 9ed73d9dfbe61eafd56bd86d8acdf0e48614c0ae Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Wed, 28 Feb 2018 17:51:59 +0800
Subject: [PATCH 087/100] Fix the git short commit id to 7-byte long

---
 build-ubunturepo | 2 +-
 buildcore.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-ubunturepo b/build-ubunturepo
index 7511a168d..97ce0a1c1 100755
--- a/build-ubunturepo
+++ b/build-ubunturepo
@@ -183,8 +183,8 @@ then
         short_short_ver=`cat Version|cut -d. -f 1`
         build_time=`date`
         build_machine=`hostname`
-        commit_id=`git rev-parse --short HEAD`
         commit_id_long=`git rev-parse HEAD`
+        commit_id="${commit_id_long:0:7}"
 
         package_dir_name=debs$REL
         #TODO: define the core path and tarball name
diff --git a/buildcore.sh b/buildcore.sh
index 1b41b4b1c..7ed9e277e 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -188,8 +188,8 @@ function setversionvars {
     SHORTSHORTVER=`echo $VER|cut -d. -f 1`
     BUILD_TIME=`date`
     BUILD_MACHINE=`hostname`
-    COMMIT_ID=`git rev-parse --short HEAD`
     COMMIT_ID_LONG=`git rev-parse HEAD`
+    COMMIT_ID="${COMMIT_ID_LONG:0:7}"
     XCAT_RELEASE="snap$(date '+%Y%m%d%H%M')"
     echo "$XCAT_RELEASE" >Release
 }

From 71a3c68d516bfe52339d5db89f1cd28e6a184f6a Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Wed, 28 Feb 2018 16:26:15 -0500
Subject: [PATCH 088/100] Better Python login action ConnectionError exception
 handling

---
 .../lib/python/agent/common/exceptions.py     |  6 +-
 .../lib/python/agent/common/rest.py           | 56 +++++++++++++++++--
 .../agent/hwctl/executor/openbmc_power.py     |  3 +-
 .../lib/python/agent/hwctl/openbmc_client.py  | 21 +++++--
 4 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/common/exceptions.py b/xCAT-openbmc-py/lib/python/agent/common/exceptions.py
index 15af285c4..6f5dad33c 100644
--- a/xCAT-openbmc-py/lib/python/agent/common/exceptions.py
+++ b/xCAT-openbmc-py/lib/python/agent/common/exceptions.py
@@ -1,7 +1,11 @@
 #!/usr/bin/env python
 
 class SelfServerException(Exception) :
-    pass
+    def __init__(self, message, code=0, detail_msg= "", host_and_port="") :
+        super(Exception, self).__init__(message)
+        self.code = code
+        self.host_and_port = host_and_port
+        self.detail_msg = detail_msg
 
 class SelfClientException(Exception) :
     def __init__(self, message, code) :
diff --git a/xCAT-openbmc-py/lib/python/agent/common/rest.py b/xCAT-openbmc-py/lib/python/agent/common/rest.py
index 250fea527..bc52f325b 100644
--- a/xCAT-openbmc-py/lib/python/agent/common/rest.py
+++ b/xCAT-openbmc-py/lib/python/agent/common/rest.py
@@ -26,17 +26,65 @@ class RestSession(object):
                                             headers=headers,
                                             verify=False,
                                             timeout=timeout)
-        except requests.exceptions.ConnectionError:
-            raise xcat_exception.SelfServerException('Error: Failed to connect to server.')
+        except requests.exceptions.ConnectionError as e:
+            # Extract real reason for the exception and host/port from ConnectionError message
+            # Sometimes e.message is a list, sometimes is a string. Look for different patterns
+            # to extract the data needed.
+            causing_error = "n/a"
+            host_and_port = "n/a"
+            if "]" in e.message[0]:
+                causing_error_part1 = e.message[0].split("]")[1]
+                causing_error       = causing_error_part1.split("'")[0]
+                causing_error       = causing_error.strip()
+                host_and_port = self.extract_server_and_port(e.message[0], "STRING")
 
-        except requests.exceptions.Timeout:
-            raise xcat_exception.SelfServerException('Error: Timeout to connect to server')
+            if "Connection aborted." in e.message[0]:
+                causing_error = "Connection reset by peer"
+                host_and_port = self.extract_server_and_port(url, "URL")
+
+            if "connect timeout=" in e.message[0]:
+                causing_error = "timeout"
+                host_and_port = self.extract_server_and_port(e.message[0], "STRING")
+
+            message = 'Error: Failed to connect to server.'
+            # message = '\n\n--> {0} \n\n'.format(e.message[0])
+            raise xcat_exception.SelfServerException(message, "500", '({0})'.format(causing_error), host_and_port)
+
+        except requests.exceptions.Timeout as e:
+            causing_error = "timeout"
+            host_and_port = self.extract_server_and_port(e.message[0], "STRING")
+
+            message = 'Error: Timeout to connect to server'
+            raise xcat_exception.SelfServerException(message, "500", '({0})'.format(causing_error), host_and_port)
 
         if not self.cookies:
             self.cookies = requests.utils.dict_from_cookiejar(self.session.cookies)
 
         return response
 
+    def extract_server_and_port(self, message_string, format="STRING"):
+        # Extract hostip and port number from ConnectionError message
+        # If format="STRING" look for host='IP' and port=xxxx pattern
+        # If format="URL"    look for https://IP/login pattern
+        if format == "STRING":
+            start   = "host='"
+            end     = "',"
+            host_ip = message_string[message_string.find(start)+len(start):message_string.find(end)]
+            start   = "port="
+            end     = "):"
+            port = message_string[message_string.find(start)+len(start):message_string.find(end)]
+            host_and_port = host_ip + ":" + port
+        elif format == "URL":
+            start   = "https://"
+            end     = "/login"
+            host_ip = message_string[message_string.find(start)+len(start):message_string.find(end)]
+            host_and_port = host_ip
+        else:
+            host_and_port = "n/a"
+
+        return host_and_port
+
+
     def request_download(self, method, url, headers, file_path, using_curl=True):
 
         if using_curl:
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_power.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_power.py
index c400ee13d..4bab39788 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_power.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_power.py
@@ -83,7 +83,8 @@ class OpenBMCPowerTask(ParallelNodesCommand):
 
         except SelfServerException, SelfClientException:
             # There is no response when BMC is not ready
-            result = '%s: %s'  % (node, openbmc.RPOWER_STATES[bmc_not_ready])
+            # Do not print bmc_state, instead, error messages from login failure will be displayed
+            return bmc_state
 
         self.callback.info(result)
         return bmc_state
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index 29169ff8a..d73e17b05 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -249,6 +249,15 @@ class OpenBMCRest(object):
             self.messager.info(localtime + ' ' + log)
             logger.debug(log)
 
+    def _print_record (self, msg, cmd, type="I"):
+
+        log = self.name + ': ' + msg
+        logger.debug(log)
+        if type == "E":
+            self.messager.error(log)
+        else:
+            self.messager.info(log)
+
     def _log_request (self, method, url, headers, data=None, files=None, file_path=None, cmd=''):
 
         header_str = ' '.join([ "%s: %s" % (k, v) for k,v in headers.items() ])
@@ -276,7 +285,7 @@ class OpenBMCRest(object):
         if code != requests.codes.ok:
             description = ''.join(data['data']['description'])
             error = 'Error: [%d] %s' % (code, description)
-            self._print_record_log(error, cmd)
+            self._print_record(error, cmd, "E")
             raise SelfClientException(error, code)
 
         self._print_record_log(data['message'], cmd)
@@ -298,9 +307,13 @@ class OpenBMCRest(object):
             response = self.session.request(method, url, httpheaders, data=data)
             return self.handle_response(response, cmd=cmd)
         except SelfServerException as e:
-            e.message = 'Error: BMC did not respond. ' \
-                        'Validate BMC configuration and retry the command.'
-            self._print_record_log(e.message, cmd)
+            message = 'Error: BMC did not respond. ' \
+                      'Validate BMC configuration and retry the command.'
+            if cmd == 'login':
+                login_message = "Error: [{0}] Login to BMC failed: {1} Can't connect to {2} {3}.".format(e.code, e.code, e.host_and_port, e.detail_msg)
+                self._print_record(login_message, cmd, "I")
+
+            self._print_record(message, cmd, "E")
             raise
         except ValueError:
             error = 'Error: Received wrong format response: %s' % response

From b9624793536bc26fa7fac7d50a6ab722b8d49709 Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Wed, 28 Feb 2018 18:08:25 +0800
Subject: [PATCH 089/100] Fix the issue: Failed to discover nodes as the
 discovery method is set to udef by wrong (#4860)  - zvmdiscovery plugin will
 not handle findme  - not change request if no temp discovered bmc nodes, to
 avoid the confusing error message  - add more logs, and ignore the `ipmitool
 sol info` error output

---
 xCAT-genesis-scripts/usr/bin/dodiscovery     | 2 +-
 xCAT-genesis-scripts/usr/bin/minixcatd.awk   | 4 ++++
 xCAT-server/lib/xcat/plugins/aaadiscovery.pm | 6 +++++-
 xCAT-server/lib/xcat/plugins/nodediscover.pm | 4 ++--
 xCAT-server/lib/xcat/plugins/switch.pm       | 2 +-
 xCAT-server/lib/xcat/plugins/zvmdiscovery.pm | 7 ++++++-
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/xCAT-genesis-scripts/usr/bin/dodiscovery b/xCAT-genesis-scripts/usr/bin/dodiscovery
index e3ff40825..5a554c0af 100755
--- a/xCAT-genesis-scripts/usr/bin/dodiscovery
+++ b/xCAT-genesis-scripts/usr/bin/dodiscovery
@@ -163,7 +163,7 @@ if [ "$PLATFORM" != "unknown" ]; then
         echo "<platform>$PLATFORM</platform>" >> /tmp/discopacket
 fi
 
-LANCHAN=$(ipmitool sol info |awk '/Payload Channel/{print $4}')
+LANCHAN=$(ipmitool sol info 2>/dev/null|awk '/Payload Channel/{print $4}')
 IsStatic=`ipmitool lan print $LANCHAN | grep 'IP Address Source' | grep 'Static'`
 if [ "$IsStatic" ]; then
     BMCIPADDR=`ipmitool lan print $LANCHAN | grep 'IP Address' | grep -v 'IP Address Source' | cut -d ":" -f2 | sed 's/ //'`
diff --git a/xCAT-genesis-scripts/usr/bin/minixcatd.awk b/xCAT-genesis-scripts/usr/bin/minixcatd.awk
index c0231a579..d00d1b2f3 100755
--- a/xCAT-genesis-scripts/usr/bin/minixcatd.awk
+++ b/xCAT-genesis-scripts/usr/bin/minixcatd.awk
@@ -11,12 +11,16 @@ BEGIN {
                     quit="yes"
                     system("echo \"" $0 "\" > /restart")
                     close(listener)
+                    system("rm -rf /processing")
+                    system("logger -s -t 'xcat.genesis.minixcatd' -p local4.info 'The request is processed by xCAT master successfully.'")
                 }else if(match($0,"processing")){
                     print "processing request" |& listener
                     system("echo \"" $0 "\" > /processing")
+                    system("logger -s -t 'xcat.genesis.minixcatd' -p local4.info 'The request is processing by xCAT master...'")
                 }else if(match($0,"processed")){
                     print "finished request process" |& listener
                     system("rm -rf /processing")
+                    system("logger -s -t 'xcat.genesis.minixcatd' -p local4.warning 'The request is already processed by xCAT master, but not matched.'")
                 }
            }
            close(listener)
diff --git a/xCAT-server/lib/xcat/plugins/aaadiscovery.pm b/xCAT-server/lib/xcat/plugins/aaadiscovery.pm
index 235c016b5..e52123d80 100644
--- a/xCAT-server/lib/xcat/plugins/aaadiscovery.pm
+++ b/xCAT-server/lib/xcat/plugins/aaadiscovery.pm
@@ -36,13 +36,17 @@ sub process_request {
             $arptable = `/sbin/arp -n`;
         }
         my @arpents = split /\n/, $arptable;
-        my $mac = "$req->{mtm}->[0]*$req->{serial}->[0]";
+        my $mac;
         foreach (@arpents) {
             if (m/^($client_ip)\s+\S+\s+(\S+)\s/) {
                 $mac = $2;
                 last;
             }
         }
+        unless ($mac) {
+            xCAT::MsgUtils->message("S", "xcat.discovery.aaadiscovery: Failed to get MAC address for $client_ip in arp cache.");
+            $mac = "$req->{mtm}->[0]*$req->{serial}->[0]";
+        }
 
         xCAT::MsgUtils->message("S", "xcat.discovery.aaadiscovery: ($mac) Got a discovery request, attempting to discover the node...");
         $req->{discoverymethod}->[0] = 'undef';
diff --git a/xCAT-server/lib/xcat/plugins/nodediscover.pm b/xCAT-server/lib/xcat/plugins/nodediscover.pm
index c357000eb..d65bb9d8a 100644
--- a/xCAT-server/lib/xcat/plugins/nodediscover.pm
+++ b/xCAT-server/lib/xcat/plugins/nodediscover.pm
@@ -459,7 +459,7 @@ sub process_request {
     if (defined($request->{bmcinband})) {
         if (defined($request->{bmc_node}) and defined($request->{bmc_node}->[0])) {
             my $bmc_node = $request->{bmc_node}->[0];
-            xCAT::MsgUtils->message("S", "xcat.discovery.nodediscover: Removing discovered node definition: $bmc_node...");
+            xCAT::MsgUtils->message("S", "xcat.discovery.nodediscover: Removing discovered BMC nodes definition: $bmc_node...");
             my $rmcmd = "rmdef $bmc_node";
             xCAT::Utils->runcmd($rmcmd, 0);
             if ($::RUNCMD_RC != 0)
@@ -495,7 +495,7 @@ sub process_request {
         Timeout  => '1',
         Proto    => 'tcp'
     );
-    unless ($sock) { xCAT::MsgUtils->message("S", "xcat.discovery.nodediscover: Failed to notify $clientip that it's actually $node."); return; }
+    unless ($sock) { xCAT::MsgUtils->message("S", "xcat.discovery.nodediscover: Failed to notify $clientip that it's actually $node. $node has not been discovered."); return; }
     print $sock $restartstring;
     close($sock);
 
diff --git a/xCAT-server/lib/xcat/plugins/switch.pm b/xCAT-server/lib/xcat/plugins/switch.pm
index 1ace2fffb..8823ec029 100644
--- a/xCAT-server/lib/xcat/plugins/switch.pm
+++ b/xCAT-server/lib/xcat/plugins/switch.pm
@@ -371,7 +371,7 @@ sub process_request {
             my $request = {%$req};
             $request->{command}   = ['discovered'];
             $request->{noderange} = [$node];
-            $request->{bmc_node}  = [$bmc_node];
+            $request->{bmc_node}  = [$bmc_node] if $bmc_node;
             $doreq->($request);
             if (defined($request->{error})) {
                 $req->{error}->[0] = '1';
diff --git a/xCAT-server/lib/xcat/plugins/zvmdiscovery.pm b/xCAT-server/lib/xcat/plugins/zvmdiscovery.pm
index 66d5e6808..a243963cf 100644
--- a/xCAT-server/lib/xcat/plugins/zvmdiscovery.pm
+++ b/xCAT-server/lib/xcat/plugins/zvmdiscovery.pm
@@ -852,7 +852,7 @@ sub getSiteVal {
 #-------------------------------------------------------
 sub handled_commands {
     return {
-        findme             => 'zvmdiscovery',
+        #findme             => 'zvmdiscovery',   # Not handle findme in this plugin, #4860
         #nodediscoverdef   => 'zvmdiscovery',    # Handled by sequential discovery
         nodediscoverls     => 'zvmdiscovery',
         nodediscoverstart  => 'zvmdiscovery',
@@ -1710,6 +1710,11 @@ sub process_request {
     my $args = $request->{arg};
 
     if ($command eq "findme"){
+        if (defined($request->{discoverymethod}) and defined($request->{discoverymethod}->[0]) and ($request->{discoverymethod}->[0] ne 'undef')) {
+
+            # The findme request had been processed by other module, just return
+            return;
+        }
         findme( $request, $callback, $request_command );
     } elsif ($command eq "nodediscoverls") {
         nodediscoverls( $callback, $args );

From 32c8e3a21a63525943b40b962c162ca8bf99bc2d Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Thu, 1 Mar 2018 02:44:29 -0500
Subject: [PATCH 090/100] modified depending on comments

---
 .../agent/hwctl/executor/openbmc_bmcconfig.py      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
index 9524b0d1b..aa91a56be 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
@@ -328,10 +328,10 @@ rmdir \"/tmp/$userid\" \n")
         if not netinfo:
             return self.callback.error("%s: No network information get" % node)
 
-        nic = None
-        for k,v in netinfo.items():
-            if 'ip' in v and v['ip'] == node_info['bmcip']:
-                nic = k
+        bmcip = node_info['bmcip']
+        nic = self._get_facing_nic(bmcip, netinfo)
+        if not nic:
+            return self.callback.error('%s: Can not get facing NIC for %s' % (node, bmcip))
 
         try:
             obmc.set_ntp_servers(nic, servers)
@@ -346,6 +346,12 @@ rmdir \"/tmp/$userid\" \n")
             ntpservers = netinfo[nic]['ntpservers']
         self.callback.info('%s: BMC NTP Servers: %s' % (node, ntpservers))
 
+    def _get_facing_nic(self, bmcip, netinfo):
+        for k,v in netinfo.items():
+            if 'ip' in v and v['ip'] == bmcip:
+                return k
+        return None
+
     def _set_admin_password(self, admin_passwd, **kw):
         node = kw['node']
         node_info = kw['nodeinfo']

From e86d5442422b9fbe533ee61a382b721bef98aebf Mon Sep 17 00:00:00 2001
From: chenglch <chenglch@cn.ibm.com>
Date: Wed, 28 Feb 2018 14:46:50 +0800
Subject: [PATCH 091/100] Add makegocons -C|--cleanup to remove entries that do
 not exist

`rmdef` command do not help clean up the recousrces that related to
the node when removing the node. this is a technical debt. This patch
is only a work around to add -C|--cleanup option to help remove the
entries in goconserver.
---
 .../admin-guides/references/man1/rmdef.1.rst  |  2 +-
 .../references/man8/makegocons.8.rst          |  8 ++
 xCAT-client/pods/man1/rmdef.1.pod             |  2 +-
 xCAT-client/pods/man8/makegocons.8.pod        |  5 ++
 xCAT-server/lib/perl/xCAT/Goconserver.pm      | 78 ++++++++++++++++++-
 xCAT-server/lib/xcat/plugins/DBobjectdefs.pm  |  6 ++
 xCAT-server/lib/xcat/plugins/goconserver.pm   | 61 +++------------
 7 files changed, 110 insertions(+), 52 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man1/rmdef.1.rst b/docs/source/guides/admin-guides/references/man1/rmdef.1.rst
index 221319ff5..e2190cf6b 100644
--- a/docs/source/guides/admin-guides/references/man1/rmdef.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rmdef.1.rst
@@ -90,7 +90,7 @@ OPTIONS
 
 \ **-C|-**\ **-cleanup**\ 
  
- Perform additional cleanup by running \ **nodeset offline**\  and \ **makeconservercf -d**\  on the objects specified in the \ *noderange*\ .
+ Perform additional cleanup by running \ **nodeset offline**\, \ **makeconservercf -d**\ and \ **makegocons --cleanup**\ on the objects specified in the \ *noderange*\ .
  
 
 
diff --git a/docs/source/guides/admin-guides/references/man8/makegocons.8.rst b/docs/source/guides/admin-guides/references/man8/makegocons.8.rst
index 6ceff8ae6..b9ba5e686 100644
--- a/docs/source/guides/admin-guides/references/man8/makegocons.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/makegocons.8.rst
@@ -21,6 +21,8 @@ SYNOPSIS
 
 \ **makegocons**\  [\ **-V|-**\ **-verbose**\ ] [\ **-d|-**\ **-delete**\ ] [\ **-q|-**\ **-query**\ ] [\ *noderange*\ ]
 
+\ **makegocons**\  [\ **-V|-**\ **-verbose**\ ] [\ **-C|-**\ **-cleanup**\ ]
+
 
 ***********
 DESCRIPTION
@@ -70,6 +72,12 @@ OPTIONS
  
 
 
+\ **-C|-**\ **-cleanup**\ 
+ 
+ Remove the entries for the nodes whose definitions have been removed from xCAT db.
+ 
+
+
 \ **-q|-**\ **-query**\ 
  
  List the console connection of the nodes. If noderange is not specified, all of the console nodes will be displayed.
diff --git a/xCAT-client/pods/man1/rmdef.1.pod b/xCAT-client/pods/man1/rmdef.1.pod
index 38b67b077..347cf18a1 100644
--- a/xCAT-client/pods/man1/rmdef.1.pod
+++ b/xCAT-client/pods/man1/rmdef.1.pod
@@ -58,7 +58,7 @@ A set of comma delimited object types.
 
 =item B<-C|--cleanup>
 
-Perform additional cleanup by running B<nodeset offline> and B<makeconservercf -d> on the objects specified in the I<noderange>.
+Perform additional cleanup by running B<nodeset offline>, B<makeconservercf -d> and B<makegocons --cleanup> on the objects specified in the I<noderange>.
 
 =item B<-V|--verbose>
 
diff --git a/xCAT-client/pods/man8/makegocons.8.pod b/xCAT-client/pods/man8/makegocons.8.pod
index ca17bb122..9d69e3d3d 100644
--- a/xCAT-client/pods/man8/makegocons.8.pod
+++ b/xCAT-client/pods/man8/makegocons.8.pod
@@ -6,6 +6,7 @@ B<makegocons> - Register or unregister the node in the goconserver service
 
 B<makegocons> [B<-V|--verbose>] [B<-d|--delete>] [B<-q|--query>] [I<noderange>]
 
+B<makegocons> [B<-V|--verbose>] [B<-C|--cleanup>]
 
 =head1 DESCRIPTION
 
@@ -48,6 +49,10 @@ B<Note:> goconserver only support the systemd based systems. It has been integra
 
 Delete rather than add or refresh the nodes specified as a noderange.
 
+=item B<-C|--cleanup>
+
+Remove the entries for the nodes whose definitions have been removed from xCAT db.
+
 =item B<-q|--query>
 
 List the console connection of the nodes. If noderange is not specified, all of the console nodes will be displayed.
diff --git a/xCAT-server/lib/perl/xCAT/Goconserver.pm b/xCAT-server/lib/perl/xCAT/Goconserver.pm
index 0e3906def..211808a2f 100644
--- a/xCAT-server/lib/perl/xCAT/Goconserver.pm
+++ b/xCAT-server/lib/perl/xCAT/Goconserver.pm
@@ -22,6 +22,7 @@ use IO::Socket::SSL qw( SSL_VERIFY_PEER );
 my $go_api_port = 12429;
 my $go_cons_port = 12430;
 my $bmc_cons_port = "2200";
+my $isSN = xCAT::Utils->isServiceNode();
 
 use constant CONSOLE_LOG_DIR => "/var/log/consoles";
 use constant PRINT_FORMAT => "%-32s %-32s %-64s";
@@ -58,7 +59,7 @@ sub http_request {
 }
 
 sub gen_request_data {
-    my ($cons_map, $siteondemand, $isSN, $callback) = @_;
+    my ($cons_map, $siteondemand, $callback) = @_;
     my (@openbmc_nodes, $data);
     while (my ($k, $v) = each %{$cons_map}) {
         my $ondemand;
@@ -397,6 +398,81 @@ sub list_nodes {
     return 0;
 }
 
+sub cleanup_nodes {
+    my $callback = shift;
+    my @hostinfo = xCAT::NetworkUtils->determinehostname();
+    my $host = $hostinfo[-1];
+    my $api_url = "https://$host:". get_api_port();
+    my $rsp;
+    my $response = http_request("GET", "$api_url/nodes");
+    if (!defined($response)) {
+        if ($callback) {
+            $rsp->{data}->[0] = "Failed to send list request.";
+            xCAT::MsgUtils->message("E", $rsp, $callback);
+        } else {
+            xCAT::MsgUtils->message("S", "Failed to send list request.");
+        }
+        return 1;
+    }
+    if (!$response->{nodes}) {
+        return 0;
+    }
+    my %delete_map;
+    my %cons_map = get_cons_map(undef);
+    foreach my $node (@{$response->{nodes}}) {
+        # not in xcatdb but exist in goconserver
+        $delete_map{$node->{name}} = 1 if !exists($cons_map{$node->{name}});
+    }
+    return delete_nodes($api_url, \%delete_map, 1, $callback);
+}
+
+sub get_cons_map {
+    my $req = shift;
+    my %iphash   = ();
+    my %cons_map;
+    my $hmtab = xCAT::Table->new('nodehm');
+    my @cons_nodes;
+    my @hostinfo = xCAT::NetworkUtils->determinehostname();
+    foreach (@hostinfo) {
+        $iphash{$_} = 1;
+    }
+    if (defined($req) && (($req->{node} and @{$req->{node}} > 0) or $req->{noderange}->[0])) {
+        # Note: do not consider terminal server currently
+        @cons_nodes = $hmtab->getNodesAttribs($req->{node}, [ 'node', 'cons', 'serialport', 'mgt', 'conserver', 'consoleondemand' ]);
+        # Adjust the data structure to make the result consistent with the getAllNodeAttribs() call we make if a noderange was not specified
+        my @tmpcons_nodes;
+        foreach my $ent (@cons_nodes)
+        {
+            foreach my $nodeent (keys %$ent)
+            {
+                push @tmpcons_nodes, $ent->{$nodeent}->[0];
+            }
+        }
+        @cons_nodes = @tmpcons_nodes
+    } else {
+        @cons_nodes = $hmtab->getAllNodeAttribs([ 'cons', 'serialport', 'mgt', 'conserver', 'consoleondemand' ]);
+    }
+    $hmtab->close();
+    my $rsp;
+
+    foreach (@cons_nodes) {
+        if ($_->{cons} or defined($_->{'serialport'})) {
+            unless ($_->{cons}) { $_->{cons} = $_->{mgt}; } #populate with fallback
+            if ($isSN && $_->{conserver} && exists($iphash{ $_->{conserver} }) || !$isSN) {
+                $cons_map{ $_->{node} } = $_; # also put the ref to the entry in a hash for quick look up
+            } else {
+                $rsp->{data}->[0] = $_->{node} .": ignore, the host for conserver could not be determined.";
+                xCAT::MsgUtils->message("I", $rsp, $::callback);
+            }
+        } else {
+            $rsp->{data}->[0] = $_->{node} .": ignore, cons attribute or serialport attribute is not specified.";
+            xCAT::MsgUtils->message("I", $rsp, $::callback);
+        }
+    }
+    return %cons_map;
+}
+
+
 #-------------------------------------------------------------------------------
 
 =head3  is_xcat_conf_ready
diff --git a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
index 0ca5df5c5..221c12819 100755
--- a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
+++ b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
@@ -4423,6 +4423,12 @@ sub defrm
                 command => ['makeconservercf'],
                 node => [@allnodes],
                 arg => ['-d'],}, $doreq, 0, 1);
+            if (-x "/usr/bin/goconserver") {
+                require xCAT::Goconserver;
+                if (xCAT::Goconserver::is_goconserver_running()) {
+                    xCAT::Goconserver::cleanup_nodes(undef);
+                }
+            }
         }
     }
 
diff --git a/xCAT-server/lib/xcat/plugins/goconserver.pm b/xCAT-server/lib/xcat/plugins/goconserver.pm
index b3487e81a..a4c1e8ea2 100644
--- a/xCAT-server/lib/xcat/plugins/goconserver.pm
+++ b/xCAT-server/lib/xcat/plugins/goconserver.pm
@@ -20,6 +20,7 @@ my $host;
 my $usage_string ="   makegocons [-V|--verbose] [-d|--delete] noderange
     -h|--help                   Display this usage statement.
     -v|--version                Display the version number.
+    -C|--cleanup                Remove the entries for the nodes whose definitions have been removed from xCAT db.
     -q|--query  [noderange]     Display the console connection status.";
 
 my $version_string = xCAT::Utils->Version();
@@ -138,50 +139,6 @@ sub process_request {
     }
 }
 
-sub get_cons_map {
-    my ($req, $iphashref) = @_;
-    my %cons_map;
-    my %iphash = %{$iphashref};
-    my $hmtab = xCAT::Table->new('nodehm');
-    my @cons_nodes;
-
-    if (($req->{node} and @{$req->{node}} > 0) or $req->{noderange}->[0]) {
-        # Note: do not consider terminal server currently
-        @cons_nodes = $hmtab->getNodesAttribs($req->{node}, [ 'node', 'cons', 'serialport', 'mgt', 'conserver', 'consoleondemand' ]);
-        # Adjust the data structure to make the result consistent with the getAllNodeAttribs() call we make if a noderange was not specified
-        my @tmpcons_nodes;
-        foreach my $ent (@cons_nodes)
-        {
-            foreach my $nodeent (keys %$ent)
-            {
-                push @tmpcons_nodes, $ent->{$nodeent}->[0];
-            }
-        }
-        @cons_nodes = @tmpcons_nodes
-
-    } else {
-        @cons_nodes = $hmtab->getAllNodeAttribs([ 'cons', 'serialport', 'mgt', 'conserver', 'consoleondemand' ]);
-    }
-    $hmtab->close();
-    my $rsp;
-
-    foreach (@cons_nodes) {
-        if ($_->{cons} or defined($_->{'serialport'})) {
-            unless ($_->{cons}) { $_->{cons} = $_->{mgt}; } #populate with fallback
-            if ($isSN && $_->{conserver} && exists($iphash{ $_->{conserver} }) || !$isSN) {
-                $cons_map{ $_->{node} } = $_; # also put the ref to the entry in a hash for quick look up
-            } else {
-                $rsp->{data}->[0] = $_->{node} .": ignore, the host for conserver could not be determined.";
-                xCAT::MsgUtils->message("I", $rsp, $::callback);
-            }
-        } else {
-            $rsp->{data}->[0] = $_->{node} .": ignore, cons attribute or serialport attribute is not specified.";
-            xCAT::MsgUtils->message("I", $rsp, $::callback);
-        }
-    }
-    return %cons_map;
-}
-
 sub start_goconserver {
     my ($rsp, $running, $ready, $ret);
     unless (-x "/usr/bin/goconserver") {
@@ -233,18 +190,24 @@ sub makegocons {
     }
     @ARGV = @exargs;
     $Getopt::Long::ignorecase = 0;
-    my ($delmode, $querymode);
+    my ($delmode, $querymode, $cleanupmode);
     GetOptions('d|delete' => \$delmode,
         'q|query' => \$querymode,
+        'C|cleanup' => \$cleanupmode,
     );
 
     my $svboot = 0;
     if (exists($req->{svboot})) {
         $svboot = 1;
     }
-    my %iphash   = ();
-    foreach (@$hostinfo) { $iphash{$_} = 1; }
-    my %cons_map = get_cons_map($req, \%iphash);
+    if ($cleanupmode) {
+        if (exists($req->{_allnodes}) && $req->{_allnodes}->[0] != 1) {
+            xCAT::SvrUtils::sendmsg([ 1, "Can not specify noderange together with -C|--cleanup." ], $::callback);
+            return 1;
+        }
+        return xCAT::Goconserver::cleanup_nodes($::callback);
+    }
+    my %cons_map = xCAT::Goconserver::get_cons_map($req);
     if (! %cons_map) {
         xCAT::SvrUtils::sendmsg([ 1, "Could not get any console request entry" ], $::callback);
         return 1;
@@ -271,7 +234,7 @@ sub makegocons {
         }
     }
     my (@nodes);
-    my $data = xCAT::Goconserver::gen_request_data(\%cons_map, $siteondemand, $isSN, $::callback);
+    my $data = xCAT::Goconserver::gen_request_data(\%cons_map, $siteondemand, $::callback);
     if (! $data) {
         xCAT::SvrUtils::sendmsg([ 1, "Could not generate the request data" ], $::callback);
         return 1;

From 5c8cdbd351952d6a08154d66c9661489636890e8 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Thu, 1 Mar 2018 11:55:06 -0500
Subject: [PATCH 092/100] Enhance rspconfig sshcfg to use paramiko directly
 rather than parallel-ssh

---
 .../agent/hwctl/executor/openbmc_bmcconfig.py | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
index aa91a56be..fc39bf776 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
@@ -6,7 +6,15 @@
 #
 from __future__ import print_function
 import os, stat
-import gevent
+import sys
+if 'threading' in sys.modules:
+    del sys.modules['threading']
+from gevent import monkey
+monkey.patch_all()
+from gevent import sleep
+import paramiko
+from paramiko.ssh_exception import NoValidConnectionsError
+
 import time
 
 from common import utils
@@ -14,10 +22,6 @@ from common.task import ParallelNodesCommand
 from common.exceptions import SelfClientException, SelfServerException
 from hwctl import openbmc_client as openbmc
 
-#For rspconfig sshcfg
-from pssh.ssh_client import SSHClient
-from pssh.exceptions import UnknownHostException, AuthenticationException, \
-     ConnectionErrorException, SSHException
 from scp import SCPClient
 
 import logging
@@ -167,7 +171,7 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
                 if (20-i) % 8 == 0:
                     self.callback.info('%s: Still waiting for dump %s to be generated... '  % (node, dump_id))
 
-                gevent.sleep( 15 )
+                sleep( 15 )
 
             if flag: 
                 result = self._dump_download(obmc, node, str(dump_id), flag_dump_process=True)
@@ -224,27 +228,25 @@ rmdir \"/tmp/$userid\" \n")
         node = kw['node']
         nodeinfo = kw['nodeinfo']
         tmp_remote_dir = "/tmp/%s/.ssh/" % nodeinfo['username']
-        #try: 
-        ssh_client = SSHClient(nodeinfo['bmcip'], user=nodeinfo['username'], password=nodeinfo['password'])
-        #except (SSHException, NoValidConnectionsError,BadHostKeyException) as e: 
-        #    self.callback.info("%s: %s" % (node, e))
-        if not ssh_client.client.get_transport().is_active():
-            self.callback.info("SSH session is not active")
-        if not ssh_client.client.get_transport().is_authenticated():
-            self.callback.info("SSH session is not authenticated")
         try:
-            ssh_client.client.exec_command("/bin/mkdir -p %s\n" % tmp_remote_dir)
-        except (SSHException, ConnectionErrorException) as e: 
-            self.callback.info("%s: ----%s------" % (host, e))
-        scp = SCPClient(ssh_client.client.get_transport()) 
+            ssh_client = paramiko.SSHClient()
+            ssh_client.set_missing_host_key_policy(paramiko.MissingHostKeyPolicy())
+            ssh_client.connect(nodeinfo['bmcip'], username=nodeinfo['username'], password=nodeinfo['password'])
+        except (NoValidConnectionsError) as e:
+            return self.callback.error("%s: Unable to connect to bmc %s" % (node, nodeinfo['bmcip']))
+        if not ssh_client.get_transport().is_active():
+            return self.callback.error("%s: SSH session to bmc %s is not active" % (node, nodeinfo['bmcip']))
+        if not ssh_client.get_transport().is_authenticated():
+            return self.callback.error("%s: SSH session to bmc %s is not authenticated" % (node, nodeinfo['bmcip']))
+        ssh_client.exec_command("/bin/mkdir -p %s\n" % tmp_remote_dir)
+        scp = SCPClient(ssh_client.get_transport())
         scp.put(self.copy_sh_file, tmp_remote_dir + "copy.sh")
         scp.put(self.local_public_key, tmp_remote_dir + "id_rsa.pub")
-        ssh_client.client.exec_command("%s/copy.sh %s" % (tmp_remote_dir, nodeinfo['username']))
-        ssh_client.client.close()
+        ssh_client.exec_command("%s/copy.sh %s" % (tmp_remote_dir, nodeinfo['username']))
+        ssh_client.close()
         return self.callback.info("ssh keys copied to %s" % nodeinfo['bmcip'])
 
 
-
     def set_ipdhcp(self, **kw):
         node = kw['node']
         obmc = openbmc.OpenBMCRest(name=node, nodeinfo=kw['nodeinfo'], messager=self.callback,

From 6230706c43d86d2fcb776a8f568d4700db0ed462 Mon Sep 17 00:00:00 2001
From: Aaron Knister <aaron.knister@gmail.com>
Date: Sun, 25 Feb 2018 18:11:56 -0500
Subject: [PATCH 093/100] be more explicit about default stanza naming
 convention

---
 perl-xCAT/xCAT/DBobjUtils.pm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/perl-xCAT/xCAT/DBobjUtils.pm b/perl-xCAT/xCAT/DBobjUtils.pm
index 9eb185374..fc9e9b0fd 100755
--- a/perl-xCAT/xCAT/DBobjUtils.pm
+++ b/perl-xCAT/xCAT/DBobjUtils.pm
@@ -1676,13 +1676,10 @@ sub readFileInput
 
             #  could have different default stanzas for different object types
 
-            if ($objectname =~ /default/) {
+            if ($objectname =~ /^default-([^-]+)$/) {
 
-                ($junk1, $objtype) = split(/-/, $objectname);
-
-                if ($objtype) {
-                    $objectname = 'default';
-                }
+                $objtype = $1;
+                $objectname = 'default';
 
                 next;
             }

From f1ff71e3bc115067f42e3b559526474cae516c51 Mon Sep 17 00:00:00 2001
From: xuweibj <xwbj@cn.ibm.com>
Date: Fri, 2 Mar 2018 15:45:10 +0800
Subject: [PATCH 094/100] [OpenBMC] The return code on error should be 1
 instead of 0 (#4871)

* fix issue 4854, modify return code when has error
---
 .../lib/python/agent/common/utils.py          |  7 +-
 .../agent/hwctl/executor/openbmc_beacon.py    |  5 +-
 .../agent/hwctl/executor/openbmc_bmcconfig.py | 70 +++++++++----------
 .../agent/hwctl/executor/openbmc_eventlog.py  |  2 +-
 .../agent/hwctl/executor/openbmc_inventory.py |  4 +-
 .../agent/hwctl/executor/openbmc_sensor.py    |  4 +-
 .../agent/hwctl/executor/openbmc_setboot.py   | 10 ++-
 .../lib/python/agent/xcatagent/server.py      |  4 +-
 xCAT-server/lib/perl/xCAT/OPENBMC.pm          |  2 +-
 9 files changed, 51 insertions(+), 57 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/common/utils.py b/xCAT-openbmc-py/lib/python/agent/common/utils.py
index 9c2c2786f..e4112741b 100644
--- a/xCAT-openbmc-py/lib/python/agent/common/utils.py
+++ b/xCAT-openbmc-py/lib/python/agent/common/utils.py
@@ -92,8 +92,11 @@ class Messager(object):
     def warn(self, msg):
         self.logger.warn(msg)
 
-    def error(self, msg):
-        self.logger.error(msg)
+    def error(self, msg, node=''):
+        if node:
+            self.logger.error('%s: Error: %s' % (node, msg))
+        else:
+            self.logger.error('Error: %s' % msg)
 
     def syslog(self, msg):
         pass
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_beacon.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_beacon.py
index e68f56f7a..b22170fff 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_beacon.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_beacon.py
@@ -27,9 +27,8 @@ class OpenBMCBeaconTask(ParallelNodesCommand):
         try:
             obmc.login()
             obmc.set_beacon_state(state)
-            result = '%s: %s' % (node, state)
+            self.callback.info('%s: %s' % (node, state))
 
         except (SelfServerException, SelfClientException) as e:
-            result = '%s: %s'  % (node, e.message)
+            self.callback.error(e.message, node)
 
-        self.callback.info(result)
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
index fc39bf776..f1b648ede 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
@@ -59,12 +59,12 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
             check_cmd = grep_cmd + ' ' + path_not_found + ' ' + dump_log_file
             grep_string = os.popen(check_cmd).readlines()
             if grep_string:
-                result = 'Invalid dump %s was specified. Use -l option to list.' % download_id
+                self.callback.error('Invalid dump %s was specified. Use -l option to list.' % download_id, node)
             else:
-                result = 'Downloaded dump %s to %s.' % (download_id, dump_log_file)
+                self.callback.info('%s: Downloaded dump %s to %s.' % (node, download_id, dump_log_file))
         else:
-            result = 'Failed to download dump %s to %s.' % (download_id, dump_log_file)
-        return result
+            self.callback.error('Failed to download dump %s to %s.' % (download_id, dump_log_file), node)
+        return
 
     def dump_list(self, **kw):
 
@@ -90,7 +90,7 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
                 self.callback.info('%s: %s'  % (node, info))
 
         except (SelfServerException, SelfClientException) as e:
-            self.callback.info('%s: %s'  % (node, e.message))
+            self.callback.error(e.message, node)
 
         return dump_info
 
@@ -109,7 +109,7 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
             else:
                 self.callback.info('%s: [%s] success'  % (node, dump_id))
         except (SelfServerException, SelfClientException) as e:
-            self.callback.info('%s: %s'  % (node, e.message))
+            self.callback.error(e.message, node)
 
         return dump_id
 
@@ -123,11 +123,9 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
             obmc.login()
             obmc.clear_dump(clear_arg)
 
-            result = '%s: [%s] clear' % (node, clear_arg)  
+            self.callback.info('%s: [%s] clear' % (node, clear_arg))
         except (SelfServerException, SelfClientException) as e:
-            result = '%s: %s'  % (node, e.message)
-
-        self.callback.info(result) 
+            self.callback.error(e.message, node)
 
     def dump_download(self, download_arg, **kw):
 
@@ -138,8 +136,7 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
         try:
             obmc.login()
             if download_arg != 'all':
-                result = self._dump_download(obmc, node, download_arg)
-                self.callback.info('%s: %s'  % (node, result))
+                self._dump_download(obmc, node, download_arg)
                 return
 
             dump_dict = obmc.list_dump_info()
@@ -147,10 +144,9 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
             keys.sort()
 
             for key in keys:
-                result = self._dump_download(obmc, node, str(key))
-                self.callback.info('%s: %s'  % (node, result))
+                self._dump_download(obmc, node, str(key))
         except SelfServerException as e:
-            self.callback.info('%s: %s'  % (node, e.message))
+            self.callback.error(e.message, node)
 
     def dump_process(self, **kw):
 
@@ -174,14 +170,12 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
                 sleep( 15 )
 
             if flag: 
-                result = self._dump_download(obmc, node, str(dump_id), flag_dump_process=True)
+                self._dump_download(obmc, node, str(dump_id), flag_dump_process=True)
             else:
-                result = 'Could not find dump %s after waiting %d seconds.' % (dump_id, 20 * 15) 
-
-            self.callback.info('%s: %s'  % (node, result))
+                self.callback.error('Could not find dump %s after waiting %d seconds.' % (dump_id, 20 * 15), node)
 
         except SelfServerException as e:
-            self.callback.info('%s: %s'  % (node, e.message))
+            self.callback.error(e.message, node)
 
     def gard_clear(self, **kw):
 
@@ -195,7 +189,7 @@ class OpenBMCBmcConfigTask(ParallelNodesCommand):
             self.callback.info('%s: GARD cleared' % node)
 
         except SelfServerException as e:
-            self.callback.info('%s: %s'  % (node, e.message))
+            self.callback.error(e.message, node)
 
     def pre_set_sshcfg(self, *arg, **kw):
         local_home_dir=os.path.expanduser('~')
@@ -233,11 +227,11 @@ rmdir \"/tmp/$userid\" \n")
             ssh_client.set_missing_host_key_policy(paramiko.MissingHostKeyPolicy())
             ssh_client.connect(nodeinfo['bmcip'], username=nodeinfo['username'], password=nodeinfo['password'])
         except (NoValidConnectionsError) as e:
-            return self.callback.error("%s: Unable to connect to bmc %s" % (node, nodeinfo['bmcip']))
+            return self.callback.error("Unable to connect to bmc %s" % nodeinfo['bmcip'], node)
         if not ssh_client.get_transport().is_active():
-            return self.callback.error("%s: SSH session to bmc %s is not active" % (node, nodeinfo['bmcip']))
+            return self.callback.error("SSH session to bmc %s is not active" % nodeinfo['bmcip'], node)
         if not ssh_client.get_transport().is_authenticated():
-            return self.callback.error("%s: SSH session to bmc %s is not authenticated" % (node, nodeinfo['bmcip']))
+            return self.callback.error("SSH session to bmc %s is not authenticated" % nodeinfo['bmcip'], node)
         ssh_client.exec_command("/bin/mkdir -p %s\n" % tmp_remote_dir)
         scp = SCPClient(ssh_client.get_transport())
         scp.put(self.copy_sh_file, tmp_remote_dir + "copy.sh")
@@ -255,14 +249,14 @@ rmdir \"/tmp/$userid\" \n")
             obmc.login()
             obmc.set_ipdhcp()
         except (SelfServerException, SelfClientException) as e:
-            self.callback.info("%s: %s" % (node, e.message))
+            self.callback.error(e.message, node)
             return
 
         self.callback.info("%s: BMC Setting IP to DHCP..." % (node))
         try:
             obmc.reboot_bmc()
         except (SelfServerException, SelfClientException) as e:
-            self.callback.info("%s: %s" % (node, e.message))
+            self.callback.error(e.message, node)
 
     def get_attributes(self, attributes, **kw):
         netinfo_dict={}
@@ -273,7 +267,7 @@ rmdir \"/tmp/$userid\" \n")
             elif attr in openbmc.RSPCONFIG_APIS:
                 self._get_apis_values(attr, **kw)
             else:
-                self.callback.error("get_attributes can not deal with attr %s" % attr)
+                self.callback.error("get_attributes can not deal with attr %s" % attr, kw['node'])
         if len(netinfo_dict):
             self._get_netinfo(ip=netinfo_dict.get('ip', False), ipsrc=netinfo_dict.get('ipsrc', False), netmask=netinfo_dict.get('netmask', False),
                               gateway=netinfo_dict.get('gateway', False),vlan= netinfo_dict.get('vlan', False), 
@@ -295,7 +289,7 @@ rmdir \"/tmp/$userid\" \n")
             elif k in openbmc.RSPCONFIG_APIS:
                 self._set_apis_values(k, v, **kw)
             else:
-                return self.callback.error("set_attributes unsupported attribute:%s" % k)
+                return self.callback.error("set_attributes unsupported attribute:%s" % k, node)
         if len(netinfo_dict) > 1 and ('ip' not in netinfo_dict or 'netmask' not in netinfo_dict or 'gateway' not in netinfo_dict):
             self.callback.info("set_attributes miss either ip, netmask or gateway to set network information")
         elif len(netinfo_dict) <= 1:
@@ -324,23 +318,23 @@ rmdir \"/tmp/$userid\" \n")
             obmc.login()
             netinfo = obmc.get_netinfo()
         except (SelfServerException, SelfClientException) as e:
-            self.callback.info('%s: %s' % (node, e.message))
+            self.callback.error(e.message, node)
             return
 
         if not netinfo:
-            return self.callback.error("%s: No network information get" % node)
+            return self.callback.error('No network information get', node)
 
         bmcip = node_info['bmcip']
         nic = self._get_facing_nic(bmcip, netinfo)
         if not nic:
-            return self.callback.error('%s: Can not get facing NIC for %s' % (node, bmcip))
+            return self.callback.error('Can not get facing NIC for %s' % bmcip, node)
 
         try:
             obmc.set_ntp_servers(nic, servers)
             self.callback.info('%s: BMC Setting NTPServers...' % node)
             netinfo = obmc.get_netinfo()
         except (SelfServerException, SelfClientException) as e:
-            self.callback.info('%s: %s' % (node, e.message))
+            self.callback.error(e.message, node)
             return
 
         ntpservers = None
@@ -361,7 +355,7 @@ rmdir \"/tmp/$userid\" \n")
         origin_passwd, new_passwd = admin_passwd.split(',')
 
         if origin_passwd != node_info['password']:
-            self.callback.info('%s: Current BMC password is incorrect, cannot set the new password.' % node)
+            self.callback.error('Current BMC password is incorrect, cannot set the new password.', node)
             return
 
         obmc = openbmc.OpenBMCRest(name=node, nodeinfo=node_info, messager=self.callback,
@@ -371,7 +365,7 @@ rmdir \"/tmp/$userid\" \n")
             obmc.set_admin_passwd(new_passwd)
             self.callback.info("%s: BMC Setting Password..." % node)
         except (SelfServerException, SelfClientException) as e:
-            self.callback.info("%s: %s" % (node, e.message))
+            self.callback.error(e.message, node)
 
     def _set_apis_values(self, key, value, **kw):
         node = kw['node']
@@ -381,7 +375,7 @@ rmdir \"/tmp/$userid\" \n")
             obmc.login()
             obmc.set_apis_values(key, value)
         except (SelfServerException, SelfClientException) as e:
-            self.callback.info("%s: %s" % (node, e.message))
+            self.callback.error(e.message, node)
 
         self.callback.info("%s: BMC Setting %s..." % (node, openbmc.RSPCONFIG_APIS[key]['display_name']))
 
@@ -394,7 +388,7 @@ rmdir \"/tmp/$userid\" \n")
             value = obmc.get_apis_values(key)
 
         except (SelfServerException, SelfClientException) as e:
-            self.callback.info('%s: %s' % (node, e.message))
+            self.callback.error(e.message, node)
 
         str_value = '0.'+str(value)
         result = '%s: %s: %s' % (node, openbmc.RSPCONFIG_APIS[key]['display_name'], str_value.split('.')[-1])
@@ -415,10 +409,10 @@ rmdir \"/tmp/$userid\" \n")
             obmc.login()
             netinfo = obmc.get_netinfo()
         except (SelfServerException, SelfClientException) as e:
-            self.callback.info('%s: %s' % (node, e.message))
+            self.callback.error(e.message, node)
             return
         if not netinfo:
-            return self.callback.error("%s: No network information get" % node)
+            return self.callback.error("No network information get", node)
         defaultgateway = "n/a"
         bmchostname = ""
         if 'defaultgateway' in netinfo:
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py
index 243b469f7..54efae78a 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_eventlog.py
@@ -49,7 +49,7 @@ class OpenBMCEventlogTask(ParallelNodesCommand):
                 eventlog_info += eventlog_info_dict[key]
 
         except (SelfServerException, SelfClientException) as e:
-            self.callback.info('%s: %s'  % (node, e.message))
+            self.callback.error(e.message, node)
 
         return eventlog_info
 
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_inventory.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_inventory.py
index 58e3fc906..4ff829b46 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_inventory.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_inventory.py
@@ -93,7 +93,7 @@ class OpenBMCInventoryTask(ParallelNodesCommand):
                 self.callback.info( '%s: %s' % (node, info))
 
         except (SelfServerException, SelfClientException) as e:
-            self.callback.info('%s: %s'  % (node, e.message))
+            self.callback.error(e.message, node)
 
         return inventory_info 
 
@@ -113,7 +113,7 @@ class OpenBMCInventoryTask(ParallelNodesCommand):
                 self.callback.info( '%s: %s' % (node, info))
 
         except (SelfServerException, SelfClientException) as e:
-            self.callback.info('%s: %s'  % (node, e.message))
+            self.callback.error(e.message, node)
 
         return firm_info
 
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_sensor.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_sensor.py
index 0cc8a7af1..3bee6bf98 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_sensor.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_sensor.py
@@ -88,7 +88,7 @@ class OpenBMCSensorTask(ParallelNodesCommand):
                 self.callback.info( '%s: %s' % (node, info))
 
         except (SelfServerException, SelfClientException) as e:
-            self.callback.info('%s: %s'  % (node, e.message))
+            self.callback.error(e.message, node)
 
         return sensor_info
 
@@ -111,7 +111,7 @@ class OpenBMCSensorTask(ParallelNodesCommand):
                 self.callback.info( '%s: %s' % (node, info))
 
         except (SelfServerException, SelfClientException) as e:
-            self.callback.info('%s: %s'  % (node, e.message))
+            self.callback.error(e.message, node)
 
         return beacon_info
                 
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_setboot.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_setboot.py
index eb8ff65dc..3a6b5ba1b 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_setboot.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_setboot.py
@@ -30,12 +30,11 @@ class OpenBMCBootTask(ParallelNodesCommand):
             obmc.login()
             state = obmc.get_boot_state()
 
-            result = '%s: %s' % (node, state)
+            self.callback.info('%s: %s' % (node, state))
 
         except (SelfServerException, SelfClientException) as e:
-            result = '%s: %s'  % (node, e.message)
+            self.callback.error(e.message, node)
 
-        self.callback.info(result)
         return state
 
     def set_state(self, state, persistant, **kw):
@@ -55,10 +54,9 @@ class OpenBMCBootTask(ParallelNodesCommand):
 
             state = obmc.get_boot_state()
 
-            result = '%s: %s' % (node, state)
+            self.callback.info('%s: %s' % (node, state))
 
         except (SelfServerException, SelfClientException) as e:
-            result = '%s: %s'  % (node, e.message)
+            self.callback.error(e.message, node)
 
-        self.callback.info(result)
 
diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
index cb6ba5a41..24a728560 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
@@ -36,8 +36,8 @@ class XCATMessager(utils.Messager):
         d = {'type': MSG_TYPE, 'msg': {'type': 'warning', 'data': msg}}
         self._send(d)
 
-    def error(self, msg):
-        d = {'type': MSG_TYPE, 'msg': {'type': 'error', 'data': msg}}
+    def error(self,  msg, node=''):
+        d = {'type': MSG_TYPE, 'msg': {'type': 'error', 'node': node, 'data': msg}}
         self._send(d)
 
     def syslog(self, msg):
diff --git a/xCAT-server/lib/perl/xCAT/OPENBMC.pm b/xCAT-server/lib/perl/xCAT/OPENBMC.pm
index 3fc6fc1aa..ae19224c9 100644
--- a/xCAT-server/lib/perl/xCAT/OPENBMC.pm
+++ b/xCAT-server/lib/perl/xCAT/OPENBMC.pm
@@ -109,7 +109,7 @@ sub handle_message {
         } elsif ($msg->{type} eq 'warning') {
             xCAT::MsgUtils->message("W", { data => [$msg->{data}] }, $callback);
         } elsif ($msg->{type} eq 'error'){
-            xCAT::MsgUtils->message("E", { data => [$msg->{data}] }, $callback);
+            xCAT::SvrUtils::sendmsg([ 1, $msg->{data} ], $callback, $msg->{node});
         } elsif ($msg->{type} eq 'syslog'){
             xCAT::MsgUtils->message("S", $msg->{data});
         }

From 02523e89715f80867585bf7ede2b10ac086dc2f9 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Thu, 1 Mar 2018 13:48:37 -0500
Subject: [PATCH 095/100] Changes for review comments

---
 .../lib/python/agent/common/exceptions.py     |  3 +--
 .../lib/python/agent/common/rest.py           |  8 +++----
 .../agent/hwctl/executor/openbmc_power.py     | 10 +++++++--
 .../lib/python/agent/hwctl/openbmc_client.py  | 21 ++++---------------
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/xCAT-openbmc-py/lib/python/agent/common/exceptions.py b/xCAT-openbmc-py/lib/python/agent/common/exceptions.py
index 6f5dad33c..88e80e59a 100644
--- a/xCAT-openbmc-py/lib/python/agent/common/exceptions.py
+++ b/xCAT-openbmc-py/lib/python/agent/common/exceptions.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python
 
 class SelfServerException(Exception) :
-    def __init__(self, message, code=0, detail_msg= "", host_and_port="") :
+    def __init__(self, message, detail_msg= "", host_and_port="") :
         super(Exception, self).__init__(message)
-        self.code = code
         self.host_and_port = host_and_port
         self.detail_msg = detail_msg
 
diff --git a/xCAT-openbmc-py/lib/python/agent/common/rest.py b/xCAT-openbmc-py/lib/python/agent/common/rest.py
index bc52f325b..88c836998 100644
--- a/xCAT-openbmc-py/lib/python/agent/common/rest.py
+++ b/xCAT-openbmc-py/lib/python/agent/common/rest.py
@@ -46,16 +46,16 @@ class RestSession(object):
                 causing_error = "timeout"
                 host_and_port = self.extract_server_and_port(e.message[0], "STRING")
 
-            message = 'Error: Failed to connect to server.'
+            message = 'Failed to connect to server.'
             # message = '\n\n--> {0} \n\n'.format(e.message[0])
-            raise xcat_exception.SelfServerException(message, "500", '({0})'.format(causing_error), host_and_port)
+            raise xcat_exception.SelfServerException(message, '({0})'.format(causing_error), host_and_port)
 
         except requests.exceptions.Timeout as e:
             causing_error = "timeout"
             host_and_port = self.extract_server_and_port(e.message[0], "STRING")
 
-            message = 'Error: Timeout to connect to server'
-            raise xcat_exception.SelfServerException(message, "500", '({0})'.format(causing_error), host_and_port)
+            message = 'Timeout to connect to server'
+            raise xcat_exception.SelfServerException(message, '({0})'.format(causing_error), host_and_port)
 
         if not self.cookies:
             self.cookies = requests.utils.dict_from_cookiejar(self.session.cookies)
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_power.py b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_power.py
index 4bab39788..567d6b825 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_power.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_power.py
@@ -73,6 +73,13 @@ class OpenBMCPowerTask(ParallelNodesCommand):
         bmc_not_ready = bmc_state = 'NotReady'
         try:
             obmc.login()
+        except SelfServerException as e:
+            # Special exception handling for login failure
+            login_message = "Login to BMC failed: Can't connect to {0} {1}.".format(e.host_and_port, e.detail_msg)
+            self.callback.error(login_message, node)
+            return bmc_state
+
+        try:
             state = obmc.get_bmc_state()
             bmc_state = state.get('bmc')
 
@@ -83,8 +90,7 @@ class OpenBMCPowerTask(ParallelNodesCommand):
 
         except SelfServerException, SelfClientException:
             # There is no response when BMC is not ready
-            # Do not print bmc_state, instead, error messages from login failure will be displayed
-            return bmc_state
+            result = '%s: %s'  % (node, openbmc.RPOWER_STATES[bmc_not_ready])
 
         self.callback.info(result)
         return bmc_state
diff --git a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
index d73e17b05..29169ff8a 100644
--- a/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
+++ b/xCAT-openbmc-py/lib/python/agent/hwctl/openbmc_client.py
@@ -249,15 +249,6 @@ class OpenBMCRest(object):
             self.messager.info(localtime + ' ' + log)
             logger.debug(log)
 
-    def _print_record (self, msg, cmd, type="I"):
-
-        log = self.name + ': ' + msg
-        logger.debug(log)
-        if type == "E":
-            self.messager.error(log)
-        else:
-            self.messager.info(log)
-
     def _log_request (self, method, url, headers, data=None, files=None, file_path=None, cmd=''):
 
         header_str = ' '.join([ "%s: %s" % (k, v) for k,v in headers.items() ])
@@ -285,7 +276,7 @@ class OpenBMCRest(object):
         if code != requests.codes.ok:
             description = ''.join(data['data']['description'])
             error = 'Error: [%d] %s' % (code, description)
-            self._print_record(error, cmd, "E")
+            self._print_record_log(error, cmd)
             raise SelfClientException(error, code)
 
         self._print_record_log(data['message'], cmd)
@@ -307,13 +298,9 @@ class OpenBMCRest(object):
             response = self.session.request(method, url, httpheaders, data=data)
             return self.handle_response(response, cmd=cmd)
         except SelfServerException as e:
-            message = 'Error: BMC did not respond. ' \
-                      'Validate BMC configuration and retry the command.'
-            if cmd == 'login':
-                login_message = "Error: [{0}] Login to BMC failed: {1} Can't connect to {2} {3}.".format(e.code, e.code, e.host_and_port, e.detail_msg)
-                self._print_record(login_message, cmd, "I")
-
-            self._print_record(message, cmd, "E")
+            e.message = 'Error: BMC did not respond. ' \
+                        'Validate BMC configuration and retry the command.'
+            self._print_record_log(e.message, cmd)
             raise
         except ValueError:
             error = 'Error: Received wrong format response: %s' % response

From c3a36f0e7e52b1effb1d30525139e09b36dbc868 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Fri, 2 Mar 2018 13:06:49 -0500
Subject: [PATCH 096/100] For ppc64le platforms, install xCAT-openbmc-py

---
 xCAT/xCAT.spec     | 4 ++++
 xCATsn/xCATsn.spec | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index e62ae73dd..737f815e3 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -87,6 +87,10 @@ Requires: ipmitool-xcat >= 1.8.17-1
 %ifarch ppc ppc64 ppc64le
 Requires: ipmitool-xcat >= 1.8.17-1
 %endif
+%ifarch ppc64le
+# only OpenBMC support
+Requires: xCAT-openbmc-py
+%endif
 %endif
 
 %if %notpcm
diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec
index 07dde086c..c2538e31f 100644
--- a/xCATsn/xCATsn.spec
+++ b/xCATsn/xCATsn.spec
@@ -69,6 +69,10 @@ Requires: ipmitool-xcat >= 1.8.17-1
 %ifarch ppc ppc64 ppc64le
 Requires: ipmitool-xcat >= 1.8.17-1
 %endif
+%ifarch ppc64le
+# only OpenBMC support
+Requires: xCAT-openbmc-py
+%endif
 %endif
 
 %if %notpcm

From 58cf5b67a164ccd18815a6a52826b59e368e2fe6 Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Mon, 5 Mar 2018 13:56:55 +0800
Subject: [PATCH 097/100] report clear error message when lacking python
 dependency.

---
 xCAT-openbmc-py/lib/python/agent/xcatagent/server.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
index 24a728560..ab236a5a7 100644
--- a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
+++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py
@@ -105,6 +105,11 @@ class Server(object):
                 sock.close()
                 self.server.stop()
                 os._exit(0)
+        except ImportError:
+            messager.error("xCAT mgt=openbmc is using a Python based framework and there are some dependencies that are not met.")
+            print(traceback.format_exc(), file=sys.stderr)
+            self.server.stop()
+            os._exit(1)
         except Exception:
             print(traceback.format_exc(), file=sys.stderr)
             self.server.stop()

From 2156528baf35a11f147d2b14f7e1b02c8f5a6459 Mon Sep 17 00:00:00 2001
From: chenglch <chenglch@cn.ibm.com>
Date: Mon, 5 Mar 2018 13:59:28 +0800
Subject: [PATCH 098/100] Remove the spaces at the end for `makegocons -q`

Tidy the output
---
 xCAT-server/lib/perl/xCAT/Goconserver.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/Goconserver.pm b/xCAT-server/lib/perl/xCAT/Goconserver.pm
index 211808a2f..a28d398e0 100644
--- a/xCAT-server/lib/perl/xCAT/Goconserver.pm
+++ b/xCAT-server/lib/perl/xCAT/Goconserver.pm
@@ -25,7 +25,7 @@ my $bmc_cons_port = "2200";
 my $isSN = xCAT::Utils->isServiceNode();
 
 use constant CONSOLE_LOG_DIR => "/var/log/consoles";
-use constant PRINT_FORMAT => "%-32s %-32s %-64s";
+use constant PRINT_FORMAT => "%-32s %-32s %s";
 unless (-d CONSOLE_LOG_DIR) {
     mkpath(CONSOLE_LOG_DIR, 0, 0755);
 }
@@ -385,7 +385,7 @@ sub list_nodes {
             xCAT::MsgUtils->message("E", $rsp, $callback);
             next;
         }
-        $rsp->{data}->[0] = sprintf(PRINT_FORMAT, $node->{name}, $node->{host}, $node->{state});
+        $rsp->{data}->[0] = sprintf(PRINT_FORMAT, $node->{name}, $node->{host}, substr($node->{state}, 0, 16));
         xCAT::MsgUtils->message("I", $rsp, $callback);
     }
     my %node_hash = %{$node_map};

From 7a316aeda0dade392e942069e0cb7e16bcb92d9b Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Mon, 5 Mar 2018 14:55:59 +0800
Subject: [PATCH 099/100] Fix the CI problem in github issue #4881

---
 xCAT-test/autotest/testcase/xcatstanzafile/cases0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-test/autotest/testcase/xcatstanzafile/cases0 b/xCAT-test/autotest/testcase/xcatstanzafile/cases0
index 0ce9b052f..d8b672a8b 100644
--- a/xCAT-test/autotest/testcase/xcatstanzafile/cases0
+++ b/xCAT-test/autotest/testcase/xcatstanzafile/cases0
@@ -171,7 +171,7 @@ end
 
 start:xcatstanzafile_specificvalue
 description:When a specific value for an attribute is provided in the stanza, it takes priority over any default value that had been set.
-cmd:echo -e "default-node:\n    groups=all,compute\ntestnode:\n    objtype=node\n    groups=all,rhels5.5\n	xcatmaster= MS02.ppd.pok.com\n       nfsserver=IS227.ppd.pok.com" > testfile
+cmd:bash -c 'echo -e "default-node:\n    groups=all,compute\ntestnode:\n    objtype=node\n    groups=all,rhels5.5\n	xcatmaster= MS02.ppd.pok.com\n       nfsserver=IS227.ppd.pok.com" > testfile'
 check:rc==0
 cmd:cat testfile|mkdef -z
 check:rc==0

From b5bfe17bfc74ab1945e42be96bd96599d1592326 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Mon, 5 Mar 2018 04:32:56 -0500
Subject: [PATCH 100/100] Control openbmc Perl/Python commands with site
 attribute (#4879)

* Control openbmc Perl/Python commands with site attribute

* update PR: control openbmc perl/python commands, using site attribute, env variable as well
---
 perl-xCAT/xCAT/Utils.pm                  |  1 -
 xCAT-server/lib/perl/xCAT/OPENBMC.pm     | 56 ++++++++++++++++++++++--
 xCAT-server/lib/xcat/plugins/openbmc.pm  | 21 +++------
 xCAT-server/lib/xcat/plugins/openbmc2.pm | 20 +--------
 4 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm
index 530bc0d5a..cc03a05b5 100644
--- a/perl-xCAT/xCAT/Utils.pm
+++ b/perl-xCAT/xCAT/Utils.pm
@@ -4968,5 +4968,4 @@ sub console_sleep {
     sleep($time);
 }
 
-
 1;
diff --git a/xCAT-server/lib/perl/xCAT/OPENBMC.pm b/xCAT-server/lib/perl/xCAT/OPENBMC.pm
index ae19224c9..8984a7a10 100644
--- a/xCAT-server/lib/perl/xCAT/OPENBMC.pm
+++ b/xCAT-server/lib/perl/xCAT/OPENBMC.pm
@@ -22,6 +22,7 @@ use File::Path;
 use Fcntl ":flock";
 use IO::Socket::UNIX qw( SOCK_STREAM );
 use xCAT_monitoring::monitorctrl;
+use xCAT::TableUtils;
 
 my $LOCK_DIR = "/var/lock/xcat/";
 my $LOCK_PATH = "/var/lock/xcat/agent.lock";
@@ -201,8 +202,8 @@ sub wait_agent {
 sub is_openbmc_python {
     my $environment = shift;
     $environment = shift if (($environment) && ($environment =~ /OPENBMC/));
-    # If XCAT_OPENBMC_PYTHON is YES, 
-    # will return "ALL" and caller will run openbmc2.pm. 
+    # If XCAT_OPENBMC_PYTHON is YES,
+    # will return "ALL" and caller will run openbmc2.pm.
     # If XCAT_OPENBMC_PYTHON is not set or is set to NO, return "NO" and caller
     # will run openbmc.pm
     # If XCAT_OPENBMC_PYTHON is a list of commands, return that list and caller
@@ -215,7 +216,7 @@ sub is_openbmc_python {
     } else {
         $::OPENBMC_PYTHON = $environment->{XCAT_OPENBMC_PYTHON};
     }
-    if (defined($::OPENBMC_PYTHON)) { 
+    if (defined($::OPENBMC_PYTHON)) {
         if ($::OPENBMC_PYTHON eq "YES") {
             return "ALL";
         }
@@ -230,4 +231,53 @@ sub is_openbmc_python {
     return "NO";
 }
 
+#--------------------------------------------------------------------------------
+
+=head3 is_support_in_perl 
+      check if specified command is included in site attribute openbmcperl
+      The policy is:
+            Get value from `openbmcperl`, `XCAT_OPENBMC_DEVEL`, agent.py:
+            1. If agent.py not exist: ==>Go Perl
+            2. If `openbmcperl` not set or not include a command:
+                    if `XCAT_OPENBMC_DEVEL` set to `NO`:  ==> Go Perl
+                    else if set to `YES` or not set: ==> Go Python
+            3. If `openbmcperl` set and include a command
+                    if `XCAT_OPENBMC_DEVEL` set to `YES`: == >Go Python
+                    else ==> Go Perl
+=cut
+
+#--------------------------------------------------------------------------------
+sub is_support_in_perl {
+    my ($class, $command, $env) = @_;
+    if (! -e $PYTHON_AGENT_FILE) {
+        return (1, '');
+    }
+    my @entries = xCAT::TableUtils->get_site_attribute("openbmcperl");
+    my $site_entry = $entries[0];
+    my $support_obmc = undef;
+    if (ref($env) eq 'ARRAY' and ref($env->[0]->{XCAT_OPENBMC_DEVEL}) eq 'ARRAY') {
+        $support_obmc = $env->[0]->{XCAT_OPENBMC_DEVEL}->[0];
+    } elsif (ref($env) eq 'ARRAY') {
+        $support_obmc = $env->[0]->{XCAT_OPENBMC_DEVEL};
+    } else {
+        $support_obmc = $env->{XCAT_OPENBMC_DEVEL};
+    }
+    if ($support_obmc and $support_obmc ne 'YES' and $support_obmc ne 'NO') {
+        return (-1, "Value $support_obmc is invalid for XCAT_OPENBMC_DEVEL, only support 'YES' and 'NO'");
+    }
+    if ($site_entry and $site_entry =~ $command) {
+        if ($support_obmc and $support_obmc eq 'YES') {
+            return (0, '');
+        } else {
+            return (1, '');
+        }
+    } else {
+        if ($support_obmc and $support_obmc eq 'NO') {
+            return (1, '');
+        } else {
+            return (0, '');
+        }
+    }
+}
+
 1;
diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 02fc8598a..3d61835ad 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -758,21 +758,12 @@ sub preprocess_request {
 
     $callback  = shift;
     my $command   = $request->{command}->[0];
-    my $python_env = xCAT::OPENBMC->is_openbmc_python($request->{environment});
-    # Process command in this module only if PYTHON env is not ALL or command is
-    # listed in the PYTHON env list (without EXCEPT: prefix. 
-    # All other cases => return
-    SWITCH: {
-        if ($python_env eq "ALL") {$request = {}; return;}
-        if ($python_env eq "NO")  {last SWITCH;}
-        if ($python_env !~ $command) {
-            if ($python_env =~ /^EXCEPT:/) {$request = {}; return;}
-            else {last SWITCH;}
-        }
-        if ($python_env =~ $command) {
-            if ($python_env =~ /^EXCEPT:/) {last SWITCH;}
-            else {$request = {}; return;}
-        }
+    my ($rc, $msg) = xCAT::OPENBMC->is_support_in_perl($command, $request->{environment});
+    if ($rc == 0) { $request = {}; return;}
+    if ($rc < 0) {
+        $request = {};
+        $callback->({ errorcode => [1], data => [$msg] });
+        return;
     }
 
     if ($::XCATSITEVALS{xcatdebugmode}) { $xcatdebugmode = $::XCATSITEVALS{xcatdebugmode} }
diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm
index 1bcf513a0..0e6364b48 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc2.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm
@@ -13,7 +13,6 @@ use warnings "all";
 
 use JSON;
 use Getopt::Long;
-use xCAT::Utils;
 use xCAT::Usage;
 use xCAT::SvrUtils;
 use xCAT::OPENBMC;
@@ -63,23 +62,8 @@ sub preprocess_request {
     $callback  = shift;
 
     my $command   = $request->{command}->[0];
-    my $python_env = xCAT::OPENBMC->is_openbmc_python($request->{environment});
-    # Process command in this module only if PYTHON env is not NO or 
-    # command is listed in the PYTHON env list (without EXCEPT: prefix). 
-    # All other cases => return
-
-    SWITCH: {
-        if ($python_env eq "NO")  {$request = {}; return;}
-        if ($python_env eq "ALL") {last SWITCH;}
-        if ($python_env !~ $command) {
-            if ($python_env =~ /^EXCEPT:/) {last SWITCH}
-            else {$request = {}; return;}
-        }
-        if ($python_env =~ $command) {
-            if ($python_env =~ /^EXCEPT:/) {$request = {}; return;}
-            else {last SWITCH;}
-        }
-    }
+    my ($rc, $msg) = xCAT::OPENBMC->is_support_in_perl($command, $request->{environment});
+    if ($rc != 0) { $request = {}; return;}
 
     my $noderange = $request->{node};
     my $extrargs  = $request->{arg};