From a9bf99652503a7eabc5bcd9985b6072bf1d7f5cf Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Wed, 3 May 2017 04:55:43 -0400
Subject: [PATCH 001/283] Modify xcat-genesis-builder script for Fedora26 ppc64

---
 xCAT-genesis-builder/buildrpm | 39 +++++++++++++++++++----------------
 xCAT-genesis-builder/install  | 17 +++++++--------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/xCAT-genesis-builder/buildrpm b/xCAT-genesis-builder/buildrpm
index f301961a3..25a37c743 100755
--- a/xCAT-genesis-builder/buildrpm
+++ b/xCAT-genesis-builder/buildrpm
@@ -133,30 +133,32 @@ if [ "$HOSTOS" = "mcp" ]; then
 # For ppc64 platform, needs to remove some files,
 # # and some files are in different directories
 elif [ $BUILDARCH = "ppc64" ]; then
-        sed -i 's/dracut_install efibootmgr//' $DRACUTMODDIR/install
+        sed -i 's/ efibootmgr//' $DRACUTMODDIR/install
         sed -i 's/ dmidecode//' $DRACUTMODDIR/install
-        sed -i 's/\/lib\/libncurses.so.5.7/\/lib64\/libncurses.so.5.7/' $DRACUTMODDIR/install
-        sed -i 's/\/usr\/lib\/libstdc++.so.6.0.13/\/usr\/lib64\/libstdc++.so.6.0.13/' $DRACUTMODDIR/install
-        sed -i 's/\/lib\/libgcc_s.so.1/\/lib64\/libgcc_s.so.1/' $DRACUTMODDIR/install
-        sed -i 's/\/lib\/libtinfo.so.5.7/\/lib64\/libtinfo.so.5.7/' $DRACUTMODDIR/install
+        # Remove the libraries with special version number, starting from Fedora 26 Alpha ppc64
+        # ==========================================================
+        #sed -i 's/\/lib\/libncurses.so.5.7/\/lib64\/libncurses.so.5.7/' $DRACUTMODDIR/install
+        #sed -i 's/\/usr\/lib\/libstdc++.so.6.0.13/\/usr\/lib64\/libstdc++.so.6.0.13/' $DRACUTMODDIR/install
+        #sed -i 's/\/lib\/libgcc_s.so.1/\/lib64\/libgcc_s.so.1/' $DRACUTMODDIR/install
+        #sed -i 's/\/lib\/libtinfo.so.5.7/\/lib64\/libtinfo.so.5.7/' $DRACUTMODDIR/install
         # following changes are required on Fedora 20 ppc64
         # sed -i 's/\/lib64\/libnss_dns-2.12.so/\/lib64\/libnss_dns-2.18.so/' $DRACUTMODDIR/install
-        # following changes are required on Fedora 23 ppc64
-        sed -i 's/\/lib64\/libnss_dns-2.12.so/\/lib64\/libnss_dns-2.22.so/' $DRACUTMODDIR/install
-        sed -i 's/\/lib\/libc.so.6/\/lib64\/libc.so.6/' $DRACUTMODDIR/install
+        # following changes are required on Fedora 26 Alpha ppc64
+        #sed -i 's/\/lib64\/libnss_dns-2.12.so/\/lib64\/libnss_dns-2.25.so/' $DRACUTMODDIR/install
+        #sed -i 's/\/lib\/libc.so.6/\/lib64\/libc.so.6/' $DRACUTMODDIR/install
         # following changes are required on Fedora 23 ppc64
         #sed -i 's/\/lib\/ld-linux.so.2/\/lib64\/ld-2.18.so/' $DRACUTMODDIR/install
-        sed -i 's/\/lib\/ld-linux.so.2/\/lib64\/ld-2.22.so/' $DRACUTMODDIR/install
-        sed -i 's/\/lib\/libdl.so.2/\/lib64\/libdl.so.2/' $DRACUTMODDIR/install
-        sed -i 's/\/lib\/libm.so.6/\/lib64\/libm.so.6/' $DRACUTMODDIR/install
-        sed -i 's/\/lib\/libpthread.so.0/\/lib64\/libpthread.so.0/' $DRACUTMODDIR/install
-        sed -i 's/\/lib64\/libncurses.so.5.7/\/lib64\/libncurses.so.5.9/' $DRACUTMODDIR/install
-        # following changes are required on Fedora 22 ppc64
+        #sed -i 's/\/lib\/ld-linux.so.2/\/lib64\/ld-2.25.so/' $DRACUTMODDIR/install
+        #sed -i 's/\/lib\/libdl.so.2/\/lib64\/libdl.so.2/' $DRACUTMODDIR/install
+        #sed -i 's/\/lib\/libm.so.6/\/lib64\/libm.so.6/' $DRACUTMODDIR/install
+        #sed -i 's/\/lib\/libpthread.so.0/\/lib64\/libpthread.so.0/' $DRACUTMODDIR/install
+        #sed -i 's/\/lib64\/libncurses.so.5.7/\/lib64\/libncurses.so.6.0/' $DRACUTMODDIR/install
         #sed -i 's/\/usr\/lib64\/libstdc++.so.6.0.13/\/usr\/lib64\/libstdc++.so.6.0.19/' $DRACUTMODDIR/install
-        sed -i 's/\/usr\/lib64\/libstdc++.so.6.0.13/\/usr\/lib64\/libstdc++.so.6.0.21/' $DRACUTMODDIR/install
-        sed -i 's/\/lib64\/libtinfo.so.5.7/\/lib64\/libtinfo.so.5.9/' $DRACUTMODDIR/install
-        sed -i 's/\/usr\/lib64\/libsasl2.so.2/\/usr\/lib64\/libsasl2.so.3/' $DRACUTMODDIR/install
+        #sed -i 's/\/usr\/lib64\/libstdc++.so.6.0.13/\/usr\/lib64\/libstdc++.so.6.0.23/' $DRACUTMODDIR/install
+        #sed -i 's/\/lib64\/libtinfo.so.5.7/\/lib64\/libtinfo.so.6.0/' $DRACUTMODDIR/install
+        #sed -i 's/\/usr\/lib64\/libsasl2.so.2/\/usr\/lib64\/libsasl2.so.3/' $DRACUTMODDIR/install
         #sed -i 's/\/lib64\/libnss_dns-2.12.so/\/lib64\/libnss_dns-2.18.so/' $DRACUTMODDIR/install
+        # ==========================================================
         sed -i 's/\/lib\/terminfo\/l\/linux/\/usr\/share\/terminfo\/l\/linux/g' $DRACUTMODDIR/install
         sed -i 's/\/lib\/terminfo\/v\/vt100/\/usr\/share\/terminfo\/v\/vt100/g' $DRACUTMODDIR/install
 fi
@@ -189,7 +191,8 @@ cd /tmp/xcatgenesis.$$/opt/xcat/share/xcat/netboot/genesis/$BUILDARCH/fs
 zcat /tmp/xcatgenesis.$$.rfs|cpio -dumi
 
 # add the perl library
-PERL_LIB_DIR="/usr/share/perl5 /usr/lib64/perl5 /usr/local/lib64/perl5 /usr/local/share/perl5"
+# add /usr/share/ntp/lib for Fedora26 ppc64, the ntp-perl will installed libraries under it
+PERL_LIB_DIR="/usr/share/perl5 /usr/lib64/perl5 /usr/local/lib64/perl5 /usr/local/share/perl5 /usr/share/ntp/lib"
 for d in `echo $PERL_LIB_DIR`; do
     if [ -e $d ]; then
         echo Adding perl libary "$d"
diff --git a/xCAT-genesis-builder/install b/xCAT-genesis-builder/install
index 2f1d0507f..36ee6207b 100755
--- a/xCAT-genesis-builder/install
+++ b/xCAT-genesis-builder/install
@@ -5,18 +5,16 @@ dracut_install netstat # broadcom update requires
 dracut_install uniq # mellanox update requires
 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 efibootmgr
 #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 lldptool /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 /lib/libc.so.6 /lib/ld-linux.so.2 /lib/libdl.so.2 /lib/libm.so.6 /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
-dracut_install dmidecode /usr/lib64/libstdc++.so.6 #uxspi prereqs, but will use dmidecode to improve decision on loading ipmi_si
-dracut_install dmidecode /usr/lib64/libstdc++.so.5 #broadcom firmware update links against old lib
-dracut_install /lib/libpthread.so.0 #32 bit lib because UXSPI will not ship a native 64 bit build
-dracut_install /lib/libncurses.so.5.7 /usr/lib/libstdc++.so.6.0.13 /lib/libgcc_s.so.1  /lib/libtinfo.so.5.7
-dracut_install /lib64/libldap-2.4.so.2 /lib64/liblber-2.4.so.2 /usr/lib64/libsasl2.so.2 #uxspi has incurred these...
+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
+dracut_install efibootmgr lldptool dmidecode #uxspi prereqs, but will use dmidecode to improve decision on loading ipmi_si
+#dracut_install dmidecode /usr/lib64/libstdc++.so.5 #broadcom firmware update links against old lib
+#dracut_install /lib/libpthread.so.0 #32 bit lib because UXSPI will not ship a native 64 bit build
+#dracut_install /lib/libncurses.so.5.7 /usr/lib/libstdc++.so.6.0.13 /lib/libgcc_s.so.1  /lib/libtinfo.so.5.7
+#dracut_install /lib64/libldap-2.4.so.2 /lib64/liblber-2.4.so.2 /usr/lib64/libsasl2.so.2 #uxspi has incurred these...
 dracut_install /usr/share/zoneinfo/posix/Zulu
 dracut_install /usr/share/zoneinfo/posix/GMT-0
 dracut_install /usr/share/zoneinfo/posix/Europe/Istanbul
@@ -594,7 +592,6 @@ 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" 
@@ -624,4 +621,4 @@ dracut_install /lib/udev/rules.d/95-dm-notify.rules
 dracut_install /usr/share/hwdata/pci.ids
 # The DB files for udevadm
 dracut_install /etc/udev/hwdb.bin
-dracut_install /lib64/libform.so.5 /lib64/libpanel.so.5 /lib64/libmenu.so.5 /lib64/libsysfs.so.2 /usr/sbin/iprconfig # iprconfig for IBM Power RAID configuration
+dracut_install /usr/sbin/iprconfig # iprconfig for IBM Power RAID configuration

From 7a8d431650b1be81112c5e8e971f942d51eaecc1 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 2 May 2017 10:49:39 -0400
Subject: [PATCH 002/283] Initialize IPMI variables earlier

In some scenarios, an IPMI instance could be called to handle
data earlier than it should.  Ensure the state of the object is
in adequate shape to react as soon as possible.
---
 xCAT-server/lib/perl/xCAT/IPMI.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-server/lib/perl/xCAT/IPMI.pm b/xCAT-server/lib/perl/xCAT/IPMI.pm
index d7223dc6b..54d33289a 100644
--- a/xCAT-server/lib/perl/xCAT/IPMI.pm
+++ b/xCAT-server/lib/perl/xCAT/IPMI.pm
@@ -181,6 +181,7 @@ sub new {
     my $self  = {};
     bless $self, $class;
     my %args = @_;
+    $self->init();
     unless ($ipmi2support) {
         $self->{ipmi15only} = 1;
     }
@@ -238,7 +239,6 @@ sub new {
     } else {
         $self->{peeraddr} = sockaddr_in($self->{port}, $bmc_n);
     }
-    $self->init();
     return $self;
 }
 

From 13ee6733e706b76f50f23e7c9e8fae30e5b2c602 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 2 May 2017 11:19:54 -0400
Subject: [PATCH 003/283] Fix FPC reseat behavior on multiple nodes

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

diff --git a/xCAT-server/lib/perl/xCAT/IPMI.pm b/xCAT-server/lib/perl/xCAT/IPMI.pm
index 54d33289a..bd0b480c6 100644
--- a/xCAT-server/lib/perl/xCAT/IPMI.pm
+++ b/xCAT-server/lib/perl/xCAT/IPMI.pm
@@ -471,6 +471,11 @@ sub checksum {
 sub subcmd {
     my $self = shift;
     my %args = @_;
+    while ($self->{incommand}) {
+        $self->waitforrsp();
+    }
+    $self->{incommand} = 1;
+
     $self->{expectedcmd}   = $args{command};
     $self->{expectednetfn} = $args{netfn} + 1;
     if ($self->{onlogon_args}->{xcatdebugmode}) {
@@ -573,6 +578,7 @@ sub timedout {
         $self->{timeout} = $initialtimeout + (0.5 * rand());
         my $rsp = {};
         $rsp->{error} = "timeout";
+	$self->{incommand} = 0;
         $self->{ipmicallback}->($rsp, $self->{ipmicallback_args});
         $self->{nowait} = 0;
         return;
@@ -833,6 +839,7 @@ sub init {
       #if we should incur 7 bumps, clear the taboo list and continue on, hoping for best (pessimistically assuming the spec means seq number or that someone could at least interpret it that way)
       #I'll implement this later...
     $self->{'logged'} = 0;
+    $self->{'incommand'} = 0;
 }
 
 sub relog {
@@ -1008,6 +1015,7 @@ sub parse_ipmi_payload {
     $rsp->{code}     = shift @payload;
     $rsp->{data}     = \@payload;
     $self->{timeout} = $initialtimeout + (0.5 * rand());
+    $self->{incommand} = 0;
     $self->{ipmicallback}->($rsp, $self->{ipmicallback_args});
     return 0;
 }
diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 00302d365..9bbecab53 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -2301,6 +2301,8 @@ sub fpc_firmxfer_watch {
     }
 }
 
+my %fpcsessions;
+
 sub reseat_node {
     my $sessdata = shift;
     if (1) {    # TODO: FPC path checked for
@@ -2321,8 +2323,19 @@ sub reseat_node {
         my $nodeuser = $authdata->{$fpc}->{username};
         my $nodepass = $authdata->{$fpc}->{password};
         $sessdata->{slotnumber} = $mpent->{id};
-        $sessdata->{fpcipmisession} = xCAT::IPMI->new(bmc => $mpent->{mpa}, userid => $nodeuser, password => $nodepass);
-        $sessdata->{fpcipmisession}->login(callback => \&fpc_node_reseat, callback_args => $sessdata);
+	if (exists $fpcsessions{$mpent->{mpa}}) {
+            $sessdata->{fpcipmisession} = $fpcsessions{$mpent->{mpa}}; 
+	    until ($sessdata->{fpcipmisession}->{logged}) {
+                $sessdata->{fpcipmisession}->waitforrsp();
+            }
+	    $sessdata->{fpcipmisession}->subcmd(netfn => 0x32, command => 0xa4,
+		    data => [ $sessdata->{slotnumber}, 2 ],
+		    callback => \&fpc_node_reseat_complete, callback_args => $sessdata);
+	} else {
+            $sessdata->{fpcipmisession} = xCAT::IPMI->new(bmc => $mpent->{mpa}, userid => $nodeuser, password => $nodepass);
+	    $fpcsessions{$mpent->{mpa}} = $sessdata->{fpcipmisession};
+            $sessdata->{fpcipmisession}->login(callback => \&fpc_node_reseat, callback_args => $sessdata);
+        }
     }
 }
 

From e61b6c3789fa3d77b08d3693800962c5858699db Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 3 May 2017 11:34:22 -0400
Subject: [PATCH 004/283] Implement timeout for session sharing

When an ipmi session is shared, have waitforrsp
have a specified timeout.
---
 xCAT-server/lib/perl/xCAT/IPMI.pm    | 2 +-
 xCAT-server/lib/xcat/plugins/ipmi.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/IPMI.pm b/xCAT-server/lib/perl/xCAT/IPMI.pm
index bd0b480c6..4b444ac48 100644
--- a/xCAT-server/lib/perl/xCAT/IPMI.pm
+++ b/xCAT-server/lib/perl/xCAT/IPMI.pm
@@ -472,7 +472,7 @@ sub subcmd {
     my $self = shift;
     my %args = @_;
     while ($self->{incommand}) {
-        $self->waitforrsp();
+        $self->waitforrsp(timeout=>1);
     }
     $self->{incommand} = 1;
 
diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 9bbecab53..fc10adc97 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -2326,7 +2326,7 @@ sub reseat_node {
 	if (exists $fpcsessions{$mpent->{mpa}}) {
             $sessdata->{fpcipmisession} = $fpcsessions{$mpent->{mpa}}; 
 	    until ($sessdata->{fpcipmisession}->{logged}) {
-                $sessdata->{fpcipmisession}->waitforrsp();
+                $sessdata->{fpcipmisession}->waitforrsp(timeout=>1);
             }
 	    $sessdata->{fpcipmisession}->subcmd(netfn => 0x32, command => 0xa4,
 		    data => [ $sessdata->{slotnumber}, 2 ],

From 7091e7713faba8de82ec432240eacbe43cee68f6 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Fri, 5 May 2017 09:37:26 -0400
Subject: [PATCH 005/283] Add rsync as an xCAT dependency

---
 xCAT/xCAT.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index 5842d6664..d293339d2 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -31,6 +31,7 @@ Requires: xCAT-server = 4:%{version}-%{release}
 Requires: xCAT-probe  = 4:%{version}-%{release}
 Requires: xCAT-genesis-scripts-x86_64 = 1:%{version}-%{release}
 Requires: xCAT-genesis-scripts-ppc64  = 1:%{version}-%{release}
+Requires: rsync
 
 %define pcm %(if [ "$pcm" = "1" ];then echo 1; else echo 0; fi)
 %define notpcm %(if [ "$pcm" = "1" ];then echo 0; else echo 1; fi)

From 4434d4a6ffa4dffefaaf037d9ec5ade95bb4b049 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Mon, 8 May 2017 02:56:31 -0400
Subject: [PATCH 006/283] Fix issue 2350: Wcons IPMI not working due to xcat
 code

---
 xCAT-server/share/xcat/cons/ipmi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/share/xcat/cons/ipmi b/xCAT-server/share/xcat/cons/ipmi
index fd4546c3c..631e7200a 100755
--- a/xCAT-server/share/xcat/cons/ipmi
+++ b/xCAT-server/share/xcat/cons/ipmi
@@ -125,7 +125,9 @@ if (grep /IPMI Version              : 1.5/, @mcinfo) {
     $solcom = "isol";
     $iface  = "lan";
 } elsif (grep /Manufacturer ID           : 343/, @mcinfo && ! grep /Product ID                : 117/,@mcinfo) {
-    $isintel = 1;
+    if (! grep /Product ID\s*:\s*64/,@mcinfo) {
+        $isintel = 1;
+    }
 }
 my $inteloption = "";
 if ($isintel) {

From b7f8af5e34f4cdfceccd6568a39d681ea5fbcf98 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Mon, 5 Jun 2017 14:09:37 -0400
Subject: [PATCH 007/283] When go-xcat prompts the user to continue, prompt
 until y or n is specified before aborting.

---
 xCAT-server/share/xcat/tools/go-xcat | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat
index b09adea6d..673bc20b4 100755
--- a/xCAT-server/share/xcat/tools/go-xcat
+++ b/xCAT-server/share/xcat/tools/go-xcat
@@ -1567,14 +1567,22 @@ case "${GO_XCAT_ACTION}" in
 	then
 		echo
 		echo "xCAT is going to be ${GO_XCAT_ACTION/%e/}ed."
-		read -r -p "Continue? [y/n] "
-		case "${REPLY}" in
-		"Y"*|"y"*)
-			;;
-		*)
-			echo "Aborting ..."
-			exit 0
-		esac
+		while true; do
+
+			read -r -p "Continue? [y/n] "
+			case "${REPLY}" in
+			"Y"*|"y"*)
+				break	
+				;;
+			"N"*|"n"*)
+				echo "Good-bye!"
+				exit 0
+				;;
+			*)
+				echo "Invalid response!"
+				;;
+			esac
+		done
 	fi
 	# Use `-y' here. Since the STDOUT is redirect to tee.
 	# `yum' does not display the prompt message properly when

From 65615ce7e9d7d73b3537710041fb845258ffc751 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Mon, 5 Jun 2017 14:18:30 -0400
Subject: [PATCH 008/283] Remove the quotes around the source command

---
 xCAT-server/share/xcat/tools/go-xcat | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat
index 673bc20b4..3787ed9d4 100755
--- a/xCAT-server/share/xcat/tools/go-xcat
+++ b/xCAT-server/share/xcat/tools/go-xcat
@@ -1653,10 +1653,11 @@ case "${GO_XCAT_ACTION}" in
 		If this is the very first time xCAT has been installed, run the following
 		commands to set environment variables into your PATH:
 
-		    for sh,
-		        \`source /etc/profile.d/xcat.sh'
-		    or csh,
-		        \`source /etc/profile.d/xcat.csh'
+		For sh: 
+			source /etc/profile.d/xcat.sh
+
+		For csh: 
+			source /etc/profile.d/xcat.csh
 		EOF
 		;;
 	"update")

From f1b406dbc03c611743a7b1740537223544724d82 Mon Sep 17 00:00:00 2001
From: Samveen Gulati <samveen@yahoo.com>
Date: Sat, 25 Mar 2017 17:30:59 +0000
Subject: [PATCH 009/283] Reduce `grep` invocations by passing `-[46]` to `ip`

---
 perl-xCAT/xCAT/Client.pm                                  | 2 +-
 xCAT-OpenStack/postscripts/configgw                       | 2 +-
 xCAT-client/bin/rcons                                     | 2 +-
 xCAT-genesis-builder/dhclient-script                      | 2 +-
 xCAT-genesis-scripts/bin/dodiscovery                      | 8 ++++----
 xCAT-genesis-scripts/bin/doxcat                           | 6 +++---
 xCAT-probe/subcmds/xcatmn                                 | 2 +-
 xCAT-server/sbin/xcatd                                    | 2 +-
 xCAT-server/share/xcat/install/scripts/post.rh.common     | 6 +++---
 xCAT-server/share/xcat/install/scripts/post.ubuntu.common | 4 ++--
 xCAT-server/share/xcat/tools/detect_dhcpd                 | 2 +-
 xCAT/postscripts/hardeths                                 | 2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/perl-xCAT/xCAT/Client.pm b/perl-xCAT/xCAT/Client.pm
index 079a62155..d7df0a9fc 100644
--- a/perl-xCAT/xCAT/Client.pm
+++ b/perl-xCAT/xCAT/Client.pm
@@ -33,7 +33,7 @@ if ($inet6support) {
 if ($^O =~ /^linux/i) {
 
     # Is IPv6 enabled on the MN or xcat client node at all?
-    my $ipv6enabled = `ip addr 2> /dev/null | grep inet6`;
+    my $ipv6enabled = `ip -6 -o addr 2> /dev/null`;
     if (!$ipv6enabled) {
         $inet6support = 0;
     }
diff --git a/xCAT-OpenStack/postscripts/configgw b/xCAT-OpenStack/postscripts/configgw
index 36c246eaf..e2b97be77 100755
--- a/xCAT-OpenStack/postscripts/configgw
+++ b/xCAT-OpenStack/postscripts/configgw
@@ -9,7 +9,7 @@ if [ -z "$1" ];then
 fi
 
 str_nic_name=$1
-str_ip_mask=`ip addr show dev $str_nic_name | grep inet | grep -v inet6 | awk '{print $2}' | head -n 1`
+str_ip_mask=`ip -4 -o addr show dev $str_nic_name | awk '{print $4}' | head -n 1`
 
 str_ip=`echo $str_ip_mask | awk -F'/' '{print $1}'`
 str_mask=`echo $str_ip_mask | awk -F'/' '{print $2}'`
diff --git a/xCAT-client/bin/rcons b/xCAT-client/bin/rcons
index 2fa148d6a..20c7da036 100755
--- a/xCAT-client/bin/rcons
+++ b/xCAT-client/bin/rcons
@@ -87,7 +87,7 @@ if [ $USE_CONFLUENT == "1" ] && ([ -x "/opt/confluent/bin/confetty" ] || [ -x "/
     fi
     if [ -z "$CONSERVER" ]; then
         CONSERVER=`nodels $1 nodehm.conserver 2>/dev/null | awk -F: '{print $2}' | tr -d ' '`
-        declare -a ipaddrs=`ip addr | grep 'inet' | awk {'print $2'} | cut -d/ -f1 | grep -v : | tr '\n' ' '`
+        declare -a ipaddrs=`ip -o a | awk {'print $4'} | cut -d/ -f1 | grep -v : | tr '\n' ' '`
         for IP in ${ipaddrs[*]}; do 
             if [[ "${CONSERVER}" == "${IP}" ]]; then 
                 # conserver is the same node, do not connect using -s
diff --git a/xCAT-genesis-builder/dhclient-script b/xCAT-genesis-builder/dhclient-script
index fcf51c9ac..21c1e0e76 100755
--- a/xCAT-genesis-builder/dhclient-script
+++ b/xCAT-genesis-builder/dhclient-script
@@ -14,7 +14,7 @@ elif [ $reason = "BOUND" ]; then
 	if [ ! -z "$old_ip_address" ]; then
 		ip addr del dev $interface $old_ip_address/$old_subnet_mask
 	fi
-        for oldip in `ip addr show dev $interface|grep 'inet '|awk '{print $2}'`; do
+        for oldip in `ip -o addr show dev $interface|awk '{print $4}'`; do
 		ip addr del dev $interface $oldip
 	done
 	if [ ! -z "$new_ip_address" -a ! -z "$new_subnet_mask" ]; then
diff --git a/xCAT-genesis-scripts/bin/dodiscovery b/xCAT-genesis-scripts/bin/dodiscovery
index f33ef9c3d..5c3591c00 100755
--- a/xCAT-genesis-scripts/bin/dodiscovery
+++ b/xCAT-genesis-scripts/bin/dodiscovery
@@ -25,11 +25,11 @@ logger -s -t $log_label -p local4.info "Waiting for nics to get addresses"
 while [ ! -z "$NICSGETTINGADDR" -a $timewaiting != 700 ]; do
 	NEWNICSGETTINGADDR=""
 	for nic in $NICSGETTINGADDR; do
-		if ! ip addr show dev $nic |grep -v inet6|grep inet >/dev/null;  then
+		if ! ip -4 -o a show dev $nic |grep -q inet;  then
 			NEWNICSGETTINGADDR="$NEWNICSGETTINGADDR $nic"
 		else
 			echo -n "$nic|"
-			ip addr show dev $nic |grep -v inet6|grep inet|sed -e s/\\/.*//|awk '{print $2}'
+			ip -4 -o addr show dev $nic | awk '{print $4}' | sed -e sX/.*XX
 		fi
 	done
 	sleep 0.1
@@ -187,8 +187,8 @@ for dev in `ip link|grep -B1 ether|grep UP|awk '{print $2}'|sed -e s/://|grep -v
 	ONBOARDINDEX=""
 	DRIVER=`grep DRIVER /sys/class/net/$dev/device/uevent|awk -F= '{print $2}'`
 	PCI_SLOT=`grep PCI_SLOT_NAME /sys/class/net/$dev/device/uevent|awk -F= '{print $2}'`
-	ADDRESS=`ip address show dev $dev|grep "inet "|grep global|awk '{print $2}'`
-	MAC=`ip link show dev $dev|grep ether|awk '{print $2}'| tr /a-f/ /A-F/`
+	ADDRESS=`ip -4 -o a show dev $dev|awk '/global/{print $4}'`
+	MAC=`ip -o l show dev $dev|awk '/ether/{print $15}'| tr /a-f/ /A-F/`
         if [ "$MAC_OF_FIRST_UP_NIC" == "unknown" ]; then
             MAC_OF_FIRST_UP_NIC=`echo $MAC | sed -e s/://g`
         fi
diff --git a/xCAT-genesis-scripts/bin/doxcat b/xCAT-genesis-scripts/bin/doxcat
index 88f86890d..b95a0e0e1 100755
--- a/xCAT-genesis-scripts/bin/doxcat
+++ b/xCAT-genesis-scripts/bin/doxcat
@@ -212,7 +212,7 @@ else
             tries=0
             while [ -z "$bootnic" ]; do
 	        for tmp1 in $ALLUP_NICS; do
-	            if ip addr show dev $tmp1|grep -v 'scope link'|grep -v 'dynamic'|grep -v  inet6|grep inet > /dev/null; then
+	            if ip -4 -o a show dev $tmp1|grep -v 'scope link'|grep -v 'dynamic'|grep -q inet ; then
                         result=`ping -c1 -I $tmp1 $XCATMASTER 2>&1`
 	                if [ $? -eq 0 ]; then
 	                    logger -s -t $log_label -p local4.info "the nic $tmp1 can ping $XCATMASTER"
@@ -247,7 +247,7 @@ else
 
             gripeiter=101
             logger -s -t $log_label -p local4.info "Acquiring network addresses.."
-            while ! ip addr show dev $bootnic|grep -v 'scope link'|grep -v 'dynamic'|grep -v  inet6|grep inet > /dev/null; do
+            while ! ip -4 -o a show dev $bootnic|grep -v 'scope link'|grep -v 'dynamic'|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..."
@@ -261,7 +261,7 @@ openssl genrsa -out /etc/xcat/certkey.pem 4096 > /dev/null 2>&1 &
 
 logger -s -t $log_label -p local4.info "Acquired IPv4 address on $bootnic"
 
-ip addr show dev $bootnic|grep -v 'scope link'|grep -v 'dynamic'|grep -v  inet6|grep inet|awk '{print $2}'
+ip -4 -o a show dev $bootnic|grep -v 'scope link'|grep -v 'dynamic'|awk '{print $4}'
 
 logger -s -t $log_label -p local4.info "Starting ntpd..." 
 ntpd -g -x
diff --git a/xCAT-probe/subcmds/xcatmn b/xCAT-probe/subcmds/xcatmn
index d192ae60d..e7867d51c 100755
--- a/xCAT-probe/subcmds/xcatmn
+++ b/xCAT-probe/subcmds/xcatmn
@@ -387,7 +387,7 @@ sub check_network {
 
         # on SN, get ip address by compare 'master' attribute in 'site' table
         # choose the one in the same network with 'master'
-        my @ipoutput = `ip addr show 2>&1| grep inet | grep -v inet6`;
+        my @ipoutput = `ip -4 a show 2>&1| grep inet`;
         foreach (@ipoutput) {
             if ($_ =~ /inet\s+(.+)\/(.+)\s+brd\s+(.+)\s+scope global/i) {
                 if (xCAT::NetworkUtils::isInSameSubnet($sitetable_ref->{master}, $1, $2, 1)) {
diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index 8132fad96..99792c097 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -97,7 +97,7 @@ if ($inet6support) {
 if ($^O =~ /^linux/i) {
 
     # Is IPv6 enabled on the MN or SN at all?
-    my $ipv6enabled = `ip addr | grep inet6`;
+    my $ipv6enabled = `ip -6 -o a`;
     if (!$ipv6enabled) {
         $inet6support = 0;
     }
diff --git a/xCAT-server/share/xcat/install/scripts/post.rh.common b/xCAT-server/share/xcat/install/scripts/post.rh.common
index e3f570030..d9cd19a5a 100644
--- a/xCAT-server/share/xcat/install/scripts/post.rh.common
+++ b/xCAT-server/share/xcat/install/scripts/post.rh.common
@@ -39,12 +39,12 @@ elif [[ `echo "$PRINIC" | grep -sqE ^[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-F
 fi
 
 #IP=$(ifconfig $PRINIC | grep inet | awk '{print $2}' | awk -F: '{print $2}')
-IP=$(ip addr show dev $PRINIC | grep inet | grep -v inet6  | awk  '{print $2}' | head -n 1 | awk -F '/' '{print $1}')
-if [ -z $IP ]
+IP=$(ip -4 -o a sh dev $PRINIC | awk  '/inet/{print $4}' | head -n 1 | awk -F '/' '{print $1}')
+if [ -z "$IP" ]
 then
 	dhclient $PRINIC
 	#IP=$(ifconfig $PRINIC | grep inet | awk '{print $2}' | awk -F: '{print $2}')
-        IP=$(ip addr show dev $PRINIC | grep inet | grep -v inet6  | awk  '{print $2}' | head -n 1 | awk -F '/' '{print $1}')
+        IP=$(ip -4 -o a sh dev $PRINIC | awk  '/inet/{print $4}' | head -n 1 | awk -F '/' '{print $1}')
 fi
 
 export HOSTNAME=$(host $IP 2>/dev/null | awk '{print $5}' | awk -F. '{print $1}')
diff --git a/xCAT-server/share/xcat/install/scripts/post.ubuntu.common b/xCAT-server/share/xcat/install/scripts/post.ubuntu.common
index 7d1fa02a7..c937a7273 100755
--- a/xCAT-server/share/xcat/install/scripts/post.ubuntu.common
+++ b/xCAT-server/share/xcat/install/scripts/post.ubuntu.common
@@ -22,12 +22,12 @@ elif [[ `echo "$PRINIC" | grep -sqE ^[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-Fa-f0-9]+:[A-F
     export PRINIC=`ip -o link|grep -i  "$PRINIC" |awk  '{print $2}'|sed s/://`
 fi
 #IP=$(ifconfig $PRINIC | grep inet | awk '{print $2}' | awk -F: '{print $2}')
-IP=$(ip addr show dev $PRINIC | grep inet | grep -v inet6  | awk  '{print $2}' | head -n 1 | awk -F '/' '{print $1}')
+IP=$(ip -4 -o a sh dev $PRINIC | awk  '/inet/{print $4}' | head -n 1 | awk -F '/' '{print $1}')
 if [ -z $IP ]
 then
 	dhclient $PRINIC
 	#IP=$(ifconfig $PRINIC | grep inet | awk '{print $2}' | awk -F: '{print $2}')
-        IP=$(ip addr show dev $PRINIC | grep inet | grep -v inet6  | awk  '{print $2}' | head -n 1 | awk -F '/' '{print $1}')
+        IP=$(ip -4 -o a sh dev $PRINIC | awk  '/inet/{print $4}' | head -n 1 | awk -F '/' '{print $1}')
 fi
 
 if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then
diff --git a/xCAT-server/share/xcat/tools/detect_dhcpd b/xCAT-server/share/xcat/tools/detect_dhcpd
index 1769ba5f1..7003dc297 100755
--- a/xCAT-server/share/xcat/tools/detect_dhcpd
+++ b/xCAT-server/share/xcat/tools/detect_dhcpd
@@ -46,7 +46,7 @@ $start =~ s/(\d.*)\.(\d.*)/$1/;
 if (!$nic) { print "specify a nic\n"; print $::USAGE; exit 1; }
 
 #my $IP = `ifconfig $nic | grep "inet addr" | awk '{print \$2}' | awk -F: '{print \$2}'`;
-my $IPADDRMASK = `ip addr show dev $nic | grep inet | grep -v inet6 | awk '{print \$2}' | head -n 1`;
+my $IPADDRMASK = `ip -4 -o a show dev $nic | awk '/inet/{print \$4}' | head -n 1`;
 my ($IP, $MASK) = split(/\//, $IPADDRMASK);
 my $MAC;
 my $tmpMAC;
diff --git a/xCAT/postscripts/hardeths b/xCAT/postscripts/hardeths
index 0d51de150..da2880bb1 100755
--- a/xCAT/postscripts/hardeths
+++ b/xCAT/postscripts/hardeths
@@ -88,7 +88,7 @@ if [ ! -z $HOSTNAMECTL ] && [ ! -z $NODE ]; then
 fi
 
 for nic in `ip link |grep "BROADCAST" |awk '{print $2}'   | sed s/://`; do
-    IPADDRMASK=`ip addr show dev $nic | grep inet | grep -v inet6 | awk '{print $2}' | head -n 1`
+    IPADDRMASK=`ip -4 -o a sh dev $nic | awk '/inet/{print $4}' | head -n 1`
     IPADDR=`echo $IPADDRMASK | awk -F'/' '{print $1}'`
     [ -z $IPADDR ] && continue
     PREFIXMASK=`echo $IPADDRMASK | awk -F'/' '{print $2}'`

From dc1b787f8e193efe9e47b915a8b57a08d0684188 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Mon, 12 Jun 2017 10:20:58 -0400
Subject: [PATCH 010/283] add cases for confignetwork to config installnic and
 secondarynic

---
 .../autotest/testcase/confignetwork/cases0    | 445 ++++++++++++++++++
 1 file changed, 445 insertions(+)
 create mode 100644 xCAT-test/autotest/testcase/confignetwork/cases0

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
new file mode 100644
index 000000000..fbd1fd177
--- /dev/null
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -0,0 +1,445 @@
+start: confignetwork_s_installnic_diskful
+description: this case is to test confignetwork -s could config installnic successfully in diskful provision. 
+cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
+cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN  xcatmaster=$$MN
+check:rc==0
+cmd:makedns -n
+check:rc==0
+cmd:makeconservercf
+check:rc==0
+cmd:cat /etc/conserver.cf | grep $$CN
+check:output=~$$CN
+cmd:sleep 20
+cmd:if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]; then getmacs -D $$CN; fi
+check:rc==0
+cmd:makedhcp -n
+check:rc==0
+cmd:makedhcp -a
+check:rc==0
+cmd:sleep 10
+cmd:copycds $$ISO
+check:rc==0
+cmd:chdef $$CN postscripts="confignetwork -s"
+check:rc==0
+cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
+check:rc==0
+cmd:if [[ "__GETNODEATTR($$CN,mgt)__" = "ipmi" ]]; then rsetboot $$CN net; fi
+check:rc==0
+cmd:if [ "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" ];then rnetboot $$CN;else rpower $$CN boot;fi else rpower $$CN boot;fi
+check:rc==0
+cmd:sleep 300
+cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 20;((a++));if [ $a -gt 300 ];then break;fi done
+cmd:ping $$CN -c 3
+check:rc==0
+check:output=~64 bytes from $$CN
+cmd:lsdef -l $$CN | grep status
+check:rc==0
+check:output=~booted
+cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+check:output=~__GETNODEATTR($$CN,ip)__
+check:output!~dhcp
+cmd:chdef -m -t node $$CN postscripts="confignetwork -s"
+check:rc==0
+end
+
+start:confignetwork_s_installnic_diskless
+description: this case is to test confignetwork -s could config installnic successfully in diskless provision.
+cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN  xcatmaster=$$MN
+check:rc==0
+cmd:chdef -t node -o $$CN postbootscripts="confignetwork -s"
+check:rc==0
+cmd:makedns -n
+check:rc==0
+cmd:makeconservercf $$CN
+check:rc==0
+cmd:cat /etc/conserver.cf | grep $$CN
+check:output=~$$CN
+cmd:sleep 20
+cmd:if [[ "__GETNODEATTR($$CN,arch)__" = "ppc64" ]] && [[ "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]]; then getmacs -D $$CN; fi
+check:rc==0
+cmd:makedhcp -n
+check:rc==0
+cmd:makedhcp -a
+check:rc==0
+cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
+check:rc==0
+cmd:copycds $$ISO
+check:rc==0
+cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then mv $rootimgdir $rootimgdir.regbak -f;fi
+check:rc==0
+cmd:genimage  __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
+check:rc==0
+cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
+check:rc==0
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
+check:rc==0
+cmd:sleep 900
+cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 60 ];then break;fi done
+cmd:ping $$CN -c 3
+check:rc==0
+check:output=~64 bytes from $$CN
+cmd:lsdef -l $$CN | grep status
+check:rc==0
+check:output=~booted
+cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+check:output=~__GETNODEATTR($$CN,ip)__
+check:output!~dhcp
+cmd:chdef -m -t node $$CN postscripts="confignetwork -s"
+check:rc==0
+cmd:if [ -d $rootimgdir.regbak ]; then mv $rootimgdir.regbak $rootimgdir -f;fi
+end
+
+start: confignetwork_secondarynic_diskless
+description: this case is to test confignetwork -s could config installnic and secondarynic at the same time successfully in diskless provision.
+cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN  xcatmaster=$$MN
+check:rc==0
+cmd:mkdef -t network -o 100_1_0_0-255_255_0_0 net=100.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC 
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=100.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=100_1_0_0-255_255_0_0
+check:rc==0
+cmd:chdef -t node -o $$CN postbootscripts="confignetwork -s"
+check:rc==0
+cmd:makedns -n
+check:rc==0
+cmd:makeconservercf $$CN
+check:rc==0
+cmd:cat /etc/conserver.cf | grep $$CN
+check:output=~$$CN
+cmd:sleep 20
+cmd:if [[ "__GETNODEATTR($$CN,arch)__" = "ppc64" ]] && [[ "__GETNODEATTR($$CN,mgt)__" != "ipmi" ]]; then getmacs -D $$CN; fi
+check:rc==0
+cmd:makedhcp -n
+check:rc==0
+cmd:makedhcp -a
+check:rc==0
+cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
+check:rc==0
+cmd:copycds $$ISO
+check:rc==0
+cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then mv $rootimgdir $rootimgdir.regbak -f;fi
+check:rc==0
+cmd:genimage  __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
+check:rc==0
+cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
+check:rc==0
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
+check:rc==0
+cmd:sleep 900
+cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 60 ];then break;fi done
+cmd:ping $$CN -c 3
+check:rc==0
+check:output=~64 bytes from $$CN
+cmd:lsdef -l $$CN | grep status
+check:rc==0
+check:output=~booted
+cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+check:output=~__GETNODEATTR($$CN,ip)__
+check:output!~dhcp
+cmd:secondarynic=`xdsh $$CN ip addr |grep 100.1.0.100|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "grep 100.1.0.100 /etc/sysconfig/network/ifcfg-$secondarynic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 100.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$secondarynic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 100.1.0.100 /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+check:output=~100.1.0.100
+check:output!~dhcp
+cmd:chdef -m -t node $$CN postscripts="confignetwork -s"
+check:rc==0
+cmd:if [ -d $rootimgdir.regbak ]; then mv $rootimgdir.regbak $rootimgdir -f;fi
+cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC=
+check:rc==0
+end
+
+start:confignetwork_secondarynic_updatenode
+description: this case is to test confignetwork could config secondarynic successfully with updatenode.
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1501
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
+check:rc==0
+cmd:chdef -t node -o $$CN postscripts="confignetwork"
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+check:output=~11.1.0.100
+check:output=~MTU=1501
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+end
+
+start: confignetwork_secondarynic_nicaliases_updatenode
+description: this case is to test confignetwork could config secondarynic nicaliases successfully with updatenode.
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:cp -f /etc/hosts /etc/hosts.bak
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC="11.1.0.100|12.1.0.100" nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0" nicaliases.$$SECONDNIC="aliases1-1|aliases1-2"
+check:rc==0
+cmd:makehosts $$CN
+check:rc==0
+cmd:cat /etc/hosts
+check:output=~aliases1-1
+check:output=~aliases1-2
+cmd:updatenode $$CN -P confignetwork 
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+check:output=~11.1.0.100
+check:output!~dhcp
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+check:output=~12.1.0.100
+check:output!~dhcp
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -f /etc/network/interfaces.d/$$SECONDNIC /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+cmd:mv -f /etc/hosts.bak /etc/hosts
+end
+
+start:confignetwork_secondarynic_nicextraparams_updatenode
+description: this case is to test confignetwork could config secondarynic nicextraparams successfully with updatenode.
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:cp -f /etc/hosts /etc/hosts.bak
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC="11.1.0.100|12.1.0.100" nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0" nichostnamesuffixes.$$SECONDNIC="-$$SECONDNIC-1|-$$SECONDNIC-2"
+check:rc==0
+cmd:makehosts $$CN
+check:rc==0
+cmd:cat /etc/hosts
+check:output=~$$CN-$$SECONDNIC-1
+check:output=~$$CN-$$SECONDNIC-2
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:output=~11.1.0.100
+check:output!~dhcp
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
+check:output=~12.1.0.100
+check:output!~dhcp
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -f /etc/network/interfaces.d/$$SECONDNIC /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+cmd:mv -f /etc/hosts.bak /etc/hosts
+end
+
+start:confignetwork_secondarynic_nicnetworks_updatenode_false
+description: this case is to test confignetwork could return error message when there is no not enough attributes when configing secondarynic with updatenode.
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC 
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=
+check:rc==0
+cmd:chdef -t node -o $$CN postscripts="confignetwork"
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc!=0
+#TODO check the error message
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+end
+
+start:confignetwork_secondarynic_nicips_updatenode_false
+description: this case is to test confignetwork could return error message when there is no not enough attributes when configing secondarynic with updatenode.
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
+check:rc==0
+cmd:chdef -t node -o $$CN postscripts="confignetwork"
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc!=0
+#TODO check the error message
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+end
+
+start:confignetwork_secondarynic_nictype_updatenode_false
+description: this case is to test confignetwork could return error message when there is no not enough attributes when configing secondarynic with updatenode.
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
+check:rc==0
+cmd:chdef -t node -o $$CN postscripts="confignetwork"
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc!=0
+#TODO check the error message
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+end
+
+start:confignetwork_disable_set_to_yes
+description: this case is to test if confignetwork could work correctly when disable is set to yes in nics table
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=100.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
+check:rc==0
+cmd:chtab node=$$CN nics.disable=yes
+check:rc==0
+cmd:chdef -t node -o $$CN postscripts="confignetwork"
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:output!~11.1.0.100
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+cmd:chtab node=$$CN nics.disable=0
+check:rc==0
+end
+
+start:confignetwork_disable_set_to_1
+description: this case is to test if confignetwork could work correctly when disable is set to 1 in nics table
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=100.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
+check:rc==0
+cmd:chtab node=$$CN nics.disable=1
+check:rc==0
+cmd:chdef -t node -o $$CN postscripts="confignetwork"
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:output!~11.1.0.100
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+cmd:chtab node=$$CN nics.disable=0
+check:rc==0
+end
+
+start:confignetwork_niccustomscripts
+description: this case is to test confignetwork could config secondarynic and envoke scripts to execute.
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:echo "echo hello > /tmp/confignetwork_niccustomscript" > /tmp/script1
+check:rc==0
+cmd:chmod a+x /tmp/script1
+check:rc==0
+cmd:cp /tmp/script1 /install/postscripts
+check:rc==0
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mut=1501
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0 niccustomscripts.$$SECONDNIC=script1
+check:rc==0
+cmd:chdef -t node -o $$CN postscripts=confignetwork 
+check:rc==0
+cmd:updatenode $$CN -P confignetwork 
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:output=~11.1.0.100
+check:output=~MTU=1501
+check:output!~dhcp
+cmd:xdsh $$CN "cat /tmp/confignetwork_niccustomscript"
+check:rc==0
+check:output=~hello
+cmd:xdsh $$CN "rm -rf /tmp/confignetwork_niccustomscript"
+check:rc==0
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+end
+
+start:confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
+description:this case is to verify if confignetwork could config serveral nics' multiple value at the same time.
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:mkdef -t network -o 13_1_0_0-255_255_0_0 net=13.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC
+check:rc==0
+cmd:mkdef -t network -o 14_1_0_0-255_255_0_0 net=14.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC="11.1.0.100|12.1.0.100" nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0" nichostnamesuffixes.$$SECONDNIC="-$$SECONDNIC-1|-$$SECONDNIC-2"
+check:rc==0
+cmd:chdef $$CN nicips.$$THIRDNIC="13.1.0.100|14.1.0.100" nictypes.$$THIRDNIC=Ethernet nicnetworks.$$THIRDNIC="13_1_0_0-255_255_0_0|14_1_0_0-255_255_0_0" nichostnamesuffixes.$$THIRDNIC="-$$THIRDNIC-1|-$$THIRDNIC-2"
+check:rc==0
+cmd:cp /etc/hosts /etc/hosts.bak
+cmd:rc==0
+cmd:makehosts $$CN
+check:rc==0
+cmd:cat /etc/hosts
+check:output=~$$CN-$$SECONDNIC-1
+check:output=~$$CN-$$SECONDNIC-2
+check:output=~$$CN-$$THIRDNIC-1
+check:output=~$$CN-$$THIRDNIC-2
+cmd:chdef -t node -o $$CN postscripts="confignetwork"
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:output=~11.1.0.100
+check:output!~dhcp
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
+check:output=~12.1.0.100
+check:output!~dhcp
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 13.1.0.100 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 13.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 13.1.0.100 /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
+check:output=~13.1.0.100
+check:output!~dhcp
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 14.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/network/interfaces.d/$$THIRDNIC:1";else echo "Sorry,this is not supported os"; fi
+check:output=~14.1.0.100
+check:output!~dhcp
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
+cmd:rmdef -t network -o 13_1_0_0-255_255_0_0
+cmd:rmdef -t network -o 14_1_0_0-255_255_0_0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC /etc/network/interfaces.d/$$THIRDNIC:1";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+cmd:mv -f /etc/hosts.bak /etc/hosts
+end
+
+start:confignetwork_help
+cmd:confignetworks -h
+check:rc==0
+#TODO help information is printed
+cmd:confignetworks --help
+check:rc==0
+#TODO help information is printed
+end
+
+
+
+
+
+
+

From fac7d28f3fa8182883c3af0adc8694727bb20097 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Tue, 13 Jun 2017 04:59:19 -0400
Subject: [PATCH 011/283] add a description for help case

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

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index fbd1fd177..46d93588e 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -429,6 +429,7 @@ cmd:mv -f /etc/hosts.bak /etc/hosts
 end
 
 start:confignetwork_help
+description:this case is to verify if help information is provided
 cmd:confignetworks -h
 check:rc==0
 #TODO help information is printed

From 5d2e814243e723578774c67f036da0f31ecc1e5f Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Wed, 14 Jun 2017 15:15:51 -0400
Subject: [PATCH 012/283] openbmc rflash command support for -u --upload option

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index ff192fbbf..618e96200 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -36,6 +36,7 @@ $::POWER_STATE_POWERING_OFF="powering-off";
 $::POWER_STATE_POWERING_ON="powering-on";
 $::POWER_STATE_QUIESCED="quiesced";
 $::POWER_STATE_RESET="reset";
+$::UPLOAD_FILE="";
 
 $::NO_ATTRIBUTES_RETURNED="No attributes returned from the BMC.";
 
@@ -126,6 +127,13 @@ my %status_info = (
     RFLASH_LIST_RESPONSE => {
         process        => \&rflash_response,
     },
+    RFLASH_FILE_UPLOAD_REQUEST  => {
+        method         => "PUT",
+        init_url       => "$openbmc_project_url/upload/image/",
+    },
+    RFLASH_FILE_UPLOAD_RESPONSE => {
+        process        => \&rflash_response,
+    },
 
     RINV_REQUEST => {
         method         => "GET",
@@ -217,6 +225,7 @@ my %status_info = (
 $::RESPONSE_OK                  = "200 OK";
 $::RESPONSE_SERVER_ERROR        = "500 Internal Server Error";
 $::RESPONSE_SERVICE_UNAVAILABLE = "503 Service Unavailable";
+$::RESPONSE_METHOD_NOT_ALLOWED  = "405 Method Not Allowed";
 
 #-----------------------------
 
@@ -677,6 +686,7 @@ sub parse_command_status {
             if ($update_file =~ /.*\.tar$/) {
                 # Filename ending on .tar was specified
                 $filename = $update_file;
+                $::UPLOAD_FILE = $update_file; # Save filename to upload
                 if ($check_version) {
                     # Display firmware version of the specified .tar file
                     my $firmware_version_in_file = `$grep_cmd $version_tag $filename`;
@@ -710,8 +720,9 @@ sub parse_command_status {
             return 1;
         }
         if ($upload) {
-            xCAT::SvrUtils::sendmsg("Upload option is not yet supported.", $callback);
-            return 1;
+            # Upload specified update file to  BMC
+            $next_status{LOGIN_RESPONSE} = "RFLASH_FILE_UPLOAD_REQUEST";
+            $next_status{"RFLASH_FILE_UPLOAD_REQUEST"} = "RFLASH_FILE_UPLOAD_RESPONSE";
         }
     }
 
@@ -832,7 +843,13 @@ sub gen_send_request {
     if ($method eq "GET") {
         $debug_info = "$node: DEBUG $method $request_url";
     } else {
-        $debug_info = "$node: DEBUG $method $request_url -d $content";
+        if ($::UPLOAD_FILE) {
+            # Slightly different debug message when doing a file upload
+            $debug_info = "$node: DEBUG $method $request_url -T " . $::UPLOAD_FILE;
+        }
+        else {
+            $debug_info = "$node: DEBUG $method $request_url -d $content";
+        }
     }
     print "$debug_info\n";
 
@@ -864,6 +881,15 @@ sub deal_with_response {
         my $error;
         if ($response->status_line eq $::RESPONSE_SERVICE_UNAVAILABLE) {
             $error = $::RESPONSE_SERVICE_UNAVAILABLE;
+        } elsif ($response->status_line eq $::RESPONSE_METHOD_NOT_ALLOWED) {
+            # Special processing for file upload. At this point we do not know how to
+            # form a proper file upload request. It always fails with "Method not allowed" error.
+            # If that happens, just assume it worked. 
+            # TODO remove this block when proper request can be generated
+            $status_info{ $node_info{$node}{cur_status} }->{process}->($node, $response); 
+
+            return;
+            
         } else {
             my $response_info = decode_json $response->content;
             if ($response->status_line eq $::RESPONSE_SERVER_ERROR) {
@@ -1420,6 +1446,45 @@ sub rflash_response {
         }
         xCAT::SvrUtils::sendmsg("", $callback, $node); #Separate output in case more than 1 endpoint
     }
+    if ($node_info{$node}{cur_status} eq "RFLASH_FILE_UPLOAD_RESPONSE") {
+        # Special processing for file upload. At this point we do not know how to
+        # form a proper file upload request. It always fails with "Method not allowed" error.
+        # If that happens, just call the curl commands for now. 
+        # TODO remove this block when proper request can be generated
+        if ($::UPLOAD_FILE) {
+            my $request_url_login  = "$http_protocol://" . $node_info{$node}{bmc} .  "/login";
+            my $request_url_logout = "$http_protocol://" . $node_info{$node}{bmc} .  "/logout";
+            my $request_url_upload = "$http_protocol://" . $node_info{$node}{bmc} .  "/upload/image/";
+            my $content_login = '{ "data": [ "' . $node_info{$node}{username} .'", "' . $node_info{$node}{password} . '" ] }';
+            my $content_logout = '{ "data": [ ] }';
+
+            # curl commands
+            my $curl_login_cmd  = "curl -c cjar -k -H 'Content-Type: application/json' -X POST $request_url_login -d '" . $content_login . "'";
+            my $curl_logout_cmd = "curl -b cjar -k -H 'Content-Type: application/json' -X POST $request_url_logout -d '" . $content_logout . "'";
+            my $curl_upload_cmd = "curl -b cjar -k -H 'Content-Type: application/octet-stream' -X PUT -T $::UPLOAD_FILE $request_url_upload";
+
+            # Try to login
+            my $curl_login_result = `$curl_login_cmd`;
+            my $h = from_json($curl_login_result); # convert command output to hash
+            if ($h->{message} eq $::RESPONSE_OK) {
+                # Login successfull, upload the file
+                my $curl_upload_result = `$curl_upload_cmd`;
+                $h = from_json($curl_upload_result); # convert command output to hash
+                if ($h->{message} eq $::RESPONSE_OK) {
+                    # Upload successfull
+                    xCAT::SvrUtils::sendmsg("Update file $::UPLOAD_FILE successfully uploaded", $callback, $node);
+                    # Try to logoff, no need to check result, as there is nothing else to do if failure
+                    my $curl_logout_result = `$curl_logout_cmd`;
+                }
+                else {
+                    xCAT::SvrUtils::sendmsg("Failed to upload update file $::UPLOAD_FILE :" . $h->{message} . " - " . $h->{data}->{description}, $callback, $node);
+                }
+            }
+            else {
+                xCAT::SvrUtils::sendmsg("Unable to login :" . $h->{message} . " - " . $h->{data}->{description}, $callback, $node);
+            }
+        }
+    }
 
     if ($next_status{ $node_info{$node}{cur_status} }) {
         $node_info{$node}{cur_status} = $next_status{ $node_info{$node}{cur_status} };

From d80adecbc29d3dcdf63741f183056aa86b8da140 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Thu, 15 Jun 2017 05:43:58 -0400
Subject: [PATCH 013/283] add hardware control bundle for different hardware
 type

---
 xCAT-test/autotest/bundle/hdctrl_bmc.bundle   |  5 ++++
 .../autotest/bundle/hdctrl_general.bundle     | 25 +++++++++++++++++++
 .../bundle/hdctrl_openpower_ipmi.bundle       | 10 ++++++++
 .../bundle/hdctrl_openpower_openbmc.bundle    | 10 ++++++++
 .../autotest/bundle/hdctrl_ppc_hmc.bundle     |  4 +++
 5 files changed, 54 insertions(+)
 create mode 100644 xCAT-test/autotest/bundle/hdctrl_bmc.bundle
 create mode 100644 xCAT-test/autotest/bundle/hdctrl_general.bundle
 create mode 100644 xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
 create mode 100644 xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
 create mode 100644 xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle

diff --git a/xCAT-test/autotest/bundle/hdctrl_bmc.bundle b/xCAT-test/autotest/bundle/hdctrl_bmc.bundle
new file mode 100644
index 000000000..08ddf66c1
--- /dev/null
+++ b/xCAT-test/autotest/bundle/hdctrl_bmc.bundle
@@ -0,0 +1,5 @@
+#INCLUDE:hdctrl_general.bundle#
+rvitals_wattage
+rvitals_fanspeed
+rvitals_power
+rvitals_leds
diff --git a/xCAT-test/autotest/bundle/hdctrl_general.bundle b/xCAT-test/autotest/bundle/hdctrl_general.bundle
new file mode 100644
index 000000000..7ea993052
--- /dev/null
+++ b/xCAT-test/autotest/bundle/hdctrl_general.bundle
@@ -0,0 +1,25 @@
+rpower_off
+rpower_stat
+rpower_status
+rpower_state
+rpower_boot
+rpower_on
+rpower_reset
+rpower_noderange
+rpower_noderange_nodeps
+rpower_err_noderange
+rinv_h
+rinv_v
+rinv_help
+rinv_errorcommand
+rinv_serial
+rinv_model
+rinv_firm
+rinv_all
+rvitals_h
+rvitals_v
+rvitals_errorcommand
+rvitals_temp
+rvitals_voltage
+rvitals_all
+rvitals_noderange_err
diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
new file mode 100644
index 000000000..7ab405aab
--- /dev/null
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
@@ -0,0 +1,10 @@
+#INCLUDE:hdctrl_general.bundle#
+rinv_deviceid
+rinv_uuid
+rinv_guid
+rinv_vpd
+rinv_mprom
+rvitals_wattage
+rvitals_fanspeed
+rvitals_power
+rvitals_leds
diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
new file mode 100644
index 000000000..043bb245e
--- /dev/null
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
@@ -0,0 +1,10 @@
+#INCLUDE:hdctrl_general.bundle#
+rinv_deviceid
+rinv_uuid
+rinv_vpd
+rinv_cpu
+rinv_dimm
+rvitals_wattage
+rvitals_fanspeed
+rvitals_power
+rvitals_leds
diff --git a/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle
new file mode 100644
index 000000000..e7ba1aa74
--- /dev/null
+++ b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle
@@ -0,0 +1,4 @@
+#INCLUDE:hdctrl_general.bundle#
+rinv_bus
+rinv_config
+rvitals_lcds

From c92e8eca1aea1db6a9de99fada7befcc602ac6e3 Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Thu, 15 Jun 2017 07:15:03 -0400
Subject: [PATCH 014/283] Refine test case: nodeset_cmdline, nodeset_runimage,
 nodeset_shell

---
 xCAT-test/autotest/testcase/genesis/cases0    |  6 ++---
 .../autotest/testcase/genesis/genesistest.pl  | 25 ++++++++++++++++---
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/xCAT-test/autotest/testcase/genesis/cases0 b/xCAT-test/autotest/testcase/genesis/cases0
index 977261ad0..3b0037e5d 100644
--- a/xCAT-test/autotest/testcase/genesis/cases0
+++ b/xCAT-test/autotest/testcase/genesis/cases0
@@ -2,7 +2,7 @@ start:nodeset_shell
 description: verify could log in genesis shell
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN  -g
 check:rc==0
-cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN -s 
+cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN -s ;if [[ $? -eq 0 ]];then exit 0 ;else cat /var/log/consoles/$$CN; cat /tmp/genesistestlog/*;exit 1;fi
 check:rc==0
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN -c
 check:rc==0
@@ -12,7 +12,7 @@ start:nodeset_cmdline
 description:verify could run cmdline successfully
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN  -g
 check:rc==0
-cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -d
+cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -d;if [[ $? -eq 0 ]];then exit 0 ;else cat /var/log/consoles/$$CN;cat /tmp/genesistestlog/*;exit 1;fi
 check:rc==0
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN -c 
 check:rc==0
@@ -22,7 +22,7 @@ start:nodeset_runimg
 description:verify runimg could work
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN  -g
 check:rc==0
-cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -i 
+cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -i;if [[ $? -eq 0 ]];then exit 0 ;else cat /var/log/consoles/$$CN;cat /tmp/genesistestlog/*;exit 1;fi 
 check:rc==0
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -c
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/genesis/genesistest.pl b/xCAT-test/autotest/testcase/genesis/genesistest.pl
index 73c3bc3b4..cf64a2bc5 100755
--- a/xCAT-test/autotest/testcase/genesis/genesistest.pl
+++ b/xCAT-test/autotest/testcase/genesis/genesistest.pl
@@ -5,7 +5,6 @@ BEGIN
     $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr';
 }
 use lib "$::XCATROOT/lib/perl";
-use xCAT::Utils;
 use strict;
 use warnings;
 use Getopt::Long;
@@ -71,7 +70,8 @@ if (!defined($noderange)) {
     print "$::USAGE";
     exit 1;
 }
-my $os = xCAT::Utils->osver("all");
+my $os = &get_os;
+print "os is $os\n";
 if ($check_genesis_file) {
     send_msg(2, "[$$]:Check genesis file...............");
     &check_genesis_file(&get_arch);
@@ -81,8 +81,9 @@ if ($check_genesis_file) {
         send_msg(2, "genesis file available");
     }
 }
-my $master=xCAT::TableUtils->get_site_Master();
+my $master=`lsdef -t site -i master -c  2>&1 | awk -F'=' '{print \$2}'`;
 if (!$master) { $master=hostname(); }
+print "master is $master\n"; 
 
 ####################################
 ####nodesetshell test for genesis
@@ -236,6 +237,7 @@ sub rungenesisimg {
     chmod 0755, "/install/my_image/runme.sh";
     `tar -zcvf /tmp/my_image.tgz -C /install/my_image .`;
     copy("/tmp/my_image.tgz", "/install/my_image") or die "Copy failed: $!";
+    print "master is $master\n";
     `rinstall $noderange "runimage=http://$master/install/my_image/my_image.tgz",shell`;
     if ($?) {
         send_msg(0, "rinstall noderange failed for runimg");
@@ -264,7 +266,7 @@ sub testxdsh {
     if (($value == 1) || ($value == 2) || ($value == 3)) {
         `xdsh $noderange -t 2 cat $checkfile |grep $checkstring`;
         if ($?) {
-            foreach (1 .. 1500) {
+            foreach (1 .. 15) {
                 `xdsh $noderange -t 2 cat $checkfile | grep $checkstring`;
                 last if ($? == 0);
             }
@@ -311,6 +313,21 @@ sub clearenv {
     return 0;
 }
 ####################################
+#get os 
+###################################
+sub get_os {
+    my $os     = "unknown";
+    my $output = `cat /etc/*release* 2>&1`;
+    if ($output =~ /suse/i) {
+        $os = "sles";
+    } elsif ($output =~ /Red Hat/i) {
+        $os = "redhat";
+    } elsif ($output =~ /ubuntu/i) {
+        $os = "ubuntu";
+    }
+    return $os;
+}
+####################################
 #get arch
 ###################################
 sub get_arch {

From 6cb1dbb82446fe4dedb770cd13213b50efd7dd51 Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Thu, 15 Jun 2017 09:31:44 -0400
Subject: [PATCH 015/283] Refine test case: nodeset_cmdline, nodeset_runimage,
 nodeset_shell

---
 .../autotest/testcase/genesis/genesistest.pl      | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/xCAT-test/autotest/testcase/genesis/genesistest.pl b/xCAT-test/autotest/testcase/genesis/genesistest.pl
index cf64a2bc5..d75ff6e7b 100755
--- a/xCAT-test/autotest/testcase/genesis/genesistest.pl
+++ b/xCAT-test/autotest/testcase/genesis/genesistest.pl
@@ -1,10 +1,5 @@
 #!/usr/bin/env perl
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
-BEGIN
-{
-    $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr';
-}
-use lib "$::XCATROOT/lib/perl";
 use strict;
 use warnings;
 use Getopt::Long;
@@ -71,7 +66,6 @@ if (!defined($noderange)) {
     exit 1;
 }
 my $os = &get_os;
-print "os is $os\n";
 if ($check_genesis_file) {
     send_msg(2, "[$$]:Check genesis file...............");
     &check_genesis_file(&get_arch);
@@ -171,7 +165,7 @@ sub check_genesis_file {
 sub rungenesiscmd {
     my $runcmd_script    = "/tmp/cmdtest";
     my $result           = "/tmp/testresult";
-    my $genesis_base_dir = "$::XCATROOT/share/xcat/netboot/genesis";
+    my $genesis_base_dir = "/opt/xcat/share/xcat/netboot/genesis";
     my $genesis_bin_dir;
     my $value = 0;
     my $arch  = shift;
@@ -211,7 +205,7 @@ sub rungenesiscmd {
 sub rungenesisimg {
     my $runimg_script    = "/tmp/imgtest";
     my $result           = "/tmp/testresult";
-    my $genesis_base_dir = "$::XCATROOT/share/xcat/netboot/genesis";
+    my $genesis_base_dir = "/opt/xcat/share/xcat/netboot/genesis";
     my $genesis_bin_dir;
     my $value = 0;
     mkdir("/install/my_image");
@@ -237,7 +231,6 @@ sub rungenesisimg {
     chmod 0755, "/install/my_image/runme.sh";
     `tar -zcvf /tmp/my_image.tgz -C /install/my_image .`;
     copy("/tmp/my_image.tgz", "/install/my_image") or die "Copy failed: $!";
-    print "master is $master\n";
     `rinstall $noderange "runimage=http://$master/install/my_image/my_image.tgz",shell`;
     if ($?) {
         send_msg(0, "rinstall noderange failed for runimg");
@@ -266,7 +259,7 @@ sub testxdsh {
     if (($value == 1) || ($value == 2) || ($value == 3)) {
         `xdsh $noderange -t 2 cat $checkfile |grep $checkstring`;
         if ($?) {
-            foreach (1 .. 15) {
+            foreach (1 .. 1500) {
                 `xdsh $noderange -t 2 cat $checkfile | grep $checkstring`;
                 last if ($? == 0);
             }
@@ -285,7 +278,7 @@ sub clearenv {
     my $runmetar            = "/install/my_image/my_image.tgz";
     my $runmetar_tmp         = "/tmp/my_image.tgz";
     my $runmedir         = "/install/my_image";
-    my $genesis_base_dir = "$::XCATROOT/share/xcat/netboot/genesis";
+    my $genesis_base_dir = "/opt/xcat/share/xcat/netboot/genesis";
     if (-e "$runimg_script") {
         unlink("$runme");
         unlink("$runmetar_tmp");

From 3735a07bb91fea3ce8ec32aa47ec3fe5716d5f04 Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Thu, 15 Jun 2017 04:06:11 -0400
Subject: [PATCH 016/283] add SIGN=0 option to skip repo sign in ubuntu build
 script

---
 build-ubunturepo | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/build-ubunturepo b/build-ubunturepo
index 6e01caab8..42625d895 100755
--- a/build-ubunturepo
+++ b/build-ubunturepo
@@ -22,6 +22,8 @@
 #                           When you are ready to release this build, use PROMOTE=1 without PREGA
 #               BUILDALL=1 - build all rpms, whether they changed or not.  Should be used for snap builds that are in
 #                            prep for a release.
+#               GPGSIGN=0 -  Do not sign the repo in the end of the build. The repo will be signed by default 
+#                            
 #               LOG=<filename> - provide an LOG file option to redirect some output into log file
 #
 # For the dependency packages 1. All the xcat dependency deb packages should be uploaded to
@@ -125,16 +127,20 @@ if [ ! -z ${LOG} ]; then
     WGET_CMD="wget -o ${LOG}"
 fi
 
-#sync the gpg key to the build machine local
-gsa_url=http://pokgsa.ibm.com/projects/x/xcat/build/linux
-mkdir -p $HOME/.gnupg
-for key_name in pubring.gpg secring.gpg trustdb.gpg; do
-    if [ ! -f $HOME/.gnupg/$key_name ] || [ `wc -c $HOME/.gnupg/$key_name|cut -f 1 -d' '` == 0 ]; then
-        rm -f $HOME/.gnupg/$key_name
-        ${WGET_CMD} -P $HOME/.gnupg $gsa_url/keys/$key_name
-        chmod 600 $HOME/.gnupg/$key_name
-    fi
-done
+if [ "$GPGSIGN" = "0" ];then
+    echo "GPGSIGN=$GPGSIGN specified, skip gnupg key downloading"
+else
+    #sync the gpg key to the build machine local
+    gsa_url=http://pokgsa.ibm.com/projects/x/xcat/build/linux
+    mkdir -p $HOME/.gnupg
+    for key_name in pubring.gpg secring.gpg trustdb.gpg; do
+        if [ ! -f $HOME/.gnupg/$key_name ] || [ `wc -c $HOME/.gnupg/$key_name|cut -f 1 -d' '` == 0 ]; then
+            rm -f $HOME/.gnupg/$key_name
+            ${WGET_CMD} -P $HOME/.gnupg $gsa_url/keys/$key_name
+            chmod 600 $HOME/.gnupg/$key_name
+        fi
+    done
+fi
 
 if [ "$c_flag" ]
 then
@@ -323,9 +329,14 @@ Codename: $dist
 Architectures: $tmp_out_arch
 Components: main
 Description: Repository automatically genereted conf
-SignWith: yes
 
 __EOF__
+
+       if [ "$GPGSIGN" = "0" ];then
+           echo "GPGSIGN=$GPGSIGN specified, the repo will not be signed"
+       else 
+           echo "SignWith: yes" >> conf/distributions
+       fi
      done
 
     cat << __EOF__ > conf/options
@@ -444,11 +455,16 @@ Codename: $dist
 Architectures: $tmp_out_arch
 Components: main
 Description: Repository automatically genereted conf
-SignWith: yes
 
 __EOF__
     done
 
+    if [ "$GPGSIGN" = "0" ];then
+        echo "GPGSIGN=$GPGSIGN specified, the repo will not be signed"
+    else
+        echo "SignWith: yes" >> conf/distributions
+    fi
+
     cat << __EOF__ > conf/options
 verbose
 ask-passphrase

From 9e0406b0e960511349f6d533ada42b7409993dd2 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Fri, 16 Jun 2017 02:15:04 -0400
Subject: [PATCH 017/283] update descriptions and rspconfig/rsetboot cases

---
 xCAT-test/autotest/bundle/hdctrl_bmc.bundle           | 11 +++++++++++
 xCAT-test/autotest/bundle/hdctrl_general.bundle       |  1 +
 .../autotest/bundle/hdctrl_openpower_ipmi.bundle      |  1 +
 .../autotest/bundle/hdctrl_openpower_openbmc.bundle   | 11 +++++++++++
 xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle       |  1 +
 5 files changed, 25 insertions(+)

diff --git a/xCAT-test/autotest/bundle/hdctrl_bmc.bundle b/xCAT-test/autotest/bundle/hdctrl_bmc.bundle
index 08ddf66c1..b75dc41ce 100644
--- a/xCAT-test/autotest/bundle/hdctrl_bmc.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_bmc.bundle
@@ -1,5 +1,16 @@
+description:the cases in this bundle is to used to verify xCAT hardware control funtions on BMC managed servers.
 #INCLUDE:hdctrl_general.bundle#
 rvitals_wattage
 rvitals_fanspeed
 rvitals_power
 rvitals_leds
+rsetboot_net_statcheck
+rsetboot_cd_statcheck
+rsetboot_default_statcheck
+rsetboot_h
+rsetboot_help
+rsetboot_v
+rsetboot_node_invalidnode
+rsetboot_noderange_net
+rsetboot_node_invalidaction
+rsetboot_group_net
diff --git a/xCAT-test/autotest/bundle/hdctrl_general.bundle b/xCAT-test/autotest/bundle/hdctrl_general.bundle
index 7ea993052..84ed91f6f 100644
--- a/xCAT-test/autotest/bundle/hdctrl_general.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_general.bundle
@@ -1,3 +1,4 @@
+description:the cases in this bundle is to verify xCAT hardware control functions. This is the basic bundle for all hardware types.
 rpower_off
 rpower_stat
 rpower_status
diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
index 7ab405aab..c44ce9d54 100644
--- a/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
@@ -1,3 +1,4 @@
+description:the cases in this bundle is to verify xCAT hardware control functions on servers which are managed using IPMI. 
 #INCLUDE:hdctrl_general.bundle#
 rinv_deviceid
 rinv_uuid
diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
index 043bb245e..a271c5b6a 100644
--- a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
@@ -1,3 +1,4 @@
+description:the cases in this bundle is to used to verify xCAT hardware control funtions on openpower servers which are mananged using openbmc. 
 #INCLUDE:hdctrl_general.bundle#
 rinv_deviceid
 rinv_uuid
@@ -8,3 +9,13 @@ rvitals_wattage
 rvitals_fanspeed
 rvitals_power
 rvitals_leds
+rsetboot_net_statcheck
+rsetboot_cd_statcheck
+rsetboot_default_statcheck
+rsetboot_h
+rsetboot_help
+rsetboot_v
+rsetboot_node_invalidnode
+rsetboot_noderange_net
+rsetboot_node_invalidaction
+rsetboot_group_net
diff --git a/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle
index e7ba1aa74..2cf057542 100644
--- a/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle
@@ -1,3 +1,4 @@
+description:the cases in this bundle is to used to verify xCAT hardware control funtions on HMC managed servers.
 #INCLUDE:hdctrl_general.bundle#
 rinv_bus
 rinv_config

From 56e418d81aa3b3fa0e11f4fe20249e9d6d8b04c7 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Fri, 16 Jun 2017 04:05:04 -0400
Subject: [PATCH 018/283] add reventlog cases in hdctrl_general.bundle

---
 xCAT-test/autotest/bundle/hdctrl_general.bundle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xCAT-test/autotest/bundle/hdctrl_general.bundle b/xCAT-test/autotest/bundle/hdctrl_general.bundle
index 84ed91f6f..e7020b1d6 100644
--- a/xCAT-test/autotest/bundle/hdctrl_general.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_general.bundle
@@ -24,3 +24,7 @@ rvitals_temp
 rvitals_voltage
 rvitals_all
 rvitals_noderange_err
+reventlog_null
+reventlog_all
+reventlog_clear
+reventlog_numofentries

From ce5ad6f52651b739c83c2cbbb8d2ccaeb4deeeb0 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Fri, 16 Jun 2017 04:38:33 -0400
Subject: [PATCH 019/283] Remove the commented out lines to not have the
 reviewer confusing

---
 xCAT-genesis-builder/buildrpm | 24 ------------------------
 xCAT-genesis-builder/install  |  4 ----
 2 files changed, 28 deletions(-)

diff --git a/xCAT-genesis-builder/buildrpm b/xCAT-genesis-builder/buildrpm
index 25a37c743..28f3985aa 100755
--- a/xCAT-genesis-builder/buildrpm
+++ b/xCAT-genesis-builder/buildrpm
@@ -135,30 +135,6 @@ if [ "$HOSTOS" = "mcp" ]; then
 elif [ $BUILDARCH = "ppc64" ]; then
         sed -i 's/ efibootmgr//' $DRACUTMODDIR/install
         sed -i 's/ dmidecode//' $DRACUTMODDIR/install
-        # Remove the libraries with special version number, starting from Fedora 26 Alpha ppc64
-        # ==========================================================
-        #sed -i 's/\/lib\/libncurses.so.5.7/\/lib64\/libncurses.so.5.7/' $DRACUTMODDIR/install
-        #sed -i 's/\/usr\/lib\/libstdc++.so.6.0.13/\/usr\/lib64\/libstdc++.so.6.0.13/' $DRACUTMODDIR/install
-        #sed -i 's/\/lib\/libgcc_s.so.1/\/lib64\/libgcc_s.so.1/' $DRACUTMODDIR/install
-        #sed -i 's/\/lib\/libtinfo.so.5.7/\/lib64\/libtinfo.so.5.7/' $DRACUTMODDIR/install
-        # following changes are required on Fedora 20 ppc64
-        # sed -i 's/\/lib64\/libnss_dns-2.12.so/\/lib64\/libnss_dns-2.18.so/' $DRACUTMODDIR/install
-        # following changes are required on Fedora 26 Alpha ppc64
-        #sed -i 's/\/lib64\/libnss_dns-2.12.so/\/lib64\/libnss_dns-2.25.so/' $DRACUTMODDIR/install
-        #sed -i 's/\/lib\/libc.so.6/\/lib64\/libc.so.6/' $DRACUTMODDIR/install
-        # following changes are required on Fedora 23 ppc64
-        #sed -i 's/\/lib\/ld-linux.so.2/\/lib64\/ld-2.18.so/' $DRACUTMODDIR/install
-        #sed -i 's/\/lib\/ld-linux.so.2/\/lib64\/ld-2.25.so/' $DRACUTMODDIR/install
-        #sed -i 's/\/lib\/libdl.so.2/\/lib64\/libdl.so.2/' $DRACUTMODDIR/install
-        #sed -i 's/\/lib\/libm.so.6/\/lib64\/libm.so.6/' $DRACUTMODDIR/install
-        #sed -i 's/\/lib\/libpthread.so.0/\/lib64\/libpthread.so.0/' $DRACUTMODDIR/install
-        #sed -i 's/\/lib64\/libncurses.so.5.7/\/lib64\/libncurses.so.6.0/' $DRACUTMODDIR/install
-        #sed -i 's/\/usr\/lib64\/libstdc++.so.6.0.13/\/usr\/lib64\/libstdc++.so.6.0.19/' $DRACUTMODDIR/install
-        #sed -i 's/\/usr\/lib64\/libstdc++.so.6.0.13/\/usr\/lib64\/libstdc++.so.6.0.23/' $DRACUTMODDIR/install
-        #sed -i 's/\/lib64\/libtinfo.so.5.7/\/lib64\/libtinfo.so.6.0/' $DRACUTMODDIR/install
-        #sed -i 's/\/usr\/lib64\/libsasl2.so.2/\/usr\/lib64\/libsasl2.so.3/' $DRACUTMODDIR/install
-        #sed -i 's/\/lib64\/libnss_dns-2.12.so/\/lib64\/libnss_dns-2.18.so/' $DRACUTMODDIR/install
-        # ==========================================================
         sed -i 's/\/lib\/terminfo\/l\/linux/\/usr\/share\/terminfo\/l\/linux/g' $DRACUTMODDIR/install
         sed -i 's/\/lib\/terminfo\/v\/vt100/\/usr\/share\/terminfo\/v\/vt100/g' $DRACUTMODDIR/install
 fi
diff --git a/xCAT-genesis-builder/install b/xCAT-genesis-builder/install
index 36ee6207b..e5dfbe0f0 100755
--- a/xCAT-genesis-builder/install
+++ b/xCAT-genesis-builder/install
@@ -11,10 +11,6 @@ dracut_install poweroff ntpq ntpd ntp-wait hwclock date /usr/share/terminfo/x/xt
 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
 dracut_install efibootmgr lldptool dmidecode #uxspi prereqs, but will use dmidecode to improve decision on loading ipmi_si
-#dracut_install dmidecode /usr/lib64/libstdc++.so.5 #broadcom firmware update links against old lib
-#dracut_install /lib/libpthread.so.0 #32 bit lib because UXSPI will not ship a native 64 bit build
-#dracut_install /lib/libncurses.so.5.7 /usr/lib/libstdc++.so.6.0.13 /lib/libgcc_s.so.1  /lib/libtinfo.so.5.7
-#dracut_install /lib64/libldap-2.4.so.2 /lib64/liblber-2.4.so.2 /usr/lib64/libsasl2.so.2 #uxspi has incurred these...
 dracut_install /usr/share/zoneinfo/posix/Zulu
 dracut_install /usr/share/zoneinfo/posix/GMT-0
 dracut_install /usr/share/zoneinfo/posix/Europe/Istanbul

From beb7d5af12304226dbe5cd518202e1b6239a745f Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Fri, 16 Jun 2017 14:40:11 -0400
Subject: [PATCH 020/283] Check for update file existance and eliminate few
 lines

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 618e96200..3128b3f21 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -687,6 +687,11 @@ sub parse_command_status {
                 # Filename ending on .tar was specified
                 $filename = $update_file;
                 $::UPLOAD_FILE = $update_file; # Save filename to upload
+                # Verify file exists and is readable
+                unless (-r $filename) {
+                    xCAT::SvrUtils::sendmsg("Error accessing update file $filename", $callback);
+                    return 1;
+                }
                 if ($check_version) {
                     # Display firmware version of the specified .tar file
                     my $firmware_version_in_file = `$grep_cmd $version_tag $filename`;
@@ -1452,16 +1457,14 @@ sub rflash_response {
         # If that happens, just call the curl commands for now. 
         # TODO remove this block when proper request can be generated
         if ($::UPLOAD_FILE) {
-            my $request_url_login  = "$http_protocol://" . $node_info{$node}{bmc} .  "/login";
-            my $request_url_logout = "$http_protocol://" . $node_info{$node}{bmc} .  "/logout";
-            my $request_url_upload = "$http_protocol://" . $node_info{$node}{bmc} .  "/upload/image/";
+            my $request_url = "$http_protocol://" . $node_info{$node}{bmc};
             my $content_login = '{ "data": [ "' . $node_info{$node}{username} .'", "' . $node_info{$node}{password} . '" ] }';
             my $content_logout = '{ "data": [ ] }';
 
             # curl commands
-            my $curl_login_cmd  = "curl -c cjar -k -H 'Content-Type: application/json' -X POST $request_url_login -d '" . $content_login . "'";
-            my $curl_logout_cmd = "curl -b cjar -k -H 'Content-Type: application/json' -X POST $request_url_logout -d '" . $content_logout . "'";
-            my $curl_upload_cmd = "curl -b cjar -k -H 'Content-Type: application/octet-stream' -X PUT -T $::UPLOAD_FILE $request_url_upload";
+            my $curl_login_cmd  = "curl -c cjar -k -H 'Content-Type: application/json' -X POST $request_url/login -d '" . $content_login . "'";
+            my $curl_logout_cmd = "curl -b cjar -k -H 'Content-Type: application/json' -X POST $request_url/logout -d '" . $content_logout . "'";
+            my $curl_upload_cmd = "curl -b cjar -k -H 'Content-Type: application/octet-stream' -X PUT -T $::UPLOAD_FILE $request_url/upload/image/";
 
             # Try to login
             my $curl_login_result = `$curl_login_cmd`;

From 978ed4ab6978b1c95acc69789950aad388cab158 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Mon, 19 Jun 2017 04:53:46 -0400
Subject: [PATCH 021/283] add missed cases for hardware control commands. Fix
 bug 3269

---
 xCAT-test/autotest/testcase/rinv/cases2   | 26 ++++++++++++
 xCAT-test/autotest/testcase/rpower/cases0 | 49 ++++++++++++++---------
 2 files changed, 55 insertions(+), 20 deletions(-)
 create mode 100644 xCAT-test/autotest/testcase/rinv/cases2

diff --git a/xCAT-test/autotest/testcase/rinv/cases2 b/xCAT-test/autotest/testcase/rinv/cases2
new file mode 100644
index 000000000..0588d179c
--- /dev/null
+++ b/xCAT-test/autotest/testcase/rinv/cases2
@@ -0,0 +1,26 @@
+start:rinv_mprom
+hcp:ipmi
+arch:x86_64
+cmd:rinv $$CN mprom 
+check:rc==0
+check:output=~BMC Firmware:\s*\w+.\w+
+end
+
+start:rinv_guid
+hcp:ipmi
+arch:x86_64
+cmd:rinv $$CN guid 
+check:rc==0
+check:output=~UUID/GUID:\s*\w+-\w+-\w+-\w+-\w+
+end
+
+start:rinv_dimm
+hcp:ipmi
+arch:x86_64
+cmd:rinv $$CN dimm
+check:rc==0
+check:output=~DIMM 1 :\s*\w+
+check:output=~DIMM 1 Manufacture Date:\s*\w+
+check:output=~DIMM 1 Manufacture Location:\s*\d+
+check:output=~DIMM 1 Model:\s*\w+-\w+
+end
diff --git a/xCAT-test/autotest/testcase/rpower/cases0 b/xCAT-test/autotest/testcase/rpower/cases0
index c8ab300c9..23b0d1905 100644
--- a/xCAT-test/autotest/testcase/rpower/cases0
+++ b/xCAT-test/autotest/testcase/rpower/cases0
@@ -1,6 +1,4 @@
 start:rpower_off
-description:This case is to test off option could remote power off nodes 
-Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN on
 cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 check:ouptut=~Running|on
@@ -12,8 +10,6 @@ check:output=~Not Activated|off
 end
 
 start:rpower_stat
-description:This case is to test stat option could show the power status of nodes
-Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN on
 cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 5 ];then break;fi done
 cmd:rpower $$CN stat
@@ -33,8 +29,6 @@ check:output=~Not Activated|off
 end
 
 start:rpower_boot
-description:This case is to test boot option could power on the nodes if nodes in off state.  Or could  hard reset the nodes if they are on. 
-Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN off
 cmd:a=0;while ! `rpower $$CN stat|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 cmd:rpower $$CN stat
@@ -47,8 +41,7 @@ check:output=~Running|on
 end
 
 start:rpower_status
-description:This case is to test status option could show the power status of nodes
-Attribute: $$CN-The operation object of rpower command
+description:checkout rpower node status could get node's stauts
 cmd:rpower $$CN off
 cmd:a=0;while ! `rpower $$CN status|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 cmd:rpower $$CN status
@@ -61,8 +54,7 @@ check:output=~Running|on
 end
 
 start:rpower_state
-description:This case is to test state option could show the power status of nodes
-Attribute: $$CN-The operation object of rpower command
+description:checkout rpower node status could get node's stauts
 cmd:rpower $$CN off
 cmd:a=0;while ! `rpower $$CN state|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 cmd:rpower $$CN state
@@ -75,8 +67,6 @@ check:output=~Running|on
 end
 
 start:rpower_on
-description:This case is to test on option could remote power on nodes
-Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN off
 cmd:a=0;while ! `rpower $$CN stat|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 cmd:rpower $$CN stat
@@ -89,8 +79,6 @@ check:output=~Running|on
 end
 
 start:rpower_reset
-description:This case is to test reset option could hard reset nodes when nodes are in on state.
-Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN on
 cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 cmd:rpower $$CN stat
@@ -103,25 +91,46 @@ check:output=~Running|on
 end
 
 start:rpower_noderange
-description:This case is to test rpower could process error usage and return help information.
-Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN
 check:rc!=0
 check:output=~Unsupported|Usage
 end
 
 start:rpower_noderange_nodeps
-description:This case is to test rpower could process error usage and return help information.
-Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN --nodeps
 check:rc!=0
 check:output=~Unsupported|Usage
 end
 
 start:rpower_err_noderange
-description:This case is to test rpower could process error usage and return help information.
-Attribute:N/A 
 cmd:rpower testnode stat
 check:rc!=0
 check:output=~Error
 end
+
+start:rpower_softoff
+description:This case is to test softoff option could remote shutdown nodes 
+Attribute: $$CN-The operation object of rpower command
+cmd:rpower $$CN on
+cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
+check:ouptut=~Running|on
+cmd:rpower $$CN softoff
+check:rc==0
+cmd:a=0;while ! `rpower $$CN stat|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
+cmd:rpower $$CN stat
+check:output=~Not Activated|off
+end
+
+start:rpower_onstandby
+description:This case is to test onstandby option could bring server to standby state 
+Attribute: $$CN-The operation object of rpower command
+arch:ppc64
+cmd:rpower $$CN off
+check:rc==0
+cmd:a=0;while ! `rpower $$CN stat|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
+cmd:rpower $$CN stat
+check:output=~Not Activated|off
+cmd:rpower $$CN onstandby
+cmd:a=0;while ! `rpower $$CN stat|grep "standby\|Standby" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
+check:ouptut=~standby|Standby
+end

From d445a91c7405b0e3ee997b31ae6f96fbd1c391f5 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Mon, 19 Jun 2017 05:03:20 -0400
Subject: [PATCH 022/283] update the description

---
 xCAT-test/autotest/testcase/rinv/cases2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xCAT-test/autotest/testcase/rinv/cases2 b/xCAT-test/autotest/testcase/rinv/cases2
index 0588d179c..388ae6ce5 100644
--- a/xCAT-test/autotest/testcase/rinv/cases2
+++ b/xCAT-test/autotest/testcase/rinv/cases2
@@ -1,4 +1,5 @@
 start:rinv_mprom
+description:this case is to test mprom option for rinv on x86_64 servers.
 hcp:ipmi
 arch:x86_64
 cmd:rinv $$CN mprom 
@@ -7,6 +8,7 @@ check:output=~BMC Firmware:\s*\w+.\w+
 end
 
 start:rinv_guid
+description:this case is to test guid option for rinv on x86_64 servers.
 hcp:ipmi
 arch:x86_64
 cmd:rinv $$CN guid 
@@ -15,6 +17,7 @@ check:output=~UUID/GUID:\s*\w+-\w+-\w+-\w+-\w+
 end
 
 start:rinv_dimm
+description:this case is to test dimm option for rinv on x86_64 servers.
 hcp:ipmi
 arch:x86_64
 cmd:rinv $$CN dimm

From df1a5aeb522c0297a8c47a17b1caa6934b73904b Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Mon, 19 Jun 2017 10:32:30 -0400
Subject: [PATCH 023/283] Change to only display the active firmware instead of
 any firmware that is listed and add in the software id into the output so
 that sorting would keep the various software information together.

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 64bfbb99c..9bbed2852 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -1036,25 +1036,31 @@ sub rinv_response {
             # Handle printing out all posssible Software values in a generic format: 
             #    node: <Purpose> Software: <version> (<Activation>)
             #
+            my $sw_id = (split(/\//, $key_url))[-1];
             if (defined($content{Version}) and $content{Version}) {
                 my $purpose_value = uc ((split(/\./, $content{Purpose}))[-1]);
                 my $activation_value = (split(/\./, $content{Activation}))[-1];
                 #
-                # The space below between "SOFTWARE:" and $content{Version} is intentional
-                # to cause the sorting of this line before any additional info lines 
+                # For 'rinv firm', only print Active software.  'rflash list' will handle others
                 #
-                $content_info = "$purpose_value SOFTWARE:   $content{Version} ($activation_value)";
-                push (@sorted_output, $content_info); 
-
-                if ($content{ExtendedVersion} ne "") { 
-                    # ExtendedVersion is going to be a comma separated list of additional software
-                    my @versions = split(',', $content{ExtendedVersion});
-                    foreach my $ver (@versions) { 
-                        $content_info = "$purpose_value SOFTWARE: -- additional info: $ver";
-                        push (@sorted_output, $content_info);
+                if ($activation_value =~ "Active") {
+                    #
+                    # The space below between "SOFTWARE:" and $content{Version} is intentional
+                    # to cause the sorting of this line before any additional info lines 
+                    #
+                    $content_info = "$purpose_value SOFTWARE[$sw_id]:   $content{Version} ($activation_value)";
+                    push (@sorted_output, $content_info); 
+    
+                    if (defined($content{ExtendedVersion}) and $content{ExtendedVersion} ne "") { 
+                        # ExtendedVersion is going to be a comma separated list of additional software
+                        my @versions = split(',', $content{ExtendedVersion});
+                        foreach my $ver (@versions) { 
+                            $content_info = "$purpose_value SOFTWARE[$sw_id]: -- additional info: $ver";
+                            push (@sorted_output, $content_info);
+                        }
                     }
+                    next;
                 }
-                next;
             }
         } else {
             if (! defined $content{Present}) {

From cbf7c3b00749acf3ddfc525ede5c1025a6531e41 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Mon, 19 Jun 2017 10:52:20 -0400
Subject: [PATCH 024/283] update the doc for steps on checking packages that
 changed in xcat-dep

---
 docs/source/guides/install-guides/yum/update_xcat.rst    | 4 ++--
 docs/source/guides/install-guides/zypper/update_xcat.rst | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/source/guides/install-guides/yum/update_xcat.rst b/docs/source/guides/install-guides/yum/update_xcat.rst
index fc01d99ad..fbbbe4762 100644
--- a/docs/source/guides/install-guides/yum/update_xcat.rst
+++ b/docs/source/guides/install-guides/yum/update_xcat.rst
@@ -6,5 +6,5 @@ If at a later date you want to update xCAT, first, update the software repositor
     yum clean metadata # or, yum clean all
     yum update '*xCAT*'
 
-
-
+    # To check and update the packages provided by xcat-dep:
+    yum update '*xcat*'
diff --git a/docs/source/guides/install-guides/zypper/update_xcat.rst b/docs/source/guides/install-guides/zypper/update_xcat.rst
index c18bb5b3c..3da2a2bb2 100644
--- a/docs/source/guides/install-guides/zypper/update_xcat.rst
+++ b/docs/source/guides/install-guides/zypper/update_xcat.rst
@@ -6,4 +6,5 @@ If at a later date you want to update xCAT, first, update the software repositor
     zypper refresh
     zypper update "*xCAT*"
 
-
+    # To check and update the packages provided by xcat-dep:
+    zypper update "*xcat*"

From 4cdad73b8f2d710f537660f38d754a8d50d79cbc Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Mon, 19 Jun 2017 10:59:53 -0400
Subject: [PATCH 025/283] Better error message for missing file

---
 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 3128b3f21..284f9d4a5 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -689,7 +689,7 @@ sub parse_command_status {
                 $::UPLOAD_FILE = $update_file; # Save filename to upload
                 # Verify file exists and is readable
                 unless (-r $filename) {
-                    xCAT::SvrUtils::sendmsg("Error accessing update file $filename", $callback);
+                    xCAT::SvrUtils::sendmsg([1,"Cannot access $filename"], $callback);
                     return 1;
                 }
                 if ($check_version) {

From e5e93255071556d6fe828dfed82efdd5ee082f83 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Mon, 19 Jun 2017 14:59:25 -0400
Subject: [PATCH 026/283] Change the dhcpinterface documentation to avoid
 confusion about xcatmn

---
 .../manage_clusters/ppc64le/configure/networks.rst            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/networks.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/networks.rst
index 3bacd82b5..7d10ecd29 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/networks.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/configure/networks.rst
@@ -45,6 +45,10 @@ Configure DHCP to listen on different network interfaces [**Optional**]
 
    To set "eth1" and "eth3" on the management node and "bond0" on all nodes in the nodegroup="service", set ``dhcpinterfaces`` using: ::
 
+      chdef -t site dhcpinterfaces="eth1,eth3;service|bond0"
+
+   or, to explicitly identify the management node with hostname ``xcatmn``: ::
+
       chdef -t site dhcpinterfaces="xcatmn|eth1,eth3;service|bond0"
 
 **noboot**

From a6696f7fde0e4243f07911842082c0f957767fe6 Mon Sep 17 00:00:00 2001
From: chenglch <chenglch@cn.ibm.com>
Date: Tue, 20 Jun 2017 10:12:54 +0800
Subject: [PATCH 027/283] Fix the calculation error for conserver version
 number

This patch fix the error while calculating the version number.
Use int instead of ord to convert string to integer.

fix-issue: #3286
---
 perl-xCAT/xCAT/Utils.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm
index 1dde56d16..ea107f482 100644
--- a/perl-xCAT/xCAT/Utils.pm
+++ b/perl-xCAT/xCAT/Utils.pm
@@ -638,7 +638,7 @@ sub calc_conserver_version
 {
     my $ver_str = shift;
     my @vers = split(/\./, $ver_str);
-    return ord($vers[2]) + ord($vers[1]) * 10000 + ord($vers[0]) * 100000000;
+    return int($vers[2]) + int($vers[1]) * 10000 + int($vers[0]) * 100000000;
 }
 
 

From 74942a8f20763e139a13a746ed135407ad288b5a Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Mon, 19 Jun 2017 22:23:40 -0400
Subject: [PATCH 028/283] update for an error checkin

---
 xCAT-test/autotest/testcase/rpower/cases0 | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/xCAT-test/autotest/testcase/rpower/cases0 b/xCAT-test/autotest/testcase/rpower/cases0
index 23b0d1905..09f619fe0 100644
--- a/xCAT-test/autotest/testcase/rpower/cases0
+++ b/xCAT-test/autotest/testcase/rpower/cases0
@@ -1,4 +1,6 @@
 start:rpower_off
+description:This case is to test off option could remote power off nodes 
+Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN on
 cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 check:ouptut=~Running|on
@@ -10,6 +12,8 @@ check:output=~Not Activated|off
 end
 
 start:rpower_stat
+description:This case is to test stat option could show the power status of nodes
+Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN on
 cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 5 ];then break;fi done
 cmd:rpower $$CN stat
@@ -29,6 +33,8 @@ check:output=~Not Activated|off
 end
 
 start:rpower_boot
+description:This case is to test boot option could power on the nodes if nodes in off state.  Or could  hard reset the nodes if they are on. 
+Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN off
 cmd:a=0;while ! `rpower $$CN stat|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 cmd:rpower $$CN stat
@@ -41,7 +47,8 @@ check:output=~Running|on
 end
 
 start:rpower_status
-description:checkout rpower node status could get node's stauts
+description:This case is to test status option could show the power status of nodes
+Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN off
 cmd:a=0;while ! `rpower $$CN status|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 cmd:rpower $$CN status
@@ -54,7 +61,8 @@ check:output=~Running|on
 end
 
 start:rpower_state
-description:checkout rpower node status could get node's stauts
+description:This case is to test state option could show the power status of nodes
+Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN off
 cmd:a=0;while ! `rpower $$CN state|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 cmd:rpower $$CN state
@@ -67,6 +75,8 @@ check:output=~Running|on
 end
 
 start:rpower_on
+description:This case is to test on option could remote power on nodes
+Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN off
 cmd:a=0;while ! `rpower $$CN stat|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 cmd:rpower $$CN stat
@@ -79,6 +89,8 @@ check:output=~Running|on
 end
 
 start:rpower_reset
+description:This case is to test reset option could hard reset nodes when nodes are in on state.
+Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN on
 cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 cmd:rpower $$CN stat
@@ -91,18 +103,24 @@ check:output=~Running|on
 end
 
 start:rpower_noderange
+description:This case is to test rpower could process error usage and return help information.
+Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN
 check:rc!=0
 check:output=~Unsupported|Usage
 end
 
 start:rpower_noderange_nodeps
+description:This case is to test rpower could process error usage and return help information.
+Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN --nodeps
 check:rc!=0
 check:output=~Unsupported|Usage
 end
 
 start:rpower_err_noderange
+description:This case is to test rpower could process error usage and return help information.
+Attribute:N/A 
 cmd:rpower testnode stat
 check:rc!=0
 check:output=~Error

From 32060a54cc2a58b63bcb48c9e4d880fe134bfbc2 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Mon, 19 Jun 2017 23:23:00 -0400
Subject: [PATCH 029/283] update rpower cases for hdctrl_ppc_hmc.bundle and
 rinv cases for hdctrl_bmc.bundle

---
 xCAT-test/autotest/bundle/hdctrl_bmc.bundle     | 3 +++
 xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/xCAT-test/autotest/bundle/hdctrl_bmc.bundle b/xCAT-test/autotest/bundle/hdctrl_bmc.bundle
index b75dc41ce..e8fcfd2fa 100644
--- a/xCAT-test/autotest/bundle/hdctrl_bmc.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_bmc.bundle
@@ -1,5 +1,8 @@
 description:the cases in this bundle is to used to verify xCAT hardware control funtions on BMC managed servers.
 #INCLUDE:hdctrl_general.bundle#
+rinv_mprom
+rinv_guid
+rinv_dimm
 rvitals_wattage
 rvitals_fanspeed
 rvitals_power
diff --git a/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle
index 2cf057542..51a886de1 100644
--- a/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle
@@ -1,5 +1,7 @@
 description:the cases in this bundle is to used to verify xCAT hardware control funtions on HMC managed servers.
 #INCLUDE:hdctrl_general.bundle#
+rpower_softoff
+rpower_onstandby
 rinv_bus
 rinv_config
 rvitals_lcds

From f3ea0a27296b6fbc7d6dc0a2f87a35edd07f9924 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Tue, 20 Jun 2017 02:53:12 -0400
Subject: [PATCH 030/283] When start simulator failed, will exit not mkdef
 nodes

---
 xCAT-test/autotest/testcase/simulator/config_simulator.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xCAT-test/autotest/testcase/simulator/config_simulator.sh b/xCAT-test/autotest/testcase/simulator/config_simulator.sh
index 80860227a..fc4013fdd 100755
--- a/xCAT-test/autotest/testcase/simulator/config_simulator.sh
+++ b/xCAT-test/autotest/testcase/simulator/config_simulator.sh
@@ -47,6 +47,10 @@ if [ $flag = "-s" ]; then
         rmdef $cnhn
 
         /root/openbmc_simulator/simulator -n $nic -r $range 
+        if [ $? != 0 ]; then
+            echo "Start simulator Failed"
+            exit 1
+        fi
 
         node_end=$[nodes-1]
         chdef -t group $cnhn mgt=openbmc bmc="|\D+(\d+)$|10.100.(1+((\$1)/100)).((\$1)%100+1)|" bmcusername=$username bmcpassword=$password

From 6720675b21440e30d56f7b4e491352f4587c6617 Mon Sep 17 00:00:00 2001
From: Yuan Bai <bybai@cn.ibm.com>
Date: Tue, 20 Jun 2017 17:08:51 +0800
Subject: [PATCH 031/283] revert to old udevadm code (#3294)

---
 xCAT-server/share/xcat/install/scripts/getinstdisk | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/xCAT-server/share/xcat/install/scripts/getinstdisk b/xCAT-server/share/xcat/install/scripts/getinstdisk
index 311a7294d..fcc517565 100644
--- a/xCAT-server/share/xcat/install/scripts/getinstdisk
+++ b/xCAT-server/share/xcat/install/scripts/getinstdisk
@@ -141,19 +141,8 @@ if [ -z "$install_disk" ]; then
         disk_wwn=$(echo $output_for_wwn | $utolcmd)
         output_for_path=$(IFS= ;echo $disk_info | grep DEVPATH | cut -d "=" -f2)
         disk_path=$(echo $output_for_path | $utolcmd)
-
-        # Work around the issue Pegas running on Power9 installation hang in anaconda 
-        # with "TypeError: argument of type 'NoneType' is not iterable", 
-        # after running of "udevadm info --attribute-walk --name=/dev/sda" in %pre section of kickstart 
-        cpu_model=$(awk '/model/ { print $NF }' /proc/cpuinfo)
-        p9_bool=$(grep POWER9 /proc/cpuinfo|head -n 1|awk '{print $3}')
-        anaconda --version >/dev/null  2>&1
-        if [ $? -eq 0 ] && [ "$cpu_model" = "0000000000000000" ] && [ "$p9_bool" = "POWER9" ]; then
-            disk_driver=""
-        else
-            disk_driver=$(udevadm info --attribute-walk --name=$disk | grep DRIVERS| grep -v '""'| grep -v '"sd"'|
+        disk_driver=$(udevadm info --attribute-walk --name=$disk | grep DRIVERS| grep -v '""'| grep -v '"sd"'|
                     \head -n 1| sed -e 's/[^"]*"//' -e 's/"//' | $utolcmd)
-        fi
 
         echo "[get_install_disk]The disk $disk information: "
         echo "[get_install_disk]    disk_wwn=$disk_wwn"

From 1340f398e0b28e857516fa93cd4b9f5a4a753079 Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Tue, 20 Jun 2017 08:50:35 -0400
Subject: [PATCH 032/283] Refine test case: nodeset_cmdline, nodeset_runimage,
 nodeset_shell

---
 xCAT-test/autotest/testcase/genesis/cases0         |  9 ++++++---
 xCAT-test/autotest/testcase/genesis/genesistest.pl | 10 ++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/xCAT-test/autotest/testcase/genesis/cases0 b/xCAT-test/autotest/testcase/genesis/cases0
index 3b0037e5d..f9fb966ea 100644
--- a/xCAT-test/autotest/testcase/genesis/cases0
+++ b/xCAT-test/autotest/testcase/genesis/cases0
@@ -2,28 +2,31 @@ start:nodeset_shell
 description: verify could log in genesis shell
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN  -g
 check:rc==0
-cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN -s ;if [[ $? -eq 0 ]];then exit 0 ;else cat /var/log/consoles/$$CN; cat /tmp/genesistestlog/*;exit 1;fi
+cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN -s 
 check:rc==0
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN -c
 check:rc==0
+cmd:cat /tmp/genesistestlog/*
 end
 
 start:nodeset_cmdline
 description:verify could run cmdline successfully
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN  -g
 check:rc==0
-cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -d;if [[ $? -eq 0 ]];then exit 0 ;else cat /var/log/consoles/$$CN;cat /tmp/genesistestlog/*;exit 1;fi
+cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -d
 check:rc==0
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN -c 
 check:rc==0
+cmd:cat /tmp/genesistestlog/*
 end
 
 start:nodeset_runimg
 description:verify runimg could work
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl  -n $$CN  -g
 check:rc==0
-cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -i;if [[ $? -eq 0 ]];then exit 0 ;else cat /var/log/consoles/$$CN;cat /tmp/genesistestlog/*;exit 1;fi 
+cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -i 
 check:rc==0
 cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n $$CN -c
 check:rc==0
+cmd:cat /tmp/genesistestlog/*
 end
diff --git a/xCAT-test/autotest/testcase/genesis/genesistest.pl b/xCAT-test/autotest/testcase/genesis/genesistest.pl
index d75ff6e7b..1c3c20fe6 100755
--- a/xCAT-test/autotest/testcase/genesis/genesistest.pl
+++ b/xCAT-test/autotest/testcase/genesis/genesistest.pl
@@ -195,7 +195,7 @@ sub rungenesiscmd {
     }
     `rinstall $noderange "runcmd=cmdtest,shell"`;
     if ($?) {
-        send_msg(0, "rinstall noderange shell failed for runcmd test");
+      send_msg(0, "nodeset noderange shell failed for runcmd test");
     }
     return $value;
 }
@@ -257,10 +257,12 @@ sub testxdsh {
         $checkfile   = "/proc/cmdline";
     }
     if (($value == 1) || ($value == 2) || ($value == 3)) {
-        `xdsh $noderange -t 2 cat $checkfile |grep $checkstring`;
+        `xdsh $noderange -t 2 cat $checkfile 2>&1|grep $checkstring `;
         if ($?) {
-            foreach (1 .. 1500) {
-                `xdsh $noderange -t 2 cat $checkfile | grep $checkstring`;
+            foreach (1 .. 10) {
+                `sleep 300`;
+                send_msg(1,"try to run xdsh to check the results again");
+                `xdsh $noderange -t 2 cat $checkfile 2>&1| grep $checkstring `;
                 last if ($? == 0);
             }
         }

From d8e2303b050b278b0a11d4639567b64964b0896f Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Tue, 20 Jun 2017 09:21:22 -0400
Subject: [PATCH 033/283] Refine test case: nodeset_cmdline, nodeset_runimage,
 nodeset_shell

---
 xCAT-test/autotest/testcase/genesis/genesistest.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-test/autotest/testcase/genesis/genesistest.pl b/xCAT-test/autotest/testcase/genesis/genesistest.pl
index 1c3c20fe6..75d88398f 100755
--- a/xCAT-test/autotest/testcase/genesis/genesistest.pl
+++ b/xCAT-test/autotest/testcase/genesis/genesistest.pl
@@ -195,7 +195,7 @@ sub rungenesiscmd {
     }
     `rinstall $noderange "runcmd=cmdtest,shell"`;
     if ($?) {
-      send_msg(0, "nodeset noderange shell failed for runcmd test");
+      send_msg(0, "rinstall noderange shell failed for runcmd test");
     }
     return $value;
 }

From 3f43f44c7e44428b10ef071b9637f3558dc66bd9 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Tue, 20 Jun 2017 15:58:16 -0400
Subject: [PATCH 034/283] Update code to print a warning message if we get a
 response error. Currently there is nothing printed back so we can't tell if
 an error has occurred.  Allow for some debug output if XCATBYPASS=1

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

diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
index 9fe214b77..f1fb34b32 100644
--- a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
@@ -46,6 +46,7 @@ my $bmc_user;
 my $bmc_pass;
 my $openbmc_user;
 my $openbmc_pass;
+my $openbmc_port = 2200;
 
 #-------------------------------------------------------
 
@@ -584,9 +585,9 @@ sub scan_process {
                 # Set child process default, if not the function runcmd may return error
                 $SIG{CHLD} = 'DEFAULT';
 
-                my $nmap_cmd = "nmap ${$live_ip}[$i] -p 2200 -Pn";
+                my $nmap_cmd = "nmap ${$live_ip}[$i] -p $openbmc_port -Pn";
                 my $nmap_output = xCAT::Utils->runcmd($nmap_cmd, -1);
-                if ($nmap_output =~ /2200\/tcp (\w+)/) {
+                if ($nmap_output =~ /$openbmc_port\/tcp (\w+)/) {
                     my $port_stat = $1;
                     if ($port_stat eq "open") {
                         bmcdiscovery_openbmc(${$live_ip}[$i], $opz, $opw, $request_command);
@@ -1048,6 +1049,7 @@ sub bmcdiscovery_openbmc{
     my $request_command = shift;
     my $node            = sprintf("node-%08x", unpack("N*", inet_aton($ip)));
 
+    print "$ip: Detected openbmc, attempting to obtain system information...\n";
     my $http_protocol="https";
     my $openbmc_project_url = "xyz/openbmc_project";
     my $login_endpoint = "login";
@@ -1068,7 +1070,10 @@ sub bmcdiscovery_openbmc{
         $url = "$http_protocol://$ip/$openbmc_project_url/$system_endpoint";
         my $req = HTTP::Request->new('GET', $url, $header);
         my $req_output = $brower->request($req);
-        return if ($req_output->is_error); 
+        if ($req_output->is_error) {
+            xCAT::MsgUtils->message("W", { data => ["$ip: Could not obtain system information from BMC. Verify firmware levels are up-to-date."] }, $::CALLBACK);
+            return;
+        }
         my $response = decode_json $req_output->content;
         my $mtm;
         my $serial;

From 0ab98f9273c0095d5a16c2d001192155824be47d Mon Sep 17 00:00:00 2001
From: zet809 <ertaozh@cn.ibm.com>
Date: Wed, 21 Jun 2017 10:24:05 +0800
Subject: [PATCH 035/283] To replace pull request 3061: use rpm inside chroot
 to query dracut version (#3293)

---
 xCAT-server/share/xcat/netboot/sles/genimage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage
index 84897d2ed..f3e80aaa8 100755
--- a/xCAT-server/share/xcat/netboot/sles/genimage
+++ b/xCAT-server/share/xcat/netboot/sles/genimage
@@ -615,7 +615,7 @@ if ((-d "$rootimg_dir/usr/share/dracut") or (-d "$rootimg_dir/usr/lib/dracut"))
     $dracutmode = 1;
 
     # get dracut version
-    $dracutver = `rpm --root $rootimg_dir -qi dracut | grep Version | awk -F' ' '{print \$3}'     `;
+    $dracutver = `chroot $rootimg_dir rpm -qi dracut | awk '/Version/{print $3}'     `;
     chomp($dracutver);
     if ($dracutver =~ /^\d\d\d$/) {
         if ($dracutver >= "033") {

From d038c61851d675ce20591470220ccb372d9a1b46 Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Wed, 21 Jun 2017 05:02:53 -0400
Subject: [PATCH 036/283] Refine test case: nodeset_cmdline, nodeset_runimage,
 nodeset_shell

---
 xCAT-test/autotest/testcase/genesis/genesistest.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xCAT-test/autotest/testcase/genesis/genesistest.pl b/xCAT-test/autotest/testcase/genesis/genesistest.pl
index 75d88398f..f7b376049 100755
--- a/xCAT-test/autotest/testcase/genesis/genesistest.pl
+++ b/xCAT-test/autotest/testcase/genesis/genesistest.pl
@@ -77,6 +77,7 @@ if ($check_genesis_file) {
 }
 my $master=`lsdef -t site -i master -c  2>&1 | awk -F'=' '{print \$2}'`;
 if (!$master) { $master=hostname(); }
+chomp($master);
 print "master is $master\n"; 
 
 ####################################
@@ -260,7 +261,7 @@ sub testxdsh {
         `xdsh $noderange -t 2 cat $checkfile 2>&1|grep $checkstring `;
         if ($?) {
             foreach (1 .. 10) {
-                `sleep 300`;
+                sleep 300;
                 send_msg(1,"try to run xdsh to check the results again");
                 `xdsh $noderange -t 2 cat $checkfile 2>&1| grep $checkstring `;
                 last if ($? == 0);

From 5f1a506cfbf497c425f5d452d4aad180d23c4169 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Wed, 21 Jun 2017 02:00:28 -0400
Subject: [PATCH 037/283] update rspconfig cases in bundle file
 hdctrl_openpower_openbmc.bundle

---
 xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
index a271c5b6a..42e3d05a2 100644
--- a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
@@ -19,3 +19,11 @@ rsetboot_node_invalidnode
 rsetboot_noderange_net
 rsetboot_node_invalidaction
 rsetboot_group_net
+rspconfig_ip
+rspconfig_ip_invalid
+rspconfig_ip_null
+rspconfig_netmask
+rspconfig_netmask_invalid
+rspconfig_gateway
+rspconfig_gateway_invalid
+rspconfig_node_invalid

From e5dd79d55eb169e79f455a75200ee20dcdd0aaf5 Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Wed, 21 Jun 2017 14:56:38 +0800
Subject: [PATCH 038/283] add nodeset_errorcommand testcase for issue :3175
 (#3300)

---
 xCAT-test/autotest/testcase/nodeset/cases0 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/xCAT-test/autotest/testcase/nodeset/cases0 b/xCAT-test/autotest/testcase/nodeset/cases0
index 6972152d3..d43f6ae66 100644
--- a/xCAT-test/autotest/testcase/nodeset/cases0
+++ b/xCAT-test/autotest/testcase/nodeset/cases0
@@ -196,4 +196,11 @@ cmd:noderm testnode1
 cmd:rmdef -t osimage -o "__GETNODEATTR($$CN,os)__-x86_64-install-compute"
 cmd:cp -f /etc/hosts.xcattestbak /etc/hosts
 end
-
+start:nodeset_errorcommand
+description:This testcase is to very nodeset osimage errorcommand could give right output
+Attribute: $$CN-The operation object of nodeset command
+cmd:nodeset $$CN osimage= __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
+check:rc==1
+check:output=~Error: Invalid argument:
+check:output=~Usage: nodeset <noderange>
+end

From 17faabe04e6a9264dfaf9f911cd358044bd49977 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Wed, 21 Jun 2017 03:57:51 -0400
Subject: [PATCH 039/283] fix issue 3289: Changing site table attributes using
 chdef does not return the correct message

---
 perl-xCAT/xCAT/DBobjUtils.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/perl-xCAT/xCAT/DBobjUtils.pm b/perl-xCAT/xCAT/DBobjUtils.pm
index 4faa725b8..880160f42 100755
--- a/perl-xCAT/xCAT/DBobjUtils.pm
+++ b/perl-xCAT/xCAT/DBobjUtils.pm
@@ -780,6 +780,7 @@ sub setobjdefs
 
             $montable->commit;
             $monsettable->commit;
+            $objhash{$objname}{updated} = 1;
             next;
         }    #if ($type eq 'monitoring')
 
@@ -870,6 +871,9 @@ sub setobjdefs
                 }
 
             }
+            unless ($ret) {
+                $objhash{$objname}{updated} = 1;
+            }
 
             $thistable->commit;
 

From dad84e8820990f32af0bd2dea020a3f8c3f1355b Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Wed, 21 Jun 2017 04:35:47 -0400
Subject: [PATCH 040/283] update confignetwork cases according to comments

---
 .../autotest/testcase/confignetwork/cases0    | 82 +++++++++++--------
 1 file changed, 50 insertions(+), 32 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index 46d93588e..76fbce5f3 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -1,5 +1,5 @@
 start: confignetwork_s_installnic_diskful
-description: this case is to test confignetwork -s could config installnic successfully in diskful provision. 
+description: this case is to test confignetwork -s could configure installnic successfully in diskful provision. 
 cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
 cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN  xcatmaster=$$MN
 check:rc==0
@@ -16,16 +16,12 @@ cmd:makedhcp -n
 check:rc==0
 cmd:makedhcp -a
 check:rc==0
-cmd:sleep 10
+cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
 cmd:copycds $$ISO
 check:rc==0
 cmd:chdef $$CN postscripts="confignetwork -s"
 check:rc==0
-cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
-check:rc==0
-cmd:if [[ "__GETNODEATTR($$CN,mgt)__" = "ipmi" ]]; then rsetboot $$CN net; fi
-check:rc==0
-cmd:if [ "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [ "__GETNODEATTR($$CN,arch)__" = "ppc64" ];then rnetboot $$CN;else rpower $$CN boot;fi else rpower $$CN boot;fi
+cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute 
 check:rc==0
 cmd:sleep 300
 cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 20;((a++));if [ $a -gt 300 ];then break;fi done
@@ -44,7 +40,7 @@ check:rc==0
 end
 
 start:confignetwork_s_installnic_diskless
-description: this case is to test confignetwork -s could config installnic successfully in diskless provision.
+description: this case is to test confignetwork -s could configure installnic successfully in diskless provision.
 cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN  xcatmaster=$$MN
 check:rc==0
 cmd:chdef -t node -o $$CN postbootscripts="confignetwork -s"
@@ -74,7 +70,7 @@ cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-comput
 check:rc==0
 cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
 check:rc==0
-cmd:sleep 900
+cmd:sleep 180 
 cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 60 ];then break;fi done
 cmd:ping $$CN -c 3
 check:rc==0
@@ -86,7 +82,7 @@ cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{pr
 check:rc==0
 check:output=~__GETNODEATTR($$CN,ip)__
 check:output!~dhcp
-cmd:chdef -m -t node $$CN postscripts="confignetwork -s"
+cmd:chdef -m -t node $$CN postbootscripts="confignetwork -s"
 check:rc==0
 cmd:if [ -d $rootimgdir.regbak ]; then mv $rootimgdir.regbak $rootimgdir -f;fi
 end
@@ -126,7 +122,7 @@ cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-comput
 check:rc==0
 cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
 check:rc==0
-cmd:sleep 900
+cmd:sleep 180 
 cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 60 ];then break;fi done
 cmd:ping $$CN -c 3
 check:rc==0
@@ -142,18 +138,23 @@ cmd:secondarynic=`xdsh $$CN ip addr |grep 100.1.0.100|awk -F " " '{print $NF}'`;
 check:rc==0
 check:output=~100.1.0.100
 check:output!~dhcp
-cmd:chdef -m -t node $$CN postscripts="confignetwork -s"
+cmd:chdef -m -t node $$CN postbootscripts="confignetwork -s"
 check:rc==0
 cmd:if [ -d $rootimgdir.regbak ]; then mv $rootimgdir.regbak $rootimgdir -f;fi
+cmd:rmdef -t network -o 100_1_0_0-255_255_0_0
 cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC=
 check:rc==0
 end
 
 start:confignetwork_secondarynic_updatenode
-description: this case is to test confignetwork could config secondarynic successfully with updatenode.
+description: this case is to test confignetwork could configure secondarynic successfully with updatenode.
 cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
 check:rc==0
-cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1501
+cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1496
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
 check:rc==0
@@ -161,20 +162,28 @@ cmd:chdef -t node -o $$CN postscripts="confignetwork"
 check:rc==0
 cmd:updatenode $$CN -P confignetwork
 check:rc==0
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
-check:output=~MTU=1501
+check:output=~MTU=1496
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
 check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:xdsh $$CN "rm -rf /tmp/backupnet/"
+check:rc==0
 end
 
 start: confignetwork_secondarynic_nicaliases_updatenode
 description: this case is to test confignetwork could config secondarynic nicaliases successfully with updatenode.
 cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
 check:rc==0
+cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/";else echo "Sorry,this is not supported os"; fi
+check:rc==0
 cmd:cp -f /etc/hosts /etc/hosts.bak
 cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
 check:rc==0
@@ -202,18 +211,26 @@ check:rc==0
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
 check:rc==0
 cmd:mv -f /etc/hosts.bak /etc/hosts
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:xdsh $$CN "rm -rf /tmp/backupnet/"
+check:rc==0
 end
 
 start:confignetwork_secondarynic_nicextraparams_updatenode
-description: this case is to test confignetwork could config secondarynic nicextraparams successfully with updatenode.
+description: this case is to test confignetwork could configure secondarynic nicextraparams successfully with updatenode.
 cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
 check:rc==0
+cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/";else echo "Sorry,this is not supported os"; fi
+check:rc==0
 cmd:cp -f /etc/hosts /etc/hosts.bak
 cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
 check:rc==0
 cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
 check:rc==0
-cmd:chdef $$CN nicips.$$SECONDNIC="11.1.0.100|12.1.0.100" nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0" nichostnamesuffixes.$$SECONDNIC="-$$SECONDNIC-1|-$$SECONDNIC-2"
+cmd:chdef $$CN nicips.$$SECONDNIC="11.1.0.100|12.1.0.100" nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0" nichostnamesuffixes.$$SECONDNIC="-$$SECONDNIC-1|-$$SECONDNIC-2" nicextraparams.$$SECONDNIC="CONNECTED_MODE=yes"
 check:rc==0
 cmd:makehosts $$CN
 check:rc==0
@@ -227,6 +244,7 @@ check:output=~11.1.0.100
 check:output!~dhcp
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
 check:output=~12.1.0.100
+check:output=~CONNECTED_MODE=yes
 check:output!~dhcp
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
@@ -235,6 +253,10 @@ check:rc==0
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
 check:rc==0
 cmd:mv -f /etc/hosts.bak /etc/hosts
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:xdsh $$CN "rm -rf /tmp/backupnet/"
+check:rc==0
 end
 
 start:confignetwork_secondarynic_nicnetworks_updatenode_false
@@ -312,8 +334,6 @@ cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 check:rc==0
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
 check:rc==0
-cmd:chtab node=$$CN nics.disable=0
-check:rc==0
 end
 
 start:confignetwork_disable_set_to_1
@@ -336,8 +356,6 @@ cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 check:rc==0
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
 check:rc==0
-cmd:chtab node=$$CN nics.disable=0
-check:rc==0
 end
 
 start:confignetwork_niccustomscripts
@@ -350,7 +368,7 @@ cmd:chmod a+x /tmp/script1
 check:rc==0
 cmd:cp /tmp/script1 /install/postscripts
 check:rc==0
-cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mut=1501
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mut=1496
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0 niccustomscripts.$$SECONDNIC=script1
 check:rc==0
@@ -360,7 +378,7 @@ cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
-check:output=~MTU=1501
+check:output=~MTU=1496
 check:output!~dhcp
 cmd:xdsh $$CN "cat /tmp/confignetwork_niccustomscript"
 check:rc==0
@@ -378,6 +396,10 @@ start:confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 description:this case is to verify if confignetwork could config serveral nics' multiple value at the same time.
 cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
 check:rc==0
+cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/";else echo "Sorry,this is not supported os"; fi
+check:rc==0
 cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
 check:rc==0
 cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
@@ -426,6 +448,10 @@ check:rc==0
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
 check:rc==0
 cmd:mv -f /etc/hosts.bak /etc/hosts
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:xdsh $$CN "rm -rf /tmp/backupnet/"
+check:rc==0
 end
 
 start:confignetwork_help
@@ -436,11 +462,3 @@ check:rc==0
 cmd:confignetworks --help
 check:rc==0
 #TODO help information is printed
-end
-
-
-
-
-
-
-

From 1531f136c83c34a0a97c5bdcb6bfd8cc85f7105b Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Wed, 21 Jun 2017 05:36:44 -0400
Subject: [PATCH 041/283] update confignetwork cases according to comments

---
 xCAT-test/autotest/testcase/confignetwork/cases0 | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index 76fbce5f3..1b36ff610 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -158,8 +158,6 @@ cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
 check:rc==0
-cmd:chdef -t node -o $$CN postscripts="confignetwork"
-check:rc==0
 cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
@@ -267,8 +265,6 @@ cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=
 check:rc==0
-cmd:chdef -t node -o $$CN postscripts="confignetwork"
-check:rc==0
 cmd:updatenode $$CN -P confignetwork
 check:rc!=0
 #TODO check the error message
@@ -285,8 +281,6 @@ cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
 check:rc==0
-cmd:chdef -t node -o $$CN postscripts="confignetwork"
-check:rc==0
 cmd:updatenode $$CN -P confignetwork
 check:rc!=0
 #TODO check the error message
@@ -303,8 +297,6 @@ cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
 check:rc==0
-cmd:chdef -t node -o $$CN postscripts="confignetwork"
-check:rc==0
 cmd:updatenode $$CN -P confignetwork
 check:rc!=0
 #TODO check the error message
@@ -324,8 +316,6 @@ cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicne
 check:rc==0
 cmd:chtab node=$$CN nics.disable=yes
 check:rc==0
-cmd:chdef -t node -o $$CN postscripts="confignetwork"
-check:rc==0
 cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
@@ -346,8 +336,6 @@ cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicne
 check:rc==0
 cmd:chtab node=$$CN nics.disable=1
 check:rc==0
-cmd:chdef -t node -o $$CN postscripts="confignetwork"
-check:rc==0
 cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
@@ -372,8 +360,6 @@ cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0 niccustomscripts.$$SECONDNIC=script1
 check:rc==0
-cmd:chdef -t node -o $$CN postscripts=confignetwork 
-check:rc==0
 cmd:updatenode $$CN -P confignetwork 
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
@@ -421,8 +407,6 @@ check:output=~$$CN-$$SECONDNIC-1
 check:output=~$$CN-$$SECONDNIC-2
 check:output=~$$CN-$$THIRDNIC-1
 check:output=~$$CN-$$THIRDNIC-2
-cmd:chdef -t node -o $$CN postscripts="confignetwork"
-check:rc==0
 cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi

From b8c402c86a23ce0203bcc8da8712f89ebd4eb305 Mon Sep 17 00:00:00 2001
From: yangsong <immarvin@users.noreply.github.com>
Date: Wed, 21 Jun 2017 04:45:23 -0500
Subject: [PATCH 042/283] Revert "add GPGSIGN =0 option to skip repo sign in
 ubuntu build script" (#3303)

---
 build-ubunturepo | 40 ++++++++++++----------------------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/build-ubunturepo b/build-ubunturepo
index 42625d895..6e01caab8 100755
--- a/build-ubunturepo
+++ b/build-ubunturepo
@@ -22,8 +22,6 @@
 #                           When you are ready to release this build, use PROMOTE=1 without PREGA
 #               BUILDALL=1 - build all rpms, whether they changed or not.  Should be used for snap builds that are in
 #                            prep for a release.
-#               GPGSIGN=0 -  Do not sign the repo in the end of the build. The repo will be signed by default 
-#                            
 #               LOG=<filename> - provide an LOG file option to redirect some output into log file
 #
 # For the dependency packages 1. All the xcat dependency deb packages should be uploaded to
@@ -127,20 +125,16 @@ if [ ! -z ${LOG} ]; then
     WGET_CMD="wget -o ${LOG}"
 fi
 
-if [ "$GPGSIGN" = "0" ];then
-    echo "GPGSIGN=$GPGSIGN specified, skip gnupg key downloading"
-else
-    #sync the gpg key to the build machine local
-    gsa_url=http://pokgsa.ibm.com/projects/x/xcat/build/linux
-    mkdir -p $HOME/.gnupg
-    for key_name in pubring.gpg secring.gpg trustdb.gpg; do
-        if [ ! -f $HOME/.gnupg/$key_name ] || [ `wc -c $HOME/.gnupg/$key_name|cut -f 1 -d' '` == 0 ]; then
-            rm -f $HOME/.gnupg/$key_name
-            ${WGET_CMD} -P $HOME/.gnupg $gsa_url/keys/$key_name
-            chmod 600 $HOME/.gnupg/$key_name
-        fi
-    done
-fi
+#sync the gpg key to the build machine local
+gsa_url=http://pokgsa.ibm.com/projects/x/xcat/build/linux
+mkdir -p $HOME/.gnupg
+for key_name in pubring.gpg secring.gpg trustdb.gpg; do
+    if [ ! -f $HOME/.gnupg/$key_name ] || [ `wc -c $HOME/.gnupg/$key_name|cut -f 1 -d' '` == 0 ]; then
+        rm -f $HOME/.gnupg/$key_name
+        ${WGET_CMD} -P $HOME/.gnupg $gsa_url/keys/$key_name
+        chmod 600 $HOME/.gnupg/$key_name
+    fi
+done
 
 if [ "$c_flag" ]
 then
@@ -329,14 +323,9 @@ Codename: $dist
 Architectures: $tmp_out_arch
 Components: main
 Description: Repository automatically genereted conf
+SignWith: yes
 
 __EOF__
-
-       if [ "$GPGSIGN" = "0" ];then
-           echo "GPGSIGN=$GPGSIGN specified, the repo will not be signed"
-       else 
-           echo "SignWith: yes" >> conf/distributions
-       fi
      done
 
     cat << __EOF__ > conf/options
@@ -455,16 +444,11 @@ Codename: $dist
 Architectures: $tmp_out_arch
 Components: main
 Description: Repository automatically genereted conf
+SignWith: yes
 
 __EOF__
     done
 
-    if [ "$GPGSIGN" = "0" ];then
-        echo "GPGSIGN=$GPGSIGN specified, the repo will not be signed"
-    else
-        echo "SignWith: yes" >> conf/distributions
-    fi
-
     cat << __EOF__ > conf/options
 verbose
 ask-passphrase

From 3c75e9cfae2ce5f868593743fa5079943f0893e1 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Wed, 21 Jun 2017 13:23:54 -0400
Subject: [PATCH 043/283] Fix man page and usage for MPA rinv command

---
 .../admin-guides/references/man1/rinv.1.rst   | 19 +++++++++----------
 perl-xCAT/xCAT/Usage.pm                       |  6 ++----
 xCAT-client/pods/man1/rinv.1.pod              | 16 +++++++---------
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man1/rinv.1.rst b/docs/source/guides/admin-guides/references/man1/rinv.1.rst
index f7202fae2..214b06e13 100644
--- a/docs/source/guides/admin-guides/references/man1/rinv.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rinv.1.rst
@@ -25,7 +25,7 @@ BMC/MPA specific:
 =================
 
 
-\ **rinv**\  \ *noderange*\  {\ **pci | model | serial | asset | vpd | mprom | deviceid | guid | firm | diag | dimm | bios | mparom | mac | all**\ }
+\ **rinv**\  \ *noderange*\  [\ **model | serial | asset | vpd | deviceid | guid | firm | dimm | mprom | all**\ ]
 
 
 OpenPOWER (IPMI) server specific:
@@ -126,12 +126,6 @@ Calling \ **rinv**\  for VMware will display the UUID/GUID, number of CPUs, amou
 
 
 
-\ **pci**\ 
- 
- Retrieves PCI bus information.
- 
-
-
 \ **bus**\ 
  
  List all buses for each I/O slot.
@@ -140,8 +134,7 @@ Calling \ **rinv**\  for VMware will display the UUID/GUID, number of CPUs, amou
 
 \ **config**\ 
  
- Retrieves number of processors, speed, total memory, and DIMM
- locations.
+ Retrieves number of processors, speed, total memory, and DIMM locations.
  
 
 
@@ -177,7 +170,7 @@ Calling \ **rinv**\  for VMware will display the UUID/GUID, number of CPUs, amou
 
 \ **asset**\ 
  
- Retrieves asset tag.  Usually it's the MAC address of eth0.
+ Retrieves asset tag. Usually it's the MAC address of eth0.
  
 
 
@@ -199,6 +192,12 @@ Calling \ **rinv**\  for VMware will display the UUID/GUID, number of CPUs, amou
  
 
 
+\ **dimm**\ 
+ 
+ Retrieves dual in-line memory module information.
+ 
+
+
 \ **deviceid**\ 
  
  Retrieves device identification. Usually device, manufacturing and product IDs.
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index a2c1c5864..b733daca9 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -95,14 +95,12 @@ my %usage = (
     Common:
        rinv <noderange> [all|model|serial] [-V|--verbose]
        rinv [-h|--help|-v|--version]
-    BMC specific:
-       rinv <noderange> [mprom|deviceid|uuid|guid|vpd|dimm|all]
+    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 <noderange> [model|serial|firm|cpu|dimm|all]
-    MPA specific:
-       rinv <noderange> [firm|bios|diag|mprom|sprom|mparom|mac|mtm] 
     PPC specific(with HMC):
        rinv <noderange> [all|bus|config|serial|model|firm]
     PPC specific(using Direct FSP Management):
diff --git a/xCAT-client/pods/man1/rinv.1.pod b/xCAT-client/pods/man1/rinv.1.pod
index e6fda9914..090194df1 100644
--- a/xCAT-client/pods/man1/rinv.1.pod
+++ b/xCAT-client/pods/man1/rinv.1.pod
@@ -8,7 +8,7 @@ B<rinv> [B<-h>|B<--help>|B<-v>|B<--version>]
 
 =head2 BMC/MPA specific:
 
-B<rinv> I<noderange> {B<pci>|B<model>|B<serial>|B<asset>|B<vpd>|B<mprom>|B<deviceid>|B<guid>|B<firm>|B<diag>|B<dimm>|B<bios>|B<mparom>|B<mac>|B<all>}
+B<rinv> I<noderange> [B<model>|B<serial>|B<asset>|B<vpd>|B<deviceid>|B<guid>|B<firm>|B<dimm>|B<mprom>|B<all>]
 
 =head2 OpenPOWER (IPMI) server specific:
   
@@ -40,7 +40,6 @@ B<rinv> I<noderange> [B<-t>]
 
 B<rinv> I<noderange> 
 
-
 =head2 zVM specific:
 
 B<rinv> I<noderange> [B<config>|B<all>]
@@ -78,18 +77,13 @@ Calling B<rinv> for VMware will display the UUID/GUID, number of CPUs, amount of
 
 =over 7
 
-=item B<pci>
-
-Retrieves PCI bus information.
-
 =item B<bus>
 
 List all buses for each I/O slot.
 
 =item B<config>
 
-Retrieves number of processors, speed, total memory, and DIMM
-locations.
+Retrieves number of processors, speed, total memory, and DIMM locations.
 
 =item B<model>
 
@@ -113,7 +107,7 @@ To output the raw information of deconfigured resources for CEC.
 
 =item B<asset>
 
-Retrieves asset tag.  Usually it's the MAC address of eth0.
+Retrieves asset tag. Usually it's the MAC address of eth0.
 
 =item B<vpd>
 
@@ -127,6 +121,10 @@ Diagnostics information of firmware.
 
 Retrieves mprom firmware level.
 
+=item B<dimm>
+
+Retrieves dual in-line memory module information.
+
 =item B<deviceid>
 
 Retrieves device identification. Usually device, manufacturing and product IDs. 

From aaa62e33337957f5fbef9e13b479b5c52fd69015 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Wed, 21 Jun 2017 22:26:48 -0400
Subject: [PATCH 044/283] Modified judging condition of openbmc in bmcdiscover,
 if not open enter bmcdiscover_ipmi

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

diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
index f1fb34b32..9cd5b02b7 100644
--- a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
@@ -587,18 +587,10 @@ sub scan_process {
 
                 my $nmap_cmd = "nmap ${$live_ip}[$i] -p $openbmc_port -Pn";
                 my $nmap_output = xCAT::Utils->runcmd($nmap_cmd, -1);
-                if ($nmap_output =~ /$openbmc_port\/tcp (\w+)/) {
-                    my $port_stat = $1;
-                    if ($port_stat eq "open") {
-                        bmcdiscovery_openbmc(${$live_ip}[$i], $opz, $opw, $request_command);
-                    } else {
-                        bmcdiscovery_ipmi(${$live_ip}[$i], $opz, $opw, $request_command);
-                    }
+                if ($nmap_output =~ /$openbmc_port(.+)open/) {
+                    bmcdiscovery_openbmc(${$live_ip}[$i], $opz, $opw, $request_command);
                 } else {
-                    my $rsp = {};
-                    push @{ $rsp->{data} }, "Can not get status of 2200 port for ip ${$live_ip}[$i].\n";
-                    xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
-                    exit 1;
+                    bmcdiscovery_ipmi(${$live_ip}[$i], $opz, $opw, $request_command);
                 }
 
                 exit 0;

From 0624deb5471245b90241dc28a7e6ce133f4be6a2 Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Wed, 21 Jun 2017 22:52:01 -0400
Subject: [PATCH 045/283] correct typo in PR#3293

---
 xCAT-server/share/xcat/netboot/sles/genimage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage
index f3e80aaa8..0f914415e 100755
--- a/xCAT-server/share/xcat/netboot/sles/genimage
+++ b/xCAT-server/share/xcat/netboot/sles/genimage
@@ -615,7 +615,7 @@ if ((-d "$rootimg_dir/usr/share/dracut") or (-d "$rootimg_dir/usr/lib/dracut"))
     $dracutmode = 1;
 
     # get dracut version
-    $dracutver = `chroot $rootimg_dir rpm -qi dracut | awk '/Version/{print $3}'     `;
+    $dracutver = `chroot $rootimg_dir rpm -qi dracut | awk '/Version/{print \$3}'     `;
     chomp($dracutver);
     if ($dracutver =~ /^\d\d\d$/) {
         if ($dracutver >= "033") {

From d97db29102fd893986f6ec9cbfa96124a10b161e Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Wed, 21 Jun 2017 22:59:38 -0400
Subject: [PATCH 046/283] Add a case
 confignetwork_s_installnic_secondarynic_updatenode

---
 xCAT-test/autotest/testcase/confignetwork/cases0 | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index 1b36ff610..cf7a707a3 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -362,20 +362,15 @@ cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicne
 check:rc==0
 cmd:updatenode $$CN -P confignetwork 
 check:rc==0
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
-check:output=~11.1.0.100
-check:output=~MTU=1496
-check:output!~dhcp
 cmd:xdsh $$CN "cat /tmp/confignetwork_niccustomscript"
 check:rc==0
 check:output=~hello
 cmd:xdsh $$CN "rm -rf /tmp/confignetwork_niccustomscript"
 check:rc==0
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
-check:rc==0
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
 check:rc==0
+cmd:rm -rf /tmp/script1 /install/postscripts/script1
 end
 
 start:confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
@@ -440,9 +435,9 @@ end
 
 start:confignetwork_help
 description:this case is to verify if help information is provided
-cmd:confignetworks -h
+cmd:confignetwork -h
 check:rc==0
 #TODO help information is printed
-cmd:confignetworks --help
+cmd:confignetwork --help
 check:rc==0
 #TODO help information is printed

From dde6ccdde89a472422e38720ac6d77d7fc223ed1 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Wed, 21 Jun 2017 23:02:58 -0400
Subject: [PATCH 047/283] update according to comments

---
 .../autotest/testcase/confignetwork/cases0    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index cf7a707a3..dcdf442f3 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -146,6 +146,38 @@ cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC
 check:rc==0
 end
 
+start:confignetwork_s_installnic_secondarynic_updatenode
+description: this case is to test confignetwork -s could configure installnic and secondarynic successfully with updatenode.
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/;cp -f /etc/network/interfaces /tmp";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1496
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
+check:rc==0
+cmd:updatenode $$CN -P "confignetwork -s"
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:output=~11.1.0.100
+check:output=~MTU=1496
+cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+check:output=~__GETNODEATTR($$CN,ip)__
+check:output!~dhcp
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/;cp -f /tmp/interfaces /etc/network/";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:xdsh $$CN "rm -rf /tmp/backupnet/ /tmp/interfaces"
+check:rc==0
+end
+
 start:confignetwork_secondarynic_updatenode
 description: this case is to test confignetwork could configure secondarynic successfully with updatenode.
 cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi

From b7236100397863768e42216bfdad38360487e820 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Thu, 22 Jun 2017 14:03:48 +0800
Subject: [PATCH 048/283] Add test cases for command nodeset for
 grub2/petitboot/yaboot (#3155)

* Add test cases for command nodeset for grub2/petitboot/yaboot

* Revise nodeset test cases and add more negative verifications

* Revise nodeset test cases by add more verifications with makedhcp and getent

* Temporary remove all dhcp lease checking from nodeset test cases, since it is rely on DNS service

* Minor tweaks while doing unit tests
---
 xCAT-test/autotest/testcase/nodeset/cases0 | 167 +++++++++++++++++++--
 1 file changed, 155 insertions(+), 12 deletions(-)

diff --git a/xCAT-test/autotest/testcase/nodeset/cases0 b/xCAT-test/autotest/testcase/nodeset/cases0
index d43f6ae66..84546a788 100644
--- a/xCAT-test/autotest/testcase/nodeset/cases0
+++ b/xCAT-test/autotest/testcase/nodeset/cases0
@@ -27,7 +27,6 @@ cmd:rmdef -t osimage -o "rhels7.5-ppc64-install-compute"
 cmd:noderm testnode1
 end
 
-
 start:nodeset_check_yaboot_yes
 os:rhels
 cmd:mkdef -t node -o testnode1 arch=ppc64 cons=hmc groups=lpar hcp=hmc1 hwtype=lpar  id=1 ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=hmc monserver=10.1.1.1 nameservers=10.1.1.1 nodetype=ppc,osi parent=fsp1 pprofile=testnode1 profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1
@@ -173,29 +172,173 @@ check:output=~Warning: testnode1: petitboot might be invalid|testnode1 could not
 cmd:noderm testnode1
 end
 
-start:nodeset_addkcmdline
-description: This case is to verify when netboot=xnba, addkcmdline is correctly supported. 
-cmd:mkdef -t node -o testnode1 arch=x86_64 cons=kvm groups=kvm ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=kvm monserver=10.1.1.1 nameservers=10.1.1.1 profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1
-os=__GETNODEATTR($$CN,os)__ 
+start:nodeset_xnba
+description: Verify when xnba is used for OS loader, whether the configuration files under /tftpboot can be generated corrently
+cmd:rmdef testnode1
+cmd:rm -f /tftpboot/xcat/xnba/nodes/testnode1 /tftpboot/xcat/xnba/nodes/testnode1.elilo
+cmd:mkdef -t node -o testnode1 arch=x86_64 cons=kvm groups=kvm ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=kvm profile=compute os=rhels6.99
+check:rc==0
+cmd:cp -f /etc/hosts /etc/hosts.xcattestbak
+cmd:echo "10.1.1.200 testnode1" >> /etc/hosts
+check:rc==0
+cmd:chdef testnode1 netboot=xnba addkcmdline=debug
+check:rc==0
+cmd:mkdef "rhels6.99-x86_64-install-compute" -u profile=compute provmethod=install osvers=rhels6.99 osarch=x86_64
+cmd:mkdir -p /install/rhels6.99/x86_64/images/pxeboot
+cmd:echo blah >/install/rhels6.99/x86_64/images/pxeboot/vmlinuz
+cmd:echo blah >/install/rhels6.99/x86_64/images/pxeboot/initrd.img
+cmd:nodeset testnode1 osimage=rhels6.99-x86_64-install-compute
+check:rc==0
+cmd:grep "debug" /tftpboot/xcat/xnba/nodes/testnode1
+check:rc==0
+cmd:grep "debug" /tftpboot/xcat/xnba/nodes/testnode1.elilo
+check:rc==0
+#cmd:makedhcp -q testnode1 | grep ^testnode1:
+#check:rc==0
+cmd:nodeset testnode1 offline
+check:rc==0
+cmd:grep "debug" /tftpboot/xcat/xnba/nodes/testnode1
+check:rc!=0
+#cmd:makedhcp -q testnode1 | grep ^testnode1:
+#check:rc!=0
+cmd:chdef -t node -o testnode1 ip=
+check:rc==0
+cmd:cp -f /etc/hosts.xcattestbak /etc/hosts
+cmd:getent hosts testnode1 | grep testnode1
+check:rc!=0
+cmd:nodeset testnode1 osimage=rhels6.99-x86_64-install-compute
+check:rc!=0
+cmd:noderm testnode1
+cmd:rmdef -t osimage -o "rhels6.99-x86_64-install-compute"
+cmd:rm -rf /install/rhels6.99
+end
+
+start:nodeset_grub2
+description: Verify when grub2 is used for OS loader, whether the configuration files under /tftpboot can be generated corrently
+cmd:rmdef testnode1
+cmd:rm -f /tftpboot/boot/grub2/{testnode1,grub.cfg-{01-e6-d4-d2-3a-ad-06,0[aA]0101[cC]8}}
+cmd:mkdef -t node -o testnode1 arch=ppc64 cons=hmc groups=lpar ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=hmc profile=compute os=rhels7.99
 check:rc==0
 cmd:cp -f /etc/hosts /etc/hosts.xcattestbak
 cmd:echo "10.1.1.200 testnode1" >> /etc/hosts
 cmd:makedns -n
 check:rc==0
-cmd:chdef testnode1 netboot=xnba addkcmdline=rd.break=pre-pivot
+cmd:chdef testnode1 netboot=grub2 addkcmdline=debug
 check:rc==0
-cmd: mkdef "__GETNODEATTR($$CN,os)__-x86_64-install-compute" -u profile=compute provmethod=install osvers=__GETNODEATTR($$CN,os)__
+cmd:mkdef "rhels7.99-ppc64-install-compute" -u profile=compute provmethod=install osvers=rhels7.99 osarch=ppc64
+cmd:mkdir -p /install/rhels7.99/ppc64/ppc/ppc64
+cmd:echo blah >/install/rhels7.99/ppc64/ppc/ppc64/vmlinuz
+cmd:echo blah >/install/rhels7.99/ppc64/ppc/ppc64/initrd.img
+cmd:nodeset testnode1 osimage=rhels7.99-ppc64-install-compute
 check:rc==0
-cmd:nodeset testnode1 osimage=__GETNODEATTR($$CN,os)__-x86_64-install-compute
+cmd:grep "debug" /tftpboot/boot/grub2/testnode1
 check:rc==0
-cmd:grep "rd.break=pre-pivot" /tftpboot/xcat/xnba/nodes/testnode1
+cmd:grep "debug" /tftpboot/boot/grub2/grub.cfg-01-e6-d4-d2-3a-ad-06
 check:rc==0
-cmd:grep "rd.break=pre-pivot" /tftpboot/xcat/xnba/nodes/testnode1.elilo
+cmd:grep "debug" /tftpboot/boot/grub2/grub.cfg-0[aA]0101[cC]8
+check:rc==0
+#cmd:makedhcp -q testnode1 | grep ^testnode1:
+#check:rc==0
+cmd:nodeset testnode1 offline
+check:rc==0
+cmd:grep "debug" /tftpboot/boot/grub2/testnode1
+check:rc!=0
+#cmd:makedhcp -q testnode1 | grep ^testnode1:
+#check:rc!=0
+cmd:chdef -t node -o testnode1 ip=
 check:rc==0
-cmd:noderm testnode1
-cmd:rmdef -t osimage -o "__GETNODEATTR($$CN,os)__-x86_64-install-compute"
 cmd:cp -f /etc/hosts.xcattestbak /etc/hosts
+cmd:getent hosts testnode1 | grep testnode1
+check:rc!=0
+cmd:nodeset testnode1 osimage=rhels7.99-ppc64-install-compute
+check:rc!=0
+cmd:noderm testnode1
+cmd:rmdef -t osimage -o "rhels7.99-ppc64-install-compute"
+cmd:rm -rf /install/rhels7.99
 end
+
+start:nodeset_petitboot
+description: Verify when petitboot is used for OS loader, whether the configuration files under /tftpboot can be generated corrently
+cmd:rmdef testnode1
+cmd:rm -f /tftpboot/petitboot/testnode1
+cmd:mkdef -t node -o testnode1 arch=ppc64le cons=bmc groups=ipmi ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=ipmi profile=compute os=rhels7.99
+check:rc==0
+cmd:cp -f /etc/hosts /etc/hosts.xcattestbak
+cmd:echo "10.1.1.200 testnode1" >> /etc/hosts
+cmd:makedns -n
+check:rc==0
+cmd:chdef testnode1 netboot=petitboot addkcmdline=debug
+check:rc==0
+cmd:mkdef "rhels7.99-ppc64le-install-compute" -u profile=compute provmethod=install osvers=rhels7.99 osarch=ppc64le
+cmd:mkdir -p /install/rhels7.99/ppc64le
+cmd:mkdir -p /install/rhels7.99/ppc64le/ppc/ppc64le
+cmd:echo blah >/install/rhels7.99/ppc64le/ppc/ppc64le/vmlinuz
+cmd:echo blah >/install/rhels7.99/ppc64le/ppc/ppc64le/initrd.img
+cmd:nodeset testnode1 osimage=rhels7.99-ppc64le-install-compute
+check:rc==0
+cmd:grep "debug" /tftpboot/petitboot/testnode1
+check:rc==0
+#cmd:makedhcp -q testnode1 | grep ^testnode1:
+#check:rc==0
+cmd:nodeset testnode1 offline
+check:rc==0
+cmd:grep "debug" /tftpboot/petitboot/testnode1
+check:rc!=0
+#cmd:makedhcp -q testnode1 | grep ^testnode1:
+#check:rc!=0
+cmd:chdef -t node -o testnode1 ip=
+check:rc==0
+cmd:cp -f /etc/hosts.xcattestbak /etc/hosts
+cmd:getent hosts testnode1 | grep testnode1
+check:rc!=0
+cmd:nodeset testnode1 osimage=rhels7.99-ppc64le-install-compute
+check:rc!=0
+cmd:noderm testnode1
+cmd:rmdef -t osimage -o "rhels7.99-ppc64le-install-compute"
+cmd:rm -rf /install/rhels7.99
+end
+
+start:nodeset_yaboot
+description: Verify when yaboot is used for OS loader, whether the configuration files under /tftpboot can be generated corrently
+cmd:rmdef testnode1
+cmd:rm -f /tftpboot/yaboot.conf-e6-d4-d2-3a-ad-06
+cmd:mkdef -t node -o testnode1 arch=ppc64 cons=hmc groups=lpar ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=hmc profile=compute os=rhels6.99
+check:rc==0
+cmd:cp -f /etc/hosts /etc/hosts.xcattestbak
+cmd:echo "10.1.1.200 testnode1" >> /etc/hosts
+cmd:makedns -n
+check:rc==0
+cmd:chdef testnode1 netboot=yaboot addkcmdline=debug
+check:rc==0
+cmd:mkdef "rhels6.99-ppc64-install-compute" -u profile=compute provmethod=install osvers=rhels6.99 osarch=ppc64
+cmd:mkdir -p /install/rhels6.99/ppc64/ppc/{chrp,ppc64}
+cmd:echo blah >/install/rhels6.99/ppc64/ppc/ppc64/vmlinuz
+cmd:echo blah >/install/rhels6.99/ppc64/ppc/ppc64/initrd.img
+cmd:echo blah >/install/rhels6.99/ppc64/ppc/chrp/yaboot
+cmd:nodeset testnode1 osimage=rhels6.99-ppc64-install-compute
+check:rc==0
+cmd:grep "debug" /tftpboot/yaboot.conf-e6-d4-d2-3a-ad-06
+check:rc==0
+#cmd:makedhcp -q testnode1 | grep ^testnode1:
+#check:rc==0
+cmd:nodeset testnode1 offline
+check:rc==0
+cmd:grep "debug" /tftpboot/yaboot.conf-e6-d4-d2-3a-ad-06
+check:rc!=0
+#cmd:makedhcp -q testnode1 | grep ^testnode1:
+#check:rc!=0
+cmd:chdef -t node -o testnode1 ip=
+check:rc==0
+cmd:cp -f /etc/hosts.xcattestbak /etc/hosts
+cmd:getent hosts testnode1 | grep testnode1
+check:rc!=0
+cmd:nodeset testnode1 osimage=rhels6.99-ppc64-install-compute
+check:rc!=0
+cmd:noderm testnode1
+cmd:rmdef -t osimage -o "rhels6.99-ppc64-install-compute"
+cmd:rm -rf /install/rhels6.99
+end
+
 start:nodeset_errorcommand
 description:This testcase is to very nodeset osimage errorcommand could give right output
 Attribute: $$CN-The operation object of nodeset command

From 9f09aacb534ec83215ced7e125570e5a203ba286 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Thu, 22 Jun 2017 02:25:33 -0400
Subject: [PATCH 049/283] update installnic files location and MTU

---
 xCAT-test/autotest/testcase/confignetwork/cases0 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index dcdf442f3..a1ce6239c 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -31,7 +31,7 @@ check:output=~64 bytes from $$CN
 cmd:lsdef -l $$CN | grep status
 check:rc==0
 check:output=~booted
-cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/network/interfaces.d/*";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 check:output=~__GETNODEATTR($$CN,ip)__
 check:output!~dhcp
@@ -78,7 +78,7 @@ check:output=~64 bytes from $$CN
 cmd:lsdef -l $$CN | grep status
 check:rc==0
 check:output=~booted
-cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/network/interfaces.d/*";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 check:output=~__GETNODEATTR($$CN,ip)__
 check:output!~dhcp
@@ -154,7 +154,7 @@ cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/;cp -f /etc/network/interfaces /tmp";else echo "Sorry,this is not supported os"; fi
 check:rc==0
-cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1496
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC 
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
 check:rc==0
@@ -162,7 +162,6 @@ cmd:updatenode $$CN -P "confignetwork -s"
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
-check:output=~MTU=1496
 cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 check:output=~__GETNODEATTR($$CN,ip)__
@@ -194,6 +193,7 @@ cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep MTU /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep MTU /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep MTU /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~MTU=1496
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
@@ -228,10 +228,10 @@ check:output=~aliases1-1
 check:output=~aliases1-2
 cmd:updatenode $$CN -P confignetwork 
 check:rc==0
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/*";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
 check:output!~dhcp
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces.d/*";else echo "Sorry,this is not supported os"; fi
 check:output=~12.1.0.100
 check:output!~dhcp
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0

From 736725de210336aa20ea809f976ddc71f8c2e7fd Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Thu, 22 Jun 2017 04:52:23 -0400
Subject: [PATCH 050/283] fix 3242

---
 xCAT-test/autotest/testcase/confignics/cases0 | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignics/cases0 b/xCAT-test/autotest/testcase/confignics/cases0
index a730ff864..9f3589d5f 100644
--- a/xCAT-test/autotest/testcase/confignics/cases0
+++ b/xCAT-test/autotest/testcase/confignics/cases0
@@ -149,45 +149,47 @@ start:confignics_config_multiple_port_withnicaliases_multiple_value
 description:confignics
 cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
 check:rc==0
-cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC  mtu=1501
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
 check:rc==0
-cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC   mtu=1501
+cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
 check:rc==0
-cmd:mkdef -t network -o 13_1_0_0-255_255_0_0 net=13.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC    mtu=1503
+cmd:mkdef -t network -o 13_1_0_0-255_255_0_0 net=13.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC
 check:rc==0
-cmd:mkdef -t network -o 14_1_0_0-255_255_0_0 net=14.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC     mtu=1503
+cmd:mkdef -t network -o 14_1_0_0-255_255_0_0 net=14.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC
 check:rc==0
-cmd:chdef $$CN nicips.$$SECONDNIC="11.1.0.100|12.1.0.100" nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0" nicaliases.$$SECONDNIC="aliases1-1|aliases1-2" 
+cmd:chdef $$CN nicips.$$SECONDNIC="11.1.0.100|12.1.0.100" nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0" nicaliases.$$SECONDNIC="aliases1-1 aliases1-1-1|aliases1-2" nichostnamesuffixes.$$SECONDNIC="-$$SECONDNIC|-$$SECONDNIC-1"
 check:rc==0
-cmd:chdef $$CN nicips.$$THIRDNIC="13.1.0.100|14.1.0.100" nictypes.$$THIRDNIC=Ethernet nicnetworks.$$THIRDNIC="13_1_0_0-255_255_0_0|14_1_0_0-255_255_0_0" nicaliases.$$THIRDNIC="aliases2-1|aliases2-2"
+cmd:chdef $$CN nicips.$$THIRDNIC="13.1.0.100|14.1.0.100" nictypes.$$THIRDNIC=Ethernet nicnetworks.$$THIRDNIC="13_1_0_0-255_255_0_0|14_1_0_0-255_255_0_0" nicaliases.$$THIRDNIC="aliases2-1|aliases2-2" nichostnamesuffixes.$$THIRDNIC="-$$THIRDNIC|-$$THIRDNIC-1"
 check:rc==0
 cmd:makehosts $$CN
 check:rc==0
-#cmd:cat /etc/hosts
-#check:output=~aliases1-1
-#check:output=~aliases1-2
-#check:output=~aliases2-1
-#check:output=~aliases2-2
+cmd:cat /etc/hosts
+check:output=~aliases1-1
+check:output=~aliases1-2
+check:output=~aliases2-1
+check:output=~aliases2-2
 cmd:updatenode $$CN -P confignics
 check:rc==0
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
 check:output=~11.1.0.100
 check:output!~dhcp
-output=~MTU=1501
-cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECONDNIC:1 ; elif [ "$$OS" = "rhels" ]; then xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC:1;else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
+cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECONDNIC:1 ; elif [ "$$OS" = "rhels" ]; then xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC:1;else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC:1; fi
 check:output=~12.1.0.100
 check:output!~dhcp
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$THIRDNIC; else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$THIRDNIC; fi
 check:output=~13.1.0.100
 check:output!~dhcp
-output=~MTU=1503
-cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$THIRDNIC:1 ; elif [ "$$OS" = "rhels" ]; then xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$THIRDNIC:1;else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$THIRDNIC; fi
+cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$THIRDNIC:1 ; elif [ "$$OS" = "rhels" ]; then xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$THIRDNIC:1;else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$THIRDNIC:1; fi
 check:output=~14.1.0.100
 check:output!~dhcp
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 13_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 14_1_0_0-255_255_0_0
+cmd:ip addr del 11.1.0.100/16 dev $$SECONDNIC
+cmd:ip addr del 12.1.0.100/16 dev $$SECONDNIC
+cmd:ip addr del 13.1.0.100/16 dev $$THIRDNIC
+cmd:ip addr del 14.1.0.100/16 dev $$THIRDNIC
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC:1; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC:1; fi
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$THIRDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$THIRDNIC; fi

From 0c74811424a4201447ea9cc7e53e73a57aed8c82 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Thu, 22 Jun 2017 05:17:35 -0400
Subject: [PATCH 051/283] polished

---
 xCAT-test/autotest/testcase/confignics/cases0 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignics/cases0 b/xCAT-test/autotest/testcase/confignics/cases0
index 9f3589d5f..0765fc90f 100644
--- a/xCAT-test/autotest/testcase/confignics/cases0
+++ b/xCAT-test/autotest/testcase/confignics/cases0
@@ -186,10 +186,6 @@ cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 13_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 14_1_0_0-255_255_0_0
-cmd:ip addr del 11.1.0.100/16 dev $$SECONDNIC
-cmd:ip addr del 12.1.0.100/16 dev $$SECONDNIC
-cmd:ip addr del 13.1.0.100/16 dev $$THIRDNIC
-cmd:ip addr del 14.1.0.100/16 dev $$THIRDNIC
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC:1; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC:1; fi
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$THIRDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$THIRDNIC; fi

From 4456b5210558de2963b22627e14e20dfd416d822 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Thu, 22 Jun 2017 05:27:02 -0400
Subject: [PATCH 052/283] polished

---
 xCAT-test/autotest/testcase/confignics/cases0 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignics/cases0 b/xCAT-test/autotest/testcase/confignics/cases0
index 0765fc90f..c00b7676d 100644
--- a/xCAT-test/autotest/testcase/confignics/cases0
+++ b/xCAT-test/autotest/testcase/confignics/cases0
@@ -149,13 +149,13 @@ start:confignics_config_multiple_port_withnicaliases_multiple_value
 description:confignics
 cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
 check:rc==0
-cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC 
 check:rc==0
 cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
 check:rc==0
-cmd:mkdef -t network -o 13_1_0_0-255_255_0_0 net=13.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC
+cmd:mkdef -t network -o 13_1_0_0-255_255_0_0 net=13.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC   
 check:rc==0
-cmd:mkdef -t network -o 14_1_0_0-255_255_0_0 net=14.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC
+cmd:mkdef -t network -o 14_1_0_0-255_255_0_0 net=14.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC    
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC="11.1.0.100|12.1.0.100" nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0" nicaliases.$$SECONDNIC="aliases1-1 aliases1-1-1|aliases1-2" nichostnamesuffixes.$$SECONDNIC="-$$SECONDNIC|-$$SECONDNIC-1"
 check:rc==0
@@ -186,6 +186,10 @@ cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 13_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 14_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 11.1.0.100/16 dev $$SECONDNIC"
+cmd:xdsh $$CN "ip addr del 12.1.0.100/16 dev $$SECONDNIC"
+cmd:xdsh $$CN "ip addr del 13.1.0.100/16 dev $$THIRDNIC"
+cmd:xdsh $$CN "ip addr del 14.1.0.100/16 dev $$THIRDNIC"
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC:1; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC:1; fi
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$THIRDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$THIRDNIC; fi

From 6ed46ff77f32042ccb45bc61c058e10f51a6678c Mon Sep 17 00:00:00 2001
From: yangsong <immarvin@users.noreply.github.com>
Date: Thu, 22 Jun 2017 05:04:55 -0500
Subject: [PATCH 053/283] support service node pool (#3268)

---
 xCAT-server/lib/xcat/plugins/dhcp.pm     |  6 ++--
 xCAT-server/lib/xcat/plugins/grub2.pm    | 41 ++++++++++++++++--------
 xCAT-server/lib/xcat/plugins/networks.pm |  3 +-
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 291a9b370..c30eceffd 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -502,7 +502,7 @@ sub addnode
     if ($nrhash)
     {
         $nrent = $nrhash->{$node}->[0];
-        if ($nrent and $nrent->{tftpserver})
+        if ($nrent and $nrent->{tftpserver} and $nrent->{tftpserver} ne '<xcatmaster>')
         {
             #check the value of inet_ntoa(inet_aton("")),if the hostname cannot be resolved,
             #the value of inet_ntoa() will be "undef", which will cause fatal error
@@ -531,9 +531,7 @@ sub addnode
                 my $node_server = undef;
                 if ($nrent->{xcatmaster}) {
                     $node_server = $nrent->{xcatmaster};
-                } elsif ($nrent->{servicenode}) {
-                    $node_server = $nrent->{servicenode};
-                }
+                } 
                 unless ($node_server) {
                     my @nxtsrvd = xCAT::NetworkUtils->my_ip_facing($node);
                     unless ($nxtsrvd[0]) { $nxtsrv = $nxtsrvd[1]; }
diff --git a/xCAT-server/lib/xcat/plugins/grub2.pm b/xCAT-server/lib/xcat/plugins/grub2.pm
index 14fa9702a..f6600d22c 100644
--- a/xCAT-server/lib/xcat/plugins/grub2.pm
+++ b/xCAT-server/lib/xcat/plugins/grub2.pm
@@ -218,21 +218,36 @@ sub setstate {
         } elsif (defined($nrhash{$node}->[0]) && $nrhash{$node}->[0]->{'xcatmaster'}) {
             $tftpserver = $nrhash{$node}->[0]->{'xcatmaster'};
         } else {
-            my @master = xCAT::TableUtils->get_site_attribute("master");
-            $tftpserver = $master[0];
-        }
-        my $serverip;
-        if (defined($tftpserverip{$tftpserver})) {
-            $serverip = $tftpserverip{$tftpserver};
-        } else {
-            $serverip = xCAT::NetworkUtils->getipaddr($tftpserver);
-            unless ($serverip) {
-                syslog("local1|err", "xCAT unable to resolve $tftpserver");
-                return;
-            }
-            $tftpserverip{$tftpserver} = $serverip;
+            $tftpserver = "<xcatmaster>";
         }
 
+        my $serverip;
+
+        if($tftpserver eq "<xcatmaster>"){
+            my @nxtsrvd = xCAT::NetworkUtils->my_ip_facing($node);
+            unless ($nxtsrvd[0]) { 
+                $serverip = $nxtsrvd[1]; 
+            } else { 
+                $callback->({ error => [ $nxtsrvd[1] ], errorcode => [1] }); 
+                return;
+            }
+        }else{
+            if (defined($tftpserverip{$tftpserver})) {
+                $serverip = $tftpserverip{$tftpserver};
+            } else {
+                $serverip = xCAT::NetworkUtils->getipaddr($tftpserver);
+                unless ($serverip) {
+                    syslog("local1|err", "xCAT unable to resolve $tftpserver");
+                    return;
+                }
+                $tftpserverip{$tftpserver} = $serverip;
+            }
+        }
+
+        unless($serverip){
+            $callback->({ error => ["Unable to determine the tftpserver for $node"], errorcode => [1] });
+            return;
+        }
         my $grub2protocol = "tftp";
         if (defined($nrhash{$node}->[0]) && $nrhash{$node}->[0]->{'netboot'}
             && ($nrhash{$node}->[0]->{'netboot'} =~ /grub2-(.*)/)) {
diff --git a/xCAT-server/lib/xcat/plugins/networks.pm b/xCAT-server/lib/xcat/plugins/networks.pm
index 49f318854..cbbea2188 100644
--- a/xCAT-server/lib/xcat/plugins/networks.pm
+++ b/xCAT-server/lib/xcat/plugins/networks.pm
@@ -549,6 +549,7 @@ sub donets
                     }
                 }
 
+                my $tent=$nethash{$netname};
                 unless ($tent and $tent->{tftpserver})
                 {
                     my $netdev = $ent[7];
@@ -577,7 +578,7 @@ sub donets
                                 push @{ $rsp->{data} }, "    tftpserver=$ipaddr";
                             } else {
                                 if (!$foundmatch) {
-                                    $nettab->setAttribs({ 'net' => $net, 'mask' => $mask }, { tftpserver => $ipaddr });
+                                    $nettab->setAttribs({ 'net' => $net, 'mask' => $mask }, { tftpserver => "<xcatmaster>" });
                                 }
                             }
                             last;

From eba16f3dd84b5acc1bbc7601482761d009fecc6c Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Thu, 22 Jun 2017 20:39:27 -0400
Subject: [PATCH 054/283] Found out that for Witherspoon machines, if the host
 has not been booted there is no system information returned, so check for the
 boxelder bmc for a model/serial combination to use

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

diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
index f1fb34b32..5fb0f8009 100644
--- a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
@@ -1054,6 +1054,7 @@ sub bmcdiscovery_openbmc{
     my $openbmc_project_url = "xyz/openbmc_project";
     my $login_endpoint = "login";
     my $system_endpoint = "inventory/system";
+    my $motherboard_boxelder_endpoint = "$system_endpoint/chassis/motherboard/boxelder/bmc";
 
     my $node_data = $ip;
     my $brower = LWP::UserAgent->new( ssl_opts => { SSL_verify_mode => 0x00, verify_hostname => 0  }, );
@@ -1067,12 +1068,19 @@ sub bmcdiscovery_openbmc{
     my $login_response = $brower->request($login_request);
     
     if ($login_response->is_success) {
+        # attempt to find the system serial/model
         $url = "$http_protocol://$ip/$openbmc_project_url/$system_endpoint";
         my $req = HTTP::Request->new('GET', $url, $header);
         my $req_output = $brower->request($req);
         if ($req_output->is_error) {
-            xCAT::MsgUtils->message("W", { data => ["$ip: Could not obtain system information from BMC. Verify firmware levels are up-to-date."] }, $::CALLBACK);
-            return;
+            # If the host system has not yet been powered on, check the boxelder bmc info for model/serial
+            $url = "$http_protocol://$ip/$openbmc_project_url/$motherboard_boxelder_endpoint";
+            $req = HTTP::Request->new('GET', $url, $header);
+            $req_output = $brower->request($req);
+            if ($req_output->is_error) {
+                xCAT::MsgUtils->message("W", { data => ["$ip: Could not obtain system information from BMC."] }, $::CALLBACK);
+                return;
+            }
         }
         my $response = decode_json $req_output->content;
         my $mtm;

From 8e90e30bac13413997764fc927665a30b4951062 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Wed, 21 Jun 2017 12:39:53 -0400
Subject: [PATCH 055/283] Add verbose option to be parsed by rinv [openbmc]

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index cf9b9cc60..1fca69eb0 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -29,6 +29,7 @@ use xCAT::SvrUtils;
 use xCAT::GlobalDef;
 use xCAT_monitoring::monitorctrl;
 
+$::VERBOSE = 0;
 # String constants for rpower states
 $::POWER_STATE_OFF="off";
 $::POWER_STATE_ON="on";
@@ -409,16 +410,27 @@ sub parse_args {
     my $extrargs = shift;
     my $noderange = shift;
     my $check = undef;
- 
+
     if (!defined($extrargs) and $command =~ /rpower|rsetboot|rspconfig|rflash/) {
         return ([ 1, "No option specified for $command" ]);
     }
 
-    if (scalar(@ARGV) > 1 and ($command =~ /rpower|rinv|rsetboot|rvitals/)) {
+    my $subcommand = undef;
+    if (scalar(@ARGV) > 2 and ($command =~ /rpower|rinv|rsetboot|rvitals/)) {
         return ([ 1, "Only one option is supported at the same time" ]);
+    } elsif (scalar(@ARGV) == 2) {
+        # Check if one is calling for Verbose output
+        foreach (@ARGV) {
+           if ($_ =~ /V|verbose/) {
+              $::VERBOSE=1;
+           } else {
+               $subcommand = $_
+           }
+        }
+    } else { 
+         $subcommand = $ARGV[0]
     }
 
-    my $subcommand = $ARGV[0];
     if ($command eq "rpower") {
         unless ($subcommand =~ /^on$|^off$|^reset$|^boot$|^status$|^stat$|^state$/) {
             return ([ 1, "Unsupported command: $command $subcommand" ]);
@@ -526,6 +538,14 @@ sub parse_command_status {
 
     $next_status{LOGIN_REQUEST} = "LOGIN_RESPONSE";
 
+    my $verbose = undef;
+    unless (GetOptions(
+        'V|verbose'  => \$verbose,
+    )) {
+        xCAT::SvrUtils::sendmsg("Error parsing arguments.", $callback);
+        return 1;
+    }
+
     if ($command eq "rpower") {
         $subcommand = $ARGV[0];
 

From b658a17af30ddc67c18bc64c7985fddee5e40ade Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Wed, 21 Jun 2017 13:23:24 -0400
Subject: [PATCH 056/283] Change the output of firm [openbmc] to more closely
 match the output of OPAL P8 machines when displaying the firmware.  Use the
 ID to sort, but remove it when printing out the messages to the user

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 1fca69eb0..3c30b1407 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -1083,30 +1083,27 @@ sub rinv_response {
 
         if ($grep_string eq "firm") {
             # This handles the data from the /xyz/openbmc_project/Software endpoint.
-            #
-            # Handle printing out all posssible Software values in a generic format: 
-            #    node: <Purpose> Software: <version> (<Activation>)
-            #
             my $sw_id = (split(/\//, $key_url))[-1];
             if (defined($content{Version}) and $content{Version}) {
                 my $purpose_value = uc ((split(/\./, $content{Purpose}))[-1]);
+                $purpose_value = "[$sw_id]$purpose_value";
                 my $activation_value = (split(/\./, $content{Activation}))[-1];
                 #
-                # For 'rinv firm', only print Active software.  'rflash list' will handle others
+                # For 'rinv firm', only print Active software, unless verbose is specified
                 #
-                if ($activation_value =~ "Active") {
+                if ($activation_value =~ "Active" or $::VERBOSE) {
                     #
-                    # The space below between "SOFTWARE:" and $content{Version} is intentional
+                    # The space below between "Firmware Product Version:" and $content{Version} is intentional
                     # to cause the sorting of this line before any additional info lines 
                     #
-                    $content_info = "$purpose_value SOFTWARE[$sw_id]:   $content{Version} ($activation_value)";
+                    $content_info = "$purpose_value Firmware Product:   $content{Version} ($activation_value)";
                     push (@sorted_output, $content_info); 
     
                     if (defined($content{ExtendedVersion}) and $content{ExtendedVersion} ne "") { 
                         # ExtendedVersion is going to be a comma separated list of additional software
                         my @versions = split(',', $content{ExtendedVersion});
                         foreach my $ver (@versions) { 
-                            $content_info = "$purpose_value SOFTWARE[$sw_id]: -- additional info: $ver";
+                            $content_info = "$purpose_value Firmware Product: -- additional info: $ver";
                             push (@sorted_output, $content_info);
                         }
                     }
@@ -1149,7 +1146,14 @@ sub rinv_response {
         # sort alpha, then numeric 
         my @sorted_output = grep {s/(^|\D)0+(\d)/$1$2/g,1} sort 
             grep {s/(\d+)/sprintf"%06.6d",$1/ge,1} @sorted_output;
-        xCAT::SvrUtils::sendmsg("$_", $callback, $node) foreach (@sorted_output);
+        foreach (@sorted_output) { 
+            #
+            # The firmware output requires the ID to be part of the string to sort correctly.
+            # Remove this ID from the output to the user
+            #
+            $_ =~ s/\[.*?\]//;
+            xCAT::SvrUtils::sendmsg("$_", $callback, $node);
+        }
     } else {
         xCAT::SvrUtils::sendmsg("$::NO_ATTRIBUTES_RETURNED", $callback, $node);
     }

From 27607d7495382713bc2f57a14ad16613fc4fee6a Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Thu, 22 Jun 2017 20:55:52 -0400
Subject: [PATCH 057/283] Add verbose option to rinv for OpenBMC supported
 machines

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

diff --git a/docs/source/guides/admin-guides/references/man1/rinv.1.rst b/docs/source/guides/admin-guides/references/man1/rinv.1.rst
index 214b06e13..045866ae0 100644
--- a/docs/source/guides/admin-guides/references/man1/rinv.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rinv.1.rst
@@ -39,7 +39,7 @@ OpenPOWER (OpenBMC) server specific:
 ====================================
 
 
-\ **rinv**\  \ *noderange*\  [\ **model | serial | firm | cpu | dimm | all**\ ]
+\ **rinv**\  \ *noderange*\  [\ **model | serial | firm | cpu | dimm | all**\ ] [\ **-V | -**\ **-verbose**\ ]
 
 
 PPC (with HMC) specific:
@@ -234,6 +234,12 @@ Calling \ **rinv**\  for VMware will display the UUID/GUID, number of CPUs, amou
  
 
 
+\ **-V | -**\ **-verbose**\ 
+ 
+ Not supported for all managed machines.  Prints verbose output.
+ 
+
+
 \ **-t**\ 
  
  Set the values in the vm table to what vCenter has for the indicated nodes.
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index b733daca9..b0348dd53 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -100,7 +100,7 @@ my %usage = (
     OpenPOWER (IPMI) server specific:
        rinv <noderange> [model|serial|deviceid|uuid|guid|vpd|mprom|firm|all] 
     OpenPOWER (OpenBMC) server specific:
-       rinv <noderange> [model|serial|firm|cpu|dimm|all]
+       rinv <noderange> [model|serial|firm|cpu|dimm|all] [-V|--verbose]
     PPC specific(with HMC):
        rinv <noderange> [all|bus|config|serial|model|firm]
     PPC specific(using Direct FSP Management):
diff --git a/xCAT-client/pods/man1/rinv.1.pod b/xCAT-client/pods/man1/rinv.1.pod
index 090194df1..5b3e92665 100644
--- a/xCAT-client/pods/man1/rinv.1.pod
+++ b/xCAT-client/pods/man1/rinv.1.pod
@@ -16,7 +16,7 @@ B<rinv> I<noderange> [B<model>|B<serial>|B<deviceid>|B<uuid>|B<guid>|B<vpd>|B<mp
 
 =head2 OpenPOWER (OpenBMC) server specific:
 
-B<rinv> I<noderange> [B<model>|B<serial>|B<firm>|B<cpu>|B<dimm>|B<all>]
+B<rinv> I<noderange> [B<model>|B<serial>|B<firm>|B<cpu>|B<dimm>|B<all>] [B<-V>|B<--verbose>]
 
 =head2 PPC (with HMC) specific:
 
@@ -149,6 +149,10 @@ Print help.
 
 Print version.
 
+=item B<-V>|B<--verbose>
+
+Not supported for all managed machines.  Prints verbose output.
+
 =item B<-t>
 
 Set the values in the vm table to what vCenter has for the indicated nodes.

From c7aff42ca27605fdbd652db79183e67508a1e5a6 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Thu, 22 Jun 2017 21:00:43 -0400
Subject: [PATCH 058/283] Modify the description for verbose option in rinv

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

diff --git a/docs/source/guides/admin-guides/references/man1/rinv.1.rst b/docs/source/guides/admin-guides/references/man1/rinv.1.rst
index 045866ae0..d760fc576 100644
--- a/docs/source/guides/admin-guides/references/man1/rinv.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rinv.1.rst
@@ -236,7 +236,7 @@ Calling \ **rinv**\  for VMware will display the UUID/GUID, number of CPUs, amou
 
 \ **-V | -**\ **-verbose**\ 
  
- Not supported for all managed machines.  Prints verbose output.
+ Prints verbose output, if available.
  
 
 
diff --git a/xCAT-client/pods/man1/rinv.1.pod b/xCAT-client/pods/man1/rinv.1.pod
index 5b3e92665..52ed22ccc 100644
--- a/xCAT-client/pods/man1/rinv.1.pod
+++ b/xCAT-client/pods/man1/rinv.1.pod
@@ -151,7 +151,7 @@ Print version.
 
 =item B<-V>|B<--verbose>
 
-Not supported for all managed machines.  Prints verbose output.
+Prints verbose output, if available.
 
 =item B<-t>
 

From 65d882b9901f6b4346a610c05c6c68b847fc6bee Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Wed, 24 May 2017 04:40:43 -0400
Subject: [PATCH 059/283] add cumulus discover script

---
 perl-xCAT/xCAT/GlobalDef.pm                   |   4 +
 perl-xCAT/xCAT/data/switchinfo.pm             |  45 ++++++
 xCAT-server/lib/xcat/plugins/nodediscover.pm  |  26 +++-
 .../lib/xcat/plugins/switchdiscover.pm        |  49 +-----
 xCAT/postscripts/configinterface              |   5 +
 xCAT/postscripts/cumulusztp                   | 145 ++++++++++++++++--
 xCAT/postscripts/documulusdiscovery           | 132 ++++++++++++++++
 xCAT/postscripts/enablesnmp                   |   5 +
 xCAT/postscripts/getmypostscript.cumulus      |  58 +++++++
 9 files changed, 410 insertions(+), 59 deletions(-)
 create mode 100644 perl-xCAT/xCAT/data/switchinfo.pm
 create mode 100755 xCAT/postscripts/documulusdiscovery
 create mode 100755 xCAT/postscripts/getmypostscript.cumulus

diff --git a/perl-xCAT/xCAT/GlobalDef.pm b/perl-xCAT/xCAT/GlobalDef.pm
index b953a5168..b9b99ea20 100644
--- a/perl-xCAT/xCAT/GlobalDef.pm
+++ b/perl-xCAT/xCAT/GlobalDef.pm
@@ -51,7 +51,9 @@ $::STATUS_BOOTED       = "booted";
 $::STATUS_POWERING_ON  = "powering-on";
 $::STATUS_POWERING_OFF = "powering-off";
 $::STATUS_DISCOVERING  = "discovering";
+$::STATUS_DISCOVERED   = "discovered";
 $::STATUS_CONFIGURING  = "configuring";
+$::STATUS_CONFIGURED   = "configured";
 $::STATUS_STANDING_BY  = "standingby";
 $::STATUS_SHELL        = "shell";
 $::STATUS_DEFINED      = "defined";
@@ -69,7 +71,9 @@ $::STATUS_BMCREADY     = "bmcready";
     $::STATUS_POWERING_ON  => 1,
     $::STATUS_POWERING_OFF => 1,
     $::STATUS_DISCOVERING  => 1,
+    $::STATUS_DISCOVERED   => 1,
     $::STATUS_CONFIGURING  => 1,
+    $::STATUS_CONFIGURED   => 1,
     $::STATUS_STANDING_BY  => 1,
     $::STATUS_SHELL        => 1,
     $::STATUS_DEFINED      => 1,
diff --git a/perl-xCAT/xCAT/data/switchinfo.pm b/perl-xCAT/xCAT/data/switchinfo.pm
new file mode 100644
index 000000000..79c36abfa
--- /dev/null
+++ b/perl-xCAT/xCAT/data/switchinfo.pm
@@ -0,0 +1,45 @@
+# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
+
+#This module includes some glocal table to look up the switch type via mac and vendor 
+
+package xCAT::data::switchinfo;
+
+require Exporter;
+@ISA       = qw(Exporter);
+@EXPORT    = qw();
+@EXPORT_OK = qw(global_mac_identity global_switch_type);
+
+use strict;
+
+#the hash to look up switch type with MAC
+our %global_mac_identity = (
+    "a8:97:dc" => "BNT G8052 switch",
+    "6c:ae:8b" => "BNT G8264-T switch",
+    "fc:cf:62" => "BNT G8124 switch",
+    "7c:fe:90" => "Mellanox IB switch",
+    "cc:37:ab" => "Edgecore Networks Switch",
+    "8c:ea:1b" => "Edgecore Networks Switch"
+);
+
+#the hash to lookup switch type with vendor
+our %global_switch_type = (
+    Juniper => "Juniper",
+    juniper => "Juniper",
+    Cisco => "Cisco",
+    cisco => "Cisco",
+    BNT => "BNT",
+    Blade => "BNT",
+    G8052 => "BNT",
+    RackSwitch => "BNT",
+    Mellanox => "Mellanox",
+    mellanox => "Mellanox",
+    MLNX => "Mellanox",
+    MELLAN => "Mellanox",
+    Cumulus => "onie",
+    cumulus => "onie",
+    Edgecore => "onie"
+);
+
+
+
+1;
diff --git a/xCAT-server/lib/xcat/plugins/nodediscover.pm b/xCAT-server/lib/xcat/plugins/nodediscover.pm
index d9b9ada43..7188d8cc2 100644
--- a/xCAT-server/lib/xcat/plugins/nodediscover.pm
+++ b/xCAT-server/lib/xcat/plugins/nodediscover.pm
@@ -4,10 +4,8 @@ package xCAT_plugin::nodediscover;
 use xCAT::Table;
 use IO::Socket;
 use strict;
-
 use XML::Simple;
 $XML::Simple::PREFERRED_PARSER = 'XML::Parser';
-use Data::Dumper;
 use POSIX "WNOHANG";
 use Storable qw(freeze thaw);
 use IO::Select;
@@ -15,7 +13,7 @@ use IO::Handle;
 use xCAT::Utils;
 use Sys::Syslog;
 use Text::Balanced qw(extract_bracketed);
-
+use xCAT::data::switchinfo;
 use xCAT::DiscoveryUtils;
 
 
@@ -175,6 +173,7 @@ sub process_request {
         }
     }
 
+
     # save inventory info into the hwinv table
     if (defined($request->{cpucount}) or defined($request->{cputype}) or defined($request->{memory}) or defined($request->{disksize})) {
         my $basicdata;
@@ -232,15 +231,32 @@ sub process_request {
         if ($rent and $rent->{'netboot'}) {
             $currboot = $rent->{'netboot'};
         }
+
         if ($request->{arch}->[0] =~ /x86/ and $currboot !~ /pxe/ and $currboot !~ /xnba/) {
             $nrtab->setNodeAttribs($node, { netboot => 'xnba' });
         } elsif ($request->{arch}->[0] =~ /ppc/ and $request->{platform}->[0] =~ /PowerNV/) {
             $nrtab->setNodeAttribs($node, { netboot => 'petitboot' });
         } elsif ($request->{arch}->[0] =~ /ppc/ and $currboot !~ /yaboot/) {
             $nrtab->setNodeAttribs($node, { netboot => 'yaboot' });
+        } elsif($request->{arch}->[0] =~ /armv7l/ and $currboot !~ /onie/) { 
+            #for onie switch, the netboot should be "onie"
+            $nrtab->setNodeAttribs($node, { netboot => 'onie' });  
         }
     }
 
+    if(defined $request->{nodetype} and $request->{nodetype}->[0] = 'switch' and $request->{_xcat_clientmac}->[0]){
+        #for onie switch, lookup and set the switchtype via mac of mgt interface
+        my $switchestab = xCAT::Table->new('switches');
+        if ($switchestab) {
+            my $switchtype=$xCAT::data::switchinfo::global_mac_identity{substr(lc($request->{_xcat_clientmac}->[0]),0,8)};
+            if(defined $switchtype){
+                $switchestab->setNodeAttribs($node,{ switchtype => $switchtype });
+            }
+            $switchestab->close();
+        }
+    }
+  
+
     my $macstring = "";
     if (defined($request->{mac})) {
         my $mactab = xCAT::Table->new("mac", -create => 1);
@@ -252,9 +268,11 @@ sub process_request {
         my $forcenic = 0; #-1 is force skip, 0 is use default behavior, 1 is force to be declared even if hosttag is skipped to do so
         foreach (@{ $request->{mac} }) {
             @ifinfo = split /\|/;
+
             if ($ifinfo[1] eq 'usb0') {    #skip usb nic
                 next;
             }
+
             $bydriverindex{ $ifinfo[0] } += 1;
             if (scalar @discoverynics) {
                 $forcenic = -1;    #$forcenic defaults to explicitly skip nic
@@ -295,7 +313,7 @@ sub process_request {
                             push @hostnames_to_update, $hosttag;
                         }
                     }
-                    print Dumper($hosttag) . "\n";
+                    #print Dumper($hosttag) . "\n";
                     if ($hosttag) {
                         $usednames{$hosttag} = 1;
                         unless ($usednames_for_net{$netn}) {
diff --git a/xCAT-server/lib/xcat/plugins/switchdiscover.pm b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
index 168cf6ea8..70970480d 100644
--- a/xCAT-server/lib/xcat/plugins/switchdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
@@ -21,6 +21,7 @@ no strict;
 use Data::Dumper;
 use Socket;
 use Expect;
+use xCAT::data::switchinfo;
 
 #global variables for this module
 my $community;
@@ -33,42 +34,6 @@ my %global_scan_type = (
     snmp => "snmp_scan"
 );
 
-my %global_mac_identity = (
-    "a8:97:dc" => "BNT G8052 switch",
-    "6c:ae:8b" => "BNT G8264-T switch",
-    "fc:cf:62" => "BNT G8124 switch",
-    "7c:fe:90" => "Mellanox switch",
-    "e4:1d:2d" => "Mellanox switch",
-    "24:8a:07" => "Mellanox switch",
-    "00:25:8b" => "Mellanox switch",
-    "00:02:c9" => "Mellanox switch",
-    "f4:52:14" => "Mellanox switch",
-    "ec:0d:9a" => "Mellanox switch",
-    "cc:37:ab" => "Edgecore Networks Switch",
-    "a8:2b:b5" => "Edgecore Networks Switch",
-    "70:72:cf" => "Edgecore Networks Switch",
-    "8c:ea:1b" => "Edgecore Networks Switch"
-);
-
-my %global_switch_type = (
-    Juniper => "Juniper",
-    juniper => "Juniper",
-    Cisco => "Cisco",
-    cisco => "Cisco",
-    BNT => "BNT",
-    Blade => "BNT",
-    G8052 => "BNT",
-    RackSwitch => "BNT",
-    Mellanox => "Mellanox",
-    mellanox => "Mellanox",
-    MLNX => "Mellanox",
-    MELLAN => "Mellanox",
-    Cumulus => "onie",
-    cumulus => "onie",
-    Edgecore => "onie"
-);
-
-
 
 #-------------------------------------------------------------------------------
 =head1  xCAT_plugin:switchdiscover
@@ -748,16 +713,16 @@ sub nmap_scan {
                         }
                         my $vendor = $addr->{vendor};
                         if ($vendor) {
-                            my $search_string = join '|', keys(%global_switch_type);
+                            my $search_string = join '|', keys(%xCAT::data::switchinfo::global_switch_type);
                             if ($vendor =~ /($search_string)/) {
                                 $found = 1;
                             }
                         } 
                         if ( ($found == 0) && ($type eq "mac") ) {
-                            my $search_string = join '|', keys(%global_mac_identity);
+                            my $search_string = join '|', keys(%xCAT::data::switchinfo::global_mac_identity);
                             if ($mac =~ /($search_string)/i) {
                                 my $key = $1;
-                                $vendor = $global_mac_identity{lc $key};
+                                $vendor = $xCAT::data::switchinfo::global_mac_identity{lc $key};
                                 $found = 1;
                             }
 
@@ -851,7 +816,7 @@ sub nmap_osguess {
                         last;
                     }  
                 }
-                my $search_string = join '|', keys(%global_switch_type);
+                my $search_string = join '|', keys(%xCAT::data::switchinfo::global_switch_type);
                 if ($line =~ /Running/) {
                     if ($line =~ /($search_string)/){
                         $vendor = $1;
@@ -1180,10 +1145,10 @@ sub get_switchtype {
     my $vendor = shift;
     my $key = "Not support";
     
-    my $search_string = join '|', keys(%global_switch_type);
+    my $search_string = join '|', keys(%xCAT::data::switchinfo::global_switch_type);
     if ($vendor =~ /($search_string)/) {
         $key = $1;
-        return $global_switch_type{$key};
+        return $xCAT::data::switchinfo::global_switch_type{$key};
     } else {
         return $key;
     }
diff --git a/xCAT/postscripts/configinterface b/xCAT/postscripts/configinterface
index 40deeb269..53d9c720a 100755
--- a/xCAT/postscripts/configinterface
+++ b/xCAT/postscripts/configinterface
@@ -9,6 +9,11 @@ fi
 
 xcat_intf="/etc/network/interfaces.d/xCAT.intf"
 
+if [ -f $xcat_intf ] && grep -w '#This is sample interface file provided by xCAT' $xcat_intf ; then
+    echo "The switch data ports and default brige have been configured. Do nothing..."
+    exit 0
+fi
+
 echo "#This is sample interface file provided by xCAT" > $xcat_intf
 echo "# bridge-vlan-aware: set to yes to indicate that the bridge is VLAN-aware. " >> $xcat_intf
 echo "# bridge-access: declares the access port. " >> $xcat_intf
diff --git a/xCAT/postscripts/cumulusztp b/xCAT/postscripts/cumulusztp
index 311cdfdf1..d1403edeb 100755
--- a/xCAT/postscripts/cumulusztp
+++ b/xCAT/postscripts/cumulusztp
@@ -1,4 +1,7 @@
 #!/bin/bash
+#this script will be invoked by ZTP(zero touch provision) process in the onie switch
+#this script finish the discovery and configuration after the switch is pluged in the cluster and powered on
+
 function error() {
   echo -e "\e[0;33mERROR: The Zero Touch Provisioning script failed while running the command $BASH_COMMAND at line $BASH_LINENO.\e[0m" >&2
   exit 1
@@ -7,28 +10,144 @@ function error() {
 # Log all output from this script
 exec >/var/log/autoprovision 2>&1
  
-trap error ERR
+#trap error ERR
  
 #Add Debian Repositories
-echo "deb http://http.us.debian.org/debian jessie main" >> /etc/apt/sources.list
-echo "deb http://security.debian.org/ jessie/updates main" >> /etc/apt/sources.list
+#since in most cases, the switch has no internet access, skip this step
+#echo "deb http://http.us.debian.org/debian jessie main" >> /etc/apt/sources.list
+#echo "deb http://security.debian.org/ jessie/updates main" >> /etc/apt/sources.list
 
 #get ip address for server node
 server_ip=`grep cumulus-provision-url /var/lib/dhcp/dhclient.eth0.leases | tail -1 | awk -F/ '{print $3}'`
- 
+
+#download /install/postscripts from MN
+max_retries=5
+retry=0
+rc=1  # this is a fail return
+downloaded=0
+while [ 0 -eq 0 ]; do
+
+    if [ -e "/xcatpost" ]; then
+        rm -rf "/xcatpost"
+    fi
+    
+    export LANG=C; wget -l inf -nH -N -r --waitretry=10 --random-wait -e robots=off -T 60 -nH --cut-dirs=2 --reject "index.html*" --no-parent http://$server_ip/install/postscripts/ -P /xcatpost 2> /tmp/wget.log
+    rc=$?
+    if [ $rc -eq 0 ]; then
+      # return from wget was 0 but some OS do not return errors, so we
+      # have additional checks for
+      # failed: Connection httpd not running
+      # 404: Not Found  - if directory does not exist
+      grep -i -E "... failed: Connection refused.$" /tmp/wget.log
+      rc1=$?
+      grep -i -E "ERROR 404: Not Found.$" /tmp/wget.log
+      rc2=$?
+      # check to see no errors at all, grep returns 1
+      if [ $rc1 -eq 1 ] && [ $rc2 -eq 1 ]; then
+         logger -s -t "xcat.cumulusztp" -p local4.info  "download_postscripts return successfully "
+         downloaded=1
+         break
+      fi
+    fi
+
+    retry=$(($retry+1))
+    logger -s -t "xcat.cumulusztp" -p local4.info  "download_postscripts retry $retry"
+    if [ $retry -eq $max_retries ]; then
+
+        break
+    fi
+
+    SLI=$(awk 'BEGIN{srand(); printf("%d\n",rand()*20)}')
+    sleep $SLI
+done
+
+if [ "$downloaded" = "0"  ];then
+    logger -s -t "xcat.cumulusztp" -p local4.err  "download_postscripts failed"
+    ztp -R
+    exit 1
+fi
+
+chmod -R +x `find /xcatpost/ -maxdepth 1 -print | grep -E -v '^(/xcatpost/|/xcatpost/_xcat|/xcatpost/_ssh|/xcatpost/ca|/xcatpost/hostkeys)$'`
+
+cd /xcatpost
+rc=0
+
+./documulusdiscovery
+rc=$?
+if [ "$rc" != "0" ];then
+    ztp -R 
+    exit 1
+fi
+
+logger -s -t "xcat.cumulusztp" -p local4.info "switch discovered!"
+
+#restart mgt interface to apply the specified IP address
+ifdown eth0;ifup eth0
+
+retry=0
+while true; do
+    #check whether the network access between MN/CN and the node is ready
+    ping $server_ip -c 1 >/dev/null && break
+    retry=$[ $retry + 1 ]
+    if [ $retry -eq 90 ];then
+       #timeout, complain and exit
+       logger -s -t "xcat.cumulusztp" -p local4.err " the network between the node and $server_ip is not ready, please check[retry=$retry]..." "/var/log/xcat/xcat.log"
+       ztp -R
+       exit 1
+    fi
+
+    #sleep sometime before the next scan
+    sleep 2
+done
+
 #push root ssh keys, config passwordless
-echo "CumulusLinux!" | sudo -S mkdir -p /root/.ssh
-echo "CumulusLinux!" | sudo -S /usr/bin/wget -O /root/.ssh/authorized_keys http://$server_ip/install/postscripts/_ssh/authorized_keys
- 
+mkdir -p /root/.ssh
+mv _ssh/authorized_keys /root/.ssh/authorized_keys 
+
 #enable and config snmpd
-echo "CumulusLinux!" | sudo -S /usr/bin/wget -O /home/cumulus/enablesnmp http://$server_ip/install/postscripts/enablesnmp
-sudo chmod +x /home/cumulus/enablesnmp
-sudo /home/cumulus/enablesnmp
+./enablesnmp
+rc=$?
+if [ "$rc" != "0" ];then
+    logger -s -t "xcat.cumulusztp" -p local4.err "enablesnmp: failed to enable SNMP"
+    echo "enablesnmp: failed to enable SNMP"
+else
+    logger -s -t "xcat.cumulusztp" -p local4.info "SNMP enabled!"
+fi
 
 #config base interface
-echo "CumulusLinux!" | sudo -S /usr/bin/wget -O /home/cumulus/configinterface http://$server_ip/install/postscripts/configinterface
-sudo chmod +x /home/cumulus/configinterface
-sudo /home/cumulus/configinterface
+./configinterface
+rc=$?
+if [ "$rc" != "0" ];then
+    echo "configinterface: failed to config switch data ports"
+else
+    logger -s -t "xcat.cumulusztp" -p local4.info "data ports enabled!"
+fi
+
+#obtain myposctscript from MN
+./getmypostscript.cumulus $server_ip:3001 
+rc=$?
+if [ "$rc" != "0" ]; then
+   logger -s -t "xcat.cumulusztp" -p local4.info "failed to get mypostscript"
+   echo "failed to get mypostscript"
+   ztp -R
+   exit 1
+fi
+
+#config static ip address for mgt interface
+echo './confignics -s' >> ./mypostscript
+chmod +x ./mypostscript
+./mypostscript
+rc=$?
+if [ "$rc" != "0" ]; then
+   logger -s -t "xcat.cumulusztp" -p local4.info "failed to set static ip address for mgt interface"
+   echo "failed to set static ip address for mgt interface"
+   ztp -R
+   exit 1
+fi
+
+
+#report status
+echo "installstatus configured" | socat STDIN TCP:$server_ip:3002,sourceport=301,reuseaddr,retry=5
 
 # CUMULUS-AUTOPROVISIONING
 exit 0
diff --git a/xCAT/postscripts/documulusdiscovery b/xCAT/postscripts/documulusdiscovery
new file mode 100755
index 000000000..a6f8bae60
--- /dev/null
+++ b/xCAT/postscripts/documulusdiscovery
@@ -0,0 +1,132 @@
+#!/bin/bash
+#this script grabs the switch information, then composes a "findme" request and sends it to MN
+#so that the switch can be discovered 
+
+# TODO: Figure out the master based on the DHCP packet
+XCATMASTER=$(cat /var/lib/dhcp/dhclient.eth0.leases |grep cumulus-provision-url|tail -1|awk -F/ '{print $3}')
+XCATPORT=3001
+log_label="xcat.documulusdiscovery"
+
+#helper script for socat, write the received message to /tmp/helper.socat.sh
+cat > /tmp/helper.socat.sh << 'EOF'
+read strin
+echo $strin > /tmp/result.socat.out
+EOF
+
+[ -f "/tmp/helper.socat.sh" ] && chmod 777 /tmp/helper.socat.sh
+
+#listen to the 3001 port for any response from xcatd on MN
+#the message in the response will be written to /tmp/result.socat.out
+socat TCP4-LISTEN:3001,reuseaddr EXEC:"/tmp/helper.socat.sh" &
+
+#generate key pairs for the SSL connection between switch and xcatd on MN
+mkdir -p /etc/xcat
+mkdir -p /etc/pki/tls
+
+if [ ! -f /etc/xcat/privkey.pem ]; then
+echo "[ req ]
+distinguished_name = nodedn
+
+[ nodedn ]" > /etc/pki/tls/openssl.cnf
+    logger -s -t $log_label -p local4.info "Generating private key..."
+    openssl genrsa -out /etc/xcat/privkey.pem 1024 >& /dev/null
+    logger -s -t $log_label -p local4.info "Done"
+fi
+
+PUBKEY=`openssl rsa -in /etc/xcat/privkey.pem -pubout 2> /dev/null|grep -v "PUBLIC KEY"`
+PUBKEY=`echo $PUBKEY|sed -e 's/ //g'`
+export PUBKEY
+
+logger -s -t $log_label -p local4.info "Beginning switch discovery process..."
+
+#grab the switch information
+dmidweinfo=$(/usr/sbin/dmidecode 2>/dev/null)
+PRODUCTNAME=$(echo "$dmidweinfo"|grep "Product Name"|cut -d: -f2|sed -e 's/^\s*//'  -e 's/\s*$//')
+MTM=$PRODUCTNAME
+ARCH=$(uname -m)
+SERIAL=$(echo "$dmidweinfo"|grep "Serial Number"|cut -d: -f2|sed -e 's/^\s*//'  -e 's/\s*$//')
+
+#compose the findme request
+echo '<xcatrequest>' > /tmp/discopacket
+echo "<command>findme</command>" >> /tmp/discopacket
+echo "<sequential>1</sequential>" >> /tmp/discopacket
+echo "<nodetype>switch</nodetype>" >> /tmp/discopacket
+echo "<arch>$ARCH</arch>" >> /tmp/discopacket
+#echo "<switchtype>$MTM</switchtype>" >> /tmp/discopacket
+echo "<vendor>$MTM</vendor>" >> /tmp/discopacket
+echo "<serial>$SERIAL</serial>" >> /tmp/discopacket
+
+MAC_OF_FIRST_UP_NIC=$(ip addr show eth0|grep "link/ether"|awk -F' '  '{print $2}')
+MAC=$MAC_OF_FIRST_UP_NIC
+ADDRESS=$(ip address show dev eth0|grep "inet "|grep global|awk '{print $2}')
+DRIVER=$(grep DRIVER /sys/class/net/eth0/device/uevent|awk -F= '{print $2}')
+echo "<mac>$DRIVER|eth0|$MAC|$ADDRESS</mac>" >> /tmp/discopacket
+
+UUID=`echo $MTM-$SERIAL-$MAC_OF_FIRST_UP_NIC| tr /A-Z/ /a-z/`
+echo "<uuid>$UUID</uuid>" >> /tmp/discopacket
+
+echo "<xcatpubkey>$PUBKEY</xcatpubkey>" >> /tmp/discopacket
+echo "<sha512sig>" >> /tmp/discopacket
+echo "</sha512sig>" >> /tmp/discopacket
+echo "</xcatrequest>" >> /tmp/discopacket
+openssl dgst -sha512 -out /tmp/discopacket.sha512 -sign /etc/xcat/privkey.pem /tmp/discopacket
+openssl enc -e -a -in /tmp/discopacket.sha512  > /tmp/discopacket.b64sig
+cat /tmp/discopacket |while read line; do
+        if [ "$line" = "</sha512sig>" ]; then
+                cat /tmp/discopacket.b64sig >> /tmp/discopacket.new
+        fi
+        echo $line >> /tmp/discopacket.new
+done
+mv /tmp/discopacket.new /tmp/discopacket
+logger -s -t $log_label -p local4.info "Discovery packet file is ready."
+rm -f /tmp/discopacket.gz
+gzip -9 /tmp/discopacket
+
+
+
+if [ -z "$XCATMASTER" ] || [ -z "$XCATPORT" ]; then
+    logger -s -t $log_label -p local4.err "Failed to get xcatd connection information, exit..."
+    rm -rf /tmp/result.socat.out
+    rm -rf /tmp/helper.socat.sh
+    exit 1
+fi
+
+
+#send the find me request ot xcatd on MN
+MAX_RETRY=10
+RETRY=0
+DISCOVERED=0
+
+while [ $RETRY -lt $MAX_RETRY ]; do
+    logger -s -t $log_label -p local4.info "Sending the discovery packet to xCAT ($XCATMASTER:$XCATPORT) [ RETRY= $RETRY ]  ..."
+    (cat /tmp/discopacket.gz | socat STDIN UDP:$XCATMASTER:$XCATPORT,sourceport=301 ) &
+
+    WAITRETRY=0
+    while [ $WAITRETRY -lt 100 ]; do
+        if [ -f "/tmp/result.socat.out" ] && grep "restart" /tmp/result.socat.out; then
+            DISCOVERED=1
+            break;
+        fi
+        sleep 1
+        ((WAITRETRY=WAITRETRY+1))
+    done
+
+    if [ "$DISCOVERED" = "1" ]; then
+        break
+    fi
+    
+    sleep 2 
+    ((RETRY=RETRY+1))
+done
+
+rm -rf /tmp/result.socat.out
+rm -rf /tmp/helper.socat.sh
+
+if [ "$DISCOVERED" = "0" ] ; then
+    logger -s -t $log_label -p local4.info "Failed to discover me, exit..."
+    exit 1
+elif [ "$DISCOVERED" = "1" ]; then
+    echo "installstatus discovered" | socat STDIN TCP:$XCATMASTER:3002,sourceport=301,reuseaddr,retry=5
+fi
+
+exit 0
diff --git a/xCAT/postscripts/enablesnmp b/xCAT/postscripts/enablesnmp
index 2d4f2fd96..6f5661346 100755
--- a/xCAT/postscripts/enablesnmp
+++ b/xCAT/postscripts/enablesnmp
@@ -6,7 +6,12 @@ if ! cat /etc/os-release |grep -i  '^NAME=[ "]*Cumulus Linux[ "]*$' >/dev/null 2
     echo "This script is only supported on Cumulus OS in ONIE switch"
     exit 2
 fi
+
 snmp_conf="/etc/snmp/snmpd.conf"
+if [ -f "$snmp_conf" ] && grep -w '#xCAT customized snmpd configuration' $snmp_conf;then
+    echo "The snmp has already been configured. Do nothing..."
+    exit 0
+fi
 
 [ -f  "$snmp_conf" ] || exit -1
 
diff --git a/xCAT/postscripts/getmypostscript.cumulus b/xCAT/postscripts/getmypostscript.cumulus
new file mode 100755
index 000000000..54a54d1d0
--- /dev/null
+++ b/xCAT/postscripts/getmypostscript.cumulus
@@ -0,0 +1,58 @@
+#!/bin/bash
+#this script send getpostscript request to xcatd on MN and generate /xcatpost/mypostscript 
+#which includes the glocal environment variables to run postscripts
+
+if [ -z "$XCATDEST" ]; then
+        XCATDEST=$1
+fi
+
+#compose getpostscript request
+echo "<xcatrequest>
+<command>getpostscript</command>
+</xcatrequest>" > /tmp/req.xml
+
+
+
+if [ -f /tmp/resp.xml ]; then 
+    #remove any existing response file
+    rm /tmp/resp.xml; 
+fi
+
+
+#communicate with xcatd on MN with getpostscript request
+#the response will be saved in /tmp/resp.xml
+while [ ! -f /tmp/resp.xml ] || grep error /tmp/resp.xml; do
+        if [ -f /tmp/resp.xml ]; then
+                timer=60
+                while [ $timer -gt 0 ]; do
+                        echo -en  "Retrying in $timer seconds  \r" >&2
+                        sleep 1
+                        timer=$(($timer-1));
+                done
+        fi
+        #echo "                                                         " >&2
+        if [ -f /etc/xcat/cert.pem -a -f /etc/xcat/certkey.pem ]; then #use client cert if available
+                cat /tmp/req.xml | /usr/bin/openssl s_client -key /etc/xcat/certkey.pem -cert /etc/xcat/cert.pem -connect $XCATDEST -quiet 2> /dev/null > /tmp/resp.xml
+        else
+                cat /tmp/req.xml | /usr/bin/openssl s_client -connect $XCATDEST -quiet 2>/dev/null > /tmp/resp.xml
+        fi
+done
+
+if [ -f /tmp/resp.xml ] && grep '<data>' /tmp/resp.xml >/dev/null 2>&1 ;then
+    echo "Success to obtain mypostscript!"
+else
+    echo "Failed to obtain mypostscript!"
+    exit 1 
+fi
+
+#parse the script from the xml-formated  resposne
+cat /tmp/resp.xml | egrep  '<data>' | sed  -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' | sed -e 's/&lt;/</g' -e 's/&gt;/>/g' -e 's/&amp;/\&/g' -e 's/&quot;/"/g' -e "s/&apos;/'/g" >  /xcatpost/mypostscript
+
+#the script specified in the "postscripts" and "postbootscripts" are currently not supported
+#will be supported if there is requrement on this
+sed -i -e "/# postscripts-start-here/,$ d" /xcatpost/mypostscript
+
+rm -f /tmp/req.xml
+rm -f /tmp/resp.xml
+exit 0
+

From 32b467d635a3fe175405edc6c0cd4225638aef57 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Thu, 22 Jun 2017 22:29:20 -0400
Subject: [PATCH 060/283] Our p9 boxes do not have any VPD information, so in
 order to force the code to return a generated discovered definition, blank
 out the mtm string if XCAT_DEV_WITHERSPOON=TRUE

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

diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
index 5fb0f8009..63da7ea97 100644
--- a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
@@ -83,6 +83,11 @@ sub process_request
     $::CALLBACK = $callback;
 
     #$::args     = $request->{arg};
+    if (ref($request->{environment}) eq 'ARRAY' and ref($request->{environment}->[0]->{XCAT_DEV_WITHERSPOON}) eq 'ARRAY') {
+        $::XCAT_DEV_WITHERSPOON = $request->{environment}->[0]->{XCAT_DEV_WITHERSPOON}->[0];
+    } else {
+        $::XCAT_DEV_WITHERSPOON = $request->{environment}->{XCAT_DEV_WITHERSPOON};
+    }
 
     unless (defined($request->{arg})) {
         bmcdiscovery_usage();
@@ -1089,6 +1094,10 @@ sub bmcdiscovery_openbmc{
         if (defined($response->{data})) {
             if (defined($response->{data}->{Model}) and defined($response->{data}->{SerialNumber})) {
                 $mtm = $response->{data}->{Model};
+                if (defined($::XCAT_DEV_WITHERSPOON) && ($::XCAT_DEV_WITHERSPOON eq "TRUE")) {
+                    print "XCAT_DEV_WITHERSPOON=TRUE, forcing MTM to blank string (ORIG MTM=$mtm)\n";
+                    $mtm = "";
+                }
                 $serial = $response->{data}->{SerialNumber}; 
             } else {
                 xCAT::MsgUtils->message("W", { data => ["Could not obtain Model Type and/or Serial Number for BMC at $ip"] }, $::CALLBACK);

From bc46643b739302708a402986e876fa5aedf8b6ab Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Thu, 22 Jun 2017 23:08:15 -0400
Subject: [PATCH 061/283] Print the XCAT_DEV_WITHERSPOON bypass message out to
 the user

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

diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
index 63da7ea97..fdf03b3b7 100644
--- a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
@@ -1095,7 +1095,7 @@ sub bmcdiscovery_openbmc{
             if (defined($response->{data}->{Model}) and defined($response->{data}->{SerialNumber})) {
                 $mtm = $response->{data}->{Model};
                 if (defined($::XCAT_DEV_WITHERSPOON) && ($::XCAT_DEV_WITHERSPOON eq "TRUE")) {
-                    print "XCAT_DEV_WITHERSPOON=TRUE, forcing MTM to blank string (ORIG MTM=$mtm)\n";
+                    xCAT::MsgUtils->message("I", { data => ["XCAT_DEV_WITHERSPOON=TRUE, forcing MTM to empty string for $ip (Original MTM=$mtm)"] }, $::CALLBACK);
                     $mtm = "";
                 }
                 $serial = $response->{data}->{SerialNumber}; 

From d5290be6642849784b637bfba441375581eb4d05 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Thu, 22 Jun 2017 23:41:06 -0400
Subject: [PATCH 062/283] update according to comments

---
 .../autotest/testcase/confignetwork/cases0    | 50 +++++++++----------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index a1ce6239c..9267030af 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -31,7 +31,7 @@ check:output=~64 bytes from $$CN
 cmd:lsdef -l $$CN | grep status
 check:rc==0
 check:output=~booted
-cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/network/interfaces.d/*";else echo "Sorry,this is not supported os"; fi
+cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/network/interfaces.d/*";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 check:output=~__GETNODEATTR($$CN,ip)__
 check:output!~dhcp
@@ -78,7 +78,7 @@ check:output=~64 bytes from $$CN
 cmd:lsdef -l $$CN | grep status
 check:rc==0
 check:output=~booted
-cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/network/interfaces.d/*";else echo "Sorry,this is not supported os"; fi
+cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/*";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 check:output=~__GETNODEATTR($$CN,ip)__
 check:output!~dhcp
@@ -130,17 +130,18 @@ check:output=~64 bytes from $$CN
 cmd:lsdef -l $$CN | grep status
 check:rc==0
 check:output=~booted
-cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 check:output=~__GETNODEATTR($$CN,ip)__
 check:output!~dhcp
-cmd:secondarynic=`xdsh $$CN ip addr |grep 100.1.0.100|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "grep 100.1.0.100 /etc/sysconfig/network/ifcfg-$secondarynic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 100.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$secondarynic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 100.1.0.100 /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+cmd:secondarynic=`xdsh $$CN ip addr |grep 100.1.0.100|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$secondarynic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$secondarynic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 check:output=~100.1.0.100
 check:output!~dhcp
 cmd:chdef -m -t node $$CN postbootscripts="confignetwork -s"
 check:rc==0
 cmd:if [ -d $rootimgdir.regbak ]; then mv $rootimgdir.regbak $rootimgdir -f;fi
+cmd:xdsh $$CN "ip addr del 100.1.0.100/16 dev $$SECONDNIC"
 cmd:rmdef -t network -o 100_1_0_0-255_255_0_0
 cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC=
 check:rc==0
@@ -162,11 +163,12 @@ cmd:updatenode $$CN -P "confignetwork -s"
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
-cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep __GETNODEATTR($$CN,ip)__ /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep __GETNODEATTR($$CN,ip)__ /etc/network/interfaces";else echo "Sorry,this is not supported os"; fi
+cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/*";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 check:output=~__GETNODEATTR($$CN,ip)__
 check:output!~dhcp
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 11.1.0.100/16 dev $$SECONDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
@@ -195,6 +197,7 @@ cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/ne
 check:output=~11.1.0.100
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep MTU /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep MTU /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep MTU /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~MTU=1496
+cmd:xdsh $$CN "ip addr del 11.1.0.100/16 dev $$SECONDNIC"
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
@@ -219,23 +222,25 @@ cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
 check:rc==0
-cmd:chdef $$CN nicips.$$SECONDNIC="11.1.0.100|12.1.0.100" nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0" nicaliases.$$SECONDNIC="aliases1-1|aliases1-2"
+cmd:chdef $$CN nicips.$$SECONDNIC="11.1.0.100|12.1.0.100" nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0" nicaliases.$$SECONDNIC="aliases1-1 aliases1-1-1|aliases1-2" nichostnamesuffixes.$$SECONDNIC="-$$SECONDNIC|-$$SECONDNIC-1"
 check:rc==0
 cmd:makehosts $$CN
 check:rc==0
 cmd:cat /etc/hosts
-check:output=~aliases1-1
+check:output=~aliases1-1 aliases1-1-1
 check:output=~aliases1-2
 cmd:updatenode $$CN -P confignetwork 
 check:rc==0
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/*";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/*";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
 check:output!~dhcp
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces.d/*";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/*";else echo "Sorry,this is not supported os"; fi
 check:output=~12.1.0.100
 check:output!~dhcp
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 11.1.0.100/16 dev $$SECONDNIC"
+cmd:xdsh $$CN "ip addr del 12.1.0.100/16 dev $$SECONDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -f /etc/network/interfaces.d/$$SECONDNIC /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
@@ -269,10 +274,10 @@ check:output=~$$CN-$$SECONDNIC-1
 check:output=~$$CN-$$SECONDNIC-2
 cmd:updatenode $$CN -P confignetwork
 check:rc==0
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
 check:output!~dhcp
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
 check:output=~12.1.0.100
 check:output=~CONNECTED_MODE=yes
 check:output!~dhcp
@@ -280,6 +285,8 @@ cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -f /etc/network/interfaces.d/$$SECONDNIC /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
 check:rc==0
+cmd:xdsh $$CN "ip addr del 11.1.0.100/16 dev $$SECONDNIC"
+cmd:xdsh $$CN "ip addr del 12.1.0.100/16 dev $$SECONDNIC"
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
 check:rc==0
 cmd:mv -f /etc/hosts.bak /etc/hosts
@@ -349,7 +356,7 @@ check:rc==0
 cmd:chtab node=$$CN nics.disable=yes
 check:rc==0
 cmd:updatenode $$CN -P confignetwork
-check:rc==0
+check:rc==1
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output!~11.1.0.100
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
@@ -369,7 +376,7 @@ check:rc==0
 cmd:chtab node=$$CN nics.disable=1
 check:rc==0
 cmd:updatenode $$CN -P confignetwork
-check:rc==0
+check:rc==1
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output!~11.1.0.100
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
@@ -438,16 +445,12 @@ cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
-check:output!~dhcp
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
 check:output=~12.1.0.100
-check:output!~dhcp
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 13.1.0.100 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 13.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 13.1.0.100 /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~13.1.0.100
-check:output!~dhcp
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 14.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/network/interfaces.d/$$THIRDNIC:1";else echo "Sorry,this is not supported os"; fi
 check:output=~14.1.0.100
-check:output!~dhcp
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 13_1_0_0-255_255_0_0
@@ -456,6 +459,10 @@ cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifc
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC /etc/network/interfaces.d/$$THIRDNIC:1";else echo "Sorry,this is not supported os"; fi
 check:rc==0
+cmd:xdsh $$CN "ip addr del 11.1.0.100/16 dev $$SECONDNIC"
+cmd:xdsh $$CN "ip addr del 12.1.0.100/16 dev $$SECONDNIC"
+cmd:xdsh $$CN "ip addr del 13.1.0.100/16 dev $$THIRDNIC"
+cmd:xdsh $$CN "ip addr del 14.1.0.100/16 dev $$THIRDNIC"
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
 check:rc==0
 cmd:mv -f /etc/hosts.bak /etc/hosts
@@ -464,12 +471,3 @@ check:rc==0
 cmd:xdsh $$CN "rm -rf /tmp/backupnet/"
 check:rc==0
 end
-
-start:confignetwork_help
-description:this case is to verify if help information is provided
-cmd:confignetwork -h
-check:rc==0
-#TODO help information is printed
-cmd:confignetwork --help
-check:rc==0
-#TODO help information is printed

From 0e879470def003a08f5827f198e597141028c216 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Fri, 23 Jun 2017 00:05:47 -0400
Subject: [PATCH 063/283] update the return code

---
 xCAT-test/autotest/testcase/confignetwork/cases0 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index 9267030af..7800598c2 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -337,7 +337,7 @@ check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
 check:rc==0
 cmd:updatenode $$CN -P confignetwork
-check:rc!=0
+check:rc==0
 #TODO check the error message
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 check:rc==0
@@ -356,7 +356,7 @@ check:rc==0
 cmd:chtab node=$$CN nics.disable=yes
 check:rc==0
 cmd:updatenode $$CN -P confignetwork
-check:rc==1
+check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output!~11.1.0.100
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
@@ -376,7 +376,7 @@ check:rc==0
 cmd:chtab node=$$CN nics.disable=1
 check:rc==0
 cmd:updatenode $$CN -P confignetwork
-check:rc==1
+check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output!~11.1.0.100
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0

From 62d503797525ced1e6e368a30d5e2e0c884dd813 Mon Sep 17 00:00:00 2001
From: chenglch <chenglch@cn.ibm.com>
Date: Thu, 22 Jun 2017 03:47:57 -0400
Subject: [PATCH 064/283] Format the ouput of getadapter result

This patch format the result of getadapter command and update
the man page to notice that `getadapter` will boot into genesis.

Fix-issue: #3046
---
 .../references/man1/getadapter.1.rst          | 30 ++++++++++++++--
 xCAT-client/pods/man1/getadapter.1.pod        | 29 +++++++++++-----
 xCAT-server/lib/xcat/plugins/getadapter.pm    | 34 ++++++++++++-------
 3 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man1/getadapter.1.rst b/docs/source/guides/admin-guides/references/man1/getadapter.1.rst
index 982fcd4c3..316f4bcea 100644
--- a/docs/source/guides/admin-guides/references/man1/getadapter.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/getadapter.1.rst
@@ -31,7 +31,7 @@ DESCRIPTION
 
 Traditionally, network interfaces in Linux are enumerated as eth[0123...], but these names do not necessarily correspond to actual labels on the chassis. \ **getadapter**\  help customer to get predictable network device name and some other network adapter information before provision or network configuration.
 
-\ **getadapter**\  use genesis to collect network adapters information, so that mean it need to restart the target node.
+\ **Since getadpter uses genesis to collect network adapters information, the target node will be restarted.**\ 
 
 \ **getadapter**\  For each node within the <noderange>, follows below scheme:
 
@@ -41,16 +41,42 @@ If user hopes to scan the adapter information for the node but these information
 
 \ **getadapter**\  tries to collect more information for the  target network device,  but doesn't guarantee collect same much information for every network device.
 
-Below are the possible information can be collect up to now:
+
+******************************
+\ **Collected information:**\ 
+******************************
+
+
+
 \ **name**\ : the consistent name which can be used by confignic directly in operating system which follow the same naming scheme with rhels7
+
+
+
 \ **pci**\ : the pci location
+
+
+
 \ **mac**\ : the MAC address
+
+
+
 \ **candidatename**\ : All the names which satisfy predictable network device naming scheme. \ *(if xcat enhance confignic command later, user can use these names to configure their network adapter, even customize their name)*\ 
+
+
+
 \ **vender**\ :  the vender of network device
+
+
+
 \ **model**\ :  the model of network device
+
+
+
 \ **linkstate**\ :  the link state of network device
 
 
+
+
 *******
 OPTIONS
 *******
diff --git a/xCAT-client/pods/man1/getadapter.1.pod b/xCAT-client/pods/man1/getadapter.1.pod
index d9e43c6e9..0bdb93c42 100644
--- a/xCAT-client/pods/man1/getadapter.1.pod
+++ b/xCAT-client/pods/man1/getadapter.1.pod
@@ -12,7 +12,7 @@ B<getadapter> [B<-h>|B<--help>|B<-v>|B<--version>|B<-V>]
 
 Traditionally, network interfaces in Linux are enumerated as eth[0123...], but these names do not necessarily correspond to actual labels on the chassis. B<getadapter> help customer to get predictable network device name and some other network adapter information before provision or network configuration.
 
-B<getadapter> use genesis to collect network adapters information, so that mean it need to restart the target node.
+B<Since getadpter uses genesis to collect network adapters information, the target node will be restarted.>
 
 B<getadapter> For each node within the <noderange>, follows below scheme:
 
@@ -22,14 +22,25 @@ If user hopes to scan the adapter information for the node but these information
 
 B<getadapter> tries to collect more information for the  target network device,  but doesn't guarantee collect same much information for every network device.
 
-Below are the possible information can be collect up to now:
-B<name>: the consistent name which can be used by confignic directly in operating system which follow the same naming scheme with rhels7
-B<pci>: the pci location
-B<mac>: the MAC address
-B<candidatename>: All the names which satisfy predictable network device naming scheme. I<(if xcat enhance confignic command later, user can use these names to configure their network adapter, even customize their name)>
-B<vender>:  the vender of network device
-B<model>:  the model of network device
-B<linkstate>:  the link state of network device
+=head1 B<Collected information:>
+
+=over 2
+
+=item B<name>: the consistent name which can be used by confignic directly in operating system which follow the same naming scheme with rhels7
+
+=item B<pci>: the pci location
+
+=item B<mac>: the MAC address
+
+=item B<candidatename>: All the names which satisfy predictable network device naming scheme. I<(if xcat enhance confignic command later, user can use these names to configure their network adapter, even customize their name)>
+
+=item B<vender>:  the vender of network device
+
+=item B<model>:  the model of network device
+
+=item B<linkstate>:  the link state of network device
+
+=back
 
 =head1 OPTIONS
 
diff --git a/xCAT-server/lib/xcat/plugins/getadapter.pm b/xCAT-server/lib/xcat/plugins/getadapter.pm
index 19edc1817..3cdbe5bff 100644
--- a/xCAT-server/lib/xcat/plugins/getadapter.pm
+++ b/xCAT-server/lib/xcat/plugins/getadapter.pm
@@ -122,8 +122,8 @@ sub route_request {
     my $command = $request->{command}->[0];
     my $ret     = xCAT::State->REQUEST_ERROR;
 
-    if (scalar(@{ $request->{node} }) == 0) {
-        return $ret;
+    if (!$request->{node}) {
+        return xCAT::State->REQUEST_WAIT;
     }
 
     my $build_request_message_func = sub {
@@ -404,7 +404,7 @@ sub update_adapter_result {
         $interface_exists = 0;
 
         if (exists($msg->{nic}->[$i]->{interface})) {
-            $output .= $msg->{nic}->[$i]->{interface};
+            $output .= $msg->{nic}->[$i]->{interface}."!";
             if ($has_nic) {
                 $data .= "," . $msg->{nic}->[$i]->{interface} . "!";
             }
@@ -414,38 +414,46 @@ sub update_adapter_result {
             $interface_exists = 1;
             $has_nic          = 1;
         }
+        my @nic_attrs = ();
+        my @output_attrs = ();
         if (exists($msg->{nic}->[$i]->{mac})) {
-            $output .= "!mac=" . $msg->{nic}->[$i]->{mac};
+            push(@output_attrs, "mac=" . $msg->{nic}->[$i]->{mac});
             if ($interface_exists) {
-                $data .= " mac=" . $msg->{nic}->[$i]->{mac};
+                push(@nic_attrs, "mac=" . $msg->{nic}->[$i]->{mac});
             }
         }
         if (exists($msg->{nic}->[$i]->{pcilocation})) {
-            $output .= "|pci=" . $msg->{nic}->[$i]->{pcilocation};
+            push(@output_attrs, "pci=" . $msg->{nic}->[$i]->{pcilocation});
             if ($interface_exists) {
-                $data .= "pci=" . $msg->{nic}->[$i]->{pcilocation};
+                push(@nic_attrs, "pci=" . $msg->{nic}->[$i]->{pcilocation});
             }
         }
         if (exists($msg->{nic}->[$i]->{predictablename})) {
-            $output .= "|candidatename=" . $msg->{nic}->[$i]->{predictablename};
+            push(@output_attrs, "candidatename=" . $msg->{nic}->[$i]->{predictablename});
         }
         if (exists($msg->{nic}->[$i]->{vendor})) {
-            $output .= "|vendor=" . $msg->{nic}->[$i]->{vendor};
+            $msg->{nic}->[$i]->{vendor} =~ s/^\s+|\s+$//g;
+            push(@output_attrs, "vendor=" . $msg->{nic}->[$i]->{vendor});
         }
         if (exists($msg->{nic}->[$i]->{model})) {
-            $output .= "|model=" . $msg->{nic}->[$i]->{model};
+            $msg->{nic}->[$i]->{model} =~ s/^\s+|\s+$//g;
+            push(@output_attrs, "model=" . $msg->{nic}->[$i]->{model});
         }
         if (exists($msg->{nic}->[$i]->{linkstate})) {
-            $output .= "|linkstate=" . $msg->{nic}->[$i]->{linkstate};
+            push(@output_attrs, "linkstate=" . (split(' ', $msg->{nic}->[$i]->{linkstate}))[0]);
             if ($interface_exists) {
-                $data .= " linkstate=" . $msg->{nic}->[$i]->{linkstate};
+                push(@nic_attrs, "linkstate=". (split(' ', $msg->{nic}->[$i]->{linkstate}))[0]);
             }
         }
+        if (@nic_attrs) {
+            $data .= join(" ", @nic_attrs);
+        }
+        $output .= join("|", @output_attrs);
         $output .= "\n";
     }
     $callback->({ data => "$output" });
     if (!$has_nic) {
-        $callback->({ data => "$node: nics talbe will not be updated as not any ".
+        $callback->({ data => "$node: nics table will not be updated as not any ".
                     "useful information could be found with udevadm command." });
         return 0;
     }

From 5cd9b632a18faabb540f722fba86488019afe629 Mon Sep 17 00:00:00 2001
From: Yuan Bai <bybai@cn.ibm.com>
Date: Fri, 23 Jun 2017 14:45:13 +0800
Subject: [PATCH 065/283] refine new confignetwork framework to use configeth
 (#3302)

* new confignetwork framework to use configeth, it will be finally to replace confignics.

* updated based on comments
---
 xCAT/postscripts/configeth     |  43 +++----
 xCAT/postscripts/confignetwork | 218 ++++++++++++++++++++++++++++-----
 2 files changed, 209 insertions(+), 52 deletions(-)

diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth
index 51631a977..fd53c5dc9 100755
--- a/xCAT/postscripts/configeth
+++ b/xCAT/postscripts/configeth
@@ -6,6 +6,7 @@
 if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
    str_dir_name=`dirname $0`
    . $str_dir_name/xcatlib.sh
+   . $str_dir_name/nicutils.sh
 fi
 
 function configipv4(){
@@ -354,16 +355,16 @@ fi
 
 
 logger -t xcat -p local4.err "configeth: os type: $str_os_type"
-echo "configeth on $NODE: os type: $str_os_type"
+log_info "configeth on $NODE: os type: $str_os_type"
 if [ "$1" = "-r" ];then
     if [ $# -ne 2 ];then
         logger -t xcat -p local4.err "configeth: remove nic, but the nic name is missed"
-        echo "configeth on $NODE: remove nic, but the nic name is missed"
+        log_error "configeth on $NODE: remove nic, but the nic name is missed"
         exit 1
     fi
     str_nic_name=$2
     logger -t xcat -p local4.err "configeth: remove nic $str_nic_name"
-    echo "configeth on $NODE: remove nic $str_nic_name"
+    log_info "configeth on $NODE: remove nic $str_nic_name"
 
     if [ "$str_os_type" = "aix" ];then
         old_ifs=$IFS
@@ -392,7 +393,7 @@ if [ "$1" = "-r" ];then
             fi
         done
         logger -t xcat -p local4.err "configeth run command: chdev -l $str_nic_name -a netaddr='' -a netmask='' -a netaddr6='' -a prefixlen='' -a state=down"
-        echo "configeth on $NODE run command: chdev -l $str_nic_name -a netaddr='' -a netmask='' -a netaddr6='' -a prefixlen='' -a state=down"
+        log_info "configeth on $NODE run command: chdev -l $str_nic_name -a netaddr='' -a netmask='' -a netaddr6='' -a prefixlen='' -a state=down"
         chdev -l $str_nic_name -a netaddr='' -a netmask='' -a netaddr6='' -a prefixlen='' -a state=down
     else
         #shut down the nic if it is on 
@@ -412,7 +413,7 @@ if [ "$1" = "-r" ];then
 elif [ "$1" = "-s" ];then
     if [ $# -lt 2 ];then
         logger -t xcat -p local4.err "configeth: config install nic, but the nic name is missed"
-        echo "configeth on $NODE: config install nic, but the nic name is missed"
+        log_error "configeth on $NODE: config install nic, but the nic name is missed"
         exit 1
     fi
     str_inst_nic=$2
@@ -423,8 +424,8 @@ elif [ "$1" = "-s" ];then
 
     if [ "$str_os_type" = "aix" ];then
         logger -t xcat -p local4.err "configeth: aix does not support -s flag"
-        echo "configeth on $NODE: aix does not support -s flag"
-        exit 0
+        log_error "configeth on $NODE: aix does not support -s flag"
+        exit 1
     elif [ -f "/etc/debian_version" ];then
         str_lease_file="/var/lib/dhcp/dhclient."$str_inst_nic".leases"
         if [ -e "$str_lease_file" ];then
@@ -502,7 +503,7 @@ elif [ "$1" = "-s" ];then
 
     if [ -z "$str_inst_ip" -o -z "$str_inst_mask" ];then
         logger -t xcat -p local4.err "configeth: config install nic, can not find the information from lease file, return."
-        echo "configeth on $NODE: config install nic, can not find information from dhcp lease file, return."
+        log_info "configeth on $NODE: config install nic, can not find information from dhcp lease file, return."
         exit 0
     fi
 
@@ -648,7 +649,7 @@ fi
 #3. on linux modify the configuration files
 if [ $# -ne 3 ];then
     logger -t xcat -p local4.err "configeth: paramters error currently is $@"
-    echo "configeth on $NODE: paramters error currently is $@"
+    log_error "configeth on $NODE: paramters error currently is $@"
     exit 1
 fi
 str_nic_name=$1
@@ -706,7 +707,7 @@ while [ $num_index -le $NETWORKS_LINES ];do
 done
 
 logger -t xcat -p local4.err "configeth: new configuration"
-echo "configeth on $NODE: new configuration"
+log_info "configeth on $NODE: new configuration"
 num_index=0
 str_ipv6_gateway=''
 while [ $num_index -lt ${#array_nic_ips[*]} ];do
@@ -715,7 +716,7 @@ while [ $num_index -lt ${#array_nic_ips[*]} ];do
     str_netname=${array_nic_networks[$num_index]}
     if [ ! $str_netname ];then
         logger -t xcat -p local4.err "configeth: Network name is not defined on $str_nic_name for $str_ip."
-        echo "configeth on $NODE: Network name is not defined on $str_nic_name for $str_ip."
+        log_error "configeth on $NODE: Network name is not defined on $str_nic_name for $str_ip."
         num_index=$((num_index+1))
         continue
     fi
@@ -724,7 +725,7 @@ while [ $num_index -lt ${#array_nic_ips[*]} ];do
     str_line=${array_nic_network_config[$num_index]}
     if [ ! $str_line ];then
         logger -t xcat -p local4.err "configeth: Network object $str_netname is not defined."
-        echo "configeth on $NODE: Network object $str_netname is not defined."
+        log_error "configeth on $NODE: Network object $str_netname is not defined."
         num_index=$((num_index+1))
         continue
     fi
@@ -737,7 +738,7 @@ while [ $num_index -lt ${#array_nic_ips[*]} ];do
  
     if [ ! $str_subnet -o ! $str_netmask ];then
         logger -t xcat -p local4.err "configeth: subnet or netmask is not defined in network object $str_netname."
-        echo "configeth on $NODE: subnet or netmask is not defined in network object $str_netname."
+        log_error "configeth on $NODE: subnet or netmask is not defined in network object $str_netname."
         num_index=$((num_index+1))
         continue
     fi
@@ -768,7 +769,7 @@ while [ $num_index -lt ${#array_nic_ips[*]} ];do
         str_ip_mask_pair=$str_ip_mask_pair"${str_ip}_${str_netmask} "
     else
         logger -t xcat -p local4.err "configeth: the ipaddress( $str_ip ) for $str_nic_name is invalid."
-        echo "configeth on $NODE: the ipaddress( $str_ip ) for $str_nic_name is invalid."
+        log_error "configeth on $NODE: the ipaddress( $str_ip ) for $str_nic_name is invalid."
     fi
     num_index=$((num_index+1))
 done
@@ -788,7 +789,7 @@ if [ "$str_os_type" = "aix" ];then
         else
             chdev -l $str_nic_name -a netaddr='' -a netmask=''
             logger -t xcat -p local4.err "configeth: delete undefined ip address $str_old_ip"
-            echo "configeth on $NODE: delete undefined ip address $str_old_ip"
+            log_error "configeth on $NODE: delete undefined ip address $str_old_ip"
         fi
     fi
 
@@ -856,7 +857,7 @@ if [ "$str_os_type" = "aix" ];then
         str_ip_status=$(hashget hash_new_config $str_new_ip)
         if [ "$str_ip_status" = "new" ];then
             logger -t xcat -p local4.err "configeth: add $str_new_ip for $str_nic_name temporary."
-            echo "configeth on $NODE: add $str_new_ip for $str_nic_name temporary."
+            log_info "configeth on $NODE: add $str_new_ip for $str_nic_name temporary."
             add_ip_temporary $str_new_ip $str_nic_name
         fi
     done
@@ -891,7 +892,7 @@ else
                     else
                         bool_modify_flag=1
                         logger -t xcat -p local4.err "configeth: delete $str_old_ip for $str_nic_name temporary."
-                        echo "configeth on $NODE: delete $str_old_ip for $str_nic_name temporary."
+                        log_info "configeth on $NODE: delete $str_old_ip for $str_nic_name temporary."
                         str_old_ip=`echo $str_old_ip | tr '_' '/'`
                         ip addr del $str_old_ip dev $str_nic_name
                     fi
@@ -929,7 +930,7 @@ else
                 bool_modify_flag=1
                 if [ $bool_restart_flag -eq 0 ];then
                     logger -t xcat -p local4.err "configeth: add $str_new_ip for $str_nic_name temporary."
-                    echo "configeth on $NODE: add $str_new_ip for $str_nic_name temporary."
+                    log_info "configeth on $NODE: add $str_new_ip for $str_nic_name temporary."
                     add_ip_temporary $str_new_ip $str_nic_name
                 fi
             fi
@@ -940,7 +941,7 @@ else
         ip -6 route | grep default | grep $str_ipv6_gateway
         if [ $? -ne 0 ];then
             logger -t xcat -p local4.err "configeth: the default ipv6 route changes to $str_ipv6_gateway."
-            echo "configeth on $NODE: the default ipv6 route changes to $str_ipv6_gateway."
+            log_info "configeth on $NODE: the default ipv6 route changes to $str_ipv6_gateway."
             ip -6 route del default
             ip -6 route add default $str_ipv6_gateway dev $str_dev_name
         fi
@@ -963,7 +964,7 @@ else
             done
         fi
         logger -t xcat -p local4.err "configeth: $str_nic_name changed, modify the configuration files"
-        echo "configeth on $NODE: $str_nic_name changed, modify the configuration files"
+        log_info "configeth on $NODE: $str_nic_name changed, modify the configuration files"
         num_ipv4_index=0
         num_ipv6_index=0
         num_index=0
@@ -1020,7 +1021,7 @@ else
         done
     else
         logger -t xcat -p local4.err "configeth: $str_nic_name no changed, return directly."
-        echo "configeth on $NODE: $str_nic_name no changed, return directly."
+        log_warn "configeth on $NODE: $str_nic_name no changed, return directly."
     fi
 
     #restart the nic
diff --git a/xCAT/postscripts/confignetwork b/xCAT/postscripts/confignetwork
index 80ef76c1a..bb0a90cec 100755
--- a/xCAT/postscripts/confignetwork
+++ b/xCAT/postscripts/confignetwork
@@ -1,12 +1,16 @@
-#!/bin/bash
+#!/bin/bash 
 #-------------------------------------------------------------------------------
 #  confignetwork
-#  Used on Redhat only. Configure bond/vlan/linux bridge/ on the nodes
+#      Configure Ethernet nic/bond/vlan/bridge/ on the nodes
+#      Configure Ethernet nic support redhat sles and ubuntu OS, confignetwork use configeth to realize this work.
+#      Configure bond/vlan/bridge support redhat only.
 #
 #  You can configure nicdevices,nictypes,nicips,nicnetworks in nics table
-#  Then you can run the following commands on MN:
+#  1. If you want to configure install nic and other nics, you can run the following command on MN:
+#       updatenode noderange "confignetwork -s"
+#  2. If you want to configure nics except install nic, you can run the following command on MN:
 #       updatenode noderange confignetwork
-#  confignetwork can be used in postscript too.
+#  3. confignetwork can be used in postscripts or postbootscripts too.
 #
 ############################################################################
 
@@ -18,13 +22,12 @@ if [ x"$str_os_type" = "xLinux" ];then
     . $str_dir_name/nicutils.sh
 else
     log_error "Does NOT support non-Linux Operating System." 
-    exit -1
+    exit 1
 fi
 
-
 ######################################################################
 #
-# OS support
+# OS support checking
 # Check OS version and get the directory of network configuration file
 #
 #####################################################################
@@ -39,18 +42,78 @@ if [ -f "/etc/redhat-release" ];then
 elif [ -f "/etc/SuSE-release" -o -n "$str_temp" ];then
     is_sles=1
     nwdir="/etc/sysconfig/network"
-    log_error "Only supports RHEL"
-    exit -1
 elif [ -f "/etc/debian_version" ];then
     nwdir="/etc/network/interfaces.d"
     is_debian=1
-    log_error "Only supports RHEL" 
-    exit -1
 else
-    log_error "Only supports RHEL" 
-    exit -1
+    log_error "Only supports Linux"
+    exit 1
 fi
 
+######################################################################
+#
+# get network configuration file content
+#
+####################################################################
+function get_nic_cfg_file_content {
+    cfg_dev=$1
+    cfg_file=''
+    if [ $is_redhat -eq 1 ] || [ $is_sles -eq 1 ]; then
+         cfg_file="$nwdir/ifcfg-${cfg_dev}" 
+    elif [ $is_debian -eq 1 ]; then
+         cfg_file="$nwdir/${cfg_dev}"
+    fi
+
+    if [ -f $cfg_file ]; then
+        echo "['${cfg_file}']" >&2
+        cat ${cfg_file}| $sed -e 's/^/ >> /g' | log_lines info
+    else
+        log_error "Can not find $cfg_file."
+        errorcode=1
+    fi
+}
+
+######################################################################
+#
+# Parser input arguments
+#
+#####################################################################
+boot_install_nic=0
+for arg in "$@"
+do
+    if [ "$arg" = "-s" ];then
+        boot_install_nic=1
+    fi
+    #TODO: IB support is TBD
+done
+if [ "$SETINSTALLNIC" = "1" ] || [ "$SETINSTALLNIC" = "yes" ]; then
+    bool_install_nic=1
+fi
+
+######################################################################
+#
+# Preparation for installnic
+#
+#####################################################################
+function get_installnic {
+
+    tmp_installnic="mac"
+    [ $INSTALLNIC ] && tmp_installnic=$INSTALLNIC
+
+    instnic=''
+    if [ "$tmp_installnic" = "mac" ];then
+        if [ -n "$MACADDRESS" ]; then
+            instnic=`ip -o link | grep -i "$MACADDRESS" | awk '{print $2;}' | sed s/://`
+        else
+            errorcode=1
+        fi
+    elif [ `echo $tmp_installnic | grep -E "e(n|th|m)[0-9a-zA-Z]+"` ];then
+        instnic=$tmp_installnic
+    else
+            errorcode=1
+    fi
+    echo $instnic
+}
 
 #######################################################################################
 #
@@ -120,6 +183,19 @@ function find_nic_type {
     echo $(hashget "nictypes" $nic)
 }
 
+################################################################
+#
+# find nic custom scripts
+#
+# input : nic
+#
+# output : niccustomscripts from nics table
+#
+###############################################################
+function find_nic_custom_scripts {
+    [ $1 ] && echo $(hashget "niccustomscripts" "$1")
+}
+
 
 ################################################################
 #
@@ -231,14 +307,29 @@ function sort_nics_device_order {
     while [ $num1 -lt $max1 ];
     do
         alonenic=`echo "$alone_nics"|sed -n "${num1}p"|sed "s/ //g"`
+        #make sure alonenic does not have base device
         echo "$nics_list"| grep "$alonenic" >/dev/null
         if [ $? -ne 0 ]; then
-            echo $alonenic
+            #pre-check nicips nictype nicnetworks for alone nic
+            #nicips nictype and nicnetworks should be configured in nics table for alone nic
+            alonenicips=`find_nic_ips $alonenic`
+            alonenictype=`find_nic_type $alonenic`
+            alonenicnetwork=`query_nicnetworks_net $alonenic`
+            if [ -n "$alonenicips" ] && [ -n "$alonenictype" ] && [ -n "$alonenicnetwork" ]; then
+                #if alone nic configure nicips, it is valid 
+                echo $alonenic
+            else
+                errorcode=1
+                echo "Error: nicips,nictype and nicnetwork should be configured in nics table for $alonenic."
+                ((num1+=1)) 
+                continue
+            fi
         fi
         ((num1+=1))
     done
-    #
-    if [ -n "$nics_list" ]; then 
+    
+    if [ -n "$nics_list" ]; then
+      if [ $is_redhat -eq 1 ]; then  
         num=1
         max=`echo "$nics_list"|wc -l`
         ((max+=1))
@@ -302,6 +393,9 @@ function sort_nics_device_order {
             fi
             ((num+=1))
         done
+      else
+        log_error "Error: only support configure bond/vlan/bridge on redhat."
+      fi
     fi
     new_order=$eth_slot" "$bond_slot" "$vlan_slot
     new_order_list=""
@@ -336,6 +430,36 @@ function configure_nicdevice {
     ((max+=1))
     while [ $num -lt $max ];
     do
+        nic_dev=`echo "$nics_pair" |sed -n "${num}p"|awk '{print $1}'`
+        #If install nic is configured, skip to reconfigure it
+        if [ x"$nic_dev" = x"$installnic" -a $instnic_conf -eq 1 ]; then
+            log_warn "install nic $nic_dev has been configured, skip to reconfigure it."
+            ((num+=1))
+            continue
+        fi
+        #processing custom scripts for nic
+        customcmd=`find_nic_custom_scripts $nic_dev`
+        customscript=`echo $customcmd|awk '{print $1}'`
+        if [ -n "$customscript" ]; then
+            if [ -f "/install/postscript/$customscript" ]; then
+                #if there is no custom script in /install/postscript,exit this loop
+                log_error "/install/postscript/$customscript does not exist."
+                errorcode=1
+                ((num+=1))
+                continue
+            fi
+            echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+            log_info "processing custom scripts:\"$customcmd\"  for interface $nic_dev"
+            $customcmd
+            if [ $? -ne 0 ]; then
+                errorcode=1
+            fi
+
+            #if custom script is finished, go to configure next nic/nic_pair
+            ((num+=1))
+            continue
+        fi
+        #get base nic and its type
         base_nic_dev=`echo "$nics_pair" |sed -n "${num}p"|awk '{print $2}'`
         if [ -n "$base_nic_dev" ]; then
             if echo "$base_nic_dev"|grep "@" >/dev/null; then
@@ -347,17 +471,23 @@ function configure_nicdevice {
         
             base_nic_type=`find_nic_type "$base_temp_nic" | $utolcmd`
         fi
-        nic_dev=`echo "$nics_pair" |sed -n "${num}p"|awk '{print $1}'`
         nic_dev_type=`find_nic_type "$nic_dev" | $utolcmd`
         echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
         nic_pair=`echo "$nics_pair" |sed -n "${num}p"`
         echo "configure nic and its device : $nic_pair"
+
         #configure standalone ethernet nic
         if [ x"$nic_dev_type" = "xethernet" ]; then
-            
-            ipaddr=`find_nic_ips $nic_dev|awk -F"|" '{print $1}'`
-            if [ -n "$ipaddr" ]; then
-                create_ethernet_interface ifname=$nic_dev _ipaddr=$ipaddr
+            xcatnet=`query_nicnetworks_net $nic_dev`            
+            ipaddrs=`find_nic_ips $nic_dev`
+            if [ -n "$ipaddrs" ]; then
+                log_info "configure $nic_dev"
+                log_info "call: configeth $nic_dev $ipaddrs $xcatnet"
+                configeth $nic_dev $ipaddrs $xcatnet
+                if [ $? -ne 0 ]; then
+                    errorcode=1
+                fi
+                get_nic_cfg_file_content $nic_dev
             else
                 log_warn "There is no ip for $nic_dev."
                 ((noip+=1))
@@ -367,6 +497,7 @@ function configure_nicdevice {
                 log_error "There is no any ip configured for any nic. Check nicips in nics table first."
                 errorcode=1
             fi 
+
         #configure bridge
         #linux bridge type is bridge
         #openvswitch bridge type is bridge_ovs
@@ -387,6 +518,8 @@ function configure_nicdevice {
         #configure bond 
         elif [ x"$nic_dev_type" = "xbond" ]; then
             create_bond_interface ifname=$nic_dev slave_ports=$base_nic_for_bond       
+        elif [ x"$nic_dev_type" = "xinfiniband" ]; then
+            log_error "confignetwork does not support configure IB. "
         else
             log_error "Error : please check nictypes for $nic_pair."
             errorcode=1
@@ -424,10 +557,30 @@ function enable_network_service {
 ############################################################################
 
 errorcode=0
-
 #nictypes should support capital letters, for example, Ethernet and ethernet
 utolcmd="sed -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/"
 
+#get for installnic
+installnic=''
+installnic=`get_installnic`
+instnic_conf=0
+if [ $boot_install_nic -eq 1 ];then
+    if [ -n "$installnic" ]; then
+        echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+        log_info "configure the install nic $installnic. "
+        instnic_conf=1
+        configeth -s $installnic |log_lines info
+        if [ $? -ne 0 ]; then
+            errorcode=1
+        fi
+        get_nic_cfg_file_content $installnic
+        echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+    else
+        log_error "Can not determine proper install nic."
+        errorcode=1
+    fi
+fi
+
 #replace | with "@", for example, eth1|eth2  ---->   eth1@eth2
 nicdevice=`echo "$NICDEVICES" | sed 's/|/@/g'`
 
@@ -440,6 +593,8 @@ parser_nic_attribute "$NICTYPES" "nictypes"
 #make hash for nicips
 parser_nic_attribute "$NICIPS" "nicips"
 
+#make hash for niccustomscripts
+parser_nic_attribute "$NICCUSTOMSCRIPTS" "niccustomscripts"
 
 #get nic and its device pair, for example
 #eth0.6 eth0
@@ -449,26 +604,27 @@ parser_nic_attribute "$NICIPS" "nicips"
 new_nicdevice=`find_nic_and_device_list $str_all_nics|sort -g -k1 -g -k2|uniq`
 if [ -z "$new_nicdevice" ]; then
     log_info "There is no nic device to configure."
-    exit 
+    exit $errorcode  
 fi
 
-#enable network service
-enable_network_service
-
 #sort nics device pair based on nicdevice type
 sorted_nicdevice_list=`sort_nics_device_order "$new_nicdevice"`
 
 #If there is invalid nics pair, errorcode is 1
 invalid_nicdevice_pair=`echo "$sorted_nicdevice_list" | grep "Error"`
 if [ $? -eq 0 ]; then
-log_error $invalid_nicdevice_pair
-errorcode=1
+    echo "$invalid_nicdevice_pair"|log_lines error
+    errorcode=1
 fi
 
 #delete invalid nics device pair based on Error
-valid_sorted_nicdevice_list=`echo "$sorted_nicdevice_list" | sed '/Error/d'` 
-log_info "All valid nics and device list:"
-echo "$valid_sorted_nicdevice_list" |log_lines info
+valid_sorted_nicdevice_list=`echo "$sorted_nicdevice_list" | sed '/Error/d'`
+if [ -n "$valid_sorted_nicdevice_list" ]; then 
+    log_info "All valid nics and device list:"
+    echo "$valid_sorted_nicdevice_list" |log_lines info
+fi
+#enable network service
+enable_network_service
 
 #config nics and ifcfg files
 configure_nicdevice "$valid_sorted_nicdevice_list"

From f5126227ceaf0d4cd03769261b3acb9e5c22208d Mon Sep 17 00:00:00 2001
From: yangsong <immarvin@users.noreply.github.com>
Date: Fri, 23 Jun 2017 03:18:03 -0500
Subject: [PATCH 066/283] refine the PR 3268:support service node pool (#3323)

Fix the issue that grub2 config file is wrong when node.tftpserver="<xcatmaster>"
---
 xCAT-server/lib/xcat/plugins/anaconda.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm
index 5b61b8326..fb2a7cd19 100644
--- a/xCAT-server/lib/xcat/plugins/anaconda.pm
+++ b/xCAT-server/lib/xcat/plugins/anaconda.pm
@@ -607,7 +607,7 @@ sub mknetboot
             $xcatmaster = '!myipfn!'; #allow service nodes to dynamically nominate themselves as a good contact point, this is of limited use in the event that xcat is not the dhcp/tftp server
         }
 
-        if ($ient and $ient->{tftpserver})
+        if ($ient and $ient->{tftpserver} and $ient->{tftpserver} ne '<xcatmaster>')
         {
             $imgsrv = $ient->{tftpserver};
         }

From 4176017b1716ba285ea364948235be3d4361dbf8 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Sun, 25 Jun 2017 23:06:54 -0400
Subject: [PATCH 067/283] Fix issue 3327, check environment of request type in
 openbmc and bmcdiscover

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

diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
index fdf03b3b7..c7b3ae80c 100644
--- a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
@@ -85,6 +85,8 @@ sub process_request
     #$::args     = $request->{arg};
     if (ref($request->{environment}) eq 'ARRAY' and ref($request->{environment}->[0]->{XCAT_DEV_WITHERSPOON}) eq 'ARRAY') {
         $::XCAT_DEV_WITHERSPOON = $request->{environment}->[0]->{XCAT_DEV_WITHERSPOON}->[0];
+    } elsif (ref($request->{environment}) eq 'ARRAY') {
+        $::XCAT_DEV_WITHERSPOON = $request->{environment}->[0]->{XCAT_DEV_WITHERSPOON};
     } else {
         $::XCAT_DEV_WITHERSPOON = $request->{environment}->{XCAT_DEV_WITHERSPOON};
     }
diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 3c30b1407..ec95782b5 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -283,6 +283,8 @@ sub preprocess_request {
 
     if (ref($request->{environment}) eq 'ARRAY' and ref($request->{environment}->[0]->{XCAT_OPENBMC_DEVEL}) eq 'ARRAY') {
         $::OPENBMC_DEVEL = $request->{environment}->[0]->{XCAT_OPENBMC_DEVEL}->[0];
+    } elsif (ref($request->{environment}) eq 'ARRAY') {
+        $::OPENBMC_DEVEL = $request->{environment}->[0]->{XCAT_OPENBMC_DEVEL};
     } else {
         $::OPENBMC_DEVEL = $request->{environment}->{XCAT_OPENBMC_DEVEL};
     }

From b2d434a22fb71b5bf7095922e93e1d1202a87c4a Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Mon, 26 Jun 2017 02:01:47 -0400
Subject: [PATCH 068/283] fix sles11.4 testcase failure

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

diff --git a/xCAT-test/autotest/testcase/confignics/cases0 b/xCAT-test/autotest/testcase/confignics/cases0
index c00b7676d..b6f5e92e0 100644
--- a/xCAT-test/autotest/testcase/confignics/cases0
+++ b/xCAT-test/autotest/testcase/confignics/cases0
@@ -173,7 +173,7 @@ check:rc==0
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
 check:output=~11.1.0.100
 check:output!~dhcp
-cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECONDNIC:1 ; elif [ "$$OS" = "rhels" ]; then xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC:1;else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC:1; fi
+cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECONDNIC:1 ; elif [ "$$OS" = "rhels" ]; then xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC:1;else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
 check:output=~12.1.0.100
 check:output!~dhcp
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$THIRDNIC; else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$THIRDNIC; fi

From 664f63b8bfac5339fdae03b95eec01ddbd85e137 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Mon, 26 Jun 2017 15:19:23 -0400
Subject: [PATCH 069/283] Fix formatting and grammar for sinv man page

---
 .../admin-guides/references/man1/sinv.1.rst   | 95 +++++++++----------
 xCAT-client/pods/man1/sinv.1.pod              | 95 +++++++++----------
 2 files changed, 90 insertions(+), 100 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man1/sinv.1.rst b/docs/source/guides/admin-guides/references/man1/sinv.1.rst
index 89bf04d4e..11a98a55b 100644
--- a/docs/source/guides/admin-guides/references/man1/sinv.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/sinv.1.rst
@@ -19,7 +19,7 @@ sinv.1
 ****************
 
 
-\ **sinv**\   [\ **-o**\  \ *output*\ ] [\ **-p**\  \ *template path*\ ] [\ **-t**\  \ *template count*\ ] [\ **-s**\  \ *seed node*\ ] [\ **-i**\ ] [\ **-e**\ ] [\ **-r**\ ] [\ **-V**\ ] [\ **-**\ **-devicetype**\  \ *type_of_device*\ ]  [\ **-l**\   \ *userID*\ ] [[\ **-f**\  \ *command file*\ ] | [\ **-c**\  \ *command*\ ]]
+\ **sinv**\   [\ **-o**\  \ *output*\ ] \ **-p**\  \ *template path*\  [\ **-t**\  \ *template count*\ ] [\ **-s**\  \ *seed node*\ ] [\ **-i**\ ] [\ **-e**\ ] [\ **-r**\ ] [\ **-V**\ ] [\ **-**\ **-devicetype**\  \ *type_of_device*\ ]  [\ **-l**\   \ *userID*\ ] {\ **-f**\  \ *command file*\  | \ **-c**\  \ *command*\ }
 
 \ **sinv**\  [\ **-h**\  | \ **-v**\ ]
 
@@ -30,9 +30,9 @@ sinv.1
 
 
 The \ **sinv**\  command is designed to check the configuration of the nodes in a cluster.
-The command takes as input command line flags, and one or more templates which will be compared against the output of the xdsh command, designated to be run by the -c or -f flag, on the nodes in the noderange.
+The command takes as input command line flags, and one or more templates which will be compared against the output of the \ **xdsh**\  command, designated to be run by the \ **-c**\  or \ **-f**\  flag, on the nodes in the noderange.
 
-The nodes will then be grouped according to the template they match and a report returned to the administrator in the output file designated by the -o flag, or to stdout.
+The nodes will then be grouped according to the template they match and a report returned to the administrator in the output file designated by the \ **-o**\  flag, or to stdout.
 
 \ **sinv**\  supports checking the output from the  \ **rinv**\  or \ **xdsh**\  command.
 
@@ -40,13 +40,13 @@ The \ **sinv**\  command is an xCAT Distributed Shell Utility.
 
 \ **COMMAND**\  \ **SPECIFICATION**\ :
 
-The xdsh or rinv command to execute on the remote targets is specified by the \ **-c**\  flag, or by the \ **-f**\  flag
+The \ **xdsh**\  or \ **rinv**\  command to execute on the remote targets is specified by the \ **-c**\  flag, or by the \ **-f**\  flag
 which is followed by the fully qualified path to a file containing the command.
 
-Note: do not add | xdshcoll to the command on the command line or in the
-command file, it is automatically added by sinv.
+Note: do not add \ **| xdshcoll**\  to the command on the command line or in the
+command file, it is automatically added by \ **sinv**\ .
 
-The syntax for the \ **-c**\   \ **sinv**\  parameter is as follows:
+The syntax for the \ **-c**\   parameter is as follows:
 
 "\ *command*\ [; \ *command*\ ]..."
 
@@ -60,9 +60,9 @@ those that read from standard input.
 
 \ **REMOTE**\  \ **SHELL**\  \ **COMMAND**\ :
 
-For xdsh, support is  explicitly  provided
-for  AIX  Remote  Shell and OpenSSH, but any secure remote command that
-conforms to the IETF (Internet Engineering Task  Force)  Secure  Remote
+For \ **xdsh**\ , support is explicitly provided
+for AIX Remote Shell and OpenSSH, but any secure remote command that
+conforms to the IETF (Internet Engineering Task  Force) Secure Remote
 Command Protocol can be used. See man \ **xdsh**\  for more details.
 
 
@@ -74,32 +74,28 @@ Command Protocol can be used. See man \ **xdsh**\  for more details.
 
 \ **-o | -**\ **-output**\  \ *report output file*\ 
  
- Optional output file. This is the location of the file that will contain the report of the nodes that match, and do not match, the input templates.
- If the flag is not used, the output will go to stdout.
+ Optional output file. This is the location of the file that will contain the report of the nodes that match, and do not match, the input templates. If the flag is not used, the output will go to stdout.
  
 
 
 \ **-p | -**\ **-tp**\  \ *template path*\ 
  
  This is the path to the template file. The template contains the output
- of xdsh command, that has been run against a "seed" node, a node 
- that contains the configuration that you would like  
- all nodes in your noderange to match.
+ of \ **xdsh**\  or \ **rinv**\  command, that has been run against a "seed" node, a node 
+ that contains the configuration that you would like all nodes in your noderange to match.
  
- The admin can create the template by running the xdsh command on
- the seed node, pipe to xdshcoll ( required) and store the output
+ The admin can create the template by running the \ **xdsh**\  or \ **rinv**\  command on
+ the seed node, pipe to \ **xdshcoll**\  (required) and store the output
  in the template path. See examples.
  
- \ **Note:**\  The admin can also edit the
- template to remove any lines that they do not want checked.
+ \ **Note:**\  The admin can also edit the template to remove any lines that they do not want checked.
  
  An alternative method is to use the [\ **-s**\  \ *seed node*\ ] parameter, 
  which will automatically build the template for you from the 
  seed node named.
  
- If a template path file does not exist, and a seed node is not input,
- then sinv will automatically use the one node in the noderange as
- the seed node and build the template.
+ If a a seed node is not provided, then command will automatically use the first node in the noderange as
+ the seed node.
  
 
 
@@ -107,7 +103,7 @@ Command Protocol can be used. See man \ **xdsh**\  for more details.
  
  This count is the number of templates that the command will use
  to check for nodes matches.  If the template in the template path does not
- match a node, the \ **sinv**\  will check additional templates  up 
+ match a node, the \ **sinv**\  will check additional templates up 
  to the template count.
  
  For each node, it will compare the node against each template to see if 
@@ -127,9 +123,8 @@ Command Protocol can be used. See man \ **xdsh**\  for more details.
  that is stored in template path.  You can use this parameter instead of running
  the command yourself to build the template.
  
- \ **Note:**\  If the template path file does not exist, and no seed node is 
- supplied, the seed node automatically is one node in the
- noderange.
+ \ **Note:**\  If no seed node is supplied, the first node in the noderange is automatically
+ selected as a seed node.
  
 
 
@@ -147,9 +142,9 @@ Command Protocol can be used. See man \ **xdsh**\  for more details.
  
  This requires the check of node output against template to be an exact match.
  If this flag is not set, \ **sinv**\  checks to see if the return from the 
- xdsh command to the nodes contain a match for each line in the input 
+ \ **xdsh**\  or \ **rinv**\  command to the nodes contain a match for each line in the input 
  template (except for xdshcoll header and comments). If not in exactmatch mode,
- there can exist more lines in the xdsh return from the nodes.
+ there can be more lines in the \ **xdsh**\  or \ **rinv**\  return from the nodes.
  
  For example, if running a "rpm -qa | grep xCAT" command, without exactmatch 
  set, if the node contains more xCAT rpms that listed in the template,
@@ -185,21 +180,21 @@ Command Protocol can be used. See man \ **xdsh**\  for more details.
 
 \ **-c | -**\ **-command**\ 
  
- The xdsh or rinv command that will be run. The command should be enclosed in 
- double quotes to insure correct shell interpretation. This parameter must only contain, the node range or the image path (Linux) or spot name for AIX. It cannot be used to set additional input flags to xdsh or rinv (for example -s,-T,-e).  See examples below.
+ The \ **xdsh**\  or \ **rinv**\  command that will be run. The command should be enclosed in 
+ double quotes to insure correct shell interpretation. This parameter must only contain, the node range or the image path (Linux) or spot name for AIX. It cannot be used to set additional input flags to \ **xdsh**\  or \ **rinv**\  (for example \ **-s**\ ,\ **-T**\ ,\ **-e**\ ).  See examples below.
  
- \ **Note:**\  do not add the | xdshcoll to the command,
- it is automatically added by sinv.  sinv also automatically sets the -v flag for xdsh.
+ \ **Note:**\  do not add the \ **| xdshcoll**\  to the command,
+ it is automatically added by \ **sinv**\ .  \ **sinv**\  also automatically sets the \ **-v**\  flag for \ **xdsh**\ .
  
 
 
 \ **-f | -**\ **-file**\ 
  
- The file containing the xdsh or rinv command that will be run. 
+ The file containing the \ **xdsh**\  or \ **rinv**\  command that will be run. 
  This should be the fully qualified name of the file.
  
- \ **Note:**\  do not add the | xdshcoll to the command in the file,
- it is automatically added by sinv.
+ \ **Note:**\  do not add the \ **| xdshcoll**\  to the command in the file,
+ it is automatically added by \ **sinv**\ .
  
 
 
@@ -208,11 +203,11 @@ Command Protocol can be used. See man \ **xdsh**\  for more details.
  This flag indicates that generated templates should be removed at the
  at the end of the \ **sinv**\  command execution.
  
- If the flag is input, then all templates that are generated by the \ **sinv**\ 
+ If the flag is specified, then all templates that are generated by the \ **sinv**\ 
  command, will be removed. If the first template is created by the admin,
  it will not be removed.
  
- If the flag is not input, no
+ If the flag is not specified, no
  templates will be removed. It is up to the admin to cleanup templates.
  
 
@@ -242,7 +237,7 @@ Command Protocol can be used. See man \ **xdsh**\  for more details.
 
 
 
-1. To setup sinv.template (name optional) for input to the \ **sinv**\  command , enter:
+1. To setup sinv.template (name optional) for input to the \ **sinv**\  command, enter:
  
  
  .. code-block:: perl
@@ -250,7 +245,7 @@ Command Protocol can be used. See man \ **xdsh**\  for more details.
    xdsh node1,node2 "rpm -qa | grep ssh " | xdshcoll  > /tmp/sinv.template
  
  
- Note: when setting up the template the output of xdsh must be piped to xdshcoll, sinv processing depends on it.
+ Note: when setting up the template the output of \ **xdsh**\  must be piped to \ **xdshcoll**\ , \ **sinv**\  processing depends on it.
  
 
 
@@ -262,12 +257,12 @@ Command Protocol can be used. See man \ **xdsh**\  for more details.
    rinv node1-node2 serial | xdshcoll  > /tmp/rinv.template
  
  
- Note: when setting up the template the output of rinv must be piped to xdshcoll, sinv processing depends on it.
+ Note: when setting up the template the output of \ **rinv**\  must be piped to \ **xdshcoll**\ , \ **sinv**\  processing depends on it.
  
 
 
 3. To execute \ **sinv**\  using the sinv.template generated above
-on the nodegroup, \ **testnodes**\  ,possibly generating up to two
+on the nodegroup, \ *testnodes*\  ,possibly generating up to two
 new templates, and removing all generated templates in the end, and writing
 output report to /tmp/sinv.output, enter:
  
@@ -277,12 +272,12 @@ output report to /tmp/sinv.output, enter:
    sinv -c "xdsh testnodes rpm -qa | grep ssh" -p /tmp/sinv.template -t 2 -r -o /tmp/sinv.output
  
  
- Note: do not add the pipe to xdshcoll on the -c flag, it is automatically added by the sinv routine.
+ Note: do not add the pipe to \ **xdshcoll**\  on the \ **-c**\  flag, it is automatically added by the \ **sinv**\ .
  
 
 
-4. To execute \ **sinv**\  on noderange, node1-node4, using the seed node, node8,
-to generate the first template, using the xdsh command (-c),
+4. To execute \ **sinv**\  on noderange, \ *node1-node4*\ , using the seed node, \ *node8*\ ,
+to generate the first template, using the \ **xdsh**\  command (\ **-c**\ ),
 possibly generating up to two additional
 templates and not removing any templates at the end, enter:
  
@@ -294,8 +289,8 @@ templates and not removing any templates at the end, enter:
  
 
 
-5. To execute \ **sinv**\  on noderange, node1-node4, using the seed node, node8,
-to generate the first template, using the rinv command (-c),
+5. To execute \ **sinv**\  on noderange, \ *node1-node4*\ , using the seed node, \ *node8*\ ,
+to generate the first template, using the \ **rinv**\  command (\ **-c**\ ),
 possibly generating up to two additional
 templates and removing any generated templates at the end, enter:
  
@@ -307,8 +302,8 @@ templates and removing any generated templates at the end, enter:
  
 
 
-6. To execute \ **sinv**\  on noderange, node1-node4, using node1 as
-the seed node, to generate the sinv.template from the xdsh command (-c),
+6. To execute \ **sinv**\  on noderange, \ *node1-node4*\ , using \ *node1*\  as
+the seed node, to generate the sinv.template from the \ **xdsh**\  command (\ **-c**\ ),
 using the exact match option, generating no additional templates, enter:
  
  
@@ -322,14 +317,14 @@ using the exact match option, generating no additional templates, enter:
  
 
 
-7. To execute \ **sinv**\  on the Linux osimage defined for cn1.  First build a template from the /etc/hosts on the node. Then run sinv to compare.
+7. To execute \ **sinv**\  on the Linux osimage defined for cn1.  First build a template from the /etc/hosts on the node. Then run \ **sinv**\  to compare.
  
  
  .. code-block:: perl
  
    xdsh cn1 "cat /etc/hosts" | xdshcoll > /tmp/sinv2/template"
   
-   sinv -c "xdsh -i /install/netboot/rhels6/ppc64/test_ramdisk_statelite/rootimg cat /etc/hosts" -e -t1 -p /tmp/sinv.template -o /tmp/sinv.output
+   sinv -c "xdsh -i /install/netboot/rhels6/ppc64/test_ramdisk_statelite/rootimg cat /etc/hosts" -e -t 1 -p /tmp/sinv.template -o /tmp/sinv.output
  
  
 
diff --git a/xCAT-client/pods/man1/sinv.1.pod b/xCAT-client/pods/man1/sinv.1.pod
index b81db7b57..1d6dfa3d5 100644
--- a/xCAT-client/pods/man1/sinv.1.pod
+++ b/xCAT-client/pods/man1/sinv.1.pod
@@ -4,7 +4,7 @@ B<sinv> - Checks the software configuration of the nodes in the cluster.
 
 =head1 B<SYNOPSIS>
 
-B<sinv>  [B<-o> I<output>] [B<-p> I<template path>] [B<-t> I<template count>] [B<-s> I<seed node>] [B<-i>] [B<-e>] [B<-r>] [B<-V>] [B<--devicetype> I<type_of_device>]  [B<-l>  I<userID>] [[B<-f> I<command file>] | [B<-c> I<command>]]
+B<sinv>  [B<-o> I<output>] B<-p> I<template path> [B<-t> I<template count>] [B<-s> I<seed node>] [B<-i>] [B<-e>] [B<-r>] [B<-V>] [B<--devicetype> I<type_of_device>]  [B<-l>  I<userID>] {B<-f> I<command file> | B<-c> I<command>}
 
 B<sinv> [B<-h> | B<-v>]
 
@@ -12,9 +12,9 @@ B<sinv> [B<-h> | B<-v>]
 =head1 B<DESCRIPTION>
 
 The B<sinv> command is designed to check the configuration of the nodes in a cluster.
-The command takes as input command line flags, and one or more templates which will be compared against the output of the xdsh command, designated to be run by the -c or -f flag, on the nodes in the noderange. 
+The command takes as input command line flags, and one or more templates which will be compared against the output of the B<xdsh> command, designated to be run by the B<-c> or B<-f> flag, on the nodes in the noderange. 
 
-The nodes will then be grouped according to the template they match and a report returned to the administrator in the output file designated by the -o flag, or to stdout. 
+The nodes will then be grouped according to the template they match and a report returned to the administrator in the output file designated by the B<-o> flag, or to stdout. 
 
 B<sinv> supports checking the output from the  B<rinv> or B<xdsh> command. 
  
@@ -24,14 +24,14 @@ The B<sinv> command is an xCAT Distributed Shell Utility.
 
 B<COMMAND> B<SPECIFICATION>:
 
-The xdsh or rinv command to execute on the remote targets is specified by the B<-c> flag, or by the B<-f> flag
+The B<xdsh> or B<rinv> command to execute on the remote targets is specified by the B<-c> flag, or by the B<-f> flag
 which is followed by the fully qualified path to a file containing the command.
 
 
-Note: do not add | xdshcoll to the command on the command line or in the
-command file, it is automatically added by sinv.
+Note: do not add B<| xdshcoll> to the command on the command line or in the
+command file, it is automatically added by B<sinv>.
 
-The syntax for the B<-c>  B<sinv> parameter is as follows:
+The syntax for the B<-c>  parameter is as follows:
 
 "I<command>[; I<command>]..."
 
@@ -45,9 +45,9 @@ those that read from standard input.
 
 B<REMOTE> B<SHELL> B<COMMAND>:
 
-For xdsh, support is  explicitly  provided
-for  AIX  Remote  Shell and OpenSSH, but any secure remote command that
-conforms to the IETF (Internet Engineering Task  Force)  Secure  Remote
+For B<xdsh>, support is explicitly provided
+for AIX Remote Shell and OpenSSH, but any secure remote command that
+conforms to the IETF (Internet Engineering Task  Force) Secure Remote
 Command Protocol can be used. See man B<xdsh> for more details.
 
 =head1 B<OPTIONS>
@@ -56,37 +56,33 @@ Command Protocol can be used. See man B<xdsh> for more details.
 
 =item B<-o>|B<--output> I<report output file>
 
-Optional output file. This is the location of the file that will contain the report of the nodes that match, and do not match, the input templates.
-If the flag is not used, the output will go to stdout. 
+Optional output file. This is the location of the file that will contain the report of the nodes that match, and do not match, the input templates. If the flag is not used, the output will go to stdout. 
 
 =item B<-p>|B<--tp> I<template path>
 
 This is the path to the template file. The template contains the output
-of xdsh command, that has been run against a "seed" node, a node 
-that contains the configuration that you would like  
-all nodes in your noderange to match. 
+of B<xdsh> or B<rinv> command, that has been run against a "seed" node, a node 
+that contains the configuration that you would like all nodes in your noderange to match. 
 
-The admin can create the template by running the xdsh command on
-the seed node, pipe to xdshcoll ( required) and store the output
+The admin can create the template by running the B<xdsh> or B<rinv> command on
+the seed node, pipe to B<xdshcoll> (required) and store the output
 in the template path. See examples.
 
-B<Note:> The admin can also edit the
-template to remove any lines that they do not want checked.  
+B<Note:> The admin can also edit the template to remove any lines that they do not want checked.  
 
 An alternative method is to use the [B<-s> I<seed node>] parameter, 
 which will automatically build the template for you from the 
 seed node named.
 
-If a template path file does not exist, and a seed node is not input,
-then sinv will automatically use the one node in the noderange as
-the seed node and build the template.
+If a a seed node is not provided, then command will automatically use the first node in the noderange as
+the seed node.
 
 
 =item B<-t>|B<--tc> I<template count>
 
 This count is the number of templates that the command will use
 to check for nodes matches.  If the template in the template path does not
-match a node, the B<sinv> will check additional templates  up 
+match a node, the B<sinv> will check additional templates up 
 to the template count.
   
 For each node, it will compare the node against each template to see if 
@@ -104,9 +100,8 @@ This is the node that will be used to build the first template
 that is stored in template path.  You can use this parameter instead of running
 the command yourself to build the template.
 
-B<Note:> If the template path file does not exist, and no seed node is 
-supplied, the seed node automatically is one node in the
-noderange.
+B<Note:> If no seed node is supplied, the first node in the noderange is automatically
+selected as a seed node.
 
 
 =item B<-i>|B<--ignorefirst>
@@ -121,9 +116,9 @@ configuration.
 
 This requires the check of node output against template to be an exact match.
 If this flag is not set, B<sinv> checks to see if the return from the 
-xdsh command to the nodes contain a match for each line in the input 
+B<xdsh> or B<rinv> command to the nodes contain a match for each line in the input 
 template (except for xdshcoll header and comments). If not in exactmatch mode,
-there can exist more lines in the xdsh return from the nodes.
+there can be more lines in the B<xdsh> or B<rinv> return from the nodes.
 
 For example, if running a "rpm -qa | grep xCAT" command, without exactmatch 
 set, if the node contains more xCAT rpms that listed in the template,
@@ -153,30 +148,30 @@ Specifies a remote user name to use for remote command execution.
 
 =item B<-c>|B<--command>
 
-The xdsh or rinv command that will be run. The command should be enclosed in 
-double quotes to insure correct shell interpretation. This parameter must only contain, the node range or the image path (Linux) or spot name for AIX. It cannot be used to set additional input flags to xdsh or rinv (for example -s,-T,-e).  See examples below.
+The B<xdsh> or B<rinv> command that will be run. The command should be enclosed in 
+double quotes to insure correct shell interpretation. This parameter must only contain, the node range or the image path (Linux) or spot name for AIX. It cannot be used to set additional input flags to B<xdsh> or B<rinv> (for example B<-s>,B<-T>,B<-e>).  See examples below.
 
-B<Note:> do not add the | xdshcoll to the command,
-it is automatically added by sinv.  sinv also automatically sets the -v flag for xdsh. 
+B<Note:> do not add the B<| xdshcoll> to the command,
+it is automatically added by B<sinv>.  B<sinv> also automatically sets the B<-v> flag for B<xdsh>. 
 
 =item B<-f>|B<--file>
 
-The file containing the xdsh or rinv command that will be run. 
+The file containing the B<xdsh> or B<rinv> command that will be run. 
 This should be the fully qualified name of the file. 
 
-B<Note:> do not add the | xdshcoll to the command in the file,
-it is automatically added by sinv.
+B<Note:> do not add the B<| xdshcoll> to the command in the file,
+it is automatically added by B<sinv>.
 
 =item B<-r>|B<--remove>
 
 This flag indicates that generated templates should be removed at the
 at the end of the B<sinv> command execution. 
 
-If the flag is input, then all templates that are generated by the B<sinv>
+If the flag is specified, then all templates that are generated by the B<sinv>
 command, will be removed. If the first template is created by the admin,
 it will not be removed.
 
-If the flag is not input, no
+If the flag is not specified, no
 templates will be removed. It is up to the admin to cleanup templates.
 
 =item B<-h>|B<--help>
@@ -200,48 +195,48 @@ Verbose mode.
 =over 3
 
 =item 1.
-To setup sinv.template (name optional) for input to the B<sinv> command , enter:
+To setup sinv.template (name optional) for input to the B<sinv> command, enter:
 
  xdsh node1,node2 "rpm -qa | grep ssh " | xdshcoll  > /tmp/sinv.template
 
-Note: when setting up the template the output of xdsh must be piped to xdshcoll, sinv processing depends on it.
+Note: when setting up the template the output of B<xdsh> must be piped to B<xdshcoll>, B<sinv> processing depends on it.
 
 =item 2.
 To setup rinv.template for input to the B<sinv> command , enter:
 
  rinv node1-node2 serial | xdshcoll  > /tmp/rinv.template
 
-Note: when setting up the template the output of rinv must be piped to xdshcoll, sinv processing depends on it.
+Note: when setting up the template the output of B<rinv> must be piped to B<xdshcoll>, B<sinv> processing depends on it.
 
 =item 3.
 To execute B<sinv> using the sinv.template generated above
-on the nodegroup, B<testnodes> ,possibly generating up to two
+on the nodegroup, I<testnodes> ,possibly generating up to two
 new templates, and removing all generated templates in the end, and writing
 output report to /tmp/sinv.output, enter:
 
  sinv -c "xdsh testnodes rpm -qa | grep ssh" -p /tmp/sinv.template -t 2 -r -o /tmp/sinv.output
 
-Note: do not add the pipe to xdshcoll on the -c flag, it is automatically added by the sinv routine.
+Note: do not add the pipe to B<xdshcoll> on the B<-c> flag, it is automatically added by the B<sinv>.
 
 =item 4.
-To execute B<sinv> on noderange, node1-node4, using the seed node, node8,
-to generate the first template, using the xdsh command (-c),
+To execute B<sinv> on noderange, I<node1-node4>, using the seed node, I<node8>,
+to generate the first template, using the B<xdsh> command (B<-c>),
 possibly generating up to two additional
 templates and not removing any templates at the end, enter:
 
  sinv -c "xdsh node1-node4 lslpp -l | grep bos.adt" -s node8 -p /tmp/sinv.template -t 2 -o /tmp/sinv.output
 
 =item 5.
-To execute B<sinv> on noderange, node1-node4, using the seed node, node8,
-to generate the first template, using the rinv command (-c),
+To execute B<sinv> on noderange, I<node1-node4>, using the seed node, I<node8>,
+to generate the first template, using the B<rinv> command (B<-c>),
 possibly generating up to two additional
 templates and removing any generated templates at the end, enter:
 
  sinv -c "rinv node1-node4 serial" -s node8 -p /tmp/sinv.template -t 2 -r -o /tmp/rinv.output
  
 =item 6.
-To execute B<sinv> on noderange, node1-node4, using node1 as
-the seed node, to generate the sinv.template from the xdsh command (-c),
+To execute B<sinv> on noderange, I<node1-node4>, using I<node1> as
+the seed node, to generate the sinv.template from the B<xdsh> command (B<-c>),
 using the exact match option, generating no additional templates, enter:
 
  sinv -c "xdsh node1-node4 lslpp -l | grep bos.adt" -s node1 -e -p /tmp/sinv.template  -o /tmp/sinv.output
@@ -250,11 +245,11 @@ Note: the /tmp/sinv.template file must be empty, otherwise it will be used
 as an admin generated template.
 
 =item 7.
-To execute B<sinv> on the Linux osimage defined for cn1.  First build a template from the /etc/hosts on the node. Then run sinv to compare. 
+To execute B<sinv> on the Linux osimage defined for cn1.  First build a template from the /etc/hosts on the node. Then run B<sinv> to compare. 
 
  xdsh cn1 "cat /etc/hosts" | xdshcoll > /tmp/sinv2/template"
 
- sinv -c "xdsh -i /install/netboot/rhels6/ppc64/test_ramdisk_statelite/rootimg cat /etc/hosts" -e -t1 -p /tmp/sinv.template -o /tmp/sinv.output
+ sinv -c "xdsh -i /install/netboot/rhels6/ppc64/test_ramdisk_statelite/rootimg cat /etc/hosts" -e -t 1 -p /tmp/sinv.template -o /tmp/sinv.output
 
 =item 8.
 

From ed07804a6b7b847875ba6f8d1994fcfaf42ec776 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Tue, 27 Jun 2017 03:58:33 -0400
Subject: [PATCH 070/283] fix testcase confignics aliases

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

diff --git a/xCAT-test/autotest/testcase/confignics/cases0 b/xCAT-test/autotest/testcase/confignics/cases0
index b6f5e92e0..f73c0e282 100644
--- a/xCAT-test/autotest/testcase/confignics/cases0
+++ b/xCAT-test/autotest/testcase/confignics/cases0
@@ -179,7 +179,7 @@ check:output!~dhcp
 cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$THIRDNIC; else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$THIRDNIC; fi
 check:output=~13.1.0.100
 check:output!~dhcp
-cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$THIRDNIC:1 ; elif [ "$$OS" = "rhels" ]; then xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$THIRDNIC:1;else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$THIRDNIC:1; fi
+cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$THIRDNIC:1 ; elif [ "$$OS" = "rhels" ]; then xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$THIRDNIC:1;else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$THIRDNIC; fi
 check:output=~14.1.0.100
 check:output!~dhcp
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0

From 254fc0b151e88c53a63f919e0c3d4aaadd96b296 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Tue, 27 Jun 2017 04:35:54 -0400
Subject: [PATCH 071/283] The MAC is not got correct when doing hardware
 discovery

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

diff --git a/xCAT-genesis-scripts/bin/dodiscovery b/xCAT-genesis-scripts/bin/dodiscovery
index 5c3591c00..41ecb8c05 100755
--- a/xCAT-genesis-scripts/bin/dodiscovery
+++ b/xCAT-genesis-scripts/bin/dodiscovery
@@ -188,7 +188,7 @@ for dev in `ip link|grep -B1 ether|grep UP|awk '{print $2}'|sed -e s/://|grep -v
 	DRIVER=`grep DRIVER /sys/class/net/$dev/device/uevent|awk -F= '{print $2}'`
 	PCI_SLOT=`grep PCI_SLOT_NAME /sys/class/net/$dev/device/uevent|awk -F= '{print $2}'`
 	ADDRESS=`ip -4 -o a show dev $dev|awk '/global/{print $4}'`
-	MAC=`ip -o l show dev $dev|awk '/ether/{print $15}'| tr /a-f/ /A-F/`
+        MAC=`ip link show dev $dev|grep ether|awk '{print $2}'| tr /a-f/ /A-F/`
         if [ "$MAC_OF_FIRST_UP_NIC" == "unknown" ]; then
             MAC_OF_FIRST_UP_NIC=`echo $MAC | sed -e s/://g`
         fi

From ad71fc9336133cd55d1e128d0add0ef544de7edc Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Tue, 27 Jun 2017 13:47:03 -0400
Subject: [PATCH 072/283] Initial pass for clusterstatus xcat probe

---
 xCAT-probe/subcmds/clusterstatus | 134 +++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100755 xCAT-probe/subcmds/clusterstatus

diff --git a/xCAT-probe/subcmds/clusterstatus b/xCAT-probe/subcmds/clusterstatus
new file mode 100755
index 000000000..23b542cd1
--- /dev/null
+++ b/xCAT-probe/subcmds/clusterstatus
@@ -0,0 +1,134 @@
+#! /usr/bin/perl
+# IBM(c) 2016 EPL license http://www.eclipse.org/legal/epl-v10.html
+
+BEGIN { $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr'; }
+
+use lib "$::XCATROOT/probe/lib/perl";
+use probe_utils;
+use File::Basename;
+use Net::Ping;
+use Getopt::Long qw(:config no_ignore_case);
+
+use Data::Dumper;
+use warnings;
+
+my $program_name = basename("$0");
+my $help;
+my $noderange = "compute";
+my $test;
+my $output  = "stdout";
+my $verbose = 0;
+my $rst     = 0;
+
+$::USAGE = "Usage:
+    $program_name -h
+    $program_name {-d|-g} [-n noderange] [-V|--verbose]
+
+Description:
+    Use this command to get a summary of the cluster. 
+
+Options:
+    -h : Get usage information of $program_name
+    -n : Range of nodes to check. Default is \"compute\".
+    -d : Discovery. Display count of discovered nodes.
+    -g : Group count. Display count of nodes in each group.
+    -V : To print additional debug information.
+";
+
+#-------------------------------------
+# main process
+#-------------------------------------
+if (
+    !GetOptions("--help|h" => \$help,
+        "T"                  => \$test,
+        "V|verbose"          => \$VERBOSE,
+        "d|discovery"        => \$DISCOVERY,
+        "g|groupcount"       => \$GROUPCOUNT,
+        "n=s"                => \$noderange))
+{
+    probe_utils->send_msg("$output", "f", "Invalid parameter for $program_name");
+    probe_utils->send_msg("$output", "d", "$::USAGE");
+    exit 1;
+}
+
+if ($help) {
+    if ($output ne "stdout") {
+        probe_utils->send_msg("$output", "d", "$::USAGE");
+    } else {
+        print "$::USAGE";
+    }
+    exit 0;
+}
+
+if ($test) {
+    probe_utils->send_msg("$output", "o", "Use this command to get node summary in the cluster.");
+    exit 0;
+}
+
+if ((!$DISCOVERY) and (!$GROUPCOUNT)) {
+    probe_utils->send_msg("$output", "f", "Discovery or groupcount option is required for $program_name");
+    probe_utils->send_msg("$output", "d", "$::USAGE");
+    exit 1;
+}
+
+if (scalar(@ARGV) >= 1) {
+
+    # After processing all the expected flags and arguments,
+    # there is still left over stuff on the command line
+    probe_utils->send_msg("$output", "f", "Invalid flag or parameter: @ARGV");
+    probe_utils->send_msg("$output", "d", "$::USAGE");
+    exit 1;
+}
+
+check_for_discovered_nodes() if ($DISCOVERY);
+groupcount_nodes() if ($GROUPCOUNT);
+
+# Check for node definitions with MAC address defined
+sub check_for_discovered_nodes {
+    my $na = "N/A";
+    my $rc = 0;
+
+    my $all_nodes_mac = `lsdef -i mac -c $noderange 2> /dev/null`;
+    chomp($all_nodes_mac);
+    my @all_nodes_mac_lines = split("[\n\r]", $all_nodes_mac);
+
+    if ($all_nodes_mac =~ /Usage:/) {
+
+        # lsdef command displayed a Usage message. Must be some noderange formatting problem.
+        # Issue a warning and exit.
+        probe_utils->send_msg("$output", "w", "Can not get a list of nodes from specified noderange.");
+        return 1;
+    }
+
+    if (scalar(@all_nodes_mac_lines) <= 0) {
+
+        # There were no nodes matching the noderange. Issue a warning and exit.
+        probe_utils->send_msg("$output", "w", "No nodes matching the noderange were found.");
+        return 1;
+    }
+
+    # Go through the list of nodes and count how many have mac value
+    my $mac_counter=0;
+    foreach (@all_nodes_mac_lines) {
+        # probe_utils->send_msg("$output", "d", "Processing $_.") if ($VERBOSE);
+        my ($node_name, $value) = split ":", $_;
+        my ($mac_name, $mac_value) = split "=", $value;
+        if ($mac_value) {
+            # mac if set for the node
+            $mac_counter++;
+            probe_utils->send_msg("$output", "d", "($mac_counter) $_") if ($VERBOSE);
+        }
+    }
+    my $percent = sprintf("%.2f", (($mac_counter / scalar(@all_nodes_mac_lines)) * 100));
+
+    probe_utils->send_msg("$output", "o", "$mac_counter out of " . scalar(@all_nodes_mac_lines) . " in the noderange \"$noderange\" have been discovered ($percent/%)");
+    return $rc;
+}
+
+sub groupcount_nodes {
+    my $na = "N/A";
+    my $rc = 0;
+  
+    probe_utils->send_msg("$output", "w", "Group count function is not yet implemented.");
+    return $rc;
+}

From a770ed67269a063d71d86b4e638b5547cd96d110 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Tue, 27 Jun 2017 15:09:24 -0400
Subject: [PATCH 073/283] bump up the version of go-xcat

---
 xCAT-server/share/xcat/tools/go-xcat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat
index 3787ed9d4..d9d12e3b5 100755
--- a/xCAT-server/share/xcat/tools/go-xcat
+++ b/xCAT-server/share/xcat/tools/go-xcat
@@ -2,7 +2,7 @@
 #
 # go-xcat - Install xCAT automatically.
 #
-# Version 1.0.19
+# Version 1.0.20
 #
 # Copyright (C) 2016 International Business Machines
 # Eclipse Public License, Version 1.0 (EPL-1.0)

From 8818223af0c1041cc78bf27fddd86ef5eb0df8ff Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Tue, 27 Jun 2017 15:54:18 -0400
Subject: [PATCH 074/283] Improve the debug message when bmc value cannot be
 obtained in the openbmc or ipmi table in xCAT

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

diff --git a/xCAT-server/lib/xcat/plugins/bmcconfig.pm b/xCAT-server/lib/xcat/plugins/bmcconfig.pm
index bef071f58..bf5ba3a8e 100644
--- a/xCAT-server/lib/xcat/plugins/bmcconfig.pm
+++ b/xCAT-server/lib/xcat/plugins/bmcconfig.pm
@@ -105,7 +105,6 @@ sub process_request {
         return;
     }
 
-    #my $sitetable = xCAT::Table->new('site');
     my $ipmitable = xCAT::Table->new("$bmc_mgmt_type");
     my $tmphash;
     my $username;
@@ -142,8 +141,8 @@ sub process_request {
         $clipassword = $password;
     }
     unless (defined $bmc) {
-        xCAT::MsgUtils->message('S', "Unable to identify bmc for $node, refusing to give config data");
-        $callback->({ error => ["Invalid table configuration for bmcconfig"], errorcode => [1] });
+        xCAT::MsgUtils->message('S', "Received request from host=$node but unable to determine $bmc_mgmt_type.bmc value for the node.  Verify mgt attribute is configured correctly for the node and the BMC is defined.");
+        $callback->({ error => ["Unable to detect BMC configuration value for bmcconfig"], errorcode => [1] });
         return 1;
     }
     my $bmcport_counter = 0;

From 554c35924e5a95fa81586909c95f842bb30045fa Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Wed, 28 Jun 2017 01:51:34 -0400
Subject: [PATCH 075/283] remove the log message "snooze for 1 second" in
 bmcsetup

---
 xCAT-genesis-scripts/bin/bmcsetup | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xCAT-genesis-scripts/bin/bmcsetup b/xCAT-genesis-scripts/bin/bmcsetup
index cb2aba4a5..d2c7668c8 100755
--- a/xCAT-genesis-scripts/bin/bmcsetup
+++ b/xCAT-genesis-scripts/bin/bmcsetup
@@ -99,7 +99,6 @@ function snooze() {
         logger -s -t $log_label -p local4.debug "OpenPOWER, snooze for 30 seconds..."
         sleep 30
     else
-        logger -s -t $log_label -p local4.debug "snooze for 1 second..."
         sleep 1
     fi
 } 

From 2f963800e8ac8b1b3865f1ff7c64b8e6f9a83fd0 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Wed, 28 Jun 2017 16:55:15 -0400
Subject: [PATCH 076/283] Add Vlan and MTU to switch_macmap output

---
 perl-xCAT/xCAT/MacMap.pm               | 22 +++++++++++++++++++++
 xCAT-server/lib/xcat/plugins/switch.pm | 27 +++++++++++++++++++++-----
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/perl-xCAT/xCAT/MacMap.pm b/perl-xCAT/xCAT/MacMap.pm
index 54edb1824..f95d01091 100644
--- a/perl-xCAT/xCAT/MacMap.pm
+++ b/perl-xCAT/xCAT/MacMap.pm
@@ -356,6 +356,8 @@ sub dump_mac_info {
                         }
                     }
                     @{ $ret{$switch}->{$snmpportname}->{MACaddress} } = @{ $self->{macinfo}->{$switch}->{$snmpportname} };
+                    @{ $ret{$switch}->{$snmpportname}->{Vlanid} } = @{ $self->{vlaninfo}->{$switch}->{$snmpportname} };
+                    @{ $ret{$switch}->{$snmpportname}->{Mtu} } = @{ $self->{mtuinfo}->{$switch}->{$snmpportname} }; 
                 }
             }
         }
@@ -720,6 +722,12 @@ sub refresh_switch {
         return;
     }
 
+    # get mtu
+    my $iftomtumap = walkoid($session, '.1.3.6.1.2.1.2.2.1.4', silentfail => 1, verbose => $self->{show_verbose_info}, switch => $switch, callback => $self->{callback});
+    unless (defined($iftomtumap)) {
+        xCAT::MsgUtils->message("I", "MTU information is not availabe for this switch $switch");
+    }
+
     #Above is valid without community string indexing, on cisco, we need it on the next one and onward
     my $iftovlanmap = walkoid($session, '.1.3.6.1.4.1.9.9.68.1.2.2.1.2', silentfail => 1, verbose => $self->{show_verbose_info}, switch => $switch, callback => $self->{callback}); #use cisco vlan membership mib to ascertain vlan
     my $trunktovlanmap = walkoid($session, '.1.3.6.1.4.1.9.9.46.1.6.1.1.5', silentfail => 1, verbose => $self->{show_verbose_info}, switch => $switch, callback => $self->{callback}); #for trunk ports, we are interested in the native vlan, so we need cisco vtp mib too
@@ -783,24 +791,38 @@ sub refresh_switch {
             xCAT::MsgUtils->message("S", "Error communicating with " . $session->{DestHost} . ": Unable to get MAC entries via either BRIDGE or Q-BRIDE MIB");
             return;
         }
+
         if (defined($self->{collect_mac_info})) {
             my %index_to_mac = ();
+            my %index_to_vlan = ();
             foreach (keys %$mactoindexmap) {
                 my $index     = $mactoindexmap->{$_};
                 my @tmp       = split /\./, $_;
+                my $vlan      = @tmp[0];
                 my @mac       = @tmp[ -6 .. -1 ];
                 my $macstring = sprintf("%02x:%02x:%02x:%02x:%02x:%02x", @mac);
                 push @{ $index_to_mac{$index} }, $macstring;
+                push @{ $index_to_vlan{$index} }, $vlan;    
             }
             foreach my $boid (keys %$bridgetoifmap) {
                 my $port_index = $boid;
                 my $port_name  = $namemap->{ $bridgetoifmap->{$port_index} };
+                my $mtu  = $iftomtumap->{ $bridgetoifmap->{$port_index} };
                 if (defined($index_to_mac{$port_index})) {
                     push @{ $self->{macinfo}->{$switch}->{$port_name} }, @{ $index_to_mac{$port_index} };
                 }
                 else {
                     $self->{macinfo}->{$switch}->{$port_name}->[0] = '';
                 }
+
+                if (defined($index_to_vlan{$port_index})) {
+                    push @{ $self->{vlaninfo}->{$switch}->{$port_name} }, @{ $index_to_vlan{$port_index} };
+                }
+                else {
+                    $self->{vlaninfo}->{$switch}->{$port_name}->[0] = '';
+                }
+                push @{ $self->{mtuinfo}->{$switch}->{$port_name} } , $mtu;
+
             }
             return;
         }
diff --git a/xCAT-server/lib/xcat/plugins/switch.pm b/xCAT-server/lib/xcat/plugins/switch.pm
index 61dbce696..f4330a883 100644
--- a/xCAT-server/lib/xcat/plugins/switch.pm
+++ b/xCAT-server/lib/xcat/plugins/switch.pm
@@ -230,12 +230,12 @@ sub process_request {
                     }
                 }
             }
-            my $format = "%-" . $switch_name_length . "s  %-" . $port_name_length . "s  %-18s  %s";
+            my $format = "%-" . $switch_name_length . "s  %-" . $port_name_length . "s  %-18s  %-20s  %-7s  %s";
             my %failed_switches = ();
-            my $header = sprintf($format, "Switch", "Port", "MAC address", "Node");
+            my $header = sprintf($format, "Switch", "Port", "MAC address", "Node", "Vlan", "MTU");
             if (!defined($req->{opt}->{check}) and $port_name_length) {
                 $cb->({ data => $header });
-                $cb->({ data => "------------------------------------------------------------------" })
+                $cb->({ data => "--------------------------------------------------------------------------------------" })
             }
             foreach my $switch (keys %$macinfo) {
                 if (defined($macinfo->{$switch}->{ErrorStr})) {
@@ -251,17 +251,34 @@ sub process_request {
                     $cb->({ node => [ { name => $switch, data => ["PASS"] } ] });
                     next;
                 }
+                  
                 foreach my $port (sort keys %{ $macinfo->{$switch} }) {
                     my $node = '';
                     if (defined($macinfo->{$switch}->{$port}->{Node})) {
                         $node = $macinfo->{$switch}->{$port}->{Node};
                     }
+
+                    my $mtu = '';
+                    my @mtuarray = ();
+                    if (defined($macinfo->{$switch}->{$port}->{Mtu})) {
+                        @mtuarray = @{ $macinfo->{$switch}->{$port}->{Mtu} };
+                    }
+                    my $vlanid = '';
+                    my @vlans = ();
+                    if (defined($macinfo->{$switch}->{$port}->{Vlanid})) {
+                        @vlans = @{ $macinfo->{$switch}->{$port}->{Vlanid} };
+                    }
+
                     my @macarrary = ();
                     if (defined($macinfo->{$switch}->{$port}->{MACaddress})) {
                         @macarray = @{ $macinfo->{$switch}->{$port}->{MACaddress} };
+                        my $ind = 0;
                         foreach (@macarray) {
-                            my $data = sprintf($format, $switch, $port, ($_ ne '') ? $_ : '       N/A', $node);
+                            $vlanid = $vlans[$ind];
+                            $mtu = $mtuarray[$ind];
+                            my $data = sprintf($format, $switch, $port, ($_ ne '') ? $_ : '       N/A', $node,$vlanid,$mtu);
                             $cb->({ data => $data });
+                            $ind++;
 
                             #$cb->({node=>[{name=>$switch,data=>$data}]});
                         }
@@ -269,7 +286,7 @@ sub process_request {
                 }
             }
             if (!defined($req->{opt}->{check}) and $port_name_length) {
-                $cb->({ data => "------------------------------------------------------------------" })
+                $cb->({ data => "--------------------------------------------------------------------------------------" })
             }
             foreach (keys %failed_switches) {
                 $cb->({ node => [ { name => $_, error => [ $failed_switches{$_} ], errorcode => 1 } ] });

From 2d497a0d8c396bc673e04ca80200c389d4fa2ce3 Mon Sep 17 00:00:00 2001
From: yangsong <immarvin@users.noreply.github.com>
Date: Wed, 28 Jun 2017 22:36:23 -0500
Subject: [PATCH 077/283] documentation for ZTP based ONIE switch setup (#3362)

---
 .../advanced/networks/onie_switches/index.rst |  1 +
 .../networks/onie_switches/os_cumulus/ztp.rst | 91 +++++++++++++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 docs/source/advanced/networks/onie_switches/os_cumulus/ztp.rst

diff --git a/docs/source/advanced/networks/onie_switches/index.rst b/docs/source/advanced/networks/onie_switches/index.rst
index 1539acb9b..8c59c6c46 100644
--- a/docs/source/advanced/networks/onie_switches/index.rst
+++ b/docs/source/advanced/networks/onie_switches/index.rst
@@ -7,6 +7,7 @@ The Open Network Install Environment, or "ONIE" [1]_. is an open source project
    :maxdepth: 2
 
    os_cumulus/index.rst 
+   os_cumulus/ztp.rst 
 
 
 .. [1] Open Network Install Environment: Created by Cumulus Networks, Inc. in 2012, the Open Network Install Environment (ONIE) Project is a small operating system, pre-installed as firmware on bare metal network switches, that provides an environment for automated operating system provisioning.
diff --git a/docs/source/advanced/networks/onie_switches/os_cumulus/ztp.rst b/docs/source/advanced/networks/onie_switches/os_cumulus/ztp.rst
new file mode 100644
index 000000000..b620683e0
--- /dev/null
+++ b/docs/source/advanced/networks/onie_switches/os_cumulus/ztp.rst
@@ -0,0 +1,91 @@
+Setup ONIE switches with ZTP in large cluster 
+=============================================
+
+Zero Touch Provisioning  (ZTP) is a feature shipped in many network devices to enable them to be quickly deployed in large-scale environments. In Cumulus OS on ONIE switches with ZTP enabled, the URL of an user provided script can be specified in the DHCP response for the DHCP request trigged by one of the following events:
+
+    * Booting the switch
+    * Plugging a cable into or unplugging it from the eth0 port
+    * Disconnecting then reconnecting the switch's power cord.
+
+the script will be then downloaded and executed on the network device.
+
+Leveraging the ZTP mechanism, xCAT provides the capability to setup ONIE switches from white-box without touching anything, including Cumulus OS installation, discovery and configuration. Please follow the steps below to setup ONIE switches in the cluster:
+
+1. Ensure that xCAT is configured with an DHCP open range to detect when new switches request DHCP IPs
+
+   (1). Make sure the network in which the management interface of the ONIE switches are connected has been defined in ``networks`` table ::
+   
+       # tabdump networks
+       #netname,net,mask,mgtifname,gateway,dhcpserver,tftpserver,nameservers,ntpservers,logservers,dynamicrange,staticrange,staticrangeincrement,nodehostname,ddnsdomain,vlanid,domain,mtu,comments,disable
+       "172_21_0_0-255_255_0_0","172.21.0.0","255.255.0.0","enP3p3s0d1","<xcatmaster>","172.21.253.27","172.21.253.27",,,,"172.21.253.100-172.21.253.200",,,,,,,,,
+      
+   (2). Prepare the DHCP configuration for ONIE switches setup
+   
+      Add the management node's NIC facing the ONIE switches' management interface to the ``site.dhcpinterfaces`` ::
+     
+        chdef -t site -p dhcpinterfaces=enP3p3s0d1 
+   
+      Add dynamic range for the temporary IP addresses used in the OS provision and discovery of ONIE switches ::
+       
+        chdef -t network 172_21_0_0-255_255_0_0 dynamicrange="172.21.253.100-172.21.253.200"
+      
+      Update DHCP configuration file ::
+       
+        makedhcp -n
+
+2. Predefine ONIE switches according to the network plan ::
+
+     mkdef mid05tor10 --template onieswitch ip=172.21.205.10 switch=mgmtsw01 switchport=10 
+ 
+   ``ip`` is the IP address of the management interface of the ONIE switch
+
+   ``switch`` is the core switch to which the management interface of ONIE switch is connected.
+
+   ``switchport`` is the port on the core switch to which the management interface of ONIE switch is connected.
+
+3. Add the predefined switches into ``/etc/hosts`` ::
+    
+     makehosts mid05tor10
+
+4. [If the Cumulus OS have been installed on the ONIE switches, please skip this step] Prepare the Cumulus installation image, ``/install/onie/onie-installer`` is the hard-coded path of the Cumulus installation image, or the link to the Cumulus installation image on the management node ::
+  
+     mkdir -p /install/onie/
+     cp /install/custom/sw_os/cumulus/cumulus-linux-3.1.0-bcm-armel.bin /install/onie/ 
+     ln -s /install/onie/cumulus-linux-3.1.0-bcm-armel.bin /install/onie/onie-installer
+
+5. Plug the ONIE switches into the cluster according to the network plan and power on them. 
+
+   For the white-box ONIE switches, the Cumulus OS will be installed, then the switches will be discovered and configured automaticaly, the whole process will take about 1 hour.
+
+   For the ONIE switches already with Cumulus OS installed, please make sure the ZTP have been enabled and none of the following manual configuration have been made:
+
+   * Password changes
+   * Users and groups changes
+   * Packages changes
+   * Interfaces changes
+   * The presence of an installed license
+
+   Otherwise, please run ``ztp -R`` on the switches to reset the ZTP state before switch boot up for setup. The whole setup process will take about 1-2 minutes.
+
+6. The switch definition in xCAT will be updated when the switch is configured ::
+
+     # lsdef mid05tor10
+     Object name: mid05tor10
+         arch=armv7l
+         groups=switch
+         ip=172.21.205.10
+         mac=xx:xx:xx:xx:xx:xx
+         mgt=switch
+         netboot=onie
+         nodetype=switch
+         postbootscripts=otherpkgs
+         postscripts=syslog,remoteshell,syncfiles
+         serial=11S01FT690YA50YD73EACH
+         status=configured
+         statustime=06-22-2017 23:14:14
+         supportedarchs=armv7l
+         switch=mgmtsw01
+         switchport=10
+         switchtype=Edgecore Networks Switch
+
+   ``status=configured`` indicates that the switch has been discovered and configured. 

From f7f8096afbc9b9b81336f8bb801095edd56d487d Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Thu, 29 Jun 2017 13:22:20 +0800
Subject: [PATCH 078/283] [go-xcat] When xcat version is specified, look
 different place for xcat-dep repository

---
 xCAT-server/share/xcat/tools/go-xcat | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat
index d9d12e3b5..5960262b0 100755
--- a/xCAT-server/share/xcat/tools/go-xcat
+++ b/xCAT-server/share/xcat/tools/go-xcat
@@ -2,7 +2,7 @@
 #
 # go-xcat - Install xCAT automatically.
 #
-# Version 1.0.20
+# Version 1.0.21
 #
 # Copyright (C) 2016 International Business Machines
 # Eclipse Public License, Version 1.0 (EPL-1.0)
@@ -1051,6 +1051,8 @@ function add_xcat_dep_repo_yum_or_zypper()
 	local -a yes=()
 	[[ "$1" = "-y" ]] && yes=("-y") && shift
 	local url="$1"
+	local ver="$2"
+	[[ -z "${ver}" ]] && ver="latest"
 	local tmp=""
 	local install_path="${GO_XCAT_DEFAULT_INSTALL_PATH}"
 	local distro="${GO_XCAT_LINUX_DISTRO}${GO_XCAT_LINUX_VERSION%%.*}"
@@ -1064,7 +1066,7 @@ function add_xcat_dep_repo_yum_or_zypper()
 	*) warn_if_bad 1 "${distro}: unsupported Linux distro" || return 1
 	esac
 	[[ -z "${url}" ]] &&
-		url="${GO_XCAT_DEFAULT_BASE_URL}/yum/xcat-dep/${distro}/${GO_XCAT_ARCH}/xCAT-dep.repo"
+		url="${GO_XCAT_DEFAULT_BASE_URL}/yum/${ver}/xcat-dep"
 	case "${url##*.}" in
 	"repo") # local repo file
 		add_repo_by_url_yum_or_zypper "${url}" "xcat-dep"
@@ -1083,7 +1085,7 @@ function add_xcat_dep_repo_yum_or_zypper()
 			url="${tmp}"
 			;;
 		*)
-			url="${url}/${distro}/${GO_XCAT_ARCH}/xCAT-dep.repo"
+			url="${url}/${distro}/${GO_XCAT_ARCH}"
 			add_repo_by_url_yum_or_zypper "${url}" "xcat-dep"
 			return "$?"
 			;;
@@ -1117,8 +1119,10 @@ function add_xcat_dep_repo_apt()
 	local -a yes=()
 	[[ "$1" = "-y" ]] && yes=("-y") && shift
 	local url="$1"
+	local ver="$2"
+	[[ -z "${ver}" ]] && ver="latest"
 	[[ -z "${url}" ]] &&
-		url="${GO_XCAT_DEFAULT_BASE_URL}/apt/xcat-dep"
+		url="${GO_XCAT_DEFAULT_BASE_URL}/apt/${ver}/xcat-dep"
 	add_repo_by_url_apt "${url}" "xcat-dep"
 }
 
@@ -1538,7 +1542,7 @@ show_progress_meters
 ERR_MSG="$({
 	if add_xcat_core_repo -y "${GO_XCAT_CORE_URL}" "${GO_XCAT_VERSION}"
 	then
-		if add_xcat_dep_repo -y "${GO_XCAT_DEP_URL}"
+		if add_xcat_dep_repo -y "${GO_XCAT_DEP_URL}" "${GO_XCAT_VERSION}"
 		then
 			update_repo && exit 0
 			remove_repo "xcat-dep"

From c95b277a4adb1ddb2499e9313017fc66c900e067 Mon Sep 17 00:00:00 2001
From: Bin Xu <robin.hsu@163.com>
Date: Thu, 29 Jun 2017 16:51:31 +0800
Subject: [PATCH 079/283] Fix 3368, "noboot" is not working for mknb when
 multiple interfaces, and it is caused by something wrong in "get_nic_ip"
 (#3371)

---
 perl-xCAT/xCAT/NetworkUtils.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/perl-xCAT/xCAT/NetworkUtils.pm b/perl-xCAT/xCAT/NetworkUtils.pm
index 0c62fb7a0..d54bf253b 100755
--- a/perl-xCAT/xCAT/NetworkUtils.pm
+++ b/perl-xCAT/xCAT/NetworkUtils.pm
@@ -736,7 +736,7 @@ sub get_nic_ip
     my %iphash;
     my $mode            = "MULTICAST";
     my $payingattention = 0;
-    my $interface;
+    my $interface       = "";
     my $keepcurrentiface;
 
 
@@ -793,6 +793,7 @@ sub get_nic_ip
                     delete $iphash{$interface};
                 }
                 $keepcurrentiface = 0;
+                $interface = "";
                 if (!($line =~ /LOOPBACK/) and
                     $line =~ /UP( |,|>)/ and
                     $line =~ /$mode/) {

From 662dc2a6dec2a8f907b180282c0b4cdb232c5484 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Thu, 29 Jun 2017 15:43:40 -0400
Subject: [PATCH 080/283] Copy ssh keys to BMC with rspconfig command

---
 .../references/man1/rspconfig.1.rst           | 11 +++-
 xCAT-client/pods/man1/rspconfig.1.pod         |  9 ++-
 xCAT-server/lib/xcat/plugins/openbmc.pm       | 66 +++++++++++++++++++
 3 files changed, 80 insertions(+), 6 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 c2165234b..c2a4d365c 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,7 @@ OpenBMC specific:
 =================
 
 
-\ **rspconfig**\  \ *noderange*\  {\ **ip | netmask | gateway | vlan**\ }
+\ **rspconfig**\  \ *noderange*\  {\ **ip | netmask | gateway | vlan | sshcfg**\ }
 
 
 MPA specific:
@@ -251,8 +251,7 @@ DESCRIPTION
 ***********
 
 
-\ **rspconfig**\  configures various settings in the nodes' service processors.  If only a keyword is
-specified, without the \ **=**\ , it displays the current value.
+\ **rspconfig**\  configures various settings in the nodes' service processors.
 
 For options \ **autopower | iocap | decfg | memdecfg | procdecfg | time | date | spdump | sysdump | network**\ , user need to use \ *chdef -t site enableASMI=yes*\  to enable ASMI first.
 
@@ -526,6 +525,12 @@ OPTIONS
  
 
 
+\ **sshcfg**\ 
+ 
+ Copy SSH keys.
+ 
+
+
 \ **swnet**\ ={[\ *ip*\ ],[\ *gateway*\ ],[\ *netmask*\ ]}
  
  Set the Switch network parameters.
diff --git a/xCAT-client/pods/man1/rspconfig.1.pod b/xCAT-client/pods/man1/rspconfig.1.pod
index aba5fcd5a..972aa649b 100644
--- a/xCAT-client/pods/man1/rspconfig.1.pod
+++ b/xCAT-client/pods/man1/rspconfig.1.pod
@@ -24,7 +24,7 @@ B<rspconfig> I<noderange> B<garp>=I<time>
 
 =head2 OpenBMC specific:
 
-B<rspconfig> I<noderange> {B<ip>|B<netmask>|B<gateway>|B<vlan>}
+B<rspconfig> I<noderange> {B<ip>|B<netmask>|B<gateway>|B<vlan>|B<sshcfg>}
 
 =head2 MPA specific:
 
@@ -204,8 +204,7 @@ B<rspconfig> I<noderange> B<--resetnet>
 
 =head1 DESCRIPTION
 
-B<rspconfig> configures various settings in the nodes' service processors.  If only a keyword is
-specified, without the B<=>, it displays the current value.
+B<rspconfig> configures various settings in the nodes' service processors.
 
 For options B<autopower>|B<iocap>|B<decfg>|B<memdecfg>|B<procdecfg>|B<time>|B<date>|B<spdump>|B<sysdump>|B<network>, user need to use I<chdef -t site enableASMI=yes> to enable ASMI first.
 
@@ -390,6 +389,10 @@ Performs a service processor dump.
 
 Enable or disable SSH on MPA.
 
+=item B<sshcfg>
+
+Copy SSH keys.
+
 =item B<swnet>={[I<ip>],[I<gateway>],[I<netmask>]}
 
 Set the Switch network parameters.
diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index ec95782b5..eae17d85f 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -214,6 +214,13 @@ my %status_info = (
     RSPCONFIG_SET_RESPONSE => {
         process        => \&rspconfig_response,
     },
+    RSPCONFIG_SSHCFG_REQUEST => {
+        method         => "GET",
+        init_url       => "",
+    },
+    RSPCONFIG_SSHCFG_RESPONSE => {
+        process        => \&rspconfig_sshcfg_response,
+    },
     RVITALS_REQUEST => {
         method         => "GET",
         init_url       => "$openbmc_project_url/sensors/enumerate",
@@ -484,6 +491,8 @@ sub parse_args {
             } elsif ($subcommand =~ /^ip$|^netmask$|^gateway$|^vlan$/) {
                 return ([ 1, "Can not configure and display nodes' value at the same time" ]) if ($setorget and $setorget eq "set");
                 $setorget = "get";
+            } elsif ($subcommand =~ /^sshcfg$/) {
+                $setorget = ""; # SSH Keys are copied using a RShellAPI, not REST API
             } else {
                 return ([ 1, "Unsupported command: $command $subcommand" ]);
             }
@@ -651,6 +660,13 @@ sub parse_command_status {
                 $next_status{LOGIN_RESPONSE} = "RSPCONFIG_GET_REQUEST";
                 $next_status{RSPCONFIG_GET_REQUEST} = "RSPCONFIG_GET_RESPONSE";
                 push @options, $subcommand;
+            } elsif ($subcommand =~ /^sshcfg$/) {
+                # Special processing to copy ssh keys, currently there is no REST API to do this.
+                # Instead, copy ssh key file to the BMC in function specified by RSPCONFIG_SSHCFG_RESPONSE
+                $next_status{LOGIN_RESPONSE} = "RSPCONFIG_SSHCFG_REQUEST";
+                $next_status{RSPCONFIG_SSHCFG_REQUEST} = "RSPCONFIG_SSHCFG_RESPONSE";
+                push @options, $subcommand;
+                return 0;
             } elsif ($subcommand =~ /^(\w+)=(.+)/) {
                 my $key   = $1;
                 my $value = $2;
@@ -1351,6 +1367,56 @@ sub rspconfig_response {
 
 #-------------------------------------------------------
 
+=head3  rspconfig_sshcfg_response
+
+  Deal with response of rspconfig command for sscfg subcommand.
+  Append contents of id_rsa.pub file from management node to
+  the authorized_keys file on BMC
+  Input:
+        $node: nodename of current response
+        $response: Async return response
+
+=cut
+
+#-------------------------------------------------------
+sub rspconfig_sshcfg_response {
+    my $node = shift;
+    my $response = shift;
+
+    my $response_info = decode_json $response->content; 
+
+    use xCAT::RShellAPI;
+    if ($node_info{$node}{cur_status} eq "RSPCONFIG_SSHCFG_RESPONSE") {
+        my $bmcip = $node_info{$node}{bmc};
+        my $userid = $node_info{$node}{username}; 
+        my $userpw = $node_info{$node}{password};
+        my $filename = "/root/.ssh/id_rsa.pub";
+
+        # Read in contents of the id_rsa.pub file
+        open my $fh, '<', $filename or die "Error opening $filename: $!";
+        my $id_rsa_pub_contents = do { local $/; <$fh> };
+
+        # Login and append content of the read in id_rsa.pub file to the authorized_keys file on BMC
+        my $output = xCAT::RShellAPI::run_remote_shell_api($bmcip, $userid, $userpw, 0, 0, "mkdir -p ~/.ssh; echo \"$id_rsa_pub_contents\" >> ~/.ssh/authorized_keys");
+
+        # If error was returned from executing command above. Display it to the user.
+        # output[0] contains 1 is error, output[1] contains error messages
+        if (@$output[0] == 1) {
+            xCAT::SvrUtils::sendmsg("Error copying ssh keys to $bmcip:\n" . @$output[1], $callback, $node);
+        }
+        else {
+            xCAT::SvrUtils::sendmsg("ssh keys copied to $bmcip", $callback, $node);
+        }
+    }
+    if ($next_status{ $node_info{$node}{cur_status} }) {
+        $node_info{$node}{cur_status} = $next_status{ $node_info{$node}{cur_status} };
+        gen_send_request($node);
+    } else {
+        $wait_node_num--;
+    } 
+}
+#-------------------------------------------------------
+
 =head3  rvitals_response
 
   Deal with response of rvitals command

From 99e3645b0961bd82c4edce8429520becaddfe7f6 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Fri, 30 Jun 2017 14:55:28 +0800
Subject: [PATCH 081/283] [go-xcat] Add the indents back to the outputs

---
 xCAT-server/share/xcat/tools/go-xcat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/share/xcat/tools/go-xcat b/xCAT-server/share/xcat/tools/go-xcat
index 5960262b0..41472163c 100755
--- a/xCAT-server/share/xcat/tools/go-xcat
+++ b/xCAT-server/share/xcat/tools/go-xcat
@@ -1658,10 +1658,10 @@ case "${GO_XCAT_ACTION}" in
 		commands to set environment variables into your PATH:
 
 		For sh: 
-			source /etc/profile.d/xcat.sh
+		    source /etc/profile.d/xcat.sh
 
 		For csh: 
-			source /etc/profile.d/xcat.csh
+		    source /etc/profile.d/xcat.csh
 		EOF
 		;;
 	"update")

From f62ab5fbe2a77ceb22860114d6d1c4eee9c24dab Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Fri, 30 Jun 2017 03:13:15 -0400
Subject: [PATCH 082/283] Link 2.13.5 document

---
 README.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 1d9a9e0ca..c9250eb90 100644
--- a/README.rst
+++ b/README.rst
@@ -8,7 +8,7 @@ Documentation
 
 xCAT documentation is available at: http://xcat-docs.readthedocs.io/en/latest/
 
-|docs_latest| |docs_2134| |docs_2133| |docs_2132| |docs_2131| |docs_2130| |docs_212|
+|docs_latest| |docs_2135| |docs_2134| |docs_2133| |docs_2132| |docs_2131| |docs_2130| |docs_212|
 
 Open Source License
 -------------------
@@ -22,6 +22,11 @@ Developers
 Developers and prospective contributors are encouraged to read the `Developers Guide <http://xcat-docs.readthedocs.io/en/latest/developers/>`_
 In particular the `GitHub <http://xcat-docs.readthedocs.io/en/latest/developers/github/>`_ related subsection.
 
+.. |docs_2135| image:: https://readthedocs.org/projects/xcat-docs/badge/?version=2.13.5
+    :alt: 2.13.5 documentation status
+    :scale: 100%
+    :target: http://xcat-docs.readthedocs.io/en/2.13.5/
+
 .. |docs_2134| image:: https://readthedocs.org/projects/xcat-docs/badge/?version=2.13.4
     :alt: 2.13.4 documentation status
     :scale: 100%

From 3c83ad7b80fe96346ebda4d507bbe25e3dfad7ea Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Fri, 30 Jun 2017 03:39:22 -0400
Subject: [PATCH 083/283] Modify version to 2.13.6

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

diff --git a/Version b/Version
index 8bbab5627..14239ef15 100644
--- a/Version
+++ b/Version
@@ -1 +1 @@
-2.13.5
+2.13.6

From 043584c0ead439a58089fb30929d08247ff521dd Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Mon, 3 Jul 2017 04:00:45 -0400
Subject: [PATCH 084/283] add confignetworks cases to daily run bundle

---
 xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle       | 11 +++++++++++
 xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle       | 11 +++++++++++
 xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle     | 11 +++++++++++
 xCAT-test/autotest/bundle/sles11.4_ppc64.bundle       | 11 +++++++++++
 xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle     | 11 +++++++++++
 .../autotest/bundle/ubuntu14.04.4_ppc64le.bundle      | 11 +++++++++++
 .../autotest/bundle/ubuntu16.04.1_ppc64le.bundle      | 11 +++++++++++
 7 files changed, 77 insertions(+)

diff --git a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
index a29521d02..c790b2146 100644
--- a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
@@ -17,6 +17,17 @@ updatenode_diskful_syncfiles_P_script1
 updatenode_script3
 updatenode_P_script1_script2
 updatenode_without_flag
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 chdef_null
 chdef_t_node
 chdef_t_network
diff --git a/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle b/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle
index ccc1ef2cd..b61c79e07 100644
--- a/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle
@@ -17,6 +17,17 @@ updatenode_diskful_syncfiles_P_script1
 updatenode_script3
 updatenode_P_script1_script2
 updatenode_without_flag
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 chdef_null
 chdef_t_node
 chdef_t_network
diff --git a/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
index 0d796aaaa..b4b24da9c 100644
--- a/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
@@ -20,6 +20,17 @@ updatenode_diskful_syncfiles_P_script1
 updatenode_script3
 updatenode_P_script1_script2
 updatenode_without_flag
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 chdef_null
 chdef_t_node
 chdef_t_network
diff --git a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
index 2a47fcba5..ecc350e90 100644
--- a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
@@ -231,6 +231,17 @@ confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
 confignics_config_multiple_port_withnicaliases_multiple_value
 confignics_disable_set_to_yes
 confignics_disable_set_to_1
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 xdsh_h
 xdsh_V
 xdsh_regular_command
diff --git a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
index e48a7e537..cda0ea4f2 100644
--- a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
@@ -6,6 +6,17 @@ makehosts_help
 makehosts_n
 makehosts_n_noderange
 makehost_n_r
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 chdef_null
 chdef_z
 chdef_t_o_error
diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
index 5ab7b4b03..2f56db766 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
@@ -6,6 +6,17 @@ makehosts_help
 makehosts_n_noderange
 makehosts_n
 makehost_n_r
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 chdef_null
 chdef_z
 chdef_t_o_error
diff --git a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
index 4e982af23..178c2ee8b 100644
--- a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
@@ -7,6 +7,17 @@ makehosts_help
 makehosts_n_noderange
 makehosts_n
 makehost_n_r
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 chdef_null
 chdef_z
 chdef_t_o_error

From 2c97eded50ed01d9ee43407dd91e33b624f74ecd Mon Sep 17 00:00:00 2001
From: Yuan Bai <bybai@cn.ibm.com>
Date: Tue, 4 Jul 2017 14:59:06 +0800
Subject: [PATCH 085/283] fix routeop does not use xcatlib.sh for issue 3359
 (#3377)

* routeop does not use xcatlib.sh for issue 3359

* enhanced based on comments
---
 xCAT/postscripts/routeop | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xCAT/postscripts/routeop b/xCAT/postscripts/routeop
index f5687f6d0..4e5501592 100755
--- a/xCAT/postscripts/routeop
+++ b/xCAT/postscripts/routeop
@@ -23,10 +23,11 @@
 #=cut
 #-------------------------------------------------------------------------------
 
-
 if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
    str_dir_name=`dirname $0`
-   . $str_dir_name/xcatlib.sh
+   ([ -f $str_dir_name/xcatlib.sh ] && . $str_dir_name/xcatlib.sh) || \
+   ([ -f /install/postscripts/xcatlib.sh ] && . /install/postscripts/xcatlib.sh) || \
+   ([ -f /xcatpost/xcatlib.sh ] && . /xcatpost/xcatlib.sh)
 fi
 
 op=$1

From d9ab5b7558c7c21ccef36e1008418fa329bc9292 Mon Sep 17 00:00:00 2001
From: Bin Xu <robin.hsu@163.com>
Date: Tue, 4 Jul 2017 15:03:11 +0800
Subject: [PATCH 086/283] Fix #3082, to avoid named is started twice in short
 time. (#3388)

---
 xCAT-server/lib/xcat/plugins/ddns.pm | 40 ++++++++++++----------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/ddns.pm b/xCAT-server/lib/xcat/plugins/ddns.pm
index de6085e27..47da7c5bb 100755
--- a/xCAT-server/lib/xcat/plugins/ddns.pm
+++ b/xCAT-server/lib/xcat/plugins/ddns.pm
@@ -610,7 +610,7 @@ sub process_request {
     my @dnsifinsite = xCAT::TableUtils->get_site_attribute("dnsinterfaces");
     if (@dnsifinsite)
 
-      #syntax should be like host|ifname1,ifname2;host2|ifname3,ifname2 etc or simply ifname,ifname2
+    #syntax should be like host|ifname1,ifname2;host2|ifname3,ifname2 etc or simply ifname,ifname2
     {
         my $dnsinterfaces = $dnsifinsite[0];
         my $listenonifs;
@@ -865,29 +865,23 @@ sub process_request {
         }
         else
         {
-            #my $cmd = "service $service status|grep running";
-            #my @output=xCAT::Utils->runcmd($cmd, 0);
-            #if ($::RUNCMD_RC != 0)
-            #{
-            #    $cmd = "service $service start";
-            #    @output=xCAT::Utils->runcmd($cmd, 0);
-            #    my $outp = join('', @output);
-            #    if ($::RUNCMD_RC != 0)
-            #    {
-            #        my $rsp = {};
-            #        $rsp->{data}->[0] = "Command failed: $cmd. Error message: $outp.\n";
-            #        xCAT::MsgUtils->message("E", $rsp, $callback);
-            #        return;
-            #    }
-            #}
-            my $retcode = xCAT::Utils->startservice("named");
-            if ($retcode != 0)
+            my $needtostart = 1;
+            # If named is already restarted in the same time, then to avoid starting it again.
+            # Rare case (#3082): to avoid two named daemon co-existing
+            if ($ctx->{restartneeded}) {
+                sleep 1;
+                $needtostart = xCAT::Utils->checkservicestatus("named");
+            }
+            if ($needtostart != 0)
             {
-                my $rsp = {};
-                $rsp->{data}->[0] = "failed to start named.\n";
-                xCAT::MsgUtils->message("E", $rsp, $callback);
-                return;
-
+                my $retcode = xCAT::Utils->startservice("named");
+                if ($retcode != 0)
+                {
+                    my $rsp = {};
+                    $rsp->{data}->[0] = "failed to start named.\n";
+                    xCAT::MsgUtils->message("E", $rsp, $callback);
+                    return;
+                }
             }
         }
     }

From 2c8564b492d004422b3f597b6c30382f644e9db7 Mon Sep 17 00:00:00 2001
From: Yuan Bai <bybai@cn.ibm.com>
Date: Tue, 4 Jul 2017 16:08:34 +0800
Subject: [PATCH 087/283] fix new doc for diskful new kernel patch (#3381)

* diskful kernel patch

* enhanced based on comments
---
 .../common/deployment/use_kernel_patch.rst    | 24 +++++++++++++++++++
 .../ppc64le/diskful/customize_image/index.rst |  1 +
 .../customize_image/use_kernel_patch.rst      |  2 ++
 3 files changed, 27 insertions(+)
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/use_kernel_patch.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/use_kernel_patch.rst

diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/use_kernel_patch.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/use_kernel_patch.rst
new file mode 100644
index 000000000..6ad4b7782
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/use_kernel_patch.rst
@@ -0,0 +1,24 @@
+Use new kernel patch
+====================
+
+This procedure assumes there are kernel RPM in /tmp, we take the osimage **rhels7.3-ppc64le-install-compute** as an example.
+The RPM names below are only examples, substitute your specific level and architecture.
+
+* **[RHEL]**
+
+#. The RPM kernel package is usually named: kernel-<kernelver>.rpm. Append new kernel packages directory to osimage pkgdir ::
+
+        mkdir -p /install/kernels/<kernelver>
+        cp /tmp/kernel-*.rpm /install/kernels/<kernelver>
+        createrepo /install/kernels/<kernelver>/
+        chdef -t osimage rhels7.3-ppc64le-install-compute -p pkgdir=/install/kernels/<kernelver>
+
+#. Inject the drivers from the new kernel RPMs into the initrd ::
+
+        mkdef -t osdistroupdate kernelupdate dirpath=/install/kernels/<kernelver>/ 
+        chdef -t osimage rhels7.3-ppc64le-install-compute osupdatename=kernelupdate
+        chdef -t osimage rhels7.3-ppc64le-install-compute netdrivers=updateonly
+        genitrd rhels7.3-ppc64le-install-compute --ignorekernelchk
+        nodeset <CN> osimage=rhels7.3-ppc64le-install-compute --noupdateinitrd     
+
+#. Boot CN from net normallly.
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst
index 5b0cecea4..6a99eb8ac 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst
@@ -11,6 +11,7 @@ Optional means all the subitems in this page are not necessary to finish an OS d
    pre_post_script.rst
    syncfile.rst
    additional_pkg.rst
+   use_kernel_patch.rst
    cfg_network_adapter.rst
    
    
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/use_kernel_patch.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/use_kernel_patch.rst
new file mode 100644
index 000000000..185ae7105
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/use_kernel_patch.rst
@@ -0,0 +1,2 @@
+.. include:: ../../../common/deployment/use_kernel_patch.rst
+

From c6202a7728da36a90fd9b505f6b677ce02505e1e Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Tue, 4 Jul 2017 02:59:35 -0400
Subject: [PATCH 088/283] "rinstall xxx" command should be valid and perform
 provision by default

---
 perl-xCAT/xCAT/Usage.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index b0348dd53..ce0df5cd6 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -4,7 +4,6 @@
 package xCAT::Usage;
 use Getopt::Long;
 use xCAT::Utils;
-
 #-------------------------------------------------------------------------------
 
 =head1  xCAT::Usage
@@ -647,11 +646,11 @@ sub validateArgs {
         #filtered by GetOpt subroutine 
         #fortunately the commands in this branch does not have such options
         foreach(@extrargs){
-            if($_ !~ m/^-[-]?\S+/){
+            if($_ and $_ !~ m/^-[-]?\S+/){
                 $count+=1;
             }
         }
-        if ($count!=1) {
+        unless (($command =~ m/^(rinstall|winstall)$/ and $count==0) or $count==1) {
            return [1,"Invalid argument: '".join(" ",@extrargs)."'"];
         }
     }

From 38dc5805bb374040f1a9933aae616ff6ba9e26e8 Mon Sep 17 00:00:00 2001
From: Arif Ali <arif-ali@users.noreply.github.com>
Date: Tue, 4 Jul 2017 09:57:33 +0100
Subject: [PATCH 089/283] Update mailmap with my details (#3390)

---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index cc6d51051..32bea28b6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,5 @@
+Arif Ali <mail@arif-ali.co.uk>
+Arif Ali <mail@arif-ali.co.uk> <arifali@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 BAI Yuan	<bybai@cn.ibm.com>
 Bruce Potter	<bp@us.ibm.com>
 CAO Li		<caoli@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>

From 10776d54a6f7db8b4ed107887b9963a697b77edc Mon Sep 17 00:00:00 2001
From: Arif Ali <mail@arif-ali.co.uk>
Date: Tue, 4 Jul 2017 13:42:49 +0100
Subject: [PATCH 090/283] Update mailmap, and fix some of the entries

---
 .mailmap | 46 ++++++++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/.mailmap b/.mailmap
index 32bea28b6..d01484002 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,51 +1,65 @@
-Arif Ali <mail@arif-ali.co.uk>
-Arif Ali <mail@arif-ali.co.uk> <arifali@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+Andy Wray	<awray@lenovo.com>
+Andy Wray	<awray@lenovo.com>	<andywray@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+Arif Ali	<mail@arif-ali.co.uk>
+Arif Ali	<mail@arif-ali.co.uk>	<arifali@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+Arif Ali	<mail@arif-ali.co.uk>	<arif-ali@users.noreply.github.com>
 BAI Yuan	<bybai@cn.ibm.com>
+Bill Wajda	<billwajda@hotmail.com>	<billwajda@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+Bill Wajda	<billwajda@hotmail.com>
+Brian Elliott Finley	<brian@thefinleys.com>	<brianfinley@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+Brian Elliott Finley	<brian@thefinleys.com>
 Bruce Potter	<bp@us.ibm.com>
-CAO Li		<caoli@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+Bruce Potter	<bp@us.ibm.com>	<bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+CAO Li	<caoli@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 CAO Meng Meng	<bjcaomm@cn.ibm.com>
-CAO Meng Meng	<caomengmeng@users.noreply.github.com>
-CAO Meng Meng	<caomengmeng_1011@sina.com>
+CAO Meng Meng	<bjcaomm@cn.ibm.com>	<caomengmeng@users.noreply.github.com>
+CAO Meng Meng	<bjcaomm@cn.ibm.com>	<caomengmeng_1011@sina.com>
 Casandra Qiu	<cxhong@us.ibm.com>	<abcdqiu@gmail.com>
 Casandra Qiu	<cxhong@us.ibm.com>
 CHENG Long	<chenglch@cn.ibm.com>
 CHU De Gao	<degaochu@cn.ibm.com>	<chudegao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 CHU De Gao	<degaochu@cn.ibm.com>
 CHU De Gao	<degaochu@cn.ibm.com>	<degaochu@ibm.com.cn>
+Chuck Brazie	<brazie@us.ibm.com>
+Chuck Brazie	<brazie@us.ibm.com>	<chuckbrazie@users.noreply.github.com>
+Chuck Brazie	<brazie@us.ibm.com>	<cbrazie@stny.rr.com>
 GAO Feng	<gfgaogf@cn.ibm.com>
-GAO Ling	<linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+GAO Ling	<linggao@us.ibm.com>	<linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 GAO Ling	<linggao@us.ibm.com>
 GONG Jie	<gongjie@cn.ibm.com>
 GONG Jie	<gongjie@cn.ibm.com>	<gongjie.jie@gmail.com>
 GONG Jie	<gongjie@cn.ibm.com>	<gongjie@linux.vnet.ibm.com>
 HU Wei Hua	<huweihua@cn.ibm.com>
 Jarrod Johnson	<jarrod.b.johnson@gmail.com>
-Jarrod Johnson	<jbjohnso@us.ibm.com>
-Jarrod Johnson	<jjohnson2@buildabear.labs.lenovo.com>
-Jarrod Johnson	<jjohnson2@lenovo.com>
+Jarrod Johnson	<jarrod.b.johnson@gmail.com>	<jbjohnso@us.ibm.com>
+Jarrod Johnson	<jarrod.b.johnson@gmail.com>	<jjohnson2@buildabear.labs.lenovo.com>
+Jarrod Johnson	<jarrod.b.johnson@gmail.com>	<jjohnson2@lenovo.com>
+Jarrod Johnson	<jarrod.b.johnson@gmail.com>	<jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 JIN Jie Hua	<jinjhua@cn.ibm.com>
-JIN Jie Hua	<jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+JIN Jie Hua	<jinjhua@cn.ibm.com>	<jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+John Dunham	<jdunham@us.ibm.com>
 LI Guang Cheng	<liguangc@cn.ibm.com>
 LI Guang Cheng	<liguangc@cn.ibm.com>	<ligc@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 LI Guang Cheng	<liguangc@cn.ibm.com>	<ligc@cn.ibm.com>
 LI Ting Ting	<litingt@cn.ibm.com>
-Linda O. Mellor	<mellor@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+LI Ting Ting	<litingt@cn.ibm.com>	<root@c910f02c07p02.(none)>
+Linda O. Mellor	<mellor@us.ibm.com>	<mellor@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 Linda O. Mellor	<mellor@us.ibm.com>
-Lissa Valletta	<lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+Lissa Valletta	<lissav@us.ibm.com>	<lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 Lissa Valletta	<lissav@us.ibm.com>
 Mark Gurevich	<gurevich@us.ibm.com>
 Mark Gurevich	<gurevich@us.ibm.com>	<gurevich@c910loginx01.(none)>
-Norm Nott	<nott@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 Norm Nott	<nott@us.ibm.com>
+Norm Nott	<nott@us.ibm.com>	<nott@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 Patrick Lundgren	<plundgr@us.ibm.com>
 Patrick Lundgren	<plundgr@us.ibm.com>	<pdlun92@gmail.com>
 Patrick Lundgren	<plundgr@us.ibm.com>	<plundgr@c910loginx01.(none)>
-SUN Jing	<sjing@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 SUN Jing	<sjing@cn.ibm.com>
+SUN Jing	<sjing@cn.ibm.com>	<sjing@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 Victor Hu	<vhu@us.ibm.com>
 Victor Hu	<vhu@us.ibm.com>	<vhu@victorvm7.pok.ibm.com>
 Victor Hu	<vhu@us.ibm.com>	<whowutwut@gmail.com>
-WANG Hua Zhong	<wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+WANG Hua Zhong	<wanghuaz@cn.ibm.com>	<wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 WANG Hua Zhong	<wanghuaz@cn.ibm.com>
 WANG Jun Xia	<junxiaw@cn.ibm.com>
 WANG Xiao Peng	<wxp@cn.ibm.com>
@@ -64,7 +78,7 @@ YANG Song	<yangsbj@cn.ibm.com>
 YANG Song	<yangsbj@cn.ibm.com>	<immarvin@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 YANG Song	<yangsbj@cn.ibm.com>	<immarvin@users.noreply.github.com>
 YANG Song	<yangsbj@cn.ibm.com>	<yangsbj@cn.ibm.comq>
-YIN Le		<yinle@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
+YIN Le		<yinle@cn.ibm.com>	<yinle@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
 YIN Le		<yinle@cn.ibm.com>
 ZHAO Er Tao	<ertaozh@cn.ibm.com>
 ZHAO Er Tao	<ertaozh@cn.ibm.com>	<ertaozh@cn.ibm.comls>

From e7656b30b43bcdb3a17afd5e99211317f01bd27f Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Thu, 29 Jun 2017 22:48:24 -0400
Subject: [PATCH 091/283] [DO NOT MERGE]Task 3338, refine rsetbot command for
 OpenBMC

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index ec95782b5..5600eebc5 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -186,14 +186,15 @@ my %status_info = (
 
     RSETBOOT_SET_REQUEST => {
         method         => "PUT",
-        init_url       => "",
+        init_url       => "$openbmc_project_url/control/boot/bootsource/attr/Sources",
+        data           => "xyz.openbmc_project.Control.Boot.Sources.",
     },
     RSETBOOT_SET_RESPONSE => {
         process        => \&rsetboot_response,
     },
     RSETBOOT_STATUS_REQUEST  => {
         method         => "GET",
-        init_url       => "",
+        init_url       => "$openbmc_project_url/control/boot/bootsource",
     },
     RSETBOOT_STATUS_RESPONSE => {
         process        => \&rsetboot_response,
@@ -607,7 +608,15 @@ sub parse_command_status {
         if ($subcommand =~ /^hd$|^net$|^cd$|^default$|^def$/) {
             $next_status{LOGIN_RESPONSE} = "RSETBOOT_SET_REQUEST";
             $next_status{RSETBOOT_SET_REQUEST} = "RSETBOOT_SET_RESPONSE";
-            # modify $status_info{RSETBOOT_SET_REQUEST}{data}
+            if ($subcommand eq "net") {
+                $status_info{RSETBOOT_SET_REQUEST}{data} .= "Network";
+            } elsif ($subcommand eq "hd") {
+                $status_info{RSETBOOT_SET_REQUEST}{data} .= "Disk";
+            } elsif ($subcommand eq "cd") {
+                $status_info{RSETBOOT_SET_REQUEST}{data} .= "ExternalMedia";
+            } elsif ($subcommand eq "def" or $subcommand eq "default") {
+                $status_info{RSETBOOT_SET_REQUEST}{data} .= "Default";
+            }
             $next_status{RSETBOOT_SET_RESPONSE} = "RSETBOOT_STATUS_REQUEST";
             $next_status{RSETBOOT_STATUS_REQUEST} = "RSETBOOT_STATUS_RESPONSE";
         } elsif ($subcommand eq "stat") {
@@ -1217,10 +1226,10 @@ sub rsetboot_response {
     my $response_info = decode_json $response->content;    
 
     if ($node_info{$node}{cur_status} eq "RSETBOOT_GET_RESPONSE") {
-        xCAT::SvrUtils::sendmsg("Hard Drive", $callback, $node); #if response data is hd
-        xCAT::SvrUtils::sendmsg("Network", $callback, $node); #if response data is net
-        xCAT::SvrUtils::sendmsg("CD/DVD", $callback, $node); #if response data is net
-        xCAT::SvrUtils::sendmsg("boot override inactive", $callback, $node); #if response data is def
+        xCAT::SvrUtils::sendmsg("Hard Drive", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /Disk$/);
+        xCAT::SvrUtils::sendmsg("Network", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /Network$/);
+        xCAT::SvrUtils::sendmsg("CD/DVD", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /ExternalMedia$/);
+        xCAT::SvrUtils::sendmsg("boot override inactive", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /Default$/);
     }
 
     if ($next_status{ $node_info{$node}{cur_status} }) {

From ca5107b23da9e9c549f565025efceb1468666eda Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Tue, 4 Jul 2017 23:10:51 -0400
Subject: [PATCH 092/283] Uploade CI code

---
 .travis.yml                               |  28 ++
 travis.pl                                 | 510 ++++++++++++++++++++++
 xCAT-test/autotest/bundle/MN_basic.bundle |  30 +-
 3 files changed, 553 insertions(+), 15 deletions(-)
 create mode 100644 .travis.yml
 create mode 100644 travis.pl

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..b0ea8fb8d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,28 @@
+os: linux
+dist: trusty
+sudo: required
+before_install: 
+- sudo apt-get install -y git reprepro devscripts debhelper libsoap-lite-perl libdbi-perl quilt openssh-server dpkg looptools genometools software-properties-common
+- perl -v
+
+script: 
+- echo $TRAVIS_BUILD_ID
+- echo $TRAVIS_EVENT_TYPE
+- echo $TRAVIS_BUILD_NUMBER
+- echo $TRAVIS_BUILD_DIR
+- echo $TRAVIS_COMMIT
+- echo $TRAVIS_COMMIT_MESSAGE
+- echo $TRAVIS_COMMIT_RANGE
+- echo $TRAVIS_JOB_ID
+- echo $TRAVIS_JOB_NUMBER
+- echo $TRAVIS_BRANCH
+- echo $TRAVIS_COMMIT_MESSAGE
+- echo $USERNAME
+- echo $PASSWORD
+- echo $GITHUB_TOKEN
+- git log --pretty=format:"%s %b" -2
+
+- perl travis.pl
+
+
+
diff --git a/travis.pl b/travis.pl
new file mode 100644
index 000000000..4c827769a
--- /dev/null
+++ b/travis.pl
@@ -0,0 +1,510 @@
+# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
+
+use strict;
+use warnings;
+use Getopt::Long;
+use Data::Dumper;
+use Time::Local;
+use File::Basename;
+use File::Path;
+use File::Find;
+use LWP::UserAgent;
+use HTTP::Request;
+use Encode;
+use Encode::CN;
+use JSON;
+use URI::Escape;
+use LWP::Simple;
+
+use Term::ANSIColor qw(:constants);
+$Term::ANSIColor::AUTORESET = 1;
+
+#---Global attributes---
+my $rst = 0;
+my $check_result_str="``CI CHECK RESULT`` : ";
+my $last_func_start = timelocal(localtime());
+
+#--------------------------------------------------------
+# Fuction name: runcmd
+# Description:  run a command after 'cmd' label in one case
+# Atrributes:
+# Retrun code:
+#      $::RUNCMD_RC : the return code of command
+#      @$outref  : the output of command
+#--------------------------------------------------------
+sub runcmd
+{
+    my ($cmd) = @_;
+    my $rc = 0;
+    $::RUNCMD_RC = 0;
+    my $outref = [];
+    @$outref = `$cmd 2>&1`;
+    if ($?)
+    {
+        $rc          = $?;
+        $rc          = $rc >> 8;
+        $::RUNCMD_RC = $rc;
+    }
+    chomp(@$outref);
+    return @$outref;
+
+}
+
+#--------------------------------------------------------
+# Fuction name: get_files_recursive
+# Description:  Search all file in one directory recursively
+# Atrributes:
+#         $dir (input attribute)
+#              The target scan directory
+#         $files_path_ref (output attribute)
+#               the reference of array where save all vaild files under $dir
+# Retrun code:
+#--------------------------------------------------------
+sub get_files_recursive
+{
+    my $dir            = shift;
+    my $files_path_ref = shift;
+
+    my $fd = undef;
+    if(!opendir($fd, $dir)){
+        print "[get_files_recursive]: failed to open $dir :$!\n";
+        return 1;
+    }
+    
+    for (; ;)
+    {
+        my $direntry = readdir($fd);
+        last unless (defined($direntry));
+        next if ($direntry =~ m/^\.\w*/);
+        next if ($direntry eq '..');
+        my $target = "$dir/$direntry";
+        if (-d $target) {
+            get_files_recursive($target, $files_path_ref);
+        } else {
+            push(@{$files_path_ref}, glob("$target\n"));
+        }
+    }
+    closedir($fd);
+    return 0;
+}
+
+#--------------------------------------------------------
+# Fuction name: check_pr_format
+# Description:
+# Atrributes:
+# Retrun code:
+#--------------------------------------------------------
+sub check_pr_format{
+    if($ENV{'TRAVIS_EVENT_TYPE'} eq "pull_request"){
+        my $pr_url = "https://api.github.com/repos/$ENV{'TRAVIS_REPO_SLUG'}/pulls/$ENV{'TRAVIS_PULL_REQUEST'}";
+        my $pr_url_resp = get($pr_url);
+        my $pr_content = decode_json($pr_url_resp);
+        my $pr_title = $pr_content->{title};
+        my $pr_body  = $pr_content->{body};
+
+        #print "[check_pr_format] Dumper pr_content:\n";
+        #print Dumper $pr_content;
+        print "[check_pr_format] pr title = $pr_title\n";
+        print "[check_pr_format] pr body = $pr_body \n";
+        
+        my $checkrst="";
+        if(! $pr_title){
+            $checkrst.="Miss title.";
+        }
+        if(! $pr_body){
+             $checkrst.="Miss description.";
+        }
+        
+        if(length($checkrst) == 0){
+            $check_result_str .= "> **PR FORMAT CORRECT**";
+            send_back_comment("$check_result_str"); 
+        }else{
+            $check_result_str .= "> **PR FORMAT ERROR** : $checkrst";
+            send_back_comment("$check_result_str"); 
+            return 1;
+        }
+    }
+    return 0;
+}
+
+#--------------------------------------------------------
+# Fuction name: check_pr_format
+# Description:
+# Atrributes:
+# Retrun code:
+#--------------------------------------------------------
+sub send_back_comment{
+    my $message = shift;
+
+    my $comment_url = "https://api.github.com/repos/$ENV{'TRAVIS_REPO_SLUG'}/issues/$ENV{'TRAVIS_PULL_REQUEST'}/comments";
+    my $comment_url_resp = get($comment_url);
+    my $json = new JSON;
+    my $comment_content = $json->decode($comment_url_resp);
+    my $comment_len = @$comment_content;
+
+    #print "\n\n>>>>>Dumper comment_content: $comment_len\n";
+    #print Dumper $comment_content;
+
+    my $post_url = $comment_url;
+    my $post_method = "POST";
+    if($comment_len > 0){
+        foreach my $comment (@{$comment_content}){
+            if($comment->{'body'} =~ /CI CHECK RESULT/) {
+                 $post_url = $comment->{'url'};
+                 $post_method = "PATCH";
+            }
+        }
+    }
+    
+     print "[send_back_comment] method = $post_method to $post_url \n";
+    #`curl -u "$ENV{'USERNAME'}:$ENV{'PASSWORD'}" -X $post_method -d '{"body":"$message"}' $post_url 2>&1 > /dev/null`;
+     `curl -u "denfshuaishuai\@icloud.com:ds18811031107" -X $post_method -d '{"body":"$message"}' $post_url 2>&1 > /dev/null`;
+}
+
+#--------------------------------------------------------
+# Fuction name: build_xcat_core
+# Description:
+# Atrributes:
+# Retrun code:
+#--------------------------------------------------------
+sub build_xcat_core{
+    my $cmd = "gpg --list-keys";
+    my @output = runcmd("$cmd");
+    if($::RUNCMD_RC){
+        print "[build_xcat_core] $cmd ....[Failed]\n";
+        send_back_comment("> **BUILD ERROR**  :  $cmd .... failed. Please get detaied information in ``Merge pull request`` box");
+        return 1;
+    }
+
+    $cmd = "sudo ./build-ubunturepo -c UP=0 BUILDALL=1";
+    @output = runcmd("$cmd");
+    #print ">>>>>Dumper the output of '$cmd'\n";
+    #print Dumper \@output;
+    if($::RUNCMD_RC){
+        my $lastline = $output[-1];
+        $lastline =~ s/[\r\n\t\\"']*//g;
+        print "[build_xcat_core] $cmd ....[Failed]\n";
+        print ">>>>>Dumper the output of '$cmd'\n";
+        print Dumper \@output;
+        $check_result_str .= "> **BUILD ERROR**, Please get detaied information in ``Merge pull request`` box";
+        send_back_comment("$check_result_str");
+        return 1;
+    }else{
+        print "[build_xcat_core] $cmd ....[Pass]\n";
+        $check_result_str .= "> **BUILD SUCCESSFUL** ";
+        send_back_comment("$check_result_str");
+    }
+
+    return 0;
+}
+
+#--------------------------------------------------------
+# Fuction name: install_xcat
+# Description:
+# Atrributes:
+# Retrun code:
+#--------------------------------------------------------
+sub install_xcat{
+    
+    my @cmds = ("cd ./../../xcat-core && sudo ./mklocalrepo.sh",
+               "sudo chmod 777 /etc/apt/sources.list",
+               "sudo echo \"deb [arch=amd64] http://xcat.org/files/xcat/repos/apt/xcat-dep trusty main\" >> /etc/apt/sources.list",
+               "sudo echo \"deb [arch=ppc64el] http://xcat.org/files/xcat/repos/apt/xcat-dep trusty main\" >> /etc/apt/sources.list",
+               "sudo wget -q -O - \"http://xcat.org/files/xcat/repos/apt/apt.key\" | sudo apt-key add -",
+               "sudo apt-get -qq update");
+    my @output;
+    foreach my $cmd (@cmds){
+        @output = runcmd("$cmd");
+        if($::RUNCMD_RC){
+            print RED "[install_xcat] $cmd. ...[Failed]\n";
+            print "[install_xcat] error message:\n";
+            print Dumper \@output;
+            $check_result_str .= "> **INSTALL XCAT ERROR** : Please get detaied information in ``Merge pull request`` box ";
+            send_back_comment("$check_result_str");
+            return 1;
+        }
+    }
+
+    my $cmd = "sudo apt-get install xcat --force-yes";
+    @output = runcmd("$cmd");
+    #print ">>>>>Dumper the output of '$cmd'\n";
+    #print Dumper \@output;
+    if($::RUNCMD_RC){
+        my $lastline = $output[-1];
+        $lastline =~ s/[\r\n\t\\"']*//g;
+        print "[install_xcat] $cmd ....[Failed]\n";
+        print ">>>>>Dumper the output of '$cmd'\n";
+        print Dumper \@output;
+        $check_result_str .= "> **INSTALL XCAT ERROR** : Please get detaied information in ``Merge pull request`` box";
+        send_back_comment("$check_result_str");     
+        return 1;
+    }else{
+        print "[install_xcat] $cmd ....[Pass]\n";
+        
+        print "\n------To config xcat and check if xcat work correctly-----\n";
+        @cmds = ("sudo -s /opt/xcat/share/xcat/scripts/setup-local-client.sh -f travis",
+                 "sudo -s /opt/xcat/sbin/chtab priority=1.1 policy.name=travis policy.rule=allow",
+                 ". /etc/profile.d/xcat.sh && tabdump policy",
+                 ". /etc/profile.d/xcat.sh && tabdump site",
+                 ". /etc/profile.d/xcat.sh && lsxcatd -a",
+                 "ls /opt/xcat/sbin",
+                 "service xcatd status");
+        my $ret = 0;
+        foreach my $cmd (@cmds){
+            print "\n[install_xcat] To run $cmd.....\n";
+            @output = runcmd("$cmd");
+            print Dumper \@output;
+            if($::RUNCMD_RC){
+               print RED "[install_xcat] $cmd. ...[Failed]\n";
+               #print Dumper \@output;
+               $ret = 1;
+            }else{
+               print "[install_xcat] $cmd....[Pass]\n";
+            }
+        }
+        if($ret){
+            $check_result_str .= "> **INSTALL XCAT ERROR** : Please get detaied information in ``Merge pull request`` box";
+            send_back_comment("$check_result_str");
+            return 1;
+        }
+        $check_result_str .= "> **INSTALL XCAT SUCCESSFUL**";
+        send_back_comment("$check_result_str");
+    }
+    return 0;
+}
+
+
+#--------------------------------------------------------
+# Fuction name: check_syntax
+# Description:
+# Atrributes:
+# Retrun code:
+#--------------------------------------------------------
+sub check_syntax{
+    my @output;
+    my @syntax_err;
+    my $ret = 0;
+
+    my @target_dirs=("/opt/xcat",
+                     "/install");
+    foreach my $dir (@target_dirs){
+        my @files    = ();
+        get_files_recursive("$dir", \@files);
+
+        foreach my $file (@files) {
+            next if($file =~ /\/opt\/xcat\/share\/xcat\/netboot\/genesis\//);
+            next if($file =~ /\/opt\/xcat\/probe\//);
+        
+            @output = runcmd("file $file");
+            if($output[0] =~ /perl /i){
+                @output = runcmd("sudo bash -c '. /etc/profile.d/xcat.sh && perl -I /opt/xcat/lib/perl -I /opt/xcat/lib -I /usr/lib/perl5 -I /usr/share/perl -c $file'");
+                if($::RUNCMD_RC){
+                    push @syntax_err, @output;
+                    $ret = 1;
+                }
+            #}elsif($output[0] =~ /shell/i){
+            #    @output = runcmd("sudo bash -c '. /etc/profile.d/xcat.sh && sh -n $file'");
+            #    if($::RUNCMD_RC){
+            #        push @syntax_err, @output;
+            #        $ret = 1;
+            #    }
+            }
+        }
+    }
+
+    if(@syntax_err){
+        print "[check_syntax] syntax checking ....[Failed]\n";
+        print "[check_syntax] Dumper error message:\n";
+        print Dumper @syntax_err;
+        $check_result_str .= "> **CODE SYNTAX ERROR** : Please get detaied information in ``Merge pull request`` box";
+        send_back_comment("$check_result_str");
+    }else{
+        print "[check_syntax] syntax checking ....[Pass]\n";
+        $check_result_str .= "> **CODE SYNTAX CORRECT**";
+        send_back_comment("$check_result_str");
+    }
+
+    return $ret;
+}
+
+#--------------------------------------------------------
+# Fuction name: run_fast_regression_test
+# Description:
+# Atrributes:
+# Retrun code:
+#--------------------------------------------------------
+sub run_fast_regression_test{
+    my $cmd = "sudo apt-get install xcat-test --force-yes";
+    my @output = runcmd("$cmd");
+    if($::RUNCMD_RC){
+         print RED "[run_fast_regression_test] $cmd ....[Failed]\n";
+         print Dumper \@output;
+         return 1;
+    }else{
+        print "[run_fast_regression_test] $cmd .....:\n";
+        print Dumper \@output;
+    }
+
+    $cmd = "sudo bash -c '. /etc/profile.d/xcat.sh && xcattest -l bundleinfo'";
+    @output = runcmd("$cmd");
+    if($::RUNCMD_RC){
+         print RED "[run_fast_regression_test] $cmd ....[Failed]\n";
+         print "[run_fast_regression_test] error dumper:\n";
+         print Dumper \@output;
+         return 1;
+    }else{
+         print "[run_fast_regression_test] $cmd .....:\n";
+         print Dumper \@output; 
+    }
+  
+    my $hostname = `hostname`;
+    chomp($hostname);
+    print "hostname = $hostname\n";
+    my $conf_file = "$ENV{'PWD'}/regression.conf";
+    $cmd = "echo '[System]' > $conf_file; echo 'MN=$hostname' >> $conf_file; echo '[Table_site]' >> $conf_file; echo 'key=domain' >>$conf_file; echo 'value=pok.stglabs.ibm.com' >> $conf_file";
+    @output = runcmd("$cmd");
+    if($::RUNCMD_RC){
+         print RED "[run_fast_regression_test] $cmd ....[Failed]";
+         print "[run_fast_regression_test] error dumper:\n";
+         print Dumper \@output;
+         return 1; 
+    }
+    
+    print "Dumper regression conf file:\n";
+    @output = runcmd("cat $conf_file"); 
+    print Dumper \@output;
+
+    my @caseslist = runcmd("sudo bash -c '. /etc/profile.d/xcat.sh && xcattest -l caselist -b MN_basic.bundle'");
+    my $casenum = @caseslist;
+    
+    my $x = 0;
+    my @failcase;
+    my $passnum = 0;
+    my $failnum = 0;
+    foreach my $case (@caseslist){
+        ++$x;
+        $cmd = "sudo bash -c '. /etc/profile.d/xcat.sh &&  xcattest -f $conf_file -t $case'";
+        print "[run_fast_regression_test] run $x: $cmd\n";
+        @output = runcmd("$cmd");
+        #print Dumper \@output;
+        for(my $i = $#output; $i>-1; --$i){
+            if($output[$i] =~ /------END::(.+)::Failed/){
+                push @failcase, $1;
+                ++$failnum;
+                print Dumper \@output;
+                last;
+             }elsif ($output[$i] =~ /------END::(.+)::Passed/){
+                ++$passnum;
+                last;
+             }
+         }
+    }
+
+    if($failnum){
+        my $log_str = join (",", @failcase );
+        $check_result_str .= "> **FAST REGRESSION TEST Failed**: Totalcase $casenum Pass $passnum failed $failnum FailedCases: $log_str.  Please get detaied information in ``Merge pull request`` box";
+        send_back_comment("$check_result_str");
+        return 1;
+    }else{   
+        $check_result_str .= "> **FAST REGRESSION TEST Successful**: Totalcase $casenum Pass $passnum failed $failnum";
+        send_back_comment("$check_result_str");
+    }
+
+    return 0;
+}
+
+#--------------------------------------------------------
+# Fuction name: run_fast_regression_test
+# Description:
+# Atrributes:
+# Retrun code:
+#--------------------------------------------------------
+sub mark_time{
+    my $func_name=shift;
+    my $nowtime    = timelocal(localtime());
+    my $nowtime_str = scalar(localtime());
+    my $duration = $nowtime - $last_func_start;
+    $last_func_start = $nowtime;
+    print "[mark_time] $nowtime_str, ElapsedTime of $func_name is $duration s\n";
+}
+
+#===============Main Process=============================
+
+#Dumper Travis Environment Attribute
+print GREEN "\n------Dumper Travis Environment Attribute------\n";
+my @travis_env_attr = ("TRAVIS_REPO_SLUG",
+                       "TRAVIS_BRANCH",
+                       "TRAVIS_EVENT_TYPE",
+                       "TRAVIS_PULL_REQUEST",
+                       "GITHUB_TOKEN",
+                       "USERNAME",
+                       "PASSWORD",
+                       "PWD");
+foreach (@travis_env_attr){
+    print "$_ = $ENV{$_}\n";
+}
+
+my @os_info = runcmd("cat /etc/os-release");
+print "Current OS information:\n";
+print Dumper \@os_info;
+
+my @perl_vserion = runcmd("perl -v");
+print "Current perl information:\n";
+print Dumper \@perl_vserion;
+
+#my @sh_version = runcmd("sudo bash -c 'sh --version'");
+#print "Current sh information:\n";
+#print Dumper \@sh_version;
+
+my @disk = runcmd("df -h");
+print "Disk information:\n";
+print Dumper \@disk;
+
+#Start to check the format of pull request
+$last_func_start = timelocal(localtime());
+print GREEN "\n------To Check Pull Request Format------\n";
+$rst  = check_pr_format();
+if($rst){
+    print RED "Check pull request format failed\n";
+    exit $rst;
+}
+mark_time("check_pr_format");
+
+#Start to build xcat core
+
+print GREEN "\n------To Build xCAT core package------\n";
+$rst = build_xcat_core();
+if($rst){
+    print RED "Build xCAT core package failed\n";
+    exit $rst;
+}
+mark_time("build_xcat_core");
+
+#Start to install xcat
+print GREEN "\n------To install xcat------\n";
+$rst = install_xcat();
+if($rst){
+    print RED "Install xcat failed\n";
+    exit $rst;
+}
+mark_time("install_xcat");
+
+#Check the syntax of changing code
+print GREEN "\n------To check the syntax of changing code------\n";
+$rst = check_syntax();
+if($rst){
+    print RED "check the syntax of changing code failed\n";
+    exit $rst;
+}
+mark_time("check_syntax");
+
+#run fast regression
+print GREEN "\n------To run fast regression test------\n";
+$rst = run_fast_regression_test();
+if($rst){
+    print RED "Run fast regression test failed\n";
+    exit $rst;
+}
+mark_time("run_fast_regression_test");
+
+exit 0;
diff --git a/xCAT-test/autotest/bundle/MN_basic.bundle b/xCAT-test/autotest/bundle/MN_basic.bundle
index 3f792cfef..3639e92dd 100644
--- a/xCAT-test/autotest/bundle/MN_basic.bundle
+++ b/xCAT-test/autotest/bundle/MN_basic.bundle
@@ -12,7 +12,7 @@ chdef_t_node
 chdef_t_o_error
 chdef_template
 chdef_z
-check_mkdef_node_with_template_priority
+#check_mkdef_node_with_template_priority
 check_mn_cluster_log_file
 chtab_d
 chtab_err_symble
@@ -61,29 +61,29 @@ lsxcatd_null
 makeconservercf_d
 makeconservercf_noderange
 makeconservercf_null
-makedhcp_a_d_linux
-makedhcp_a_linux
-makedhcp_d_linux
+#makedhcp_a_d_linux
+#makedhcp_a_linux
+#makedhcp_d_linux
 makedhcp_h
 makedhcp_help
 makedhcp_n
 makedhcp_n_linux
-makedns
-makedns_d_node
+#makedns
+#makedns_d_node
 makedns_h
-makedns_n
-makedns_node
+#makedns_n
+#makedns_node
 makehost_n_r
-makehosts_d
+#makehosts_d
 makehosts_h
 makehosts_help
-makehosts_l
+#makehosts_l
 makehosts_n
 makehosts_n_noderange
 makehosts_null
 makeknownhosts_h
-makenetworks
-makenetworks_d
+#makenetworks
+#makenetworks_d
 makenetworks_d_V
 makenetworks_h
 makenetworks_help
@@ -98,7 +98,7 @@ mkdef_node_with_a_node_template
 mkdef_null
 mkdef_t_network
 mkdef_t_o_error
-mkdef_template_cec_template_step_by_step
+#mkdef_template_cec_template_step_by_step
 mkdef_template_cec_template_without_remainder
 mkdef_template_invalid_template
 mkdef_template_switch_template_without_attribute
@@ -109,7 +109,7 @@ nodeadd_noderange
 nodeadd_noderange_nodetype
 nodeadd_null
 nodeadd_v
-nodech_d_error
+#nodech_d_error
 nodech_delete
 nodech_error_node
 nodech_error_table
@@ -224,7 +224,7 @@ xcatd_stop
 xcatsnap_b_d
 xcatsnap_h
 xcatsnap_null
-xcatsnap_v
+#xcatsnap_v
 xcatstanzafile_attribute
 xcatstanzafile_colon
 xcatstanzafile_objtype

From 30ec8ec30580b8a0993cc9c4f7fbb0e3ff76c0b6 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Tue, 4 Jul 2017 23:31:23 -0400
Subject: [PATCH 093/283] CI: change the user to common user

---
 .travis.yml | 3 ++-
 travis.pl   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b0ea8fb8d..a04874d6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,8 @@ script:
 - echo $GITHUB_TOKEN
 - git log --pretty=format:"%s %b" -2
 
-- perl travis.pl
+#- perl travis.pl
+- if [ $TRAVIS_EVENT_TYPE == "pull_request" ]; then perl ./travis.pl;  fi
 
 
 
diff --git a/travis.pl b/travis.pl
index 4c827769a..7ca5563fe 100644
--- a/travis.pl
+++ b/travis.pl
@@ -157,8 +157,8 @@ sub send_back_comment{
     }
     
      print "[send_back_comment] method = $post_method to $post_url \n";
-    #`curl -u "$ENV{'USERNAME'}:$ENV{'PASSWORD'}" -X $post_method -d '{"body":"$message"}' $post_url 2>&1 > /dev/null`;
-     `curl -u "denfshuaishuai\@icloud.com:ds18811031107" -X $post_method -d '{"body":"$message"}' $post_url 2>&1 > /dev/null`;
+    `curl -u "$ENV{'USERNAME'}:$ENV{'PASSWORD'}" -X $post_method -d '{"body":"$message"}' $post_url 2>&1 > /dev/null`;
+    # `curl -u "denfshuaishuai\@icloud.com:ds18811031107" -X $post_method -d '{"body":"$message"}' $post_url 2>&1 > /dev/null`;
 }
 
 #--------------------------------------------------------

From 426c50ed1d5fc67bad60730b43b231ce797ea977 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Tue, 4 Jul 2017 23:36:25 -0400
Subject: [PATCH 094/283] modify .travis.yml back

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a04874d6c..1ab68ff82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,8 +22,8 @@ script:
 - echo $GITHUB_TOKEN
 - git log --pretty=format:"%s %b" -2
 
-#- perl travis.pl
-- if [ $TRAVIS_EVENT_TYPE == "pull_request" ]; then perl ./travis.pl;  fi
+- perl travis.pl
+#- if [ $TRAVIS_EVENT_TYPE == "pull_request" ]; then perl ./travis.pl;  fi
 
 
 

From 4635fcb730c2b033d14d045dc34ec43f6d433f66 Mon Sep 17 00:00:00 2001
From: Samveen Gulati <samveen@yahoo.com>
Date: Wed, 5 Jul 2017 04:33:40 +0000
Subject: [PATCH 095/283] Utils::servicemap: Correct formatting of `%svchash`

---
 perl-xCAT/xCAT/Utils.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm
index ea107f482..29969d381 100644
--- a/perl-xCAT/xCAT/Utils.pm
+++ b/perl-xCAT/xCAT/Utils.pm
@@ -4017,14 +4017,14 @@ sub servicemap {
     # (general service name) => {list of possible service names}
     #
     my %svchash = (
-        "dhcp" => [ "dhcp3-server", "dhcpd", "isc-dhcp-server" ],
-        "nfs" => [ "nfsserver", "nfs-server", "nfs", "nfs-kernel-server" ],
-        "named"     => [ "named",    "bind9" ],
-        "syslog"    => [ "syslog",   "syslogd", "rsyslog" ],
-        "firewall"  => [ "iptables", "firewalld", "ufw" ],
-        "http"      => [ "apache2",  "httpd" ],
-        "ntpserver" => [ "ntpd",     "ntp" ],
-        "mysql"     => [ "mysqld",   "mysql" ],
+        "dhcp"      => [ "dhcp3-server", "dhcpd", "isc-dhcp-server" ],
+        "nfs"       => [ "nfsserver",    "nfs-server", "nfs", "nfs-kernel-server" ],
+        "named"     => [ "named",        "bind9" ],
+        "syslog"    => [ "syslog",       "syslogd", "rsyslog" ],
+        "firewall"  => [ "iptables",     "firewalld", "ufw" ],
+        "http"      => [ "apache2",      "httpd" ],
+        "ntpserver" => [ "ntpd",         "ntp" ],
+        "mysql"     => [ "mysqld",       "mysql" ],
     );
 
     my $path       = undef;

From dd5d2263f6f7f41799aa8004d1ce7606f6b17938 Mon Sep 17 00:00:00 2001
From: Samveen Gulati <samveen@yahoo.com>
Date: Wed, 5 Jul 2017 04:35:03 +0000
Subject: [PATCH 096/283] Utils::servicemap: add `mariadb` as alias of `mysql`
 to `%svchash`

---
 perl-xCAT/xCAT/Utils.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm
index 29969d381..937a36473 100644
--- a/perl-xCAT/xCAT/Utils.pm
+++ b/perl-xCAT/xCAT/Utils.pm
@@ -4024,7 +4024,7 @@ sub servicemap {
         "firewall"  => [ "iptables",     "firewalld", "ufw" ],
         "http"      => [ "apache2",      "httpd" ],
         "ntpserver" => [ "ntpd",         "ntp" ],
-        "mysql"     => [ "mysqld",       "mysql" ],
+        "mysql"     => [ "mysqld",       "mysql", "mariadb" ],
     );
 
     my $path       = undef;

From ba6b62619e3dd9096b201e943cdf2e06c82e7b47 Mon Sep 17 00:00:00 2001
From: Samveen Gulati <samveen@yahoo.com>
Date: Wed, 5 Jul 2017 04:54:44 +0000
Subject: [PATCH 097/283] travis.pl: Show empty travis_env_attrs

---
 travis.pl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/travis.pl b/travis.pl
index 4c827769a..44ae86cd6 100644
--- a/travis.pl
+++ b/travis.pl
@@ -441,7 +441,11 @@ my @travis_env_attr = ("TRAVIS_REPO_SLUG",
                        "PASSWORD",
                        "PWD");
 foreach (@travis_env_attr){
-    print "$_ = $ENV{$_}\n";
+    if($ENV{$_}) {
+        print "$_ = '$ENV{$_}'\n";
+    } else {
+        print "$_ = ''\n";
+    }
 }
 
 my @os_info = runcmd("cat /etc/os-release");

From 09e7964b5f352db11e7e8330d321b5998806215e Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 5 Jul 2017 01:29:21 -0400
Subject: [PATCH 098/283] Using token to instead of user name and password

---
 travis.pl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/travis.pl b/travis.pl
index 7ca5563fe..382c61148 100644
--- a/travis.pl
+++ b/travis.pl
@@ -157,8 +157,7 @@ sub send_back_comment{
     }
     
      print "[send_back_comment] method = $post_method to $post_url \n";
-    `curl -u "$ENV{'USERNAME'}:$ENV{'PASSWORD'}" -X $post_method -d '{"body":"$message"}' $post_url 2>&1 > /dev/null`;
-    # `curl -u "denfshuaishuai\@icloud.com:ds18811031107" -X $post_method -d '{"body":"$message"}' $post_url 2>&1 > /dev/null`;
+    `curl -v -H "Authorization: token 7333caf3936a938ad0803e7a297423e43f69fb62" -X POST -d '{"body":"$message"}' $post_url 2>&1 > /dev/null`;
 }
 
 #--------------------------------------------------------

From 994e811e8eb013968470a8d8230f929ca6715983 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 5 Jul 2017 01:41:24 -0400
Subject: [PATCH 099/283] test token

---
 travis.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/travis.pl b/travis.pl
index 382c61148..2beb5dccb 100644
--- a/travis.pl
+++ b/travis.pl
@@ -156,8 +156,8 @@ sub send_back_comment{
         }
     }
     
-     print "[send_back_comment] method = $post_method to $post_url \n";
-    `curl -v -H "Authorization: token 7333caf3936a938ad0803e7a297423e43f69fb62" -X POST -d '{"body":"$message"}' $post_url 2>&1 > /dev/null`;
+     print "[send_back_comment] method = $post_method to $post_url by token\n";
+    `curl -v -H "Authorization: token 7333caf3936a938ad0803e7a297423e43f69fb62" -X $post_method -d '{"body":"$message"}' $post_url 2>&1 > /dev/null`;
 }
 
 #--------------------------------------------------------

From f356b13e65472ebf7a50a376a8afb8de80e12136 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 5 Jul 2017 01:47:37 -0400
Subject: [PATCH 100/283] test token 1

---
 travis.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis.pl b/travis.pl
index 2beb5dccb..857d961be 100644
--- a/travis.pl
+++ b/travis.pl
@@ -157,7 +157,7 @@ sub send_back_comment{
     }
     
      print "[send_back_comment] method = $post_method to $post_url by token\n";
-    `curl -v -H "Authorization: token 7333caf3936a938ad0803e7a297423e43f69fb62" -X $post_method -d '{"body":"$message"}' $post_url 2>&1 > /dev/null`;
+    `curl -v -H "Authorization: token 7333caf3936a938ad0803e7a297423e43f69fb62" -X $post_method -d '{"body":"$message"}' $post_url 2>&1`;
 }
 
 #--------------------------------------------------------

From d653535de21a110da13e6d4b258aaa3dca3c1fc7 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 5 Jul 2017 02:11:23 -0400
Subject: [PATCH 101/283] token test

---
 travis.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis.pl b/travis.pl
index 857d961be..ed3bb1a24 100644
--- a/travis.pl
+++ b/travis.pl
@@ -157,7 +157,7 @@ sub send_back_comment{
     }
     
      print "[send_back_comment] method = $post_method to $post_url by token\n";
-    `curl -v -H "Authorization: token 7333caf3936a938ad0803e7a297423e43f69fb62" -X $post_method -d '{"body":"$message"}' $post_url 2>&1`;
+    `curl -v -H "Authorization: token bf43c85ee93d2fc18bd2c8446aa997c54fc2095b" -X $post_method -d '{"body":"$message"}' $post_url 2>&1`;
 }
 
 #--------------------------------------------------------

From c4d221506523e35af4973e502553c211ecb49036 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 5 Jul 2017 02:18:42 -0400
Subject: [PATCH 102/283] token test1

---
 travis.pl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/travis.pl b/travis.pl
index ed3bb1a24..6c5d34b13 100644
--- a/travis.pl
+++ b/travis.pl
@@ -156,8 +156,9 @@ sub send_back_comment{
         }
     }
     
-     print "[send_back_comment] method = $post_method to $post_url by token\n";
-    `curl -v -H "Authorization: token bf43c85ee93d2fc18bd2c8446aa997c54fc2095b" -X $post_method -d '{"body":"$message"}' $post_url 2>&1`;
+     print "[send_back_comment] method = $post_method to $post_url\n";
+    `curl -v -H "Authorization: token bf43c85ee93d2fc18bd2c8446aa997c54fc2095b" -X $post_method -d '{"body":"$message"}' $post_url`;
+    #`curl -v -H "Authorization: token $ENV{'xcatbottoken'}" -X $post_method -d '{"body":"$message"}' $post_url`; 
 }
 
 #--------------------------------------------------------

From aa42aca6bab590e98b277de6aff04c7ee7ae0caf Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 5 Jul 2017 02:34:08 -0400
Subject: [PATCH 103/283] using username and password back

---
 travis.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/travis.pl b/travis.pl
index 6c5d34b13..c62bc6630 100644
--- a/travis.pl
+++ b/travis.pl
@@ -157,8 +157,8 @@ sub send_back_comment{
     }
     
      print "[send_back_comment] method = $post_method to $post_url\n";
-    `curl -v -H "Authorization: token bf43c85ee93d2fc18bd2c8446aa997c54fc2095b" -X $post_method -d '{"body":"$message"}' $post_url`;
-    #`curl -v -H "Authorization: token $ENV{'xcatbottoken'}" -X $post_method -d '{"body":"$message"}' $post_url`; 
+    #`curl -v -H "Authorization: token bf43c85ee93d2fc18bd2c8446aa997c54fc2095b" -X $post_method -d '{"body":"$message"}' $post_url`;
+     `curl -u "$ENV{'xcatbotuser'}:$ENV{'xcatbotpw'}" -X $post_method -d '{"body":"$message"}' $post_url`;
 }
 
 #--------------------------------------------------------
@@ -439,6 +439,8 @@ my @travis_env_attr = ("TRAVIS_REPO_SLUG",
                        "GITHUB_TOKEN",
                        "USERNAME",
                        "PASSWORD",
+                       "xcatbotuser",
+                       "xcatbotpw",
                        "PWD");
 foreach (@travis_env_attr){
     print "$_ = $ENV{$_}\n";

From 37965e1a7cba403727661dab0a433e5555661f06 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 5 Jul 2017 03:16:16 -0400
Subject: [PATCH 104/283] build test

---
 travis.pl | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/travis.pl b/travis.pl
index c62bc6630..bfef13842 100644
--- a/travis.pl
+++ b/travis.pl
@@ -157,7 +157,6 @@ sub send_back_comment{
     }
     
      print "[send_back_comment] method = $post_method to $post_url\n";
-    #`curl -v -H "Authorization: token bf43c85ee93d2fc18bd2c8446aa997c54fc2095b" -X $post_method -d '{"body":"$message"}' $post_url`;
      `curl -u "$ENV{'xcatbotuser'}:$ENV{'xcatbotpw'}" -X $post_method -d '{"body":"$message"}' $post_url`;
 }
 
@@ -172,7 +171,7 @@ sub build_xcat_core{
     my @output = runcmd("$cmd");
     if($::RUNCMD_RC){
         print "[build_xcat_core] $cmd ....[Failed]\n";
-        send_back_comment("> **BUILD ERROR**  :  $cmd .... failed. Please get detaied information in ``Merge pull request`` box");
+        send_back_comment("> **BUILD ERROR**  :  $cmd .... failed. Please click ``Details`` label in ``Merge pull request`` box for detailed information");
         return 1;
     }
 
@@ -186,7 +185,7 @@ sub build_xcat_core{
         print "[build_xcat_core] $cmd ....[Failed]\n";
         print ">>>>>Dumper the output of '$cmd'\n";
         print Dumper \@output;
-        $check_result_str .= "> **BUILD ERROR**, Please get detaied information in ``Merge pull request`` box";
+        $check_result_str .= "> **BUILD ERROR**, Please click ``Details`` label in ``Merge pull request`` box for detailed information";
         send_back_comment("$check_result_str");
         return 1;
     }else{
@@ -195,6 +194,11 @@ sub build_xcat_core{
         send_back_comment("$check_result_str");
     }
 
+my $buildpath ="/home/travis/build/xcat-core/";
+my @buildfils = (); 
+get_files_recursive("$buildpath", \@buildfils);
+print "\n-----------Dumper build files-----------\n";
+print Dumper \@buildfils;
     return 0;
 }
 
@@ -219,7 +223,7 @@ sub install_xcat{
             print RED "[install_xcat] $cmd. ...[Failed]\n";
             print "[install_xcat] error message:\n";
             print Dumper \@output;
-            $check_result_str .= "> **INSTALL XCAT ERROR** : Please get detaied information in ``Merge pull request`` box ";
+            $check_result_str .= "> **INSTALL XCAT ERROR** : Please click ``Details`` label in ``Merge pull request`` box for detailed information ";
             send_back_comment("$check_result_str");
             return 1;
         }
@@ -235,7 +239,7 @@ sub install_xcat{
         print "[install_xcat] $cmd ....[Failed]\n";
         print ">>>>>Dumper the output of '$cmd'\n";
         print Dumper \@output;
-        $check_result_str .= "> **INSTALL XCAT ERROR** : Please get detaied information in ``Merge pull request`` box";
+        $check_result_str .= "> **INSTALL XCAT ERROR** : Please click ``Details`` label in ``Merge pull request`` box for detailed information";
         send_back_comment("$check_result_str");     
         return 1;
     }else{
@@ -263,7 +267,7 @@ sub install_xcat{
             }
         }
         if($ret){
-            $check_result_str .= "> **INSTALL XCAT ERROR** : Please get detaied information in ``Merge pull request`` box";
+            $check_result_str .= "> **INSTALL XCAT ERROR** : Please click ``Details`` label in ``Merge pull request`` box for detailed information";
             send_back_comment("$check_result_str");
             return 1;
         }
@@ -316,7 +320,7 @@ sub check_syntax{
         print "[check_syntax] syntax checking ....[Failed]\n";
         print "[check_syntax] Dumper error message:\n";
         print Dumper @syntax_err;
-        $check_result_str .= "> **CODE SYNTAX ERROR** : Please get detaied information in ``Merge pull request`` box";
+        $check_result_str .= "> **CODE SYNTAX ERROR** : Please click ``Details`` label in ``Merge pull request`` box for detailed information";
         send_back_comment("$check_result_str");
     }else{
         print "[check_syntax] syntax checking ....[Pass]\n";
@@ -402,7 +406,7 @@ sub run_fast_regression_test{
 
     if($failnum){
         my $log_str = join (",", @failcase );
-        $check_result_str .= "> **FAST REGRESSION TEST Failed**: Totalcase $casenum Pass $passnum failed $failnum FailedCases: $log_str.  Please get detaied information in ``Merge pull request`` box";
+        $check_result_str .= "> **FAST REGRESSION TEST Failed**: Totalcase $casenum Pass $passnum failed $failnum FailedCases: $log_str.  Please click ``Details`` label in ``Merge pull request`` box for detailed information";
         send_back_comment("$check_result_str");
         return 1;
     }else{   

From 51ec3df5c0289797cbf0d5480f477fbada9f01ed Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 5 Jul 2017 03:31:14 -0400
Subject: [PATCH 105/283] build test

---
 travis.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/travis.pl b/travis.pl
index bfef13842..659c29857 100644
--- a/travis.pl
+++ b/travis.pl
@@ -177,8 +177,8 @@ sub build_xcat_core{
 
     $cmd = "sudo ./build-ubunturepo -c UP=0 BUILDALL=1";
     @output = runcmd("$cmd");
-    #print ">>>>>Dumper the output of '$cmd'\n";
-    #print Dumper \@output;
+    print ">>>>>Dumper the output of '$cmd'\n";
+    print Dumper \@output;
     if($::RUNCMD_RC){
         my $lastline = $output[-1];
         $lastline =~ s/[\r\n\t\\"']*//g;

From 8de802ba100522f372b8a2dd178a7c0a9d1940fd Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 5 Jul 2017 03:55:15 -0400
Subject: [PATCH 106/283] test build

---
 travis.pl | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/travis.pl b/travis.pl
index 659c29857..70a51d7ac 100644
--- a/travis.pl
+++ b/travis.pl
@@ -167,12 +167,17 @@ sub send_back_comment{
 # Retrun code:
 #--------------------------------------------------------
 sub build_xcat_core{
-    my $cmd = "gpg --list-keys";
-    my @output = runcmd("$cmd");
-    if($::RUNCMD_RC){
-        print "[build_xcat_core] $cmd ....[Failed]\n";
-        send_back_comment("> **BUILD ERROR**  :  $cmd .... failed. Please click ``Details`` label in ``Merge pull request`` box for detailed information");
-        return 1;
+    my @output;
+    my @cmds = ("gpg --list-keys",
+                "sed -i '/SignWith: yes/d' $ENV{'PWD'}/build-ubunturepo");
+    foreach my $cmd (@cmds){
+        print "[build_xcat_core] to run $cmd\n";
+        @output = runcmd("$cmd");
+        if($::RUNCMD_RC){
+            print "[build_xcat_core] $cmd ....[Failed]\n";
+            send_back_comment("> **BUILD ERROR** : $cmd failed. Please click ``Details`` label in ``Merge pull request`` box for detailed information");
+            return 1;
+        }
     }
 
     $cmd = "sudo ./build-ubunturepo -c UP=0 BUILDALL=1";

From 130c30c7d7b8166e38c30b95b9a19e3745d6240a Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Wed, 5 Jul 2017 02:39:19 -0400
Subject: [PATCH 107/283] Fix issue 3383, do not allow setting and getting in
 one command for rspconfig

---
 xCAT-server/lib/xcat/plugins/ipmi.pm | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 859283636..d37193ff3 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -8076,11 +8076,37 @@ sub preprocess_request {
         xCAT::Utils->filter_nodes($request, undef, undef, \@bmcnodes, \@nohandle);
         $realnoderange = \@bmcnodes;
     } elsif ($command eq "rspconfig") {
-
         # filter out the nodes which should be handled by ipmi.pm
         my (@bmcnodes, @nohandle);
         xCAT::Utils->filter_nodes($request, undef, undef, \@bmcnodes, \@nohandle);
         $realnoderange = \@bmcnodes;
+
+        if ($realnoderange) {
+            my $optset = 0;
+            my $optget = 0;
+            foreach (@exargs) {
+                if ($_ =~ /^(\w+)=(.*)/) {
+                    $optset = 1;
+                    my $option = $1;
+                    unless ($option =~ /^USERID$|^ip$|^netmask$|^gateway$|^vlan$|^userid$|^username$|^password$|^snmpdest|^thermprofile$|^alert$|^garp$|^community$|^backupgateway$/) {
+                        $callback->({ errorcode => [1], data => [ "Unsupported command: $command $option"] });
+                        $request = {};
+                        return;
+                    }
+                } elsif ($_ =~ /^ip$|^netmask$|^gateway$|^vlan$|^userid$|^username$|^password$|^snmpdest|^thermprofile$|^alert$|^garp$|^community$|^backupgateway$/) {
+                    $optget = 1;
+                } else {
+                    $callback->({ errorcode => [1], data => [ "Unsupported command: $command $_"] });
+                    $request = {};
+                    return;
+                }
+            }
+            if ($optset and $optget) {
+                $callback->({ errorcode => [1], data => [ "Do not set and get information in the same command for $command."] });
+                $request = {};
+                return;
+            }
+        }
     } elsif ($command eq "rinv") {
         if ($exargs[0] eq "-t" and $#exargs == 0) {
             unshift @{ $request->{arg} }, 'all';

From 3caf0531c34698d670c15da55ab0274b007d0bec Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Wed, 5 Jul 2017 04:06:06 -0400
Subject: [PATCH 108/283] fix bug 3394. Refine confignetwork cases

---
 xCAT-test/autotest/testcase/confignetwork/cases0 | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index 7800598c2..48bb6bf20 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -186,7 +186,6 @@ check:rc==0
 cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/";else echo "Sorry,this is not supported os"; fi
-check:rc==0
 cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1496
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
@@ -195,8 +194,8 @@ cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep MTU /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep MTU /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep MTU /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
-check:output=~MTU=1496
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep MTU /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep MTU /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep mtu /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:output=~MTU=1496 |mtu 1496
 cmd:xdsh $$CN "ip addr del 11.1.0.100/16 dev $$SECONDNIC"
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
@@ -277,9 +276,9 @@ check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
 check:output!~dhcp
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~12.1.0.100
-check:output=~CONNECTED_MODE=yes
+check:output=~CONNECTED_MODE=yes | CONNECTED_MODE yes
 check:output!~dhcp
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
@@ -395,7 +394,7 @@ cmd:chmod a+x /tmp/script1
 check:rc==0
 cmd:cp /tmp/script1 /install/postscripts
 check:rc==0
-cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mut=1496
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1496
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0 niccustomscripts.$$SECONDNIC=script1
 check:rc==0
@@ -445,11 +444,11 @@ cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~12.1.0.100
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 13.1.0.100 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 13.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 13.1.0.100 /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~13.1.0.100
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 14.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/network/interfaces.d/$$THIRDNIC:1";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 14.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~14.1.0.100
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0

From 496d7b407d823a669469005ff9d12957f6da1bd5 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 5 Jul 2017 04:07:28 -0400
Subject: [PATCH 109/283] build test

---
 .travis.yml | 4 ++--
 travis.pl   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1ab68ff82..a04874d6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,8 +22,8 @@ script:
 - echo $GITHUB_TOKEN
 - git log --pretty=format:"%s %b" -2
 
-- perl travis.pl
-#- if [ $TRAVIS_EVENT_TYPE == "pull_request" ]; then perl ./travis.pl;  fi
+#- perl travis.pl
+- if [ $TRAVIS_EVENT_TYPE == "pull_request" ]; then perl ./travis.pl;  fi
 
 
 
diff --git a/travis.pl b/travis.pl
index 70a51d7ac..4d78af1be 100644
--- a/travis.pl
+++ b/travis.pl
@@ -180,7 +180,7 @@ sub build_xcat_core{
         }
     }
 
-    $cmd = "sudo ./build-ubunturepo -c UP=0 BUILDALL=1";
+    my $cmd = "sudo ./build-ubunturepo -c UP=0 BUILDALL=1";
     @output = runcmd("$cmd");
     print ">>>>>Dumper the output of '$cmd'\n";
     print Dumper \@output;

From 89df8e877e5d5455e433a0b6d31e59800e9abc5d Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 5 Jul 2017 04:36:00 -0400
Subject: [PATCH 110/283] test regression

---
 travis.pl                                 | 16 +++++++++-------
 xCAT-test/autotest/bundle/MN_basic.bundle |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/travis.pl b/travis.pl
index 4d78af1be..c9b5453aa 100644
--- a/travis.pl
+++ b/travis.pl
@@ -188,8 +188,8 @@ sub build_xcat_core{
         my $lastline = $output[-1];
         $lastline =~ s/[\r\n\t\\"']*//g;
         print "[build_xcat_core] $cmd ....[Failed]\n";
-        print ">>>>>Dumper the output of '$cmd'\n";
-        print Dumper \@output;
+        #print ">>>>>Dumper the output of '$cmd'\n";
+        #print Dumper \@output;
         $check_result_str .= "> **BUILD ERROR**, Please click ``Details`` label in ``Merge pull request`` box for detailed information";
         send_back_comment("$check_result_str");
         return 1;
@@ -199,11 +199,12 @@ sub build_xcat_core{
         send_back_comment("$check_result_str");
     }
 
-my $buildpath ="/home/travis/build/xcat-core/";
-my @buildfils = (); 
-get_files_recursive("$buildpath", \@buildfils);
-print "\n-----------Dumper build files-----------\n";
-print Dumper \@buildfils;
+#    my $buildpath ="/home/travis/build/xcat-core/";
+#    my @buildfils = (); 
+#    get_files_recursive("$buildpath", \@buildfils);
+#    print "\n-----------Dumper build files-----------\n";
+#    print Dumper \@buildfils;
+
     return 0;
 }
 
@@ -223,6 +224,7 @@ sub install_xcat{
                "sudo apt-get -qq update");
     my @output;
     foreach my $cmd (@cmds){
+        print "[install_xcat] to run $cmd\n";
         @output = runcmd("$cmd");
         if($::RUNCMD_RC){
             print RED "[install_xcat] $cmd. ...[Failed]\n";
diff --git a/xCAT-test/autotest/bundle/MN_basic.bundle b/xCAT-test/autotest/bundle/MN_basic.bundle
index 3639e92dd..7a7a70c96 100644
--- a/xCAT-test/autotest/bundle/MN_basic.bundle
+++ b/xCAT-test/autotest/bundle/MN_basic.bundle
@@ -73,7 +73,7 @@ makedhcp_n_linux
 makedns_h
 #makedns_n
 #makedns_node
-makehost_n_r
+#makehost_n_r
 #makehosts_d
 makehosts_h
 makehosts_help

From 15ca602dd69e17c6184e64b2b66b2215ac97fdd4 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 5 Jul 2017 04:58:06 -0400
Subject: [PATCH 111/283] test regression

---
 xCAT-test/autotest/bundle/MN_basic.bundle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-test/autotest/bundle/MN_basic.bundle b/xCAT-test/autotest/bundle/MN_basic.bundle
index 7a7a70c96..1b5b74063 100644
--- a/xCAT-test/autotest/bundle/MN_basic.bundle
+++ b/xCAT-test/autotest/bundle/MN_basic.bundle
@@ -218,7 +218,7 @@ tabrestore_err
 tabrestore_h
 tabrestore_null
 tabrestore_table
-xcatd_restart
+#xcatd_restart
 xcatd_start
 xcatd_stop
 xcatsnap_b_d

From 35b5155322e6d9d3908a9832e9d75631b714f180 Mon Sep 17 00:00:00 2001
From: yangsong <immarvin@users.noreply.github.com>
Date: Wed, 5 Jul 2017 04:31:37 -0500
Subject: [PATCH 112/283] add GPGSIGN env variable to avoid sign for ubuntu
 build (#3403)

---
 build-ubunturepo | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/build-ubunturepo b/build-ubunturepo
index 6e01caab8..4d1fbfb04 100755
--- a/build-ubunturepo
+++ b/build-ubunturepo
@@ -22,6 +22,8 @@
 #                           When you are ready to release this build, use PROMOTE=1 without PREGA
 #               BUILDALL=1 - build all rpms, whether they changed or not.  Should be used for snap builds that are in
 #                            prep for a release.
+#               GPGSIGN=0 -  Do not sign the repo in the end of the build. The repo will be signed by default 
+#                            
 #               LOG=<filename> - provide an LOG file option to redirect some output into log file
 #
 # For the dependency packages 1. All the xcat dependency deb packages should be uploaded to
@@ -125,16 +127,20 @@ if [ ! -z ${LOG} ]; then
     WGET_CMD="wget -o ${LOG}"
 fi
 
-#sync the gpg key to the build machine local
-gsa_url=http://pokgsa.ibm.com/projects/x/xcat/build/linux
-mkdir -p $HOME/.gnupg
-for key_name in pubring.gpg secring.gpg trustdb.gpg; do
-    if [ ! -f $HOME/.gnupg/$key_name ] || [ `wc -c $HOME/.gnupg/$key_name|cut -f 1 -d' '` == 0 ]; then
-        rm -f $HOME/.gnupg/$key_name
-        ${WGET_CMD} -P $HOME/.gnupg $gsa_url/keys/$key_name
-        chmod 600 $HOME/.gnupg/$key_name
-    fi
-done
+if [ "$GPGSIGN" = "0" ];then
+    echo "GPGSIGN=$GPGSIGN specified, skip gnupg key downloading"
+else
+    #sync the gpg key to the build machine local
+    gsa_url=http://pokgsa.ibm.com/projects/x/xcat/build/linux
+    mkdir -p $HOME/.gnupg
+    for key_name in pubring.gpg secring.gpg trustdb.gpg; do
+        if [ ! -f $HOME/.gnupg/$key_name ] || [ `wc -c $HOME/.gnupg/$key_name|cut -f 1 -d' '` == 0 ]; then
+            rm -f $HOME/.gnupg/$key_name
+            ${WGET_CMD} -P $HOME/.gnupg $gsa_url/keys/$key_name
+            chmod 600 $HOME/.gnupg/$key_name
+        fi
+    done
+fi
 
 if [ "$c_flag" ]
 then
@@ -323,9 +329,15 @@ Codename: $dist
 Architectures: $tmp_out_arch
 Components: main
 Description: Repository automatically genereted conf
-SignWith: yes
-
 __EOF__
+
+       if [ "$GPGSIGN" = "0" ];then
+           echo "GPGSIGN=$GPGSIGN specified, the repo will not be signed"
+           echo "" >> conf/distributions
+       else 
+           echo "SignWith: yes" >> conf/distributions
+           echo "" >> conf/distributions
+       fi
      done
 
     cat << __EOF__ > conf/options
@@ -444,11 +456,17 @@ Codename: $dist
 Architectures: $tmp_out_arch
 Components: main
 Description: Repository automatically genereted conf
-SignWith: yes
-
 __EOF__
     done
 
+    if [ "$GPGSIGN" = "0" ];then
+        echo "GPGSIGN=$GPGSIGN specified, the repo will not be signed"
+        echo "" >> conf/distributions
+    else
+        echo "SignWith: yes" >> conf/distributions
+        echo "" >> conf/distributions
+    fi
+
     cat << __EOF__ > conf/options
 verbose
 ask-passphrase

From 2ad12e2ec443c27d508654896055de519f7812fc Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Wed, 5 Jul 2017 06:15:11 -0400
Subject: [PATCH 113/283] modify rpower testcase using unsurpported command for
 openpowerbmc

---
 xCAT-test/autotest/testcase/rpower/cases0 | 29 +++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/xCAT-test/autotest/testcase/rpower/cases0 b/xCAT-test/autotest/testcase/rpower/cases0
index 09f619fe0..143806ba7 100644
--- a/xCAT-test/autotest/testcase/rpower/cases0
+++ b/xCAT-test/autotest/testcase/rpower/cases0
@@ -152,3 +152,32 @@ cmd:rpower $$CN onstandby
 cmd:a=0;while ! `rpower $$CN stat|grep "standby\|Standby" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 check:ouptut=~standby|Standby
 end
+start:rpower_suspend_OpenpowerBmc
+description:rpower openpowerbmc using suspend
+Attribute: $$CN-The operation object of rpower command
+cmd:rpower $$CN suspend
+check:output=~Error: unsupported command rpower suspend for OpenPOWER
+check:rc==1
+end
+start:rpower_softoff_OpenpowerBmc
+description:rpower openpowerbmc using softoff
+Attribute: $$CN-The operation object of rpower command
+cmd:rpower $$CN softoff
+check:output=~Error: unsupported command rpower softoff for OpenPOWER
+check:rc==1
+end
+start:rpower_wake_OpenpowerBmc
+description:rpower openpowerbmc using wake
+Attribute: $$CN-The operation object of rpower command
+cmd:rpower $$CN wake
+check:output=~Error: unsupported command rpower wake for OpenPOWER
+check:rc==1
+end
+start:rpower_errorcommand_OpenpowerBmc
+description:rpower openpowerbmc using errorcommand
+Attribute: $$CN-The operation object of rpower command
+cmd:rpower $$CN ddd
+check:output=~Unsupported command:
+check:rc==1
+end
+

From 08f0199b90ea960cac210cce9afd0e3b573116f5 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Wed, 5 Jul 2017 20:51:50 -0400
Subject: [PATCH 114/283] In latest ITC machine, the Model Type is in the
 PartNumber Field

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

diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
index 8ec572b7d..e29059be1 100644
--- a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
@@ -1086,8 +1086,8 @@ sub bmcdiscovery_openbmc{
         my $serial;
 
         if (defined($response->{data})) {
-            if (defined($response->{data}->{Model}) and defined($response->{data}->{SerialNumber})) {
-                $mtm = $response->{data}->{Model};
+            if (defined($response->{data}->{PartNumber}) and defined($response->{data}->{SerialNumber})) {
+                $mtm = $response->{data}->{PartNumber};
                 if (defined($::XCAT_DEV_WITHERSPOON) && ($::XCAT_DEV_WITHERSPOON eq "TRUE")) {
                     xCAT::MsgUtils->message("I", { data => ["XCAT_DEV_WITHERSPOON=TRUE, forcing MTM to empty string for $ip (Original MTM=$mtm)"] }, $::CALLBACK);
                     $mtm = "";

From f883d51ae54f797c5707eea7479c639bed063f68 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Wed, 5 Jul 2017 21:15:23 -0400
Subject: [PATCH 115/283] modified depending on comments

---
 xCAT-server/lib/xcat/plugins/ipmi.pm | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index d37193ff3..9f66bc523 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -8082,30 +8082,32 @@ sub preprocess_request {
         $realnoderange = \@bmcnodes;
 
         if ($realnoderange) {
-            my $optset = 0;
-            my $optget = 0;
+            my $optset;
+            my $option;
             foreach (@exargs) {
                 if ($_ =~ /^(\w+)=(.*)/) {
-                    $optset = 1;
-                    my $option = $1;
-                    unless ($option =~ /^USERID$|^ip$|^netmask$|^gateway$|^vlan$|^userid$|^username$|^password$|^snmpdest|^thermprofile$|^alert$|^garp$|^community$|^backupgateway$/) {
-                        $callback->({ errorcode => [1], data => [ "Unsupported command: $command $option"] });
+                    if ($optset eq 0) {
+                        $callback->({ errorcode => [1], data => [ "Usage Error: Cannot display and change attributes on the same command."] });
                         $request = {};
                         return;
                     }
-                } elsif ($_ =~ /^ip$|^netmask$|^gateway$|^vlan$|^userid$|^username$|^password$|^snmpdest|^thermprofile$|^alert$|^garp$|^community$|^backupgateway$/) {
-                    $optget = 1;
+                    $optset = 1;
+                    $option = $1;
                 } else {
+                    if ($optset eq 1) {
+                        $callback->({ errorcode => [1], data => [ "Usage Error: Cannot display and change attributes on the same command."] });
+                        $request = {};
+                        return;
+                    }
+                    $option = $_;
+                    $optset = 0;
+                }
+                unless ($option =~ /^USERID$|^ip$|^netmask$|^gateway$|^vlan$|^userid$|^username$|^password$|^snmpdest|^thermprofile$|^alert$|^garp$|^community$|^backupgateway$/) {
                     $callback->({ errorcode => [1], data => [ "Unsupported command: $command $_"] });
                     $request = {};
                     return;
                 }
             }
-            if ($optset and $optget) {
-                $callback->({ errorcode => [1], data => [ "Do not set and get information in the same command for $command."] });
-                $request = {};
-                return;
-            }
         }
     } elsif ($command eq "rinv") {
         if ($exargs[0] eq "-t" and $#exargs == 0) {

From a41c0270ef5a7b27032ed44c78864d77b1c27468 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Thu, 6 Jul 2017 14:24:31 +0800
Subject: [PATCH 116/283] Add test case mkdef_regex_nicsip. Verification of the
 GitHub issue #3047

---
 xCAT-test/autotest/testcase/mkdef/cases1 | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/xCAT-test/autotest/testcase/mkdef/cases1 b/xCAT-test/autotest/testcase/mkdef/cases1
index 958aa05f1..dadc5b244 100644
--- a/xCAT-test/autotest/testcase/mkdef/cases1
+++ b/xCAT-test/autotest/testcase/mkdef/cases1
@@ -61,3 +61,27 @@ check:rc==0
 cmd:chtab -d node=kvms vm
 check:rc==0
 end
+
+start:mkdef_regex_nicsip
+description:Verify the GitHub issue #3047.
+cmd:rmdef sn[01-16]
+cmd:rmdef -t group -o testnicips
+cmd:mkdef -t group -o testnicips
+check:rc==0
+cmd:chdef -t group -o testnicips 'ip=|\D+(\d+)|172.21.254.($1%100)|'
+check:rc==0
+cmd:chdef -t group -o testnicips 'nicips.eth1=|\D+(\d+)|172.20.254.($1%100)|'
+check:rc==0
+cmd:lsdef -t group -o testnicips | grep -F 'nicips.eth1=|\D+(\d+)|172.20.254.($1%100)|'
+check:rc==0
+cmd:mkdef sn[01-16] groups=testnicips
+check:rc==0
+cmd:lsdef sn14 -c -i ip | grep -F 'ip=172.21.254.14'
+check:rc==0
+cmd:lsdef sn09 -c -i nicips  | grep -F 'nicips.eth1=172.20.254.9'
+check:rc==0
+cmd:rmdef sn[01-16]
+check:rc==0
+cmd:rmdef -t group -o testnicips
+check:rc==0
+end

From aac78a0854f8e2bdd4b7894585912c32b29f1db2 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Thu, 6 Jul 2017 02:58:26 -0400
Subject: [PATCH 117/283] Remove the plain text of user name and password of
 xcatbot

---
 travis.pl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/travis.pl b/travis.pl
index c9b5453aa..50d25ac20 100644
--- a/travis.pl
+++ b/travis.pl
@@ -450,8 +450,6 @@ my @travis_env_attr = ("TRAVIS_REPO_SLUG",
                        "GITHUB_TOKEN",
                        "USERNAME",
                        "PASSWORD",
-                       "xcatbotuser",
-                       "xcatbotpw",
                        "PWD");
 foreach (@travis_env_attr){
     print "$_ = $ENV{$_}\n";

From f326a5e7a26fa6d6124c01a93d07d9e06b442787 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Thu, 6 Jul 2017 04:35:24 -0400
Subject: [PATCH 118/283] fix bug 3215 and 3216. Add confignetworks cases for
 vlan and bond

---
 .../autotest/testcase/confignetwork/cases0    | 263 +++++++++++++++++-
 1 file changed, 256 insertions(+), 7 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index 48bb6bf20..193d9da79 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -186,6 +186,7 @@ check:rc==0
 cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/";else echo "Sorry,this is not supported os"; fi
+check:rc==0
 cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1496
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
@@ -194,8 +195,8 @@ cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep MTU /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep MTU /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep mtu /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
-check:output=~MTU=1496 |mtu 1496
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep MTU /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep MTU /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep MTU /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:output=~MTU=1496
 cmd:xdsh $$CN "ip addr del 11.1.0.100/16 dev $$SECONDNIC"
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
@@ -276,9 +277,9 @@ check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
 check:output!~dhcp
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
 check:output=~12.1.0.100
-check:output=~CONNECTED_MODE=yes | CONNECTED_MODE yes
+check:output=~CONNECTED_MODE=yes
 check:output!~dhcp
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
@@ -394,7 +395,7 @@ cmd:chmod a+x /tmp/script1
 check:rc==0
 cmd:cp /tmp/script1 /install/postscripts
 check:rc==0
-cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1496
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mut=1496
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0 niccustomscripts.$$SECONDNIC=script1
 check:rc==0
@@ -444,11 +445,11 @@ cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
 check:output=~12.1.0.100
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 13.1.0.100 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 13.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 13.1.0.100 /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~13.1.0.100
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 14.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 14.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/network/interfaces.d/$$THIRDNIC:1";else echo "Sorry,this is not supported os"; fi
 check:output=~14.1.0.100
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
@@ -470,3 +471,251 @@ check:rc==0
 cmd:xdsh $$CN "rm -rf /tmp/backupnet/"
 check:rc==0
 end
+
+start:confignetwork_vlan_eth0
+description: this case is to verify if confignetwork could config vlan for CN.When CN has Ethernet nic eth0, user wants to confgure 2 vlans, Configure vlan eth0.6 60.5.106.9 and eth0.7 70.5.106.9 based on ethernet nic eth0 
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/";else echo "Sorry,this is not supported os"; fi
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:output=~11.1.0.100
+cmd:mkdef -t network -o 60_0_0_0-255_0_0_0 net=60.0.0.0 mask=255.0.0.0 mgtifname=$$SECONDNIC 
+check:rc==0
+cmd:mkdef -t network -o 70_0_0_0-255_0_0_0 net=70.0.0.0 mask=255.0.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC.6="60_0 _0_0-255_0_0_0" nicnetworks.$$SECONDNIC.7="70_0 _0_0-255_0_0_0" nictypes.$$SECONDNIC.6=vlan nictypes.$$SECONDNIC.7=vlan nicips.$$SECONDNIC.6=60.5.106.9 nicips.$$SECONDNIC.7=70.5.106.9 nicdevices.$$SECONDNIC.6=$$SECONDNIC nicdevices.$$SECONDNIC.7=$$SECONDNIC
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 60.5.106.9 /etc/sysconfig/network/ifcfg-$$SECONDNIC.6"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 60.5.106.9 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC.6"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 60.5.106.9 /etc/network/interfaces.d/$$SECONDNIC.6";else echo "Sorry,this is not supported os"; fi
+check:output=~60.5.106.9
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 70.5.106.9 /etc/sysconfig/network/ifcfg-$$SECONDNIC.7"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 70.5.106.9 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC.7"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 70.5.106.9 /etc/network/interfaces.d/$$SECONDNIC.7";else echo "Sorry,this is not supported os"; fi
+check:output=~70.5.106.9
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:rmdef -t network -o 60_0_0_0-255_0_0_0
+cmd:rmdef -t network -o 70_0_0_0-255_0_0_0
+cmd:xdsh $$CN "ip addr del 60.5.106.9/8 dev $$SECONDNIC.6"
+cmd:xdsh $$CN "ip addr del 70.5.106.9/8 dev $$SECONDNIC.7" 
+cmd:xdsh $$CN "ip link del dev $$SECONDNIC.6"
+cmd:xdsh $$CN "ip link del dev $$SECONDNIC.7"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC.6 /etc/sysconfig/network/ifcfg-$$SECONDNIC.7"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC.6 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC.7"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC.6 /etc/network/interfaces.d/$$SECONDNIC.7";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/;cp -f /tmp/interfaces /etc/network/";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:xdsh $$CN "rm -rf /tmp/backupnet/ /tmp/interfaces"
+check:rc==0
+end
+
+start:confignetwork_vlan_false
+description:this case is to verify if confignetwork could process the false value when vlan nicdevice is not correctly set
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/";else echo "Sorry,this is not supported os"; fi
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1500
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:output=~11.1.0.100
+cmd:mkdef -t network -o 60_0_0_0-255_0_0_0 net=60.0.0.0 mask=255.0.0.0 mgtifname=$$SECONDNIC mtu=1500
+check:rc==0
+cmd:mkdef -t network -o 70_0_0_0-255_0_0_0 net=70.0.0.0 mask=255.0.0.0 mgtifname=$$SECONDNIC mtu=1500
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC.6="60_0 _0_0-255_0_0_0" nicnetworks.$$SECONDNIC.7="70_0 _0_0-255_0_0_0" nictypes.$$SECONDNIC.6=vlan nictypes.$$SECONDNIC.7=vlan nicips.$$SECONDNIC.6=60.5.106.9 nicips.$$SECONDNIC.7=70.5.106.9 
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc!=0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC.6="60_0 _0_0-255_0_0_0" nicnetworks.$$SECONDNIC.7="70_0 _0_0-255_0_0_0" nictypes.$$SECONDNIC.6=vlan nictypes.$$SECONDNIC.7=vlan nicips.$$SECONDNIC.6=60.5.106.9 nicips.$$SECONDNIC.7=70.5.106.9 nicdevices.$$SECONDNIC.6=$$SECONDNIC.6 nicdevices.$$SECONDNIC.7=$$SECONDNIC.7
+cmd:updatenode $$CN -P confignetwork
+check:rc!=0
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:rmdef -t network -o 60_0_0_0-255_0_0_0
+cmd:rmdef -t network -o 70_0_0_0-255_0_0_0
+cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/;cp -f /tmp/interfaces /etc/network/";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:xdsh $$CN "rm -rf /tmp/backupnet/ /tmp/interfaces"
+check:rc==0
+end
+
+start:confignetwork_bond_eth2_eth3
+description: this case is to verify if confignetwork could config bond for CN.CN has 2 Ethernet nics, eth2 and eth3, user configures bond bond0 using ethernet nic eth2 and eth3.
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/";else echo "Sorry,this is not supported os"; fi
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
+check:rc==0
+cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$THIRDNIC=12.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$THIRDNIC=12_1_0_0-255_255_0_0
+check:rc==0
+cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0 
+check:rc==0
+cmd:chdef $$CN nicnetworks.bond0=30_5_0_0-255_255_0_0 nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet nictypes.bond0=bond nicips.bond0=30.5.106.9 nicdevices.bond0="$$SECONDNIC|$$THIRDNIC"
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 30.5.106.9 /etc/sysconfig/network/ifcfg-bond0"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 30.5.106.9 /etc/sysconfig/network-scripts/ifcfg-bond0"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 30.5.106.9 /etc/network/interfaces.d/bond0";else echo "Sorry,this is not supported os"; fi
+check:output=~30.5.106.9
+check:rc==0
+cmd:xdsh $$CN "ls /sys/class/net"
+check:output=~bond0
+cmd:xdsh $$CN "cat /sys/class/net/bonding_masters"
+check:output=~bond0
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 12.1.0.100/8 dev $$THIRDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:rmdef -t network -o 30_5_0_0-255_255_0_0  
+cmd:xdsh $$CN "ip addr del 30.5.106.9/16 dev bond0"
+cmd:xdsh $$CN "ip link del dev bond0"
+cmd:xdsh $$CN "echo -bond0 > /sys/class/net/bonding_masters"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-bond0"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-bond0"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/bond0";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/;cp -f /tmp/interfaces /etc/network/";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:xdsh $$CN "rm -rf /tmp/backupnet/ /tmp/interfaces"
+check:rc==0
+end
+
+start:confignetwork_bond_false
+description: this case is to verify if confignetwork could process when bond is not correctly set.
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/";else echo "Sorry,this is not supported os"; fi
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
+check:rc==0
+cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$THIRDNIC=12.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$THIRDNIC=12_1_0_0-255_255_0_0
+check:rc==0
+cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0
+check:rc==0
+cmd:chdef $$CN nicnetworks.bond0=30_5_0_0-255_255_0_0 nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet nictypes.bond0=bond nicips.bond0=30.5.106.9 nicdevices.bond0=
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc!=0
+cmd:chdef $$CN nicnetworks.bond0=30_5_0_0-255_255_0_0 nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet nictypes.bond0=bond nicips.bond0=30.5.106.9 nicdevices.$$SECONDNIC=bond0
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc!=0
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 12.1.0.100/8 dev $$THIRDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:rmdef -t network -o 30_5_0_0-255_255_0_0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/;cp -f /tmp/interfaces /etc/network/";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:xdsh $$CN "rm -rf /tmp/backupnet/ /tmp/interfaces"
+check:rc==0
+end
+
+start:confignetwork_vlan_bond
+description: this case is to verify if confignetwork could config bond for CN.CN has 2 Ethernet nic eth2 and eth3, user wants to bond them to bond0, then make 2 vlan bond0.2 and bond0.3 for data network. 
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/";else echo "Sorry,this is not supported os"; fi
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1500
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
+check:rc==0
+cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC mtu=1500
+check:rc==0
+cmd:chdef $$CN nicips.$$THIRDNIC=12.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$THIRDNIC=12_1_0_0-255_255_0_0
+check:rc==0
+cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0 mtu=1500
+check:rc==0
+cmd:mkdef -t network -o 40_5_0_0-255_255_0_0 net=40.5.0.0 mask=255.255.0.0 mtu=1500
+check:rc==0
+cmd:chdef $$CN nicdevices.bond0.2=bond0 nicdevices.bond0.3=bond0 nicips.bond0.2=30.5.106.8 nicips.bond0.3=40.5.106.8 nicnetworks.bond0.2=30_5_0_0-255_255_0_0 nicnetworks.bond0.3=40_5_0_0-255_255_0_0 nictypes.bond0.2=vlan nictypes.bond0.3=vlan nictypes.bond0=bond nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet nicdevices.bond0="$$SECONDNIC|$$THIRDNIC"
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 30.5.106.8 /etc/sysconfig/network/ifcfg-bond0.2"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 30.5.106.8 /etc/sysconfig/network-scripts/ifcfg-bond0.2"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 30.5.106.8 /etc/network/interfaces.d/bond0.2";else echo "Sorry,this is not supported os"; fi
+check:output=~30.5.106.8
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 40.5.106.8 /etc/sysconfig/network/ifcfg-bond0.3"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 40.5.106.8 /etc/sysconfig/network-scripts/ifcfg-bond0.3"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 40.5.106.8 /etc/network/interfaces.d/bond0.3";else echo "Sorry,this is not supported os"; fi
+check:output=~40.5.106.8
+cmd:xdsh $$CN "ls /sys/class/net"
+check:output=~bond0
+check:output=~bond0.2
+check:output=~bond0.3
+cmd:xdsh $$CN "cat /sys/class/net/bonding_masters"
+check:output=~bond0
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 12.1.0.100/8 dev $$THIRDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:rmdef -t network -o 30_5_0_0-255_255_0_0
+cmd:rmdef -t network -o 40_5_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 30.5.106.9/16 dev bond0.2"
+cmd:xdsh $$CN "ip addr del 40.5.106.9/16 dev bond0.3"
+cmd:xdsh $$CN "ip link del dev bond0"
+cmd:xdsh $$CN "ip link del dev bond0.2"
+cmd:xdsh $$CN "ip link del dev bond0.3"
+cmd:xdsh $$CN "echo -bond0 > /sys/class/net/bonding_masters"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-bond0 /etc/sysconfig/network/ifcfg-bond0.2 /etc/sysconfig/network/ifcfg-bond0.3"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-bond0 /etc/sysconfig/network/ifcfg-bond0.2 /etc/sysconfig/network/ifcfg-bond0.3"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/bond0 /etc/sysconfig/network/ifcfg-bond0.2 /etc/sysconfig/network/ifcfg-bond0.3";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/;cp -f /tmp/interfaces /etc/network/";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:xdsh $$CN "rm -rf /tmp/backupnet/ /tmp/interfaces"
+check:rc==0
+end
+
+
+
+
+
+
+
+
+
+

From 8fd131015acbad0a58ed03147bb1db02135ac39f Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Thu, 6 Jul 2017 04:43:20 -0400
Subject: [PATCH 119/283] update for typo

---
 xCAT-test/autotest/testcase/confignetwork/cases0 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index 193d9da79..d7f602279 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -277,9 +277,9 @@ check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
 check:output!~dhcp
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~12.1.0.100
-check:output=~CONNECTED_MODE=yes
+check:output=~CONNECTED_MODE=yes | CONNECTED_MODE yes
 check:output!~dhcp
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
@@ -395,7 +395,7 @@ cmd:chmod a+x /tmp/script1
 check:rc==0
 cmd:cp /tmp/script1 /install/postscripts
 check:rc==0
-cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mut=1496
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1496
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0 niccustomscripts.$$SECONDNIC=script1
 check:rc==0
@@ -445,11 +445,11 @@ cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces.d/$$SECONDNIC:1";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~12.1.0.100
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 13.1.0.100 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 13.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 13.1.0.100 /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~13.1.0.100
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 14.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/network/interfaces.d/$$THIRDNIC:1";else echo "Sorry,this is not supported os"; fi
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 14.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~14.1.0.100
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0

From 9a8f89e128d7bdf933e753c2887330f6927d83b1 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Thu, 6 Jul 2017 16:25:26 -0400
Subject: [PATCH 120/283] Clean up some of the URLs for manpages in the
 Sequential Discovery Doc

---
 docs/source/conf.py                           |  1 -
 .../ppc64le/discovery/seq_discovery.rst       | 22 ++++++++++------
 .../discovery/standard_cn_definition.rst      | 25 -------------------
 3 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/standard_cn_definition.rst

diff --git a/docs/source/conf.py b/docs/source/conf.py
index b5b6350b3..270e99067 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -95,7 +95,6 @@ exclude_patterns = ['guides/install-guides/common_sections.rst',
                     '**ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst',
                     '**ppc64le/discovery/pbmc_discovery_with_lsslp.rst',
                     '**ppc64le/discovery/schedule_environment.rst',
-                    '**ppc64le/discovery/standard_cn_definition.rst',
                     '**ppc64le/diskless/customize_image/cfg_partition.rst',
                     '**ppc64le/diskless/customize_image/raid_cfg.rst',
                     #'**chain/create_image_for_runimage.rst'
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst
index fbb43f7c6..7ec0f41cf 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst
@@ -31,35 +31,41 @@ For more information about chain, refer to :doc:`Chain <../../../../../advanced/
 Initialize the discovery process
 ````````````````````````````````
 
-Specify the predefined nodes to the nodediscoverstart command to initialize the discovery process::
+Specify the predefined nodes to the `nodediscoverstart` command to initialize the discovery process::
 
     nodediscoverstart noderange=cn1
 
-See "nodediscoverstart man page<TBD>" for more details.
+See :doc:`nodediscoverstart </guides/admin-guides/references/man1/nodediscoverstart.1>` for more information.
 
 Display information about the discovery process
 ```````````````````````````````````````````````
 
-There are additional nodediscover commands you can run during the discovery process. See their man pages for more details.
+There are additional `nodediscover*` commands you can run during the discovery process. See the man pages for more details.
 
 
-Verify the status of discovery::
+Verify the status of discovery using :doc:`nodediscoverstatus </guides/admin-guides/references/man1/nodediscoverstatus.1>`::
     
     nodediscoverstatus
 
-Show the nodes that have been discovered so far::
+Show the nodes that have been discovered using :doc:`nodediscoverls </guides/admin-guides/references/man1/nodediscoverls.1>`::
     
     nodediscoverls -t seq -l
 
-Stop the current sequential discovery process::
+Stop the current sequential discovery process using: :doc:`nodediscoverstop </guides/admin-guides/references/man1/nodediscoverstop.1>`::
     
     nodediscoverstop
 
-Note: The sequential discovery process will be stopped automatically when all of the node names in the node pool are used up. 
+
+**Note:** The sequential discovery process will stop automatically when all of the node names in the pool are consumed.
 
 Start discovery process
 -----------------------
 
 To start the discovery process, the system administrator needs to power on the servers one by one manually. Then the hardware discovery process will start automatically.
 
-.. include:: standard_cn_definition.rst
+Verify Node Definition
+----------------------
+
+After discovery of the node, properties of the server will be added to the xCAT node definition.  
+
+Display the node definition and verify that the MAC address has been populated. 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/standard_cn_definition.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/standard_cn_definition.rst
deleted file mode 100644
index 6230e8488..000000000
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/standard_cn_definition.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-Verify node definition
-----------------------
-
-The following is an example of the server node definition after hardware discovery::
-
-  # lsdef cn1
-  Object name: cn1
-      arch=ppc64
-      bmc=50.0.100.1
-      cons=ipmi
-      cpucount=192
-      cputype=POWER8E (raw), altivec supported
-      groups=powerLE,all
-      installnic=mac
-      ip=10.0.101.1
-      mac=6c:ae:8b:02:12:50
-      memory=65118MB
-      mgt=ipmi
-      mtm=8247-22L
-      netboot=petitboot
-      postbootscripts=otherpkgs
-      postscripts=syslog,remoteshell,syncfiles
-      primarynic=mac
-      serial=10112CA
-      supportedarchs=ppc64

From 29820ff808c7b52cbe4e38424f3b5ef6a3b21d84 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Fri, 7 Jul 2017 18:31:13 -0400
Subject: [PATCH 121/283] Support hybrid mode for different access vlan other
 than 1

---
 xCAT-server/share/xcat/scripts/configMellanox | 41 ++++++++++++++-----
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/xCAT-server/share/xcat/scripts/configMellanox b/xCAT-server/share/xcat/scripts/configMellanox
index 43dc783b7..36d313996 100755
--- a/xCAT-server/share/xcat/scripts/configMellanox
+++ b/xCAT-server/share/xcat/scripts/configMellanox
@@ -43,7 +43,8 @@ if (
                 'ip'         => \$::IP,
                 'name'       => \$::NAME,
                 'snmp'       => \$::SNMP,
-                'vlan=s'     => \$::VLAN,
+                'accessvlan=s' => \$::PVID,
+                'allowvlan=s'  => \$::VID,
                 'port=s'     => \$::PORT,
                 'mode=s'     => \$::MODE,
                 'all'        => \$::ALL,
@@ -120,7 +121,7 @@ if (($::CONFIG) || ($::ALL)) {
     run_rspconfig();
 }
 
-if ($::VLAN) {
+if ( ($::PVID) || ($::VID) ) {
     config_vlan();
 }
 
@@ -363,6 +364,9 @@ sub config_vlan {
         exit(1);
     }
 
+    my $access_vlan = $::PVID;
+    my $allowed_vlan = $::VID;
+
     # will default to trunk mode
     if ($::MODE) {
        $mode = $::MODE;
@@ -372,11 +376,18 @@ sub config_vlan {
             &usage;
             exit(1);
        }
+       if ($mode =~ /hybrid/) 
+       {
+           if (!$access_vlan) {
+               print "NOTE: Hybrid mode will change access vlan back to 1\n"; 
+               print "please provide access vlan if other than 1\n"; 
+               $access_vlan = 1;
+           }
+       }
     } else {
        $mode = "access";
     }
 
-    $vlan = $::VLAN;
 
     foreach my $switch (@nodes) {
         my $devicetype;
@@ -394,10 +405,7 @@ sub config_vlan {
             next;
         }
 
-        print "Tagging VLAN=$vlan for $switch port $port_input\n";
-
-        # create vlan
-        my $vlan_cmd = `xdsh $switch --devicetype $devicetype "enable;configure terminal;vlan $vlan;exit;exit" `;
+        print "Tagging access vlan to $access_vlan and allowed vlan to $allowed_vlan with $mode mode for $switch port $port_input\n";
 
         my $cmd_prefix = "xdsh $switch --devicetype $devicetype";
         foreach my $port (@ports) {
@@ -405,12 +413,23 @@ sub config_vlan {
             # Build up the commands for easier readability
             $cmd = $cmd . "enable\;";
             $cmd = $cmd . "configure terminal\;";
+            if ($access_vlan){
+                $cmd = $cmd . "vlan $access_vlan\;";
+                $cmd = $cmd . "exit\;";
+            }
+            if ($allowed_vlan){
+                $cmd = $cmd . "vlan $allowed_vlan\;";
+                $cmd = $cmd . "exit\;";
+            }
             $cmd = $cmd . "interface ethernet 1/$port\;";
             $cmd = $cmd . "switchport mode $mode\;";
             if ($mode =~ /access/) {
-                $cmd = $cmd . "switchport access vlan $vlan\;";
+                $cmd = $cmd . "switchport access vlan $access_vlan\;";
+            } elsif ($mode =~ /hybrid/) {
+                $cmd = $cmd . "switchport $mode allowed-vlan $allowed_vlan\;";
+                $cmd = $cmd . "switchport access vlan $access_vlan\;";
             } else {
-                $cmd = $cmd . "switchport $mode allowed-vlan $vlan\;";
+                $cmd = $cmd . "switchport $mode allowed-vlan $allowed_vlan\;";
             }
             $cmd = $cmd . "exit\;exit\;exit\;";
             my $final_cmd = $cmd_prefix . " \"" . $cmd . "\"";
@@ -445,10 +464,10 @@ sub usage
         configMellanox --switches switchnames --config  
 
     To configure VLAN on a specified port (Mellanox Ethernet switch ONLY):
-        configMellanox --switches switchnames --port port --vlan vlan --mode mode
+        configMellanox --switches switchnames --port port --accessvlan vlan1 --allowvlan vlan2 --mode mode
 
             The following mode are supported for switchport:
-                * access        Only untagged ingress Ethernet packets are allowed
+                * access        Only untagged ingress Ethernet packets are allowed 
                 * trunk         Only tagged ingress Ethernet packets are allowed
                 * hybrid        Both tagged and untagged ingress Ethernet packets are allowed
                 * access-dcb    Only untagged ingress Ethernet packets are allowed. Egress packets will be priority tagged

From 06ab2e627dd98d9dff61c41b0c429770e69764ea Mon Sep 17 00:00:00 2001
From: yangsong <immarvin@users.noreply.github.com>
Date: Mon, 10 Jul 2017 02:57:32 -0500
Subject: [PATCH 122/283] fix issue [CORAL]incorrect petitboot configuration
 for nodeset shell in flat hierarchical #3414 (#3419)

---
 xCAT-server/lib/xcat/plugins/destiny.pm | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/destiny.pm b/xCAT-server/lib/xcat/plugins/destiny.pm
index ba55424f8..6d3aaae6f 100755
--- a/xCAT-server/lib/xcat/plugins/destiny.pm
+++ b/xCAT-server/lib/xcat/plugins/destiny.pm
@@ -490,12 +490,27 @@ sub setdestiny {
             my $ent = $resents->{$_}->[0]; #$restab->getNodeAttribs($_,[qw(xcatmaster)]);
             my $master;
             my $kcmdline = "quiet ";
-            if (defined($master_entry)) {
-                $master = $master_entry;
-            }
+
+            #the node.xcatmaster take precedence
             if ($ent and $ent->{xcatmaster}) {
                 $master = $ent->{xcatmaster};
             }
+    
+            #if node.xcatmaster not specified, take the ip address facing the node
+            unless($master){
+                my @nxtsrvd = xCAT::NetworkUtils->my_ip_facing($_);
+                unless ($nxtsrvd[0]) { 
+                    $master = $nxtsrvd[1];                 
+                }
+            }
+            
+            #the site.master takes the last precedence
+            unless($master){
+                if (defined($master_entry)) {
+                    $master = $master_entry;
+                }
+            }
+
             $ent = $hments->{$_}->[0]; #$nodehm->getNodeAttribs($_,['serialport','serialspeed','serialflow']);
             if ($ent and defined($ent->{serialport})) {
                 if ($arch eq "ppc64") {

From 1f277339e940108e71dd7f96961820f5c5ad5e55 Mon Sep 17 00:00:00 2001
From: Yuan Bai <bybai@cn.ibm.com>
Date: Mon, 10 Jul 2017 16:33:06 +0800
Subject: [PATCH 123/283] enhance extra params support for confignetwork
 (#3404)

* add extra params support

* enhanced based on comments
---
 xCAT/postscripts/nicutils.sh | 55 ++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/xCAT/postscripts/nicutils.sh b/xCAT/postscripts/nicutils.sh
index 73c4711f9..c3292831c 100755
--- a/xCAT/postscripts/nicutils.sh
+++ b/xCAT/postscripts/nicutils.sh
@@ -255,6 +255,45 @@ function load_kmod {
     fi
 }
 
+
+#################################################################
+# 
+# query nicextraparams from nics table
+# example: nicextraparams.eth0="MTU=9000 something=yes"
+# input: nic, here is eth0
+# output: set value for globe ${array_extra_param_names}
+#         and ${array_extra_param_values}
+#         example: 
+#         array_extra_param_names[0]="MTU"
+#         array_extra_param_values[0]="9000"
+#         array_extra_param_names[1]="something"
+#         array_extra_param_values[0]="yes"
+#
+#################################################################
+function query_extra_params {
+
+    nic=$1
+    if [ -z "$nic" ]; then
+        return 
+    fi
+    get_nic_extra_params $nic "$NICEXTRAPARAMS"
+    j=0
+    while [ $j -lt ${#array_nic_params[@]} ]
+    do
+        #get key=value pair from nicextraparams
+        #for example: MTU=9000
+        exparampair="${array_nic_params[$j]}"
+        j=$((j+1))
+    done
+    if [ ${#array_nic_params[@]} -gt 0 ]; then
+        #Current confignetwork only support one ip for vlan/bond/bridge
+        #So only need the first ${array_nic_params[0]} for first nicips
+        str_extra_params=${array_nic_params[0]}
+        parse_nic_extra_params "$str_extra_params"
+    fi
+
+}
+
 #################################################################
 #
 # query attribute from networks table
@@ -422,6 +461,9 @@ function create_persistent_ifcfg {
     local _netmask=""
     local _mtu=""
     local inattrs=""
+    unset array_nic_params
+    unset array_extra_param_names
+    unset array_extra_param_values
 
     # parser input arguments
     while [ -n "$1" ];
@@ -462,6 +504,9 @@ function create_persistent_ifcfg {
         fi
 
     fi
+
+    query_extra_params $ifname
+
     local attrs=""
     attrs=${attrs}${attrs:+,}"DEVICE=$ifname"
     attrs=${attrs}${attrs:+,}"BOOTPROTO=static"
@@ -495,6 +540,16 @@ function create_persistent_ifcfg {
             attrs=${attrs}${attrs:+,}"HWADDR=$mac"
         fi
     fi
+    
+    #add extra params
+    i=0
+    while [ $i -lt ${#array_extra_param_names[@]} ]
+    do
+        name="${array_extra_param_names[$i]}"
+        value="${array_extra_param_values[$i]}"
+        attrs=${attrs}${attrs:+,}"${name}=${value}"
+        i=$((i+1))
+    done
 
     # record manual and auto attributes first
     # since input attributes might overwrite them.

From e55e5e14dc98a9b4cdee4e354b2f34516c9d74e7 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Mon, 10 Jul 2017 12:17:29 -0400
Subject: [PATCH 124/283] change the format

---
 xCAT-server/lib/xcat/plugins/switch.pm | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/switch.pm b/xCAT-server/lib/xcat/plugins/switch.pm
index f4330a883..07a18bcfe 100644
--- a/xCAT-server/lib/xcat/plugins/switch.pm
+++ b/xCAT-server/lib/xcat/plugins/switch.pm
@@ -226,13 +226,13 @@ sub process_request {
                 }
                 foreach my $portname (keys %{ $macinfo->{$switch} }) {
                     if (length($portname) > $port_name_length) {
-                        $port_name_length = length($portname);
+                        $port_name_length = length($portname) + 8;
                     }
                 }
             }
-            my $format = "%-" . $switch_name_length . "s  %-" . $port_name_length . "s  %-18s  %-20s  %-7s  %s";
+            my $format = "%-" . $switch_name_length . "s  %-" . $port_name_length . "s  %-26s  %s";
             my %failed_switches = ();
-            my $header = sprintf($format, "Switch", "Port", "MAC address", "Node", "Vlan", "MTU");
+            my $header = sprintf($format, "Switch", "Port(MTU)", "MAC address(VLAN)", "Node");
             if (!defined($req->{opt}->{check}) and $port_name_length) {
                 $cb->({ data => $header });
                 $cb->({ data => "--------------------------------------------------------------------------------------" })
@@ -251,7 +251,6 @@ sub process_request {
                     $cb->({ node => [ { name => $switch, data => ["PASS"] } ] });
                     next;
                 }
-                  
                 foreach my $port (sort keys %{ $macinfo->{$switch} }) {
                     my $node = '';
                     if (defined($macinfo->{$switch}->{$port}->{Node})) {
@@ -274,9 +273,22 @@ sub process_request {
                         @macarray = @{ $macinfo->{$switch}->{$port}->{MACaddress} };
                         my $ind = 0;
                         foreach (@macarray) {
+                            my $mac = $_;
                             $vlanid = $vlans[$ind];
+                            my $mac_vlan;
+                            if (!$mac) {
+                                $mac_vlan="N/A";
+                            } elsif ($vlanid) {
+                                $mac_vlan = "$mac($vlanid)"; 
+                            } else {
+                                $mac_vlan = $mac;
+                            }
                             $mtu = $mtuarray[$ind];
-                            my $data = sprintf($format, $switch, $port, ($_ ne '') ? $_ : '       N/A', $node,$vlanid,$mtu);
+                            my $port_mtu = $port;
+                            if ($mtu) {
+                                $port_mtu = "$port($mtu)";
+                            }
+                            my $data = sprintf($format, $switch, $port_mtu, $mac_vlan, $node);
                             $cb->({ data => $data });
                             $ind++;
 

From 3e10a4bc3a48ec747731621e2ceaae9c0c8cf4e2 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Mon, 10 Jul 2017 13:05:33 -0400
Subject: [PATCH 125/283] Power off should be called against the chassis

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index eae17d85f..0f32b6669 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -162,8 +162,8 @@ my %status_info = (
     },
     RPOWER_OFF_REQUEST  => {
         method         => "PUT",
-        init_url       => "$openbmc_project_url/state/host0/attr/RequestedHostTransition",
-        data           => "xyz.openbmc_project.State.Host.Transition.Off",
+        init_url       => "$openbmc_project_url/state/chassis0/attr/RequestedPowerTransition",
+        data           => "xyz.openbmc_project.State.Chassis.Transition.Off",
     },
     RPOWER_OFF_RESPONSE => {
         process        => \&rpower_response,

From c5265793c5256326d2d34b7fa313314d81bdd3f5 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Mon, 10 Jul 2017 14:06:25 -0400
Subject: [PATCH 126/283] Print info message and allow rspconfig sshcfg to go
 through

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index eae17d85f..d9a57923f 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -472,7 +472,7 @@ sub parse_args {
         #
         # disable function until fully tested
         #
-        $check = unsupported($callback); if (ref($check) eq "ARRAY") { return $check; }
+        $check = unsupported($callback); # Check later for each subcommand: if (ref($check) eq "ARRAY") { return $check; }
         my $setorget;
         foreach $subcommand (@ARGV) {
             if ($subcommand =~ /^(\w+)=(.*)/) {
@@ -488,9 +488,11 @@ sub parse_args {
                     return ([ 1, "Can not configure more than 1 nodes' ip at the same time" ]) if ($nodes_num >= 2);
                 }
                 $setorget = "set";
+                if (ref($check) eq "ARRAY") { return $check; }
             } elsif ($subcommand =~ /^ip$|^netmask$|^gateway$|^vlan$/) {
                 return ([ 1, "Can not configure and display nodes' value at the same time" ]) if ($setorget and $setorget eq "set");
                 $setorget = "get";
+                if (ref($check) eq "ARRAY") { return $check; }
             } elsif ($subcommand =~ /^sshcfg$/) {
                 $setorget = ""; # SSH Keys are copied using a RShellAPI, not REST API
             } else {
@@ -547,6 +549,8 @@ sub parse_command_status {
     my $command  = shift;
     my $subcommand;
 
+    xCAT::SvrUtils::sendmsg("Ensure you are running 1724B or higher.", $callback);
+
     $next_status{LOGIN_REQUEST} = "LOGIN_RESPONSE";
 
     my $verbose = undef;

From 76b54fc2312b013c5ed103c5135e2676f5ef7859 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Mon, 10 Jul 2017 15:47:10 -0400
Subject: [PATCH 127/283] Work around a problem with OpenBMC reporting
 incorrect current status.  When this is fixed we will have to revisit this
 and update based on the chassis and host status

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 0f32b6669..8cc36abcb 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -178,7 +178,7 @@ my %status_info = (
     },
     RPOWER_STATUS_REQUEST  => {
         method         => "GET",
-        init_url       => "$openbmc_project_url/state/host0",
+        init_url       => "$openbmc_project_url/state/enumerate",
     },
     RPOWER_STATUS_RESPONSE => {
         process        => \&rpower_response,
@@ -996,10 +996,6 @@ sub rpower_response {
 
     my $response_info = decode_json $response->content;
 
-    foreach my $key (keys %{$response_info->{data}}) {
-        # Debug, print out the Current and Transition States     
-        print "$node: DEBUG host_states $key=$response_info->{'data'}->{$key}\n";
-    }
 
     if ($node_info{$node}{cur_status} eq "RPOWER_ON_RESPONSE") {
         if ($response_info->{'message'} eq $::RESPONSE_OK) {
@@ -1025,23 +1021,47 @@ sub rpower_response {
     xCAT_monitoring::monitorctrl::setNodeStatusAttributes(\%new_status, 1) if (%new_status);
 
     if ($node_info{$node}{cur_status} eq "RPOWER_STATUS_RESPONSE" and !$next_status{ $node_info{$node}{cur_status} }) { 
-        if ($response_info->{'data'}->{CurrentHostState} =~ /Off$/) {
-            # State is off, but check if it is transitioning
-            if ($response_info->{'data'}->{RequestedHostTransition} =~ /On$/) {
-                xCAT::SvrUtils::sendmsg("$::POWER_STATE_POWERING_ON", $callback, $node);
+        my $chassis_state = "";
+        my $chassis_transition_state = "";
+        my $host_state = "";
+        my $host_transition_state = "";
+        foreach my $type (keys %{$response_info->{data}}) {
+            if ($type =~ /host0/) {
+                $host_state = $response_info->{'data'}->{$type}->{CurrentHostState};
+                $host_transition_state = $response_info->{'data'}->{$type}->{RequestedHostTransition};
             }
-            else {
-                xCAT::SvrUtils::sendmsg("$::POWER_STATE_OFF", $callback, $node);
+            if ($type =~ /chassis0/) { 
+                $chassis_state = $response_info->{'data'}->{$type}->{CurrentPowerState};
+                $chassis_transition_state = $response_info->{'data'}->{$type}->{RequestedPowerTransition};
             }
-        } elsif ($response_info->{'data'}->{CurrentHostState} =~ /Quiesced$/) {
-            xCAT::SvrUtils::sendmsg("$::POWER_STATE_QUIESCED", $callback, $node);
-        } elsif ($response_info->{'data'}->{CurrentHostState} =~ /Running$/) {
-            # State is on, but check if it is transitioning
-            if ($response_info->{'data'}->{RequestedHostTransition} =~ /Off$/) {
-                xCAT::SvrUtils::sendmsg("$::POWER_STATE_POWERING_OFF", $callback, $node);
-            }
-            else {
-                xCAT::SvrUtils::sendmsg("$::POWER_STATE_ON", $callback, $node);
+        }
+       
+        print "$node: DEBUG State CurrentPowerState=$chassis_state\n";
+        print "$node: DEBUG State RequestedPowerTransition=$chassis_transition_state\n";
+        print "$node: DEBUG State CurrentHostState=$host_state\n";
+        print "$node: DEBUG State RequestedHostTransition=$host_transition_state\n";
+
+        if ($chassis_state =~ /Off$/) {
+            xCAT::SvrUtils::sendmsg("$::POWER_STATE_OFF", $callback, $node);
+        } elsif ($chassis_state =~ /On$/) { 
+            if ($host_state =~ /Off$/) {
+                # State is off, but check if it is transitioning
+                if ($host_transition_state =~ /On$/) {
+                    xCAT::SvrUtils::sendmsg("$::POWER_STATE_POWERING_ON", $callback, $node);
+                }
+                else {
+                    xCAT::SvrUtils::sendmsg("$::POWER_STATE_OFF", $callback, $node);
+                }
+            } elsif ($host_state =~ /Quiesced$/) {
+                xCAT::SvrUtils::sendmsg("$::POWER_STATE_QUIESCED", $callback, $node);
+            } elsif ($host_state =~ /Running$/) {
+                # State is on, but check if it is transitioning
+                if ($host_transition_state =~ /Off$/) {
+                    xCAT::SvrUtils::sendmsg("$::POWER_STATE_POWERING_OFF", $callback, $node);
+                }
+                else {
+                    xCAT::SvrUtils::sendmsg("$::POWER_STATE_ON", $callback, $node);
+                }
             }
         } else {
             my $unexpected_state = $response_info->{'data'}->{CurrentHostState};

From 1fe34083b67a3f755c2b4de5c651c45af3fc6200 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Mon, 10 Jul 2017 16:18:03 -0400
Subject: [PATCH 128/283] Initial commit to support rpower softoff for openbmc

---
 .../guides/admin-guides/references/man1/rpower.1.rst   |  2 +-
 xCAT-client/pods/man1/rpower.1.pod                     |  2 +-
 xCAT-server/lib/xcat/plugins/openbmc.pm                | 10 +++++++++-
 3 files changed, 11 insertions(+), 3 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 414471bd5..243d10b19 100644
--- a/docs/source/guides/admin-guides/references/man1/rpower.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rpower.1.rst
@@ -45,7 +45,7 @@ OpenPOWER OpenBMC:
 ==================
 
 
-\ **rpower**\  \ *noderange*\  [\ **off | on | reset | boot | stat | state | status**\ ]
+\ **rpower**\  \ *noderange*\  [\ **off | on | softoff | reset | boot | stat | state | status**\ ]
 
 
 PPC (with IVM or HMC) specific:
diff --git a/xCAT-client/pods/man1/rpower.1.pod b/xCAT-client/pods/man1/rpower.1.pod
index 0e38e78c8..9112ff250 100644
--- a/xCAT-client/pods/man1/rpower.1.pod
+++ b/xCAT-client/pods/man1/rpower.1.pod
@@ -22,7 +22,7 @@ B<rpower> I<noderange> [B<pduon>|B<pduoff>|B<pdustat>|B<pdureset>]
 
 =head2 OpenPOWER OpenBMC:
 
-B<rpower> I<noderange> [B<off>|B<on>|B<reset>|B<boot>|B<stat>|B<state>|B<status>]
+B<rpower> I<noderange> [B<off>|B<on>|B<softoff>|B<reset>|B<boot>|B<stat>|B<state>|B<status>]
 
 =head2 PPC (with IVM or HMC) specific:
 
diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index eae17d85f..61be2577a 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -168,6 +168,11 @@ my %status_info = (
     RPOWER_OFF_RESPONSE => {
         process        => \&rpower_response,
     },
+    RPOWER_SOFTOFF_REQUEST  => {
+        method         => "PUT",
+        init_url       => "$openbmc_project_url/state/host0/attr/RequestedHostTransition",
+        data           => "xyz.openbmc_project.State.Host.Transition.Off",
+    },
     RPOWER_RESET_REQUEST  => {
         method         => "PUT",
         init_url       => "$openbmc_project_url/state/host0/attr/RequestedHostTransition",
@@ -441,7 +446,7 @@ sub parse_args {
     }
 
     if ($command eq "rpower") {
-        unless ($subcommand =~ /^on$|^off$|^reset$|^boot$|^status$|^stat$|^state$/) {
+        unless ($subcommand =~ /^on$|^off$|^softoff$|^reset$|^boot$|^status$|^stat$|^state$/) {
             return ([ 1, "Unsupported command: $command $subcommand" ]);
         }
     } elsif ($command eq "rinv") {
@@ -566,6 +571,9 @@ sub parse_command_status {
         } elsif ($subcommand eq "off") {
             $next_status{LOGIN_RESPONSE} = "RPOWER_OFF_REQUEST";
             $next_status{RPOWER_OFF_REQUEST} = "RPOWER_OFF_RESPONSE";
+        } elsif ($subcommand eq "softoff") {
+            $next_status{LOGIN_RESPONSE} = "RPOWER_SOFTOFF_REQUEST";
+            $next_status{RPOWER_SOFTOFF_REQUEST} = "RPOWER_OFF_RESPONSE";
         } elsif ($subcommand eq "reset") {
             $next_status{LOGIN_RESPONSE} = "RPOWER_RESET_REQUEST";
             $next_status{RPOWER_RESET_REQUEST} = "RPOWER_RESET_RESPONSE";

From 7b055852686f4e7e01511f7b532642166950e15f Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Mon, 10 Jul 2017 23:17:00 -0400
Subject: [PATCH 129/283] refine confignetwork cases

---
 xCAT-test/autotest/testcase/confignetwork/cases0 | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index 48bb6bf20..f8ae773c6 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -174,9 +174,7 @@ check:rc==0
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/;cp -f /tmp/interfaces /etc/network/";else echo "Sorry,this is not supported os"; fi
-check:rc==0
 cmd:xdsh $$CN "rm -rf /tmp/backupnet/ /tmp/interfaces"
-check:rc==0
 end
 
 start:confignetwork_secondarynic_updatenode
@@ -195,7 +193,7 @@ check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep MTU /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep MTU /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep mtu /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
-check:output=~MTU=1496 |mtu 1496
+check:output=~MTU=1496|mtu 1496
 cmd:xdsh $$CN "ip addr del 11.1.0.100/16 dev $$SECONDNIC"
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
@@ -203,9 +201,7 @@ check:rc==0
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/";else echo "Sorry,this is not supported os"; fi
-check:rc==0
 cmd:xdsh $$CN "rm -rf /tmp/backupnet/"
-check:rc==0
 end
 
 start: confignetwork_secondarynic_nicaliases_updatenode
@@ -246,9 +242,7 @@ cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm
 check:rc==0
 cmd:mv -f /etc/hosts.bak /etc/hosts
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/";else echo "Sorry,this is not supported os"; fi
-check:rc==0
 cmd:xdsh $$CN "rm -rf /tmp/backupnet/"
-check:rc==0
 end
 
 start:confignetwork_secondarynic_nicextraparams_updatenode
@@ -278,7 +272,7 @@ check:output=~11.1.0.100
 check:output!~dhcp
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~12.1.0.100
-check:output=~CONNECTED_MODE=yes | CONNECTED_MODE yes
+check:output=~CONNECTED_MODE=yes|CONNECTED_MODE yes
 check:output!~dhcp
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
@@ -290,9 +284,7 @@ cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm
 check:rc==0
 cmd:mv -f /etc/hosts.bak /etc/hosts
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/";else echo "Sorry,this is not supported os"; fi
-check:rc==0
 cmd:xdsh $$CN "rm -rf /tmp/backupnet/"
-check:rc==0
 end
 
 start:confignetwork_secondarynic_nicnetworks_updatenode_false
@@ -466,7 +458,5 @@ cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm
 check:rc==0
 cmd:mv -f /etc/hosts.bak /etc/hosts
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/";else echo "Sorry,this is not supported os"; fi
-check:rc==0
 cmd:xdsh $$CN "rm -rf /tmp/backupnet/"
-check:rc==0
 end

From 59738f65f91407a39d0e65a0eeababa11e10c26f Mon Sep 17 00:00:00 2001
From: cxhong <abcdqiu@gmail.com>
Date: Mon, 10 Jul 2017 23:17:15 -0400
Subject: [PATCH 130/283] Configure Cumulus switch via switchdiscover --setup
 options (#3375)

---
 .../lib/xcat/plugins/switchdiscover.pm        |  4 +++-
 xCAT-server/share/xcat/scripts/configonie     | 23 ++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/switchdiscover.pm b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
index 70970480d..cef5c4801 100644
--- a/xCAT-server/lib/xcat/plugins/switchdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
@@ -1428,7 +1428,9 @@ sub switchsetup {
         if (-r -x $config_script) {
             my $switches = join(",",@{${nodes_to_config}->{$mytype}});
             if ($mytype eq "onie") {
-                send_msg($request, 0, "onie switch needs to take 50 mins to install, please run /opt/xcat/share/xcat/script/configonie after Cumulus OS installed on switch\n");
+                send_msg($request, 0, "Call to config $switches\n");
+                my $out = `$config_script --switches $switches --all`;
+                send_msg($request, 0, "output = $out\n");
             } else {
                 send_msg($request, 0, "call to config $mytype switches $switches\n");
                 my $out = `$config_script --switches $switches --all`;
diff --git a/xCAT-server/share/xcat/scripts/configonie b/xCAT-server/share/xcat/scripts/configonie
index f3e49a59b..c113e7c9a 100755
--- a/xCAT-server/share/xcat/scripts/configonie
+++ b/xCAT-server/share/xcat/scripts/configonie
@@ -99,16 +99,17 @@ if (($::SSH) || ($::ALL))
     config_ssh();
 }
 
-if (($::LICENSE) || ($::ALL))
+if ($::LICENSE)
 {
     install_license();
 }
 
-if (($::SNMP) || ($::ALL))
+if ($::SNMP)
 {
     config_snmp();
 }
-if (($::NTP) || ($::ALL))
+
+if ($::NTP)
 {
     config_ntp();
 }
@@ -171,9 +172,19 @@ sub config_ssh {
     if (@config_switches) {
         #update switch status
         my $csw = join(",",@config_switches);
-        $cmd = "chdef $csw status=ssh_configed ";
+        $cmd = "chdef $csw status=ssh_configured otherinterfaces=";
         $rc= xCAT::Utils->runcmd($cmd, 0);
         print "ssh configured for $csw\n";
+        if ($::ALL) {
+            $cmd = "updatenode $csw -P hardeths,enablesnmp,configinterface";
+            $rc= xCAT::Utils->runcmd($cmd, 0); 
+            if ($::RUNCMD_RC != 0) {
+                xCAT::MsgUtils->message("E","Failed to run updatenode, please check the switch");
+            }
+            $cmd = "chdef $csw status=configured";
+            $rc= xCAT::Utils->runcmd($cmd, 0);
+            print "switch: $csw configured\n";
+        }
     }
 }
 
@@ -369,7 +380,7 @@ sub config_ntp {
     if (@config_switches) {
         #update switch status
         my $csw = join(",",@config_switches);
-        $cmd = "chdef $csw status=ntp_configed";
+        $cmd = "chdef $csw status=ntp_configured";
         $rc= xCAT::Utils->runcmd($cmd, 0);
     }
 
@@ -394,7 +405,7 @@ sub usage
     configonie --switches switchnames --snmp
     configonie --switches switchnames --ntp 
 
-    To set ssh, install license(license file: /root/license.txt), config snmp and ntp:
+    To setup ssh passwordless, change ip to static, enable snmp configuration and configure basic interface :
         configonie --switches switchnames --all 
     \n";
 }

From 255062580aa4fc0eae9f356e369fc62fcd22c539 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Tue, 11 Jul 2017 03:52:45 -0400
Subject: [PATCH 131/283] enhance makehosts support regex in nicips

---
 xCAT-server/lib/xcat/plugins/hosts.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/hosts.pm b/xCAT-server/lib/xcat/plugins/hosts.pm
index bf0cd10ec..bb6ede0b6 100755
--- a/xCAT-server/lib/xcat/plugins/hosts.pm
+++ b/xCAT-server/lib/xcat/plugins/hosts.pm
@@ -72,7 +72,6 @@ sub addnode
     # if this ip was already added then just update the entry
     while ($idx <= $#hosts)
     {
-
         if ($hosts[$idx] =~ /^${ip}\s/
             or $hosts[$idx] =~ /^\d+\.\d+\.\d+\.\d+\s+${node}[\s\.\r]/)
         {
@@ -661,7 +660,12 @@ sub donics
             if (!$nicip) {
                 next;
             }
-
+            #If there is one nicip in  nicips, and it is regular expression
+            #for example: eth0!|\D+(\d+)\D+|10.80.1.($1*2+103)|
+            #Does not support: there is regular expression in multple nicips
+            if ($nicip =~ /^\|\S*\|$/) {
+                $nicip = xCAT::Table::transRegexAttrs($node, $nicip);
+            }
             if ($nicip =~ /\|/) {
                 my @ips = split(/\|/, $nicip);
                 foreach my $ip (@ips) {

From 8efbf20e6950797527b65714a766d54bb11578b6 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Tue, 11 Jul 2017 13:50:51 -0400
Subject: [PATCH 132/283] Append MTU for every switch port

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

diff --git a/xCAT-server/lib/xcat/plugins/switch.pm b/xCAT-server/lib/xcat/plugins/switch.pm
index 07a18bcfe..09e4052d9 100644
--- a/xCAT-server/lib/xcat/plugins/switch.pm
+++ b/xCAT-server/lib/xcat/plugins/switch.pm
@@ -226,7 +226,7 @@ sub process_request {
                 }
                 foreach my $portname (keys %{ $macinfo->{$switch} }) {
                     if (length($portname) > $port_name_length) {
-                        $port_name_length = length($portname) + 8;
+                        $port_name_length = length($portname) + 10;
                     }
                 }
             }
@@ -258,10 +258,6 @@ sub process_request {
                     }
 
                     my $mtu = '';
-                    my @mtuarray = ();
-                    if (defined($macinfo->{$switch}->{$port}->{Mtu})) {
-                        @mtuarray = @{ $macinfo->{$switch}->{$port}->{Mtu} };
-                    }
                     my $vlanid = '';
                     my @vlans = ();
                     if (defined($macinfo->{$switch}->{$port}->{Vlanid})) {
@@ -283,9 +279,9 @@ sub process_request {
                             } else {
                                 $mac_vlan = $mac;
                             }
-                            $mtu = $mtuarray[$ind];
                             my $port_mtu = $port;
-                            if ($mtu) {
+                            if (defined($macinfo->{$switch}->{$port}->{Mtu})) {
+                                $mtu = $macinfo->{$switch}->{$port}->{Mtu}->[0];
                                 $port_mtu = "$port($mtu)";
                             }
                             my $data = sprintf($format, $switch, $port_mtu, $mac_vlan, $node);

From 5f1d6e675a05e9b8d0e595f54b2c127e2843968b Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Tue, 11 Jul 2017 14:51:12 -0400
Subject: [PATCH 133/283] Add softoff for OpenBMC usage

---
 perl-xCAT/xCAT/Usage.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index ce0df5cd6..3a08beaa2 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -29,7 +29,7 @@ my %usage = (
        rpower noderange [on|off|softoff|reset|boot|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]
+       rpower noderange [on|off|softoff|reset|boot|stat|state|status]
        rpower noderange [pduon|pduoff|pdustat]
      OpenPOWER OpenBMC:
        rpower noderange [on|off|reset|boot|stat|state|status]

From fccace532c322cd43744340be2ef6f83a0812718 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Tue, 11 Jul 2017 14:53:18 -0400
Subject: [PATCH 134/283] Add option to rpower for OpenBMC to return the state
 of the BMC. This is a feature that the openbmc management utility allows us
 to obtain over the REST interfaces

---
 .../admin-guides/references/man1/rpower.1.rst |  8 +-
 perl-xCAT/xCAT/Usage.pm                       |  2 +-
 xCAT-client/pods/man1/rpower.1.pod            |  6 +-
 xCAT-server/lib/xcat/plugins/openbmc.pm       | 76 +++++++++++--------
 4 files changed, 59 insertions(+), 33 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 243d10b19..535687134 100644
--- a/docs/source/guides/admin-guides/references/man1/rpower.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rpower.1.rst
@@ -45,7 +45,7 @@ OpenPOWER OpenBMC:
 ==================
 
 
-\ **rpower**\  \ *noderange*\  [\ **off | on | softoff | reset | boot | stat | state | status**\ ]
+\ **rpower**\  \ *noderange*\  [\ **off | on | softoff | reset | boot | bmcstate | stat | state | status**\ ]
 
 
 PPC (with IVM or HMC) specific:
@@ -380,6 +380,12 @@ OPTIONS
  
 
 
+\ **bmcstate**\ 
+ 
+ To get state of the BMC.
+ 
+
+
 \ **state**\ 
  
  To get state of the instance.
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 3a08beaa2..4ca8093c0 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -29,7 +29,7 @@ my %usage = (
        rpower noderange [on|off|softoff|reset|boot|stat|state|status|wake|suspend [-w timeout] [-o] [-r]]
        rpower noderange [pduon|pduoff|pdustat]
      OpenPOWER BMC:
-       rpower noderange [on|off|softoff|reset|boot|stat|state|status]
+       rpower noderange [on|off|softoff|reset|boot|bmcstate|stat|state|status]
        rpower noderange [pduon|pduoff|pdustat]
      OpenPOWER OpenBMC:
        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 9112ff250..4939196db 100644
--- a/xCAT-client/pods/man1/rpower.1.pod
+++ b/xCAT-client/pods/man1/rpower.1.pod
@@ -22,7 +22,7 @@ B<rpower> I<noderange> [B<pduon>|B<pduoff>|B<pdustat>|B<pdureset>]
 
 =head2 OpenPOWER OpenBMC:
 
-B<rpower> I<noderange> [B<off>|B<on>|B<softoff>|B<reset>|B<boot>|B<stat>|B<state>|B<status>]
+B<rpower> I<noderange> [B<off>|B<on>|B<softoff>|B<reset>|B<boot>|B<bmcstate>|B<stat>|B<state>|B<status>]
 
 =head2 PPC (with IVM or HMC) specific:
 
@@ -247,6 +247,10 @@ To pause all processes in the instance.
 
 To unpause all processes in the instance.
 
+=item B<bmcstate>
+
+To get state of the BMC.
+
 =item B<state>
 
 To get state of the instance.
diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index ad78d6abf..48f584900 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -446,7 +446,7 @@ sub parse_args {
     }
 
     if ($command eq "rpower") {
-        unless ($subcommand =~ /^on$|^off$|^softoff$|^reset$|^boot$|^status$|^stat$|^state$/) {
+        unless ($subcommand =~ /^on$|^off$|^softoff$|^reset$|^boot$|^bmcstate$|^status$|^stat$|^state$/) {
             return ([ 1, "Unsupported command: $command $subcommand" ]);
         }
     } elsif ($command eq "rinv") {
@@ -554,7 +554,7 @@ sub parse_command_status {
     my $command  = shift;
     my $subcommand;
 
-    xCAT::SvrUtils::sendmsg("Ensure you are running 1724B or higher.", $callback);
+    xCAT::SvrUtils::sendmsg("[OpenBMC development support] Using this version of xCAT, ensure firware level is at v1.99.6-0-r1, or higher.", $callback);
 
     $next_status{LOGIN_REQUEST} = "LOGIN_RESPONSE";
 
@@ -581,9 +581,10 @@ sub parse_command_status {
         } elsif ($subcommand eq "reset") {
             $next_status{LOGIN_RESPONSE} = "RPOWER_RESET_REQUEST";
             $next_status{RPOWER_RESET_REQUEST} = "RPOWER_RESET_RESPONSE";
-        } elsif ($subcommand eq "status" or $subcommand eq "state" or $subcommand eq "stat") {
+        } elsif ($subcommand =~ /^bmcstate$|^status$|^state$|^stat$/) {
             $next_status{LOGIN_RESPONSE} = "RPOWER_STATUS_REQUEST";
             $next_status{RPOWER_STATUS_REQUEST} = "RPOWER_STATUS_RESPONSE";
+            $status_info{RPOWER_STATUS_RESPONSE}{argv} = "$subcommand";
         } elsif ($subcommand eq "boot") {
             $next_status{LOGIN_RESPONSE} = "RPOWER_STATUS_REQUEST";
             $next_status{RPOWER_STATUS_REQUEST} = "RPOWER_STATUS_RESPONSE";
@@ -1033,51 +1034,66 @@ sub rpower_response {
     xCAT_monitoring::monitorctrl::setNodeStatusAttributes(\%new_status, 1) if (%new_status);
 
     if ($node_info{$node}{cur_status} eq "RPOWER_STATUS_RESPONSE" and !$next_status{ $node_info{$node}{cur_status} }) { 
+        my $bmc_state = "";
+        my $bmc_transition_state = "";
         my $chassis_state = "";
         my $chassis_transition_state = "";
         my $host_state = "";
         my $host_transition_state = "";
         foreach my $type (keys %{$response_info->{data}}) {
-            if ($type =~ /host0/) {
-                $host_state = $response_info->{'data'}->{$type}->{CurrentHostState};
-                $host_transition_state = $response_info->{'data'}->{$type}->{RequestedHostTransition};
+            if ($type =~ /bmc0/) {
+                $bmc_state = $response_info->{'data'}->{$type}->{CurrentBMCState};
+                $bmc_transition_state = $response_info->{'data'}->{$type}->{RequestedBMCTransition};
             }
             if ($type =~ /chassis0/) { 
                 $chassis_state = $response_info->{'data'}->{$type}->{CurrentPowerState};
                 $chassis_transition_state = $response_info->{'data'}->{$type}->{RequestedPowerTransition};
             }
+            if ($type =~ /host0/) {
+                $host_state = $response_info->{'data'}->{$type}->{CurrentHostState};
+                $host_transition_state = $response_info->{'data'}->{$type}->{RequestedHostTransition};
+            }
         }
        
+        print "$node: DEBUG State CurrentBMCState=$bmc_state\n";
+        print "$node: DEBUG State RequestedBMCTransition=$bmc_transition_state\n";
         print "$node: DEBUG State CurrentPowerState=$chassis_state\n";
         print "$node: DEBUG State RequestedPowerTransition=$chassis_transition_state\n";
         print "$node: DEBUG State CurrentHostState=$host_state\n";
         print "$node: DEBUG State RequestedHostTransition=$host_transition_state\n";
 
-        if ($chassis_state =~ /Off$/) {
-            xCAT::SvrUtils::sendmsg("$::POWER_STATE_OFF", $callback, $node);
-        } elsif ($chassis_state =~ /On$/) { 
-            if ($host_state =~ /Off$/) {
-                # State is off, but check if it is transitioning
-                if ($host_transition_state =~ /On$/) {
-                    xCAT::SvrUtils::sendmsg("$::POWER_STATE_POWERING_ON", $callback, $node);
-                }
-                else {
-                    xCAT::SvrUtils::sendmsg("$::POWER_STATE_OFF", $callback, $node);
-                }
-            } elsif ($host_state =~ /Quiesced$/) {
-                xCAT::SvrUtils::sendmsg("$::POWER_STATE_QUIESCED", $callback, $node);
-            } elsif ($host_state =~ /Running$/) {
-                # State is on, but check if it is transitioning
-                if ($host_transition_state =~ /Off$/) {
-                    xCAT::SvrUtils::sendmsg("$::POWER_STATE_POWERING_OFF", $callback, $node);
-                }
-                else {
-                    xCAT::SvrUtils::sendmsg("$::POWER_STATE_ON", $callback, $node);
-                }
-            }
+        if (defined $status_info{RPOWER_STATUS_RESPONSE}{argv} and $status_info{RPOWER_STATUS_RESPONSE}{argv} =~ /bmcstate$/) { 
+            my $bmc_node = "$node BMC";
+            my $bmc_short_state = (split(/\./, $bmc_state))[-1];
+            xCAT::SvrUtils::sendmsg($bmc_short_state, $callback, $bmc_node);
         } else {
-            my $unexpected_state = $response_info->{'data'}->{CurrentHostState};
-            xCAT::SvrUtils::sendmsg("Unexpected state - $unexpected_state", $callback, $node);
+            if ($chassis_state =~ /Off$/) {
+                xCAT::SvrUtils::sendmsg("$::POWER_STATE_OFF", $callback, $node);
+            } elsif ($chassis_state =~ /On$/) { 
+                if ($host_state =~ /Off$/) {
+                    # State is off, but check if it is transitioning
+                    if ($host_transition_state =~ /On$/) {
+                        xCAT::SvrUtils::sendmsg("$::POWER_STATE_POWERING_ON", $callback, $node);
+                    }
+                    else {
+                        xCAT::SvrUtils::sendmsg("$::POWER_STATE_OFF", $callback, $node);
+                    }
+                } elsif ($host_state =~ /Quiesced$/) {
+                    xCAT::SvrUtils::sendmsg("$::POWER_STATE_QUIESCED", $callback, $node);
+                } elsif ($host_state =~ /Running$/) {
+                    # State is on, but check if it is transitioning
+                    if ($host_transition_state =~ /Off$/) {
+                        xCAT::SvrUtils::sendmsg("$::POWER_STATE_POWERING_OFF", $callback, $node);
+                    }
+                    else {
+                        xCAT::SvrUtils::sendmsg("$::POWER_STATE_ON", $callback, $node);
+                    }
+                } else {
+                    xCAT::SvrUtils::sendmsg("Unexpected host state=$host_state", $callback, $node);
+                }
+            } else {
+                xCAT::SvrUtils::sendmsg("Unexpected chassis state=$chassis_state", $callback, $node);
+            }
         }
     }
 

From 19a0470374a7aecec8d1829bbb67f9e14cf865ea Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Tue, 11 Jul 2017 22:14:58 -0400
Subject: [PATCH 135/283] Add rpower bmcreboot command for openbmc

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 48f584900..45613a4a3 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -31,12 +31,13 @@ use xCAT_monitoring::monitorctrl;
 
 $::VERBOSE = 0;
 # String constants for rpower states
-$::POWER_STATE_OFF="off";
-$::POWER_STATE_ON="on";
-$::POWER_STATE_POWERING_OFF="powering-off";
-$::POWER_STATE_POWERING_ON="powering-on";
-$::POWER_STATE_QUIESCED="quiesced";
-$::POWER_STATE_RESET="reset";
+$::POWER_STATE_OFF          = "off";
+$::POWER_STATE_ON           = "on";
+$::POWER_STATE_POWERING_OFF = "powering-off";
+$::POWER_STATE_POWERING_ON  = "powering-on";
+$::POWER_STATE_QUIESCED     = "quiesced";
+$::POWER_STATE_RESET        = "reset";
+$::POWER_STATE_REBOOT       = "reboot";
 $::UPLOAD_FILE="";
 
 $::NO_ATTRIBUTES_RETURNED="No attributes returned from the BMC.";
@@ -152,6 +153,11 @@ my %status_info = (
         process        => \&rinv_response,
     },
 
+    RPOWER_BMCREBOOT_REQUEST  => {
+        method         => "PUT",
+        init_url       => "$openbmc_project_url/state/bmc0/attr/RequestedBMCTransition",
+        data           => "xyz.openbmc_project.State.BMC.Transition.Reboot",
+    },
     RPOWER_ON_REQUEST  => {
         method         => "PUT",
         init_url       => "$openbmc_project_url/state/host0/attr/RequestedHostTransition",
@@ -446,7 +452,7 @@ sub parse_args {
     }
 
     if ($command eq "rpower") {
-        unless ($subcommand =~ /^on$|^off$|^softoff$|^reset$|^boot$|^bmcstate$|^status$|^stat$|^state$/) {
+        unless ($subcommand =~ /^on$|^off$|^softoff$|^reset$|^boot$|^bmcreboot$|^bmcstate$|^status$|^stat$|^state$/) {
             return ([ 1, "Unsupported command: $command $subcommand" ]);
         }
     } elsif ($command eq "rinv") {
@@ -592,6 +598,10 @@ sub parse_command_status {
             $next_status{RPOWER_ON_REQUEST} = "RPOWER_ON_RESPONSE";
             $next_status{RPOWER_STATUS_RESPONSE}{ON} = "RPOWER_RESET_REQUEST";
             $next_status{RPOWER_RESET_REQUEST} = "RPOWER_RESET_RESPONSE";
+        } elsif ($subcommand eq "bmcreboot") {
+            $next_status{LOGIN_RESPONSE} = "RPOWER_BMCREBOOT_REQUEST";
+            $next_status{RPOWER_BMCREBOOT_REQUEST} = "RPOWER_RESET_RESPONSE";
+            $status_info{RPOWER_RESET_RESPONSE}{argv} = "$subcommand";
         }
     } 
 
@@ -1026,7 +1036,12 @@ sub rpower_response {
 
     if ($node_info{$node}{cur_status} eq "RPOWER_RESET_RESPONSE") {
         if ($response_info->{'message'} eq $::RESPONSE_OK) {
-            xCAT::SvrUtils::sendmsg("$::POWER_STATE_RESET", $callback, $node);
+            if (defined $status_info{RPOWER_RESET_RESPONSE}{argv} and $status_info{RPOWER_RESET_RESPONSE}{argv} =~ /bmcreboot$/) {
+                my $bmc_node = "$node BMC";
+                xCAT::SvrUtils::sendmsg("$::POWER_STATE_REBOOT", $callback, $bmc_node);
+            } else {
+                xCAT::SvrUtils::sendmsg("$::POWER_STATE_RESET", $callback, $node);
+            }
             $new_status{$::STATUS_POWERING_ON} = [$node];
         }
     }

From 39abec2ef925cb850d1220f8c43ae27832128516 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Tue, 11 Jul 2017 22:25:38 -0400
Subject: [PATCH 136/283] Fix issue 3420: Changes required to support more
 detailed firmware information for LC Big Data boxes

---
 xCAT-server/lib/xcat/plugins/ipmi.pm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 859283636..f98656bf0 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -1611,8 +1611,10 @@ sub isopenpower {
     my $sessdata = shift;
     if ($sessdata->{prod_id} == 43707 and $sessdata->{mfg_id} == 0) {
         return 1;
-    }
-    else {
+    # mfg_id 10876 is for Supermicro, prod_id 2355 for B&S, and 0 for Boston
+    } elsif (($sessdata->{prod_id} == 0 or $sessdata->{prod_id} == 2355) and $sessdata->{mfg_id} == 10876) {
+        return 1;
+    } else {
         return 0;
     }
 }
@@ -3971,7 +3973,7 @@ sub add_fruhash {
                 $fru->rec_type("hw");
             }
             $fru->value($err);
-            if (exists($sessdata->{currfrusdr})) {
+            if ($sessdata->{currfrusdr}) {
                 $fru->desc($sessdata->{currfrusdr}->id_string);
             }
             if (exists($sessdata->{frudex})) {
@@ -4214,6 +4216,9 @@ sub parsefru {
             return "Unrecognized FRU format", undef;
         }
     }
+    elsif (!$bytes->[1] and !$bytes->[2] and !$bytes->[3] and !$bytes->[4] and !$bytes->[5]) {
+        return "No data available", undef;
+    }
     if ($bytes->[1]) { #The FRU spec, unfortunately, gave no easy way to tell the size of internal area
          #consequently, will find the next defined field and preserve the addressing and size of current FRU
          #area until then

From 50f5d4c64916ea6ea86641d0a30f371f9c3150bf Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Tue, 11 Jul 2017 22:44:08 -0400
Subject: [PATCH 137/283] modify comments for mfg_id and prod_id in ipmi module

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

diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index f98656bf0..2c7d5abe4 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -1610,9 +1610,10 @@ sub isfpc {
 sub isopenpower {
     my $sessdata = shift;
     if ($sessdata->{prod_id} == 43707 and $sessdata->{mfg_id} == 0) {
+        # mft_id 0 and prod_id 43707 is for Firestone,Minsky
         return 1;
-    # mfg_id 10876 is for Supermicro, prod_id 2355 for B&S, and 0 for Boston
     } elsif (($sessdata->{prod_id} == 0 or $sessdata->{prod_id} == 2355) and $sessdata->{mfg_id} == 10876) {
+        # mfg_id 10876 is for Supermicro, prod_id 2355 for B&S, and 0 for Boston
         return 1;
     } else {
         return 0;

From d273135b37c682696bffc571af918d2806994ead Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Wed, 12 Jul 2017 02:11:50 -0400
Subject: [PATCH 138/283] polished

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

diff --git a/xCAT-server/lib/xcat/plugins/hosts.pm b/xCAT-server/lib/xcat/plugins/hosts.pm
index bb6ede0b6..11dbaade2 100755
--- a/xCAT-server/lib/xcat/plugins/hosts.pm
+++ b/xCAT-server/lib/xcat/plugins/hosts.pm
@@ -660,9 +660,7 @@ sub donics
             if (!$nicip) {
                 next;
             }
-            #If there is one nicip in  nicips, and it is regular expression
-            #for example: eth0!|\D+(\d+)\D+|10.80.1.($1*2+103)|
-            #Does not support: there is regular expression in multple nicips
+            #Only format for nicips:<nic1>!<ip1>|<ip2>|... or <nic1>!<one regular expression>
             if ($nicip =~ /^\|\S*\|$/) {
                 $nicip = xCAT::Table::transRegexAttrs($node, $nicip);
             }

From 14c1e0c1b1809f195a702bdc0e7215621a0d7c34 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Wed, 12 Jul 2017 02:30:52 -0400
Subject: [PATCH 139/283] polished

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

diff --git a/xCAT-server/lib/xcat/plugins/hosts.pm b/xCAT-server/lib/xcat/plugins/hosts.pm
index 11dbaade2..f2a8f3327 100755
--- a/xCAT-server/lib/xcat/plugins/hosts.pm
+++ b/xCAT-server/lib/xcat/plugins/hosts.pm
@@ -660,7 +660,7 @@ sub donics
             if (!$nicip) {
                 next;
             }
-            #Only format for nicips:<nic1>!<ip1>|<ip2>|... or <nic1>!<one regular expression>
+            #Only support format for nicips is :<nic1>!<ip1>|<ip2>|... or <nic1>!<one regular expression>
             if ($nicip =~ /^\|\S*\|$/) {
                 $nicip = xCAT::Table::transRegexAttrs($node, $nicip);
             }

From f0c36045d94e7d76b705804b81ec97c6016f3fbd Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Wed, 12 Jul 2017 03:40:45 -0400
Subject: [PATCH 140/283] fix bug 3217, add confignetwork cases for bridge

---
 .../autotest/testcase/confignetwork/cases0    | 222 +++++++++++++++++-
 1 file changed, 216 insertions(+), 6 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index 71d3356b0..a9e700114 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -700,12 +700,222 @@ cmd:xdsh $$CN "rm -rf /tmp/backupnet/ /tmp/interfaces"
 check:rc==0
 end
 
+start:confignetwork_2eth_bridge_br0
+description:this case is to verify if confignetwork could config bridge for CN.CN has 2 Ethernet nics eth2 and eth3, user want to configure bond bond0 using eth2 and eth3, creates bridge br0 based on bond0.
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/";else echo "Sorry,this is not supported os"; fi
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
+check:rc==0
+cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$THIRDNIC=12.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$THIRDNIC=12_1_0_0-255_255_0_0
+check:rc==0
+cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0
+check:rc==0
+cmd:chdef $$CN nicnetworks.br0=30_5_0_0-255_255_0_0 nicdevices.br0=bond0 nictypes.br0=bridge nicips.br0=30.5.106.9 nicdevices.bond0="$$SECONDNIC|$$THIRDNIC" nictypes.bond0=bond nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 30.5.106.9 /etc/sysconfig/network/ifcfg-br0"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 30.5.106.9 /etc/sysconfig/network-scripts/ifcfg-br0"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 30.5.106.9 /etc/network/interfaces.d/br0";else echo "Sorry,this is not supported os"; fi
+check:output=~30.5.106.9
+check:rc==0
+cmd:xdsh $$CN "ls /sys/class/net"
+check:output=~br0
+cmd:xdsh $$CN "cat /sys/class/net/bonding_masters"
+check:output=~bond0
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 12.1.0.100/8 dev $$THIRDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:rmdef -t network -o 30_5_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 30.5.106.9/16 dev br0"
+cmd:xdsh $$CN "ip link del dev br0"
+cmd:xdsh $$CN "echo -bond0 > /sys/class/net/bonding_masters"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-br0"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-br0"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/br0";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/;cp -f /tmp/interfaces /etc/network/";else echo "Sorry,this is not supported os"; fi
+cmd:xdsh $$CN "rm -rf /tmp/backupnet/ /tmp/interfaces"
+end
 
+start:confignetwork_2eth_bridge_br22_br33
+description:this case is to verify if confignetwork could config bridge for CN.CN has 2 Ethernet nics eth2 and eth3, user wants to bond them as bond0, then make vlan bond0.2 and bond0.3, using bond0.2 create bridge br22,using bond0.3 create bridge br33. Use confignetwork to configure bond bond0, create vlan bond0.2 and bond0.3, create bridge br22 and br33.
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/";else echo "Sorry,this is not supported os"; fi
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
+check:rc==0
+cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$THIRDNIC=12.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$THIRDNIC=12_1_0_0-255_255_0_0
+check:rc==0
+cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0
+check:rc==0
+cmd:mkdef -t network -o 40_5_0_0-255_255_0_0 net=40.5.0.0 mask=255.255.0.0
+check:rc==0
+cmd:chdef $$CN nicdevices.br22=bond0.2 nicdevices.br33=bond0.3 nictypes.br22=bridge nictypes.br33=bridge nicnetworks.br22=30_5_0_0-255_255_0_0 nicnetworks.br33=40_5_0_0-255_255_0_0 nicips.br22=30.5.106.8 nicips.br33=40.5.106.8 nicdevices.bond0.2=bond0 nicdevices.bond0.3=bond0 nictypes.bond0.2=vlan nictypes.bond0.3=vlan nictypes.bond0=bond nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet nicdevices.bond0="$$SECONDNIC|$$THIRDNIC"
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 30.5.106.8 /etc/sysconfig/network/ifcfg-br22"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 30.5.106.8 /etc/sysconfig/network-scripts/ifcfg-br22"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 30.5.106.8 /etc/network/interfaces.d/br22";else echo "Sorry,this is not supported os"; fi
+check:output=~30.5.106.8
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 40.5.106.8 /etc/sysconfig/network/ifcfg-br33"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 40.5.106.8 /etc/sysconfig/network-scripts/ifcfg-br33"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 40.5.106.8 /etc/network/interfaces.d/br33";else echo "Sorry,this is not supported os"; fi
+check:output=~40.5.106.8
+check:rc==0
+cmd:xdsh $$CN "ls /sys/class/net"
+check:output=~br22
+check:output=~br33
+cmd:xdsh $$CN "cat /sys/class/net/bonding_masters"
+check:output=~bond0
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 12.1.0.100/8 dev $$THIRDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:rmdef -t network -o 30_5_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 30.5.106.8/16 dev br22"
+cmd:xdsh $$CN "ip link del dev br22"
+cmd:rmdef -t network -o 40_5_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 40.5.106.8/16 dev br33"
+cmd:xdsh $$CN "ip link del dev br33"
+cmd:xdsh $$CN "ip link del dev bond0.2"
+cmd:xdsh $$CN "ip link del dev bond0.3"
+cmd:xdsh $$CN "ip link del dev bond0"
+cmd:xdsh $$CN "echo -bond0 > /sys/class/net/bonding_masters"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-bond0 /etc/sysconfig/network/ifcfg-bond0.2 /etc/sysconfig/network/ifcfg-bond0.3 /etc/sysconfig/network/ifcfg-br22 /etc/sysconfig/network/ifcfg-br33"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-bond0 /etc/sysconfig/network-scripts/ifcfg-bond0.2 /etc/sysconfig/network-scripts/ifcfg-bond0.3 /etc/sysconfig/network-scripts/ifcfg-br22 /etc/sysconfig/network-scripts/ifcfg-br33"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/bond0 /etc/network/interfaces.d/bond0.2 /etc/network/interfaces.d/bond0.3 /etc/network/interfaces.d/br22 /etc/network/interfaces.d/br33";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/;cp -f /tmp/interfaces /etc/network/";else echo "Sorry,this is not supported os"; fi
+cmd:xdsh $$CN "rm -rf /tmp/backupnet/ /tmp/interfaces"
+end
 
+start:confignetwork_installnic_2eth_bridge_br22_br33
+description:this case is to test if confignetwork could config installnic and 2 bridges at the same time
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/";else echo "Sorry,this is not supported os"; fi
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
+check:rc==0
+cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$THIRDNIC=12.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$THIRDNIC=12_1_0_0-255_255_0_0
+check:rc==0
+cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0
+check:rc==0
+cmd:mkdef -t network -o 40_5_0_0-255_255_0_0 net=40.5.0.0 mask=255.255.0.0
+check:rc==0
+cmd:chdef $$CN nicdevices.br22=bond0.2 nicdevices.br33=bond0.3 nictypes.br22=bridge nictypes.br33=bridge nicnetworks.br22=30_5_0_0-255_255_0_0 nicnetworks.br33=40_5_0_0-255_255_0_0 nicips.br22=30.5.106.8 nicips.br33=40.5.106.8 nicdevices.bond0.2=bond0 nicdevices.bond0.3=bond0 nictypes.bond0.2=vlan nictypes.bond0.3=vlan nictypes.bond0=bond nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet nicdevices.bond0="$$SECONDNIC|$$THIRDNIC"
+check:rc==0
+cmd:updatenode $$CN -P "confignetwork -s"
+check:rc==0
+cmd:installnic=`xdsh $$CN ip addr |grep __GETNODEATTR($$CN,ip)__|awk -F " " '{print $NF}'`; if grep SUSE /etc/*release;then xdsh $$CN "cat /etc/sysconfig/network/ifcfg-$installnic"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "cat /etc/sysconfig/network-scripts/ifcfg-$installnic"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cat /etc/network/interfaces.d/*";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+check:output=~__GETNODEATTR($$CN,ip)__
+check:output!~dhcp
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 30.5.106.8 /etc/sysconfig/network/ifcfg-br22"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 30.5.106.8 /etc/sysconfig/network-scripts/ifcfg-br22"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 30.5.106.8 /etc/network/interfaces.d/br22";else echo "Sorry,this is not supported os"; fi
+check:output=~30.5.106.8
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 40.5.106.8 /etc/sysconfig/network/ifcfg-br33"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 40.5.106.8 /etc/sysconfig/network-scripts/ifcfg-br33"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 40.5.106.8 /etc/network/interfaces.d/br33";else echo "Sorry,this is not supported os"; fi
+check:output=~40.5.106.8
+check:rc==0
+cmd:xdsh $$CN "ls /sys/class/net"
+check:output=~br22
+check:output=~br33
+cmd:xdsh $$CN "cat /sys/class/net/bonding_masters"
+check:output=~bond0
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 12.1.0.100/8 dev $$THIRDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:rmdef -t network -o 30_5_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 30.5.106.8/16 dev br22"
+cmd:xdsh $$CN "ip link del dev br22"
+cmd:rmdef -t network -o 40_5_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 40.5.106.8/16 dev br33"
+cmd:xdsh $$CN "ip link del dev br33"
+cmd:xdsh $$CN "ip link del dev bond0.2"
+cmd:xdsh $$CN "ip link del dev bond0.3"
+cmd:xdsh $$CN "ip link del dev bond0"
+cmd:xdsh $$CN "echo -bond0 > /sys/class/net/bonding_masters"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-bond0 /etc/sysconfig/network/ifcfg-bond0.2 /etc/sysconfig/network/ifcfg-bond0.3 /etc/sysconfig/network/ifcfg-br22 /etc/sysconfig/network/ifcfg-br33"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-bond0 /etc/sysconfig/network-scripts/ifcfg-bond0.2 /etc/sysconfig/network-scripts/ifcfg-bond0.3 /etc/sysconfig/network-scripts/ifcfg-br22 /etc/sysconfig/network-scripts/ifcfg-br33"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/bond0 /etc/network/interfaces.d/bond0.2 /etc/network/interfaces.d/bond0.3 /etc/network/interfaces.d/br22 /etc/network/interfaces.d/br33";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/;cp -f /tmp/interfaces /etc/network/";else echo "Sorry,this is not supported os"; fi
+cmd:xdsh $$CN "rm -rf /tmp/backupnet/ /tmp/interfaces"
+end
 
-
-
-
-
-
-
+start:confignetwork__bridge_false
+description:this case is to test if confignetwork could process false value when the bridge is not correctly set.
+cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi
+check:rc==0
+cmd:xdsh $$CN "mkdir -p /tmp/backupnet/"
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/";else echo "Sorry,this is not supported os"; fi
+cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC=11_1_0_0-255_255_0_0
+check:rc==0
+cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtifname=$$THIRDNIC
+check:rc==0
+cmd:chdef $$CN nicips.$$THIRDNIC=12.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$THIRDNIC=12_1_0_0-255_255_0_0
+check:rc==0
+cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0
+check:rc==0
+cmd:mkdef -t network -o 40_5_0_0-255_255_0_0 net=40.5.0.0 mask=255.255.0.0
+check:rc==0
+cmd:chdef $$CN nicdevices.br22= nicdevices.br33= nictypes.br22=bridge nictypes.br33=bridge nicnetworks.br22=30_5_0_0-255_255_0_0 nicnetworks.br33=40_5_0_0-255_255_0_0 nicips.br22=30.5.106.8 nicips.br33=40.5.106.8 nicdevices.bond0.2=bond0 nicdevices.bond0.3=bond0 nictypes.bond0.2=vlan nictypes.bond0.3=vlan nictypes.bond0=bond nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet nicdevices.bond0="$$SECONDNIC|$$THIRDNIC"
+check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc!=0
+cmd:chdef $$CN nicdevices.br22=bond0.2 nicdevices.br33=bond0.3 nictypes.br22=bridge nictypes.br33=bridge nicnetworks.br22= nicnetworks.br33= nicips.br22=30.5.106.8 nicips.br33=40.5.106.8 nicdevices.bond0.2=bond0 nicdevices.bond0.3=bond0 nictypes.bond0.2=vlan nictypes.bond0.3=vlan nictypes.bond0=bond nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet nicdevices.bond0="$$SECONDNIC|$$THIRDNIC"
+cmd:updatenode $$CN -P confignetwork
+check:rc!=0
+cmd:chdef $$CN nicdevices.br22=bond0.2 nicdevices.br33=bond0.3 nictypes.br22= nictypes.br33= nicnetworks.br22=30_5_0_0-255_255_0_0 nicnetworks.br33=40_5_0_0-255_255_0_0 nicips.br22=30.5.106.8 nicips.br33=40.5.106.8 nicdevices.bond0.2=bond0 nicdevices.bond0.3=bond0 nictypes.bond0.2=vlan nictypes.bond0.3=vlan nictypes.bond0=bond nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet nicdevices.bond0="$$SECONDNIC|$$THIRDNIC"
+cmd:updatenode $$CN -P confignetwork
+check:rc!=0
+cmd:chdef $$CN nicdevices.br22=bond0.2 nicdevices.br33=bond0.3 nictypes.br22=bridge nictypes.br33=bridge nicnetworks.br22=30_5_0_0-255_255_0_0 nicnetworks.br33=40_5_0_0-255_255_0_0 nicips.br22= nicips.br33= nicdevices.bond0.2=bond0 nicdevices.bond0.3=bond0 nictypes.bond0.2=vlan nictypes.bond0.3=vlan nictypes.bond0=bond nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet nicdevices.bond0="$$SECONDNIC|$$THIRDNIC"
+cmd:updatenode $$CN -P confignetwork
+check:rc!=0
+cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
+cmd:xdsh $$CN "ip addr del 12.1.0.100/8 dev $$THIRDNIC"
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
+check:rc==0
+cmd:rmdef -t network -o 30_5_0_0-255_255_0_0
+cmd:rmdef -t network -o 40_5_0_0-255_255_0_0
+cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
+check:rc==0
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/;cp -f /tmp/interfaces /etc/network/";else echo "Sorry,this is not supported os"; fi
+cmd:xdsh $$CN "rm -rf /tmp/backupnet/ /tmp/interfaces"
+end

From bf172d1489517d82051eec0dcfb8e295e9ccdcac Mon Sep 17 00:00:00 2001
From: Bin Xu <robin.hsu@163.com>
Date: Wed, 12 Jul 2017 16:03:54 +0800
Subject: [PATCH 141/283] Fix 3151, Backup service node is not reflected in the
 /opt/xcat/xcatinfo file (#3434)

* populate node attribute servicenode into mypostscript, and then inject into /opt/xcat/xcatinfo
cover both updatenode -s and os installation case.

* using 1 step of sed for chaning
---
 .../share/xcat/mypostscript/mypostscript.tmpl |  2 ++
 xCAT/postscripts/xcatdsklspost                | 19 +++++++++++++++++--
 xCAT/postscripts/xcatinstallpost              | 17 +++++++++++++++--
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/share/xcat/mypostscript/mypostscript.tmpl b/xCAT-server/share/xcat/mypostscript/mypostscript.tmpl
index 68a7b6ee8..2ed561e34 100755
--- a/xCAT-server/share/xcat/mypostscript/mypostscript.tmpl
+++ b/xCAT-server/share/xcat/mypostscript/mypostscript.tmpl
@@ -43,6 +43,8 @@ export PRIMARYNIC
 
 MASTER=#TABLE:noderes:$NODE:xcatmaster#
 export MASTER
+SERVICEGROUP=#TABLE:noderes:$NODE:servicenode#
+export SERVICEGROUP
 
 SYSLOG=#TABLE:noderes:$NODE:syslog#
 export SYSLOG
diff --git a/xCAT/postscripts/xcatdsklspost b/xCAT/postscripts/xcatdsklspost
index 7aac7ab28..81df3d557 100755
--- a/xCAT/postscripts/xcatdsklspost
+++ b/xCAT/postscripts/xcatdsklspost
@@ -19,10 +19,8 @@
 #
 #####################################################
 
-
 [ -f "/xcatpost/xcatlib.sh" ] &&  . /xcatpost/xcatlib.sh 
 
-
 if [ -f /xcatpost/mypostscript.post ]; then
     XCATDEBUGMODE=`grep 'XCATDEBUGMODE=' /xcatpost/mypostscript.post | cut -d= -f2 | tr -d \'\" | tr A-Z a-z`
     MASTER_IP=`grep '^MASTER_IP=' /xcatpost/mypostscript.post |cut -d= -f2|sed s/\'//g`
@@ -39,6 +37,7 @@ else
     done
 fi
 
+XCATINFOFILE=/opt/xcat/xcatinfo
 
 #echolog: process message log and echo in xcatdsklspost
 #arguments:
@@ -691,6 +690,22 @@ else
     echo "USEFLOWCONTROL=NO" >> /opt/xcat/xcatinfo
 fi
 
+# Store the SERVICEGROUP into the xcatinfo file for node deployment, and also for updatenode -s
+if [ $NODE_DEPLOYMENT -eq 1 ] || [ "$MODE" = "1" ]; then
+    sn_group=`grep '^SERVICEGROUP' /$xcatpost/mypostscript |cut -d= -f2 | tr -d \'\"`
+    if [ "x" != "x$sn_group" ]; then
+      # Change or add SERVICEGROUP line if service node pool defined.
+      grep 'SERVICEGROUP=' $XCATINFOFILE > /dev/null 2>&1
+      if [ $? -eq 0 ]; then
+        sed -i "s/SERVICEGROUP=.*/SERVICEGROUP=$sn_group/" $XCATINFOFILE
+      else
+        echo "SERVICEGROUP=$sn_group" >> $XCATINFOFILE
+      fi
+    else
+      # Remove SERVICEGROUP line if no service node pool defined.
+      sed -i "/SERVICEGROUP=.*/d" $XCATINFOFILE
+    fi
+fi
 
 # when called by the updatenode command  MODE=1,2
 # the nodename is passed in by xdsh in the NODE environment variable by xdsh.
diff --git a/xCAT/postscripts/xcatinstallpost b/xCAT/postscripts/xcatinstallpost
index 5976cb531..4fcdd284d 100755
--- a/xCAT/postscripts/xcatinstallpost
+++ b/xCAT/postscripts/xcatinstallpost
@@ -20,7 +20,7 @@ fi
 SLI=$(awk 'BEGIN{srand(); printf("%d\n",rand()*10)}')
 sleep $SLI
 
-
+XCATINFOFILE=/opt/xcat/xcatinfo
 MACADDR=`grep MACADDRESS= /xcatpost/mypostscript.post |awk -F = '{print $2}'|sed s/\'//g`
 INSTALLNIC=`ip -o link|grep -i $MACADDR|awk  '{print $2}'|sed s/://`
 
@@ -74,7 +74,20 @@ if [ $? -eq 0 ]; then
 else
     echo "REBOOT=TRUE" >> /opt/xcat/xcatinfo
 fi
-
+# Store the SERVICEGROUP into the xcatinfo file for statful installation
+sn_group=`grep '^SERVICEGROUP' /xcatpost/mypostscript |cut -d= -f2 | tr -d \'\"`
+if [ "x" != "x$sn_group" ]; then
+  # Change or add SERVICEGROUP line if service node pool defined.
+  grep 'SERVICEGROUP=' $XCATINFOFILE > /dev/null 2>&1
+  if [ $? -eq 0 ]; then
+    sed -i "s/SERVICEGROUP=.*/SERVICEGROUP=$sn_group/" $XCATINFOFILE
+  else
+    echo "SERVICEGROUP=$sn_group" >> $XCATINFOFILE
+  fi
+else
+  # Remove SERVICEGROUP line if no service node pool defined.
+  sed -i "/SERVICEGROUP=.*/d" $XCATINFOFILE
+fi
 
 CNS=`grep NODESTATUS= /xcatpost/mypostscript.post |awk -F = '{print $2}' | tr -d \'\" | tr A-Z a-z`
 if [ -z "$CNS" ] || [[ "$CNS" =~ ^(1|yes|y)$ ]]; then

From 969c01c3b1e8c54f86346c49ed32c8d727ca94ed Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Wed, 12 Jul 2017 09:18:24 -0400
Subject: [PATCH 142/283] modify rpower testcase if ipmi using wrong passwd

---
 xCAT-test/autotest/testcase/rpower/cases0     |  12 ++
 .../rpower/rpower_ipmi_wrongpasswd_test.sh    | 118 ++++++++++++++++++
 2 files changed, 130 insertions(+)
 create mode 100755 xCAT-test/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh

diff --git a/xCAT-test/autotest/testcase/rpower/cases0 b/xCAT-test/autotest/testcase/rpower/cases0
index 143806ba7..40dfa7a08 100644
--- a/xCAT-test/autotest/testcase/rpower/cases0
+++ b/xCAT-test/autotest/testcase/rpower/cases0
@@ -180,4 +180,16 @@ cmd:rpower $$CN ddd
 check:output=~Unsupported command:
 check:rc==1
 end
+start:rpower_ipmi_wrongpasswd
+description:rpower ipmi and its password wrong
+Attribute: $$CN-The operation object of rpower command
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh  -pt $$CN  $$ipmipasswd $$ipminame
+check:rc==0
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh  -c $$CN
+check:rc==0
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh  -apt $$CN  $$ipmipasswd $$ipminame
+check:rc==0
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh  -c $$CN
+check:rc==0
+end
 
diff --git a/xCAT-test/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh b/xCAT-test/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh
new file mode 100755
index 000000000..a0b176bb0
--- /dev/null
+++ b/xCAT-test/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh
@@ -0,0 +1,118 @@
+#!/bin/bash
+function check_passwd_table(){
+tabdump passwd |grep ipmi
+    if [ $? -eq 0 ];then
+        `tabdump passwd |grep ipmi>/tmp/xcat_test_rpower_ipmi_wrongpasswd`
+    else
+        return 1;
+    fi
+}
+function modify_passwd_table(){
+Username=`cat /tmp/xcat_test_rpower_ipmi_wrongpasswd |awk -F "\""  '{print $4}'`;
+Passwd=`cat /tmp/xcat_test_rpower_ipmi_wrongpasswd |awk -F "\""  '{print $6}'`;
+`chtab key=ipmi passwd.password=$Passwd.wrong passwd.username=$Username`;
+tabdump passwd;
+}
+function add_passwd_table()
+{
+echo i is $1,$2,$3
+`chtab key=ipmi passwd.password=$2 passwd.username=$3`;
+rpower $1 stat
+    if [ $? -eq 0 ];then
+        `chtab key=ipmi passwd.password=$2.wrong passwd.username=$3`;
+        tabdump passwd;
+    else
+        echo "wrong password";
+    fi
+}
+function modify_node_definition()
+{
+echo node is  $1,$2,$3
+chdef $1 bmcpassword=$2  bmcusername=$3
+rpower $1 stat
+    if [ $? -eq 0 ];then
+        chdef $1 bmcpassword=$2.wrong  bmcusername=$3;
+        tabdump passwd;
+    else
+         echo "wrong password";
+    fi
+}
+function clear_env(){
+    if [ -f /tmp/xcat_test_rpower_ipmi_wrongpasswd ];then
+        Username=`cat /tmp/xcat_test_rpower_ipmi_wrongpasswd |awk -F "\""  '{print $4}'`;
+        Passwd=`cat /tmp/xcat_test_rpower_ipmi_wrongpasswd |awk -F "\""  '{print $6}'`;
+        chtab key=ipmi passwd.password=$Passwd passwd.username=$Username;tabdump passwd; 
+        rm -rf /tmp/xcat_test_rpower_ipmi_wrongpasswd;
+    else
+        `chtab -d key=ipmi passwd`;
+        chdef $1 bmcpassword= bmcusername=;
+    fi
+}
+function check_result(){
+echo node is $1;
+output=$(rpower $1 stat /dev/null  2>&1)
+echo output is $output
+    if [[ $output =~ "Incorrect password provided" ]];then
+        return 0;
+    else
+        return 1;
+    fi
+}
+while [ "$#" -gt "0" ]
+do
+        case $1 in
+                "-pt"|"--passwdtable" )
+                check_passwd_table
+                    if [[ $? -eq 0 ]];then  
+                        modify_passwd_table
+                        check_result $2
+                            if [[ $? -eq 1 ]];then
+                                exit 1
+                            else
+                                exit 0
+                            fi
+
+                    else
+                        add_passwd_table $2 $3 $4
+                        check_result $2
+                            if [[ $? -eq 1 ]];then
+                                exit 1
+                            else
+                                exit 0
+                            fi
+                    fi
+                ;;
+                "-apt"|"--addpasswdtable" )
+                check_passwd_table
+                    if [[ $? -eq 0 ]];then
+                        `chtab -d key=ipmi passwd`;                        
+                            if [[ $? -eq 1 ]];then
+                                exit 1
+                            fi
+                    fi
+                    modify_node_definition  $2 $3 $4
+                    check_result $2
+                        if [[ $? -eq 1 ]];then
+                            exit 1
+                        else
+                            exit 0
+                        fi
+                ;;
+                "-c"|"--clear" )
+                clear_env $2 
+                if [[ $? -eq 1 ]];then
+                    exit 1
+                else
+                    exit 0
+                fi
+                ;;
+                *)
+                echo
+                echo "Please Insert $0: -pt|-apt|-c"
+                echo
+                exit 1;
+                ;;
+                esac
+done
+
+

From d84490af02f61bd79656ede5f2218859c75c7bd2 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Wed, 12 Jul 2017 21:09:15 -0400
Subject: [PATCH 143/283] add related docs

---
 docs/source/guides/admin-guides/references/man1/rpower.1.rst | 2 +-
 perl-xCAT/xCAT/Usage.pm                                      | 4 ++--
 xCAT-client/pods/man1/rpower.1.pod                           | 2 +-
 3 files changed, 4 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 535687134..52dc597c1 100644
--- a/docs/source/guides/admin-guides/references/man1/rpower.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rpower.1.rst
@@ -45,7 +45,7 @@ OpenPOWER OpenBMC:
 ==================
 
 
-\ **rpower**\  \ *noderange*\  [\ **off | on | softoff | reset | boot | bmcstate | stat | state | status**\ ]
+\ **rpower**\  \ *noderange*\  [\ **off | on | softoff | reset | boot | bmcreboot | bmcstate | stat | state | status**\ ]
 
 
 PPC (with IVM or HMC) specific:
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 4ca8093c0..f69ce7dab 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -29,10 +29,10 @@ my %usage = (
        rpower noderange [on|off|softoff|reset|boot|stat|state|status|wake|suspend [-w timeout] [-o] [-r]]
        rpower noderange [pduon|pduoff|pdustat]
      OpenPOWER BMC:
-       rpower noderange [on|off|softoff|reset|boot|bmcstate|stat|state|status]
+       rpower noderange [on|off|reset|boot|stat|state|status]
        rpower noderange [pduon|pduoff|pdustat]
      OpenPOWER OpenBMC:
-       rpower noderange [on|off|reset|boot|stat|state|status]
+       rpower noderange [on|off|softoff|reset|boot|bmcreboot|bmcstate|stat|state|status]
      KVM Virtualization specific:
        rpower <noderange> [boot] [ -c <path to iso> ]
      PPC (with IVM or HMC) specific:
diff --git a/xCAT-client/pods/man1/rpower.1.pod b/xCAT-client/pods/man1/rpower.1.pod
index 4939196db..24fd01e82 100644
--- a/xCAT-client/pods/man1/rpower.1.pod
+++ b/xCAT-client/pods/man1/rpower.1.pod
@@ -22,7 +22,7 @@ B<rpower> I<noderange> [B<pduon>|B<pduoff>|B<pdustat>|B<pdureset>]
 
 =head2 OpenPOWER OpenBMC:
 
-B<rpower> I<noderange> [B<off>|B<on>|B<softoff>|B<reset>|B<boot>|B<bmcstate>|B<stat>|B<state>|B<status>]
+B<rpower> I<noderange> [B<off>|B<on>|B<softoff>|B<reset>|B<boot>|B<bmcreboot>|B<bmcstate>|B<stat>|B<state>|B<status>]
 
 =head2 PPC (with IVM or HMC) specific:
 

From cda8b539c0b42d457e509288c8fcac2787252c56 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Thu, 13 Jul 2017 03:20:48 -0400
Subject: [PATCH 144/283] To support hierarchy for openbmc

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 9b251fc48..29e7b25ed 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -351,11 +351,17 @@ sub preprocess_request {
 #-------------------------------------------------------
 sub process_request {
     my $request = shift;
+    $callback = shift;
     my $command   = $request->{command}->[0];
     my $noderange = $request->{node};
+    my $extrargs       = $request->{arg};
+    my @exargs         = ($request->{arg});
+    if (ref($extrargs)) {
+        @exargs = @$extrargs;
+    }
 
     my $check = parse_node_info($noderange);
-    my $rst = parse_command_status($command);
+    my $rst = parse_command_status($command, \@exargs);
     return if ($rst);
 
     if ($request->{command}->[0] ne "getopenbmccons") {
@@ -552,7 +558,8 @@ sub parse_args {
 
 #-------------------------------------------------------
 sub parse_command_status {
-    my $command  = shift;
+    my $command     = shift;
+    my $subcommands = shift;
     my $subcommand;
 
     xCAT::SvrUtils::sendmsg("[OpenBMC development support] Using this version of xCAT, ensure firware level is at v1.99.6-0-r1, or higher.", $callback);
@@ -568,7 +575,7 @@ sub parse_command_status {
     }
 
     if ($command eq "rpower") {
-        $subcommand = $ARGV[0];
+        $subcommand = $$subcommands[0];
 
         if ($subcommand eq "on") {
             $next_status{LOGIN_RESPONSE} = "RPOWER_ON_REQUEST";
@@ -597,8 +604,8 @@ sub parse_command_status {
     } 
 
     if ($command eq "rinv") {
-        if (defined($ARGV[0])) {
-            $subcommand = $ARGV[0];
+        if (defined($$subcommands[0])) {
+            $subcommand = $$subcommands[0];
         } else {
             $subcommand = "all";
         }
@@ -626,7 +633,7 @@ sub parse_command_status {
             return 1;
         }
 
-        $subcommand = $ARGV[0];
+        $subcommand = $$subcommands[0];
         if ($subcommand =~ /^hd$|^net$|^cd$|^default$|^def$/) {
             $next_status{LOGIN_RESPONSE} = "RSETBOOT_SET_REQUEST";
             $next_status{RSETBOOT_SET_REQUEST} = "RSETBOOT_SET_RESPONSE";
@@ -656,8 +663,8 @@ sub parse_command_status {
             return 1;
         }
 
-        if (defined($ARGV[0])) {
-            $subcommand = $ARGV[0];
+        if (defined($$subcommands[0])) {
+            $subcommand = $$subcommands[0];
         } else {
             $subcommand = "all";
         }
@@ -677,7 +684,7 @@ sub parse_command_status {
 
     if ($command eq "rspconfig") {
         my @options = ();
-        foreach $subcommand (@ARGV) {
+        foreach $subcommand (@$subcommands) {
             if ($subcommand =~ /^ip$|^netmask$|^gateway$|^vlan$/) {
                 $next_status{LOGIN_RESPONSE} = "RSPCONFIG_GET_REQUEST";
                 $next_status{RSPCONFIG_GET_REQUEST} = "RSPCONFIG_GET_RESPONSE";
@@ -709,8 +716,8 @@ sub parse_command_status {
     }
 
     if ($command eq "rvitals") {
-        if (defined($ARGV[0])) {
-            $subcommand = $ARGV[0];
+        if (defined($$subcommands[0])) {
+            $subcommand = $$subcommands[0];
         } else {
             $subcommand = "all";
         }
@@ -735,7 +742,7 @@ sub parse_command_status {
             return 1;
         }
 
-        my $update_file = $ARGV[0]; 
+        my $update_file = $$subcommands[0]; 
         my $filename = undef;
         my $file_id = undef;
         my $grep_cmd = "/usr/bin/grep -a";

From b79818648abbce44825003b547ee04d6362866c8 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Thu, 13 Jul 2017 03:51:46 -0400
Subject: [PATCH 145/283] remove ethernet ip before configure vlan/bond/bridge

---
 .../autotest/testcase/confignetwork/cases0    | 53 ++++++++++++-------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index a9e700114..55c1f07cc 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -477,11 +477,13 @@ cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
+cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC=
+check:rc==0
 cmd:mkdef -t network -o 60_0_0_0-255_0_0_0 net=60.0.0.0 mask=255.0.0.0 mgtifname=$$SECONDNIC 
 check:rc==0
 cmd:mkdef -t network -o 70_0_0_0-255_0_0_0 net=70.0.0.0 mask=255.0.0.0 mgtifname=$$SECONDNIC
 check:rc==0
-cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC.6="60_0 _0_0-255_0_0_0" nicnetworks.$$SECONDNIC.7="70_0 _0_0-255_0_0_0" nictypes.$$SECONDNIC.6=vlan nictypes.$$SECONDNIC.7=vlan nicips.$$SECONDNIC.6=60.5.106.9 nicips.$$SECONDNIC.7=70.5.106.9 nicdevices.$$SECONDNIC.6=$$SECONDNIC nicdevices.$$SECONDNIC.7=$$SECONDNIC
+cmd:chdef $$CN nicnetworks.$$SECONDNIC.6="60_0 _0_0-255_0_0_0" nicnetworks.$$SECONDNIC.7="70_0 _0_0-255_0_0_0" nictypes.$$SECONDNIC.6=vlan nictypes.$$SECONDNIC.7=vlan nicips.$$SECONDNIC.6=60.5.106.9 nicips.$$SECONDNIC.7=70.5.106.9 nicdevices.$$SECONDNIC.6=$$SECONDNIC nicdevices.$$SECONDNIC.7=$$SECONDNIC
 check:rc==0
 cmd:updatenode $$CN -P confignetwork
 check:rc==0
@@ -490,7 +492,6 @@ check:output=~60.5.106.9
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 70.5.106.9 /etc/sysconfig/network/ifcfg-$$SECONDNIC.7"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 70.5.106.9 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC.7"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 70.5.106.9 /etc/network/interfaces.d/$$SECONDNIC.7";else echo "Sorry,this is not supported os"; fi
 check:output=~70.5.106.9
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
-cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:rmdef -t network -o 60_0_0_0-255_0_0_0
@@ -524,15 +525,17 @@ cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
+cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC= 
+check:rc==0
 cmd:mkdef -t network -o 60_0_0_0-255_0_0_0 net=60.0.0.0 mask=255.0.0.0 mgtifname=$$SECONDNIC mtu=1500
 check:rc==0
 cmd:mkdef -t network -o 70_0_0_0-255_0_0_0 net=70.0.0.0 mask=255.0.0.0 mgtifname=$$SECONDNIC mtu=1500
 check:rc==0
-cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC.6="60_0 _0_0-255_0_0_0" nicnetworks.$$SECONDNIC.7="70_0 _0_0-255_0_0_0" nictypes.$$SECONDNIC.6=vlan nictypes.$$SECONDNIC.7=vlan nicips.$$SECONDNIC.6=60.5.106.9 nicips.$$SECONDNIC.7=70.5.106.9 
+cmd:chdef $$CN nicnetworks.$$SECONDNIC.6="60_0 _0_0-255_0_0_0" nicnetworks.$$SECONDNIC.7="70_0 _0_0-255_0_0_0" nictypes.$$SECONDNIC.6=vlan nictypes.$$SECONDNIC.7=vlan nicips.$$SECONDNIC.6=60.5.106.9 nicips.$$SECONDNIC.7=70.5.106.9 
 check:rc==0
 cmd:updatenode $$CN -P confignetwork
 check:rc!=0
-cmd:chdef $$CN nicips.$$SECONDNIC=11.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC.6="60_0 _0_0-255_0_0_0" nicnetworks.$$SECONDNIC.7="70_0 _0_0-255_0_0_0" nictypes.$$SECONDNIC.6=vlan nictypes.$$SECONDNIC.7=vlan nicips.$$SECONDNIC.6=60.5.106.9 nicips.$$SECONDNIC.7=70.5.106.9 nicdevices.$$SECONDNIC.6=$$SECONDNIC.6 nicdevices.$$SECONDNIC.7=$$SECONDNIC.7
+cmd:chdef $$CN  nicnetworks.$$SECONDNIC.6="60_0 _0_0-255_0_0_0" nicnetworks.$$SECONDNIC.7="70_0 _0_0-255_0_0_0" nictypes.$$SECONDNIC.6=vlan nictypes.$$SECONDNIC.7=vlan nicips.$$SECONDNIC.6=60.5.106.9 nicips.$$SECONDNIC.7=70.5.106.9 nicdevices.$$SECONDNIC.6=$$SECONDNIC.6 nicdevices.$$SECONDNIC.7=$$SECONDNIC.7
 cmd:updatenode $$CN -P confignetwork
 check:rc!=0
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
@@ -564,6 +567,10 @@ cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:chdef $$CN nicips.$$THIRDNIC=12.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$THIRDNIC=12_1_0_0-255_255_0_0
 check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC= nicips.$$THIRDNIC= nictypes.$$SECONDNIC= nicnetworks.$$THIRDNIC=
+check:rc==0
 cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0 
 check:rc==0
 cmd:chdef $$CN nicnetworks.bond0=30_5_0_0-255_255_0_0 nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet nictypes.bond0=bond nicips.bond0=30.5.106.9 nicdevices.bond0="$$SECONDNIC|$$THIRDNIC"
@@ -578,11 +585,9 @@ check:output=~bond0
 cmd:xdsh $$CN "cat /sys/class/net/bonding_masters"
 check:output=~bond0
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
-cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
-cmd:xdsh $$CN "ip addr del 12.1.0.100/8 dev $$THIRDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:rmdef -t network -o 30_5_0_0-255_255_0_0  
@@ -614,6 +619,10 @@ cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:chdef $$CN nicips.$$THIRDNIC=12.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$THIRDNIC=12_1_0_0-255_255_0_0
 check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC= nicips.$$THIRDNIC= nictypes.$$SECONDNIC= nicnetworks.$$THIRDNIC=
+check:rc==0
 cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0
 check:rc==0
 cmd:chdef $$CN nicnetworks.bond0=30_5_0_0-255_255_0_0 nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet nictypes.bond0=bond nicips.bond0=30.5.106.9 nicdevices.bond0=
@@ -625,11 +634,9 @@ check:rc==0
 cmd:updatenode $$CN -P confignetwork
 check:rc!=0
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
-cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
-cmd:xdsh $$CN "ip addr del 12.1.0.100/8 dev $$THIRDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:rmdef -t network -o 30_5_0_0-255_255_0_0
@@ -656,6 +663,10 @@ cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:chdef $$CN nicips.$$THIRDNIC=12.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$THIRDNIC=12_1_0_0-255_255_0_0
 check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC= nicips.$$THIRDNIC= nictypes.$$SECONDNIC= nicnetworks.$$THIRDNIC=
+check:rc==0
 cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0 mtu=1500
 check:rc==0
 cmd:mkdef -t network -o 40_5_0_0-255_255_0_0 net=40.5.0.0 mask=255.255.0.0 mtu=1500
@@ -675,11 +686,9 @@ check:output=~bond0.3
 cmd:xdsh $$CN "cat /sys/class/net/bonding_masters"
 check:output=~bond0
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
-cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
-cmd:xdsh $$CN "ip addr del 12.1.0.100/8 dev $$THIRDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:rmdef -t network -o 30_5_0_0-255_255_0_0
@@ -715,6 +724,10 @@ cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:chdef $$CN nicips.$$THIRDNIC=12.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$THIRDNIC=12_1_0_0-255_255_0_0
 check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC= nicips.$$THIRDNIC= nictypes.$$SECONDNIC= nicnetworks.$$THIRDNIC=
+check:rc==0
 cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0
 check:rc==0
 cmd:chdef $$CN nicnetworks.br0=30_5_0_0-255_255_0_0 nicdevices.br0=bond0 nictypes.br0=bridge nicips.br0=30.5.106.9 nicdevices.bond0="$$SECONDNIC|$$THIRDNIC" nictypes.bond0=bond nictypes.$$SECONDNIC=ethernet nictypes.$$THIRDNIC=ethernet
@@ -729,11 +742,9 @@ check:output=~br0
 cmd:xdsh $$CN "cat /sys/class/net/bonding_masters"
 check:output=~bond0
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
-cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
-cmd:xdsh $$CN "ip addr del 12.1.0.100/8 dev $$THIRDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:rmdef -t network -o 30_5_0_0-255_255_0_0
@@ -763,6 +774,10 @@ cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:chdef $$CN nicips.$$THIRDNIC=12.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$THIRDNIC=12_1_0_0-255_255_0_0
 check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC= nicips.$$THIRDNIC= nictypes.$$SECONDNIC= nicnetworks.$$THIRDNIC=
+check:rc==0
 cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0
 check:rc==0
 cmd:mkdef -t network -o 40_5_0_0-255_255_0_0 net=40.5.0.0 mask=255.255.0.0
@@ -783,11 +798,9 @@ check:output=~br33
 cmd:xdsh $$CN "cat /sys/class/net/bonding_masters"
 check:output=~bond0
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
-cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
-cmd:xdsh $$CN "ip addr del 12.1.0.100/8 dev $$THIRDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:rmdef -t network -o 30_5_0_0-255_255_0_0
@@ -823,6 +836,10 @@ cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:chdef $$CN nicips.$$THIRDNIC=12.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$THIRDNIC=12_1_0_0-255_255_0_0
 check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC= nicips.$$THIRDNIC= nictypes.$$SECONDNIC= nicnetworks.$$THIRDNIC=
+check:rc==0
 cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0
 check:rc==0
 cmd:mkdef -t network -o 40_5_0_0-255_255_0_0 net=40.5.0.0 mask=255.255.0.0
@@ -847,11 +864,9 @@ check:output=~br33
 cmd:xdsh $$CN "cat /sys/class/net/bonding_masters"
 check:output=~bond0
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
-cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
-cmd:xdsh $$CN "ip addr del 12.1.0.100/8 dev $$THIRDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:rmdef -t network -o 30_5_0_0-255_255_0_0
@@ -887,6 +902,10 @@ cmd:mkdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:chdef $$CN nicips.$$THIRDNIC=12.1.0.100 nictypes.$$SECONDNIC=Ethernet nicnetworks.$$THIRDNIC=12_1_0_0-255_255_0_0
 check:rc==0
+cmd:updatenode $$CN -P confignetwork
+check:rc==0
+cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC= nicips.$$THIRDNIC= nictypes.$$SECONDNIC= nicnetworks.$$THIRDNIC=
+check:rc==0
 cmd:mkdef -t network -o 30_5_0_0-255_255_0_0 net=30.5.0.0 mask=255.255.0.0
 check:rc==0
 cmd:mkdef -t network -o 40_5_0_0-255_255_0_0 net=40.5.0.0 mask=255.255.0.0
@@ -905,11 +924,9 @@ cmd:chdef $$CN nicdevices.br22=bond0.2 nicdevices.br33=bond0.3 nictypes.br22=bri
 cmd:updatenode $$CN -P confignetwork
 check:rc!=0
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
-cmd:xdsh $$CN "ip addr del 11.1.0.100/8 dev $$SECONDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
-cmd:xdsh $$CN "ip addr del 12.1.0.100/8 dev $$THIRDNIC"
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
 check:rc==0
 cmd:rmdef -t network -o 30_5_0_0-255_255_0_0

From fb4cf5367de34a2c9080f9f8e91048224779aead Mon Sep 17 00:00:00 2001
From: xuweibj <xwbj@cn.ibm.com>
Date: Thu, 13 Jul 2017 16:07:57 +0800
Subject: [PATCH 146/283] add testcases for openbmc simulator delay response
 and modify timeout of async (#3431)

---
 xCAT-server/lib/xcat/plugins/openbmc.pm       |  7 +++--
 .../testcase/simulator/config_simulator.sh    | 21 +++++++++++----
 .../testcase/simulator/setup_simulator        | 26 ++++++++++++++++++-
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 9b251fc48..fa40df4c2 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -240,6 +240,7 @@ $::RESPONSE_OK                  = "200 OK";
 $::RESPONSE_SERVER_ERROR        = "500 Internal Server Error";
 $::RESPONSE_SERVICE_UNAVAILABLE = "503 Service Unavailable";
 $::RESPONSE_METHOD_NOT_ALLOWED  = "405 Method Not Allowed";
+$::RESPONSE_SERVICE_TIMEOUT     = "504 Gateway Timeout";
 
 #-----------------------------
 
@@ -361,8 +362,9 @@ sub process_request {
     if ($request->{command}->[0] ne "getopenbmccons") {
         $cookie_jar = HTTP::Cookies->new({});
         $async = HTTP::Async->new(
+            slots => 500,
             cookie_jar => $cookie_jar,
-            timeout => 10,
+            timeout => 60,
             max_request_time => 60,
             ssl_options => {
                 SSL_verify_mode => 0,
@@ -954,7 +956,8 @@ sub deal_with_response {
             $status_info{ $node_info{$node}{cur_status} }->{process}->($node, $response); 
 
             return;
-            
+        } elsif ($response->status_line eq $::RESPONSE_SERVICE_TIMEOUT) {
+            $error = $::RESPONSE_SERVICE_TIMEOUT;
         } else {
             my $response_info = decode_json $response->content;
             if ($response->status_line eq $::RESPONSE_SERVER_ERROR) {
diff --git a/xCAT-test/autotest/testcase/simulator/config_simulator.sh b/xCAT-test/autotest/testcase/simulator/config_simulator.sh
index fc4013fdd..566c826bd 100755
--- a/xCAT-test/autotest/testcase/simulator/config_simulator.sh
+++ b/xCAT-test/autotest/testcase/simulator/config_simulator.sh
@@ -6,6 +6,8 @@ cnhn=$3  # CN hostname
 username=$4  # bmcusername
 password=$5  # bmcpassword
 nodes=$6  # number of IPs want to config
+delay_type=$7 # delay type "constant" or "random"
+delay_time=$8 # delay time
 
 if [ $nodes -gt 10000 ]; then
     echo "Unsupported number of nodes: $nodes"
@@ -42,11 +44,16 @@ if [ $flag = "-s" ]; then
 
     cd /root/ && git clone git@github.com:xuweibj/openbmc_simulator.git
 
-    if [ $nodes ]; then
+    if [ $nodes ] && [ $nodes -gt 0 ]; then
         lsdef $cnhn -z > /tmp/$cnhn.stanza
         rmdef $cnhn
 
-        /root/openbmc_simulator/simulator -n $nic -r $range 
+        if [ $delay_type ] && [ $delay_time ]; then 
+            option_string="-d $delay_type -t $delay_time -n $nic -r $range"
+        else
+            option_string="-n $nic -r $range"
+        fi
+        /root/openbmc_simulator/simulator $option_string 
         if [ $? != 0 ]; then
             echo "Start simulator Failed"
             exit 1
@@ -54,16 +61,20 @@ if [ $flag = "-s" ]; then
 
         node_end=$[nodes-1]
         chdef -t group $cnhn mgt=openbmc bmc="|\D+(\d+)$|10.100.(1+((\$1)/100)).((\$1)%100+1)|" bmcusername=$username bmcpassword=$password
-        chdef simulator_test_[0-$node_end] groups=$cnhn  # use CN hostname as group, so when run command against CN will rpower against all nodes added here
+        chdef simulator_test[0-$node_end] groups=$cnhn  # use CN hostname as group, so when run command against CN will rpower against all nodes added here
     else 
         cnip=`lsdef $cnhn -i bmc -c | awk -F '=' '{print $2}'`
         echo $cnip > "/tmp/simulator"
         mnip=`ping $mnhn -c 1 | grep "64 bytes from" |awk -F'(' '{print $2}'|awk -F')' '{print $1}'`
         chdef $cnhn bmc=$mnip
-        /root/openbmc_simulator/simulator
+        if [ $delay_type ] && [ $delay_time ]; then
+            /root/openbmc_simulator/simulator -d $delay_type -t $delay_time
+        else
+            /root/openbmc_simulator/simulator
+        fi
     fi
 elif [ $flag = "-c" ]; then
-    if [ $nodes ]; then
+    if [ $nodes ] && [ $nodes -gt 0 ]; then
         /root/openbmc_simulator/simulator -c -n $nic -r $range
         rmdef $cnhn
         cat /tmp/$cnhn.stanza | mkdef -z
diff --git a/xCAT-test/autotest/testcase/simulator/setup_simulator b/xCAT-test/autotest/testcase/simulator/setup_simulator
index 8ab412829..190705f3b 100644
--- a/xCAT-test/autotest/testcase/simulator/setup_simulator
+++ b/xCAT-test/autotest/testcase/simulator/setup_simulator
@@ -1,6 +1,6 @@
 start:setup_openbmc_simulator
 description:install dependent packaages, setup and start openbmc simulator
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN $$bmcusername $$bmcpasswd 0
 check:rc==0
 end
 
@@ -21,3 +21,27 @@ description:install dependent packaages, setup and start 5000 openbmc simulator
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN $$bmcusername $$bmcpasswd 5000
 check:rc==0
 end
+
+start:setup_openbmc_simulator_multiple_1000_delay_random_1m
+description:install dependent packaages, setup and start 1000 openbmc simulator with random that the most delay time 1 minute
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN $$bmcusername $$bmcpasswd 1000 random 1m
+check:rc==0
+end
+
+start:setup_openbmc_simulator_multiple_5000_delay_random_1m
+description:install dependent packaages, setup and start 5000 openbmc simulator with random that the most delay time 1 minute
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN $$bmcusername $$bmcpasswd 5000 constant 1m
+check:rc==0
+end
+
+start:setup_openbmc_simulator_multiple_1000_delay_random_1m30
+description:install dependent packaages, setup and start 1000 openbmc simulator with random that the most delay time 1m30s
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN $$bmcusername $$bmcpasswd 1000 random 1m30
+check:rc==0
+end
+
+start:setup_openbmc_simulator_multiple_1000_delay_random_30
+description:install dependent packaages, setup and start 1000 openbmc simulator with random that the most delay time 30s
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN $$bmcusername $$bmcpasswd 1000 random 0m30
+check:rc==0
+end

From 45fd73f8e3b51c1d04ed8e1186214ba0ebe4c5e1 Mon Sep 17 00:00:00 2001
From: yangsong <immarvin@users.noreply.github.com>
Date: Thu, 13 Jul 2017 04:00:58 -0500
Subject: [PATCH 147/283] fix xCAT should better support the service group
 (servicenode postscript) to avoid errors when using Hierarchy #3150 (#3442)

---
 xCAT-server/lib/perl/xCAT/SvrUtils.pm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/xCAT-server/lib/perl/xCAT/SvrUtils.pm b/xCAT-server/lib/perl/xCAT/SvrUtils.pm
index 41350d242..01b9a06f3 100755
--- a/xCAT-server/lib/perl/xCAT/SvrUtils.pm
+++ b/xCAT-server/lib/perl/xCAT/SvrUtils.pm
@@ -742,6 +742,13 @@ sub update_tables_with_templates
                     osarch       => $arch,
                     synclists    => $synclistfile,
                     osdistroname => $osdistroname);
+
+                #for service node osimage, add service node to the postscripts attributes
+                if($profile eq "service"){
+                    $tb_cols{postscripts}="servicenode";
+                }
+
+
                 if ($args{description}) {
                     $tb_cols{description} = $args{description};
                 }

From 2ba71e3d818380e2cc7eda2256b9238be9a32e3f Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Thu, 13 Jul 2017 17:52:19 +0800
Subject: [PATCH 148/283] Update test case mkdef_regex_nicsip based on Victor's
 comments

---
 xCAT-test/autotest/testcase/mkdef/cases1 | 82 ++++++++++++++++++++----
 1 file changed, 71 insertions(+), 11 deletions(-)

diff --git a/xCAT-test/autotest/testcase/mkdef/cases1 b/xCAT-test/autotest/testcase/mkdef/cases1
index dadc5b244..be260b33f 100644
--- a/xCAT-test/autotest/testcase/mkdef/cases1
+++ b/xCAT-test/autotest/testcase/mkdef/cases1
@@ -64,24 +64,84 @@ end
 
 start:mkdef_regex_nicsip
 description:Verify the GitHub issue #3047.
-cmd:rmdef sn[01-16]
-cmd:rmdef -t group -o testnicips
-cmd:mkdef -t group -o testnicips
+cmd:rmdef xcattest_tmp_node_sn[01-16]
+cmd:rmdef -t group -o xcattest_tmp_group_regex
+cmd:mkdef -t group -o xcattest_tmp_group_regex
 check:rc==0
-cmd:chdef -t group -o testnicips 'ip=|\D+(\d+)|172.21.254.($1%100)|'
+cmd:chdef -t group -o xcattest_tmp_group_regex 'ip=|\D+(\d+)|172.21.254.($1%100)|'
 check:rc==0
-cmd:chdef -t group -o testnicips 'nicips.eth1=|\D+(\d+)|172.20.254.($1%100)|'
+cmd:chdef -t group -o xcattest_tmp_group_regex 'nicips.eth1=|\D+(\d+)|172.20.254.($1%100)|'
 check:rc==0
-cmd:lsdef -t group -o testnicips | grep -F 'nicips.eth1=|\D+(\d+)|172.20.254.($1%100)|'
+cmd:lsdef -t group -o xcattest_tmp_group_regex | grep -F 'nicips.eth1=|\D+(\d+)|172.20.254.($1%100)|'
 check:rc==0
-cmd:mkdef sn[01-16] groups=testnicips
+cmd:mkdef xcattest_tmp_node_sn[01-16] groups=xcattest_tmp_group_regex
 check:rc==0
-cmd:lsdef sn14 -c -i ip | grep -F 'ip=172.21.254.14'
+cmd:lsdef xcattest_tmp_node_sn01 -c -i ip | grep -F 'ip=172.21.254.1'
 check:rc==0
-cmd:lsdef sn09 -c -i nicips  | grep -F 'nicips.eth1=172.20.254.9'
+cmd:lsdef xcattest_tmp_node_sn01 -c -i nicips | grep -F 'nicips.eth1=172.20.254.1'
 check:rc==0
-cmd:rmdef sn[01-16]
+cmd:lsdef xcattest_tmp_node_sn02 -c -i ip | grep -F 'ip=172.21.254.2'
 check:rc==0
-cmd:rmdef -t group -o testnicips
+cmd:lsdef xcattest_tmp_node_sn02 -c -i nicips | grep -F 'nicips.eth1=172.20.254.2'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn03 -c -i ip | grep -F 'ip=172.21.254.3'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn03 -c -i nicips | grep -F 'nicips.eth1=172.20.254.3'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn04 -c -i ip | grep -F 'ip=172.21.254.4'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn04 -c -i nicips | grep -F 'nicips.eth1=172.20.254.4'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn05 -c -i ip | grep -F 'ip=172.21.254.5'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn05 -c -i nicips | grep -F 'nicips.eth1=172.20.254.5'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn06 -c -i ip | grep -F 'ip=172.21.254.6'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn06 -c -i nicips | grep -F 'nicips.eth1=172.20.254.6'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn07 -c -i ip | grep -F 'ip=172.21.254.7'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn07 -c -i nicips | grep -F 'nicips.eth1=172.20.254.7'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn08 -c -i ip | grep -F 'ip=172.21.254.8'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn08 -c -i nicips | grep -F 'nicips.eth1=172.20.254.8'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn09 -c -i ip | grep -F 'ip=172.21.254.9'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn09 -c -i nicips | grep -F 'nicips.eth1=172.20.254.9'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn10 -c -i ip | grep -F 'ip=172.21.254.10'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn10 -c -i nicips | grep -F 'nicips.eth1=172.20.254.10'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn11 -c -i ip | grep -F 'ip=172.21.254.11'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn11 -c -i nicips | grep -F 'nicips.eth1=172.20.254.11'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn12 -c -i ip | grep -F 'ip=172.21.254.12'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn12 -c -i nicips | grep -F 'nicips.eth1=172.20.254.12'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn13 -c -i ip | grep -F 'ip=172.21.254.13'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn13 -c -i nicips | grep -F 'nicips.eth1=172.20.254.13'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn14 -c -i ip | grep -F 'ip=172.21.254.14'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn14 -c -i nicips | grep -F 'nicips.eth1=172.20.254.14'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn15 -c -i ip | grep -F 'ip=172.21.254.15'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn15 -c -i nicips | grep -F 'nicips.eth1=172.20.254.15'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn16 -c -i ip | grep -F 'ip=172.21.254.16'
+check:rc==0
+cmd:lsdef xcattest_tmp_node_sn16 -c -i nicips | grep -F 'nicips.eth1=172.20.254.16'
+check:rc==0
+cmd:rmdef xcattest_tmp_node_sn[01-16]
+check:rc==0
+cmd:rmdef -t group -o xcattest_tmp_group_regex
 check:rc==0
 end

From f52c9cf041018bcd117fda552850ab024bf81db2 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Thu, 13 Jul 2017 13:48:31 -0400
Subject: [PATCH 149/283] change vlan to VLAN

---
 xCAT-server/share/xcat/scripts/configMellanox | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/share/xcat/scripts/configMellanox b/xCAT-server/share/xcat/scripts/configMellanox
index 36d313996..2b7b0f224 100755
--- a/xCAT-server/share/xcat/scripts/configMellanox
+++ b/xCAT-server/share/xcat/scripts/configMellanox
@@ -379,8 +379,9 @@ sub config_vlan {
        if ($mode =~ /hybrid/) 
        {
            if (!$access_vlan) {
-               print "NOTE: Hybrid mode will change access vlan back to 1\n"; 
-               print "please provide access vlan if other than 1\n"; 
+               print "NOTE: Hybrid mode will change access VLAN back to 1\n"; 
+               print "If other than 1, run the command again with access VLAN number: \n"
+               print "    configMellanox --switches switchnames --port port --accessvlan vlan1 --allowvlan vlan2 --mode mode\n"; 
                $access_vlan = 1;
            }
        }
@@ -405,7 +406,7 @@ sub config_vlan {
             next;
         }
 
-        print "Tagging access vlan to $access_vlan and allowed vlan to $allowed_vlan with $mode mode for $switch port $port_input\n";
+        print "Tagging access VLAN to $access_vlan and allowed VLAN to $allowed_vlan with $mode mode for $switch port $port_input\n";
 
         my $cmd_prefix = "xdsh $switch --devicetype $devicetype";
         foreach my $port (@ports) {

From 9f3e61abbb566476522f103f39f5f9f28b295697 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Thu, 13 Jul 2017 14:08:16 -0400
Subject: [PATCH 150/283] mysql/mariadb package requirements

---
 docs/source/advanced/hierarchy/databases/mysql_install.rst | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/source/advanced/hierarchy/databases/mysql_install.rst b/docs/source/advanced/hierarchy/databases/mysql_install.rst
index 4ed15b5ab..497296bbc 100644
--- a/docs/source/advanced/hierarchy/databases/mysql_install.rst
+++ b/docs/source/advanced/hierarchy/databases/mysql_install.rst
@@ -26,20 +26,14 @@ Red Hat Enterprise Linux
        perl-DBD-MySQL*
        mysql-server-5.*
        mysql-5.*
-       mysql-devel-5.*
-       mysql-bench-5.*
        mysql-connector-odbc-*
 
 * MariaDB - Using ``yum``, ensure that the following packages are installed on the management node: ::
 
-       mariadb-devel-5.*
-       mariadb-libs-5.*
        mariadb-server-5.*
-       mariadb-bench-5.*
        mariadb-5.*
        perl-DBD-MySQL*
        mysql-connector-odbc-*
-       unixODBC*
 
 Suse Linux Enterprise Server
 ----------------------------

From 749d3d54a36d8626a39a855951d145365ad81ebe Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Thu, 13 Jul 2017 14:19:15 -0400
Subject: [PATCH 151/283] syntax error

---
 xCAT-server/share/xcat/scripts/configMellanox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-server/share/xcat/scripts/configMellanox b/xCAT-server/share/xcat/scripts/configMellanox
index 2b7b0f224..b92dd57d0 100755
--- a/xCAT-server/share/xcat/scripts/configMellanox
+++ b/xCAT-server/share/xcat/scripts/configMellanox
@@ -380,7 +380,7 @@ sub config_vlan {
        {
            if (!$access_vlan) {
                print "NOTE: Hybrid mode will change access VLAN back to 1\n"; 
-               print "If other than 1, run the command again with access VLAN number: \n"
+               print "If other than 1, run the command again with access VLAN number: \n";
                print "    configMellanox --switches switchnames --port port --accessvlan vlan1 --allowvlan vlan2 --mode mode\n"; 
                $access_vlan = 1;
            }

From 7d72c6d8327bafe6b96185903cf53707ac9e314c Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Thu, 13 Jul 2017 18:19:49 -0400
Subject: [PATCH 152/283] Change the auto-detect for copycds to be a little
 more generic for RHEL ISOs (#3416)

* Change the auto-detect for copycds to be a little more generic

* Fix type and use scalar to count number of words in the discinfo description
---
 xCAT-server/lib/xcat/plugins/anaconda.pm | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm
index fb2a7cd19..1507b768f 100644
--- a/xCAT-server/lib/xcat/plugins/anaconda.pm
+++ b/xCAT-server/lib/xcat/plugins/anaconda.pm
@@ -2151,12 +2151,8 @@ sub copycd
     my $installroot = "/install";
     my $sitetab     = xCAT::Table->new('site');
 
-
     require xCAT::data::discinfo;
 
-    #if ($sitetab)
-    #{
-    #    (my $ref) = $sitetab->getAttribs({key => 'installdir'}, 'value');
     my @ents     = xCAT::TableUtils->get_site_attribute("installdir");
     my $site_ent = $ents[0];
     if (defined($site_ent))
@@ -2241,18 +2237,14 @@ sub copycd
         elsif ($desc =~ /Red Hat Enterprise Linux/)
         {
             #
-            # Attempt to auto-detect for RHEL OS.
-            # RHEL 7.3 description is: Red Hat Enterprise Linux 7.3
+            # Attempt to auto-detect for RHEL OS, the last element has typically been the version
             #
             my @rhel_version = split / /, $desc;
-            #
-            # auto-detect pegas beta ISOs
-            #
-            if ( $rhel_version[4] =~ "Pegas") { 
-                $distname = "rhels" . $rhel_version[5] . "-pegas";
+            if (scalar @rhel_version > 5) {
+                $distname = "rhels" . $rhel_version[-1] . "-" . lc($rhel_version[4]);
             } 
             else { 
-                $distname = "rhels" . $rhel_version[4];
+                $distname = "rhels" . $rhel_version[-1];
             }
             open($dinfo, $mntpath . "/.treeinfo");
             while (<$dinfo>) {

From 882d47c2b5fe863da7a89564a69906da3210e9d0 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Thu, 13 Jul 2017 20:57:42 -0400
Subject: [PATCH 153/283] add describe of bmcreboot

---
 .../source/guides/admin-guides/references/man1/rpower.1.rst | 6 ++++++
 xCAT-client/pods/man1/rpower.1.pod                          | 4 ++++
 2 files changed, 10 insertions(+)

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 52dc597c1..1dee1d74a 100644
--- a/docs/source/guides/admin-guides/references/man1/rpower.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rpower.1.rst
@@ -380,6 +380,12 @@ OPTIONS
  
 
 
+\ **bmcreboot**\ 
+ 
+ To reboot BMC.
+ 
+
+
 \ **bmcstate**\ 
  
  To get state of the BMC.
diff --git a/xCAT-client/pods/man1/rpower.1.pod b/xCAT-client/pods/man1/rpower.1.pod
index 24fd01e82..2c5683fb1 100644
--- a/xCAT-client/pods/man1/rpower.1.pod
+++ b/xCAT-client/pods/man1/rpower.1.pod
@@ -247,6 +247,10 @@ To pause all processes in the instance.
 
 To unpause all processes in the instance.
 
+=item B<bmcreboot>
+
+To reboot BMC.
+
 =item B<bmcstate>
 
 To get state of the BMC.

From 57762da4c6694587687c79b885f2551f59d76c3a Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Fri, 14 Jul 2017 13:28:09 +0800
Subject: [PATCH 154/283] Fix test case mkdef_regex_kvm

---
 xCAT-test/autotest/testcase/mkdef/cases1 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xCAT-test/autotest/testcase/mkdef/cases1 b/xCAT-test/autotest/testcase/mkdef/cases1
index be260b33f..a19e5d305 100644
--- a/xCAT-test/autotest/testcase/mkdef/cases1
+++ b/xCAT-test/autotest/testcase/mkdef/cases1
@@ -44,17 +44,17 @@ cmd:chtab node=kvms 'vm.host=|\D+(\d+)\D+(\d+)\D+(\d+)\D+(\d+)|c($1)f($2)x($3)|'
 check:rc==0
 cmd:mkdef -t node -o c01f02x03v04 groups=kvms mgt=kvm
 check:rc==0
-cmd:chdef c910f02x03v04 -i vmcpus | grep 'vmcpus=2$'
+cmd:chdef c01f02x03v04 -i vmcpus | grep 'vmcpus=2$'
 check:rc==0
-cmd:chdef c910f02x03v04 -i vmhost | grep 'vmhost=c01f02x03$'
+cmd:chdef c01f02x03v04 -i vmhost | grep 'vmhost=c01f02x03$'
 check:rc==0
-cmd:chdef c910f02x03v04 -i vmmemory | grep 'vmmemory=3072$'
+cmd:chdef c01f02x03v04 -i vmmemory | grep 'vmmemory=3072$'
 check:rc==0
-cmd:chdef c910f02x03v04 -i vmnicnicmodel | grep 'vmnicnicmodel=virtio$'
+cmd:chdef c01f02x03v04 -i vmnicnicmodel | grep 'vmnicnicmodel=virtio$'
 check:rc==0
-cmd:chdef c910f02x03v04 -i vmnics | grep 'vmnics=virbr2$'
+cmd:chdef c01f02x03v04 -i vmnics | grep 'vmnics=virbr2$'
 check:rc==0
-cmd:chdef c910f02x03v04 -i vmstorage | grep 'vmstorage=dir:///install/vms/vm4$'
+cmd:chdef c01f02x03v04 -i vmstorage | grep 'vmstorage=dir:///install/vms/vm4$'
 check:rc==0
 cmd:rmdef -t node c01f02x03v04
 check:rc==0

From dfca6c2289b8468fc71a7c7534a1234cf5ef970f Mon Sep 17 00:00:00 2001
From: Yuan Bai <bybai@cn.ibm.com>
Date: Fri, 14 Jul 2017 14:24:05 +0800
Subject: [PATCH 155/283] enhance exit code for configeth (#3451)

* enhance exit code for configeth

* add exit code for confignics
---
 xCAT/postscripts/configeth     | 43 ++++++++++++++++++++++++++++------
 xCAT/postscripts/confignetwork |  6 ++---
 xCAT/postscripts/confignics    | 26 ++++++++++++++++----
 3 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth
index fd53c5dc9..745b4524c 100755
--- a/xCAT/postscripts/configeth
+++ b/xCAT/postscripts/configeth
@@ -8,7 +8,7 @@ if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
    . $str_dir_name/xcatlib.sh
    . $str_dir_name/nicutils.sh
 fi
-
+error_code=0
 function configipv4(){
     str_if_name=$1
     str_v4ip=$2
@@ -320,6 +320,10 @@ function add_ip_temporary(){
             str_bcase=$(v4calcbcase $str_ip $str_mask)
             #the label is ready, add the ip address directly
             ip addr add $str_ip/${str_mask} broadcast $str_bcase dev $str_nic_name scope global label $str_label
+            if [ $? -ne 0 ]; then
+                log_error "add the ip address $str_ip/${str_mask} failed."
+                error_code=1
+            fi
         fi
     fi
 }
@@ -349,7 +353,7 @@ if [ "$str_os_type" = "linux" ];then
     fi
 else
     echo "configeth dose not support AIX in this build"
-    exit 0
+    exit 1
 
 fi
 
@@ -409,7 +413,7 @@ if [ "$1" = "-r" ];then
         #delete the configuration files
         delete_nic_config_files $str_nic_name
     fi
-    exit 0
+    exit $error_code
 elif [ "$1" = "-s" ];then
     if [ $# -lt 2 ];then
         logger -t xcat -p local4.err "configeth: config install nic, but the nic name is missed"
@@ -472,7 +476,7 @@ elif [ "$1" = "-s" ];then
             fi
        fi
     else
-        str_lease_file=`ls /var/lib/dhclient/*$str_inst_nic* | grep lease`
+        str_lease_file=`ls /var/lib/dhclient/*$str_inst_nic* | grep lease >& /dev/null`
         if [ -e "$str_lease_file" ];then
             str_inst_ip=`grep fixed-address $str_lease_file | tail -n 1 | awk '{print $2}' | sed 's/;$//'`
             str_inst_mask=`grep subnet-mask $str_lease_file | tail -n 1 | awk '{print $3}' | sed 's/;$//'`
@@ -504,7 +508,7 @@ elif [ "$1" = "-s" ];then
     if [ -z "$str_inst_ip" -o -z "$str_inst_mask" ];then
         logger -t xcat -p local4.err "configeth: config install nic, can not find the information from lease file, return."
         log_info "configeth on $NODE: config install nic, can not find information from dhcp lease file, return."
-        exit 0
+        exit 1
     fi
 
     str_inst_net=$(v4calcnet $str_inst_ip $str_inst_mask)
@@ -636,8 +640,12 @@ elif [ "$1" = "-s" ];then
     fi
 
     ifup $str_inst_nic
+    if [ $? -ne 0 ]; then
+        log_error "ifup $str_inst_nic failed."
+        error_code=1
+    fi
 
-    exit 0
+    exit $error_code
 fi
 
 #main prcess
@@ -717,6 +725,7 @@ while [ $num_index -lt ${#array_nic_ips[*]} ];do
     if [ ! $str_netname ];then
         logger -t xcat -p local4.err "configeth: Network name is not defined on $str_nic_name for $str_ip."
         log_error "configeth on $NODE: Network name is not defined on $str_nic_name for $str_ip."
+        error_code=1
         num_index=$((num_index+1))
         continue
     fi
@@ -726,6 +735,7 @@ while [ $num_index -lt ${#array_nic_ips[*]} ];do
     if [ ! $str_line ];then
         logger -t xcat -p local4.err "configeth: Network object $str_netname is not defined."
         log_error "configeth on $NODE: Network object $str_netname is not defined."
+        error_code=1
         num_index=$((num_index+1))
         continue
     fi
@@ -739,6 +749,7 @@ while [ $num_index -lt ${#array_nic_ips[*]} ];do
     if [ ! $str_subnet -o ! $str_netmask ];then
         logger -t xcat -p local4.err "configeth: subnet or netmask is not defined in network object $str_netname."
         log_error "configeth on $NODE: subnet or netmask is not defined in network object $str_netname."
+        error_code=1
         num_index=$((num_index+1))
         continue
     fi
@@ -770,6 +781,7 @@ while [ $num_index -lt ${#array_nic_ips[*]} ];do
     else
         logger -t xcat -p local4.err "configeth: the ipaddress( $str_ip ) for $str_nic_name is invalid."
         log_error "configeth on $NODE: the ipaddress( $str_ip ) for $str_nic_name is invalid."
+        error_code=1
     fi
     num_index=$((num_index+1))
 done
@@ -790,6 +802,7 @@ if [ "$str_os_type" = "aix" ];then
             chdev -l $str_nic_name -a netaddr='' -a netmask=''
             logger -t xcat -p local4.err "configeth: delete undefined ip address $str_old_ip"
             log_error "configeth on $NODE: delete undefined ip address $str_old_ip"
+            error_code=1
         fi
     fi
 
@@ -864,6 +877,10 @@ if [ "$str_os_type" = "aix" ];then
     
     #change the nic status to up
     chdev -l $str_nic_name -a state=up
+    if [ $? -ne 0 ]; then
+        log_error "chdev -l $str_nic_name -a state=up failed."
+        error_code=1
+    fi
 else
     str_history=''
     bool_restart_flag=0
@@ -895,6 +912,10 @@ else
                         log_info "configeth on $NODE: delete $str_old_ip for $str_nic_name temporary."
                         str_old_ip=`echo $str_old_ip | tr '_' '/'`
                         ip addr del $str_old_ip dev $str_nic_name
+                        if [ $? -ne 0 ]; then
+                            log_error "ip addr del $str_old_ip dev $str_nic_name failed."
+                            error_code=1
+                        fi
                     fi
                 done
             else
@@ -1028,11 +1049,19 @@ else
     if [ $bool_restart_flag -eq 1 ];then
         if [ "$str_os_type" = "debian" ];then
             ifup -a -i /etc/network/interfaces.d/$str_nic_name
+            if [ $? -ne 0 ]; then
+                log_error "ifup -a -i /etc/network/interfaces.d/$str_nic_name failed."
+                error_code=1
+            fi
         else
             echo "bring up ip"
             ifup $str_nic_name
+            if [ $? -ne 0 ]; then
+                log_error "ifup $str_nic_name failed."
+                error_code=1
+            fi
         fi
     fi
 fi
 
-exit 0
+exit $error_code
diff --git a/xCAT/postscripts/confignetwork b/xCAT/postscripts/confignetwork
index bb0a90cec..6fac25ac8 100755
--- a/xCAT/postscripts/confignetwork
+++ b/xCAT/postscripts/confignetwork
@@ -320,7 +320,7 @@ function sort_nics_device_order {
                 echo $alonenic
             else
                 errorcode=1
-                echo "Error: nicips,nictype and nicnetwork should be configured in nics table for $alonenic."
+                echo "Error: nicips,nictypes and nicnetworks should be configured in nics table for $alonenic."
                 ((num1+=1)) 
                 continue
             fi
@@ -521,7 +521,7 @@ function configure_nicdevice {
         elif [ x"$nic_dev_type" = "xinfiniband" ]; then
             log_error "confignetwork does not support configure IB. "
         else
-            log_error "Error : please check nictypes for $nic_pair."
+            log_error "Error : please check nic data in nics table."
             errorcode=1
         fi 
 
@@ -603,7 +603,7 @@ parser_nic_attribute "$NICCUSTOMSCRIPTS" "niccustomscripts"
 #bond0 eth2@eth3
 new_nicdevice=`find_nic_and_device_list $str_all_nics|sort -g -k1 -g -k2|uniq`
 if [ -z "$new_nicdevice" ]; then
-    log_info "There is no nic device to configure."
+    log_info "There is no other nic device to configure."
     exit $errorcode  
 fi
 
diff --git a/xCAT/postscripts/confignics b/xCAT/postscripts/confignics
index 41f15db31..96a452ab4 100755
--- a/xCAT/postscripts/confignics
+++ b/xCAT/postscripts/confignics
@@ -18,7 +18,7 @@ if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
    str_dir_name=`dirname $0`
    . $str_dir_name/xcatlib.sh
 fi
-
+error_code=0
 #the nics' information contain: 
 #1. ip address
 #2. nic network
@@ -102,6 +102,7 @@ function findnetwork(){
     done
     
     echo "Error: Can not find the corresponding network defination for ip address: $str_ip ."
+    error_code=1
 }
 
 function checknetwork(){
@@ -138,7 +139,7 @@ str_os_type=`uname | tr 'A-Z' 'a-z'`
 if [ "$str_os_type" = "aix" ];then
     logger -t xcat -p local4.err "confignics: aix does not support in this build"
     echo "confignics: aix does not support in this build"
-    exit 0
+    exit 1
 fi
 bool_remove=0
 num_iba_ports=
@@ -167,7 +168,7 @@ then
         then
             logger -t xcat -p local4.info "confignics --script <myscript> could Not be used with other options"
             echo "confignics --script <myscript> could Not be used with other options"
-            exit -1
+            exit 1
         fi
         boot_myscript=1
         myscript=$2;
@@ -215,7 +216,7 @@ if [ -z "$NICIPS" ];then
    else
        logger -t xcat -p local4.info "confignics: nicips attribute is not defined. "
        echo "confignics on $NODE: nicips attribute is not defined. "
-       exit 0
+       exit 1
    fi
 fi
 splitconfig "$NICIPS"
@@ -226,7 +227,7 @@ splitconfig "$NICCUSTOMSCRIPTS"
 if [ $boot_myscript -eq 1 ];then
     . $str_dir_name/$myscript
     if [ $? -ne 0 ];then
-        exit -1
+        exit 1
     fi
     exit 0
 fi
@@ -277,6 +278,9 @@ if [ $bool_remove -eq 1 ];then
         logger -t xcat -p local4.info "confignics: remove nic $str_temp_nic"
         echo "confignics on $NODE: remove nic $str_temp_nic"
         configeth -r $str_temp_nic
+        if [ $? -ne 0 ]; then
+            error_code=1
+        fi
     done
 fi
 old_ifs=$IFS
@@ -310,6 +314,9 @@ do
                 logger -t xcat -p local4.info "confignics: call 'configeth $str_inst_nic'"
                 echo "confignics on $NODE: call 'configeth -s $str_inst_nic"
                 configeth -s $str_inst_nic
+                if [ $? -ne 0 ]; then
+                    error_code=1
+                fi
                 continue
             else
                 continue
@@ -322,6 +329,7 @@ do
         else
             logger -t xcat -p local4.info "confignics: unknown nic type for $key: $str_value ."
             echo "confignics on $NODE: unknown nic type for $key: $str_value ."
+            error_code=1
             continue
         fi
 
@@ -337,6 +345,9 @@ do
              logger -t xcat -p local4.info "confignics: call 'configeth $key ${array_temp[0]} $str_network'"
              echo "confignics on $NODE: call 'configeth $key ${array_temp[0]} $str_network'"
              configeth $key ${array_temp[0]} $str_network
+             if [ $? -ne 0 ]; then
+                 error_code=1
+             fi
         elif [ "$str_nic_type" = "infiniband" ];then
             if [ $str_ib_nics ];then
                 str_ib_nics=$str_ib_nics","$key
@@ -346,6 +357,7 @@ do
         else
             logger -t xcat -p local4.info "confignics: unknown type $str_nic_type for NIC: $key"
             echo "confignics on $NODE: unknown type $str_nic_type for NIC: $key"
+            error_code=1
         fi
     fi
 done
@@ -358,5 +370,9 @@ else
         logger -t xcat -p local4.info "confignics: executed script: 'configib -u' to remove all ib nics and configuration files"
         echo "confignics on $NODE: executed script: 'configib -r' to remove all ib nics and configuration files"
         configib
+        if [ $? -ne 0 ]; then
+            error_code=1
+        fi
     fi
 fi
+exit $error_code

From 47b92c193f28fe3cffb6ab13c25640d77684f40f Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Fri, 14 Jul 2017 13:50:58 +0800
Subject: [PATCH 156/283] Fix #3088, introduce 'disjointnetboot' site attribute
 to make nodeset request will only be handled for managed nodes on SN.

---
 .../admin-guides/references/man5/site.5.rst   |  4 ++
 perl-xCAT/xCAT/Schema.pm                      |  3 +
 xCAT-server/lib/xcat/plugins/grub2.pm         | 62 ++++++++++++++-----
 xCAT-server/lib/xcat/plugins/petitboot.pm     | 60 +++++++++++++-----
 xCAT-server/lib/xcat/plugins/xnba.pm          | 57 ++++++++++++-----
 5 files changed, 140 insertions(+), 46 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man5/site.5.rst b/docs/source/guides/admin-guides/references/man5/site.5.rst
index 9e48d38c2..39a8fdc5b 100644
--- a/docs/source/guides/admin-guides/references/man5/site.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/site.5.rst
@@ -298,6 +298,10 @@ site Attributes:
                 If value is set to a hostname, the directory in tftpdir
                 will be mounted from that hostname on the SN
   
+   disjointnetboot:  Only avaialbe when sharedtftp is set to 0/no. If set to '1', a service node
+                handles the netboot (petitboot/grub2/xnba) config file only for the nodes it manages.
+                The default value is '0'. '0' means handle all the nodes in the same subnet.
+  
    sharedinstall:  Indicates if a shared file system will be used for installation
                    resources. Possible values are: 'no', 'sns', or 'all'.  'no' 
                    means a shared file system is not being used.  'sns' means a
diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index a19207611..b5badda23 100755
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -1171,6 +1171,9 @@ passed as argument rather than by table value',
 "              in tftpdir is mounted on all on Service Nodes. Default is 1/yes.\n" .
 "              If value is set to a hostname, the directory in tftpdir\n" .
 "              will be mounted from that hostname on the SN\n\n" .
+" disjointnetboot:  Only available when sharedtftp is set to 0/no. If set to '1', a service node\n" .
+"              handles the netboot (petitboot/grub2/xnba) config file only for the nodes it manages.\n" .
+"              The default value is '0'. '0' means handle all the nodes in the same subnet.\n\n" .
 " sharedinstall:  Indicates if a shared file system will be used for installation\n" .
 "                 resources. Possible values are: 'no', 'sns', or 'all'.  'no' \n" .
 "                 means a shared file system is not being used.  'sns' means a\n" .
diff --git a/xCAT-server/lib/xcat/plugins/grub2.pm b/xCAT-server/lib/xcat/plugins/grub2.pm
index f6600d22c..5d4fa8dd8 100644
--- a/xCAT-server/lib/xcat/plugins/grub2.pm
+++ b/xCAT-server/lib/xcat/plugins/grub2.pm
@@ -1,6 +1,6 @@
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 package xCAT_plugin::grub2;
-use Data::Dumper;
+#use Data::Dumper;
 use Sys::Syslog;
 use xCAT::Scope;
 use xCAT::Utils;
@@ -123,12 +123,10 @@ sub setstate {
 
                     # We are in the service node pools, print error if no facing ip.
                     if (xCAT::InstUtils->is_me($sn)) {
-                        my @myself = xCAT::NetworkUtils->determinehostname();
-                        my $myname = $myself[ (scalar @myself) - 1 ];
                         $::callback->(
                             {
                                 error => [
-                                    "$myname: $ipfnd[1] on service node $sn"
+                                    "$::myxcatname: $ipfnd[1] on service node $sn"
                                 ],
                                 errorcode => [1]
                             }
@@ -140,7 +138,7 @@ sub setstate {
                 $::callback->(
                     {
                         error => [
-                            "$myname: $ipfnd[1]"
+                            "$::myxcatname: $ipfnd[1]"
                         ],
                         errorcode => [1]
                     }
@@ -486,6 +484,7 @@ sub preprocess_request {
             return xCAT::Scope->get_broadcast_scope_with_parallel($req);
         }
     }
+    # Do not dispatch to service nodes if non-sharedtftp or the node range contains only SNs.
     return xCAT::Scope->get_parallel_scope($req);
 }
 
@@ -528,27 +527,56 @@ sub process_request {
         return;
     }
 
-    #if not shared tftpdir, then filter, otherwise, set up everything
+    my @hostinfo = xCAT::NetworkUtils->determinehostname();
+    $::myxcatname = $hostinfo[(scalar @hostinfo) - 1];
+    xCAT::MsgUtils->trace(0, "d", "grub2: running on $::myxcatname");
+
+    my @unmanagednodes = ();
+    #if not shared tftpdir, then broadcast, otherwise, set up everything
     if ($request->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
         @nodes = ();
-        my @hostinfo = xCAT::NetworkUtils->determinehostname();
-        my $cur_xmaster = pop @hostinfo;
-        xCAT::MsgUtils->trace(0, "d", "grub2: running on $cur_xmaster");
 
-        # Get current server managed node list
+        my %iphash   = ();
+        # flag the IPs or names in iphash
+        foreach (@hostinfo) { $iphash{$_} = 1; }
+        #print Dumper(\%iphash);
+
+        my $mynodeonly  = 0;
+        my @entries = xCAT::TableUtils->get_site_attribute("disjointnetboot");
+        my $t_entry = $entries[0];
+        if (defined($t_entry)) {
+            $mynodeonly = $t_entry;
+        }
+        xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: disjointnetboot=$mynodeonly");
+
+        # Get managed node list under current server
+        # The node will be under under 'site.master' if no 'noderes.servicenode' is defined
         my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@rnodes, "xcat", "MN");
-        my %managed = {};
-        foreach (@{ $sn_hash->{$cur_xmaster} }) { $managed{$_} = 1; }
+        #print Dumper($sn_hash);
+        my %managed = ();
+        foreach (keys %$sn_hash) {
+            if (exists($iphash{$_})) {
+                my $cur_xmaster = $_;
+                foreach (@{ $sn_hash->{$cur_xmaster} }) { $managed{$_} = 1; }
+                last;
+            }
+        }
 
         foreach (@rnodes) {
+            # For MN, the scope is all CN, for SN, the scope is the nodes it managed if disjointnetboot is set.
+            my $req2manage = exists($managed{$_}) || xCAT::Utils->isMN();
+            if ($mynodeonly == 1 && $req2manage != 1) {
+                push @unmanagednodes, $_;
+                next;
+            }
+            # Only handle its boot configuration files if the node in same subnet
             if (xCAT::NetworkUtils->nodeonmynet($_)) {
                 push @nodes, $_;
             } else {
                 my $msg = "grub2 configuration file was not created for node [$_] because sharedtftp attribute is not set and the node is not on same network as this xcatmaster";
-                if ( $cur_xmaster ) {
-                    $msg .= ": $cur_xmaster";
-                }
-                if ( exists( $managed{$_} ) ) {
+                $msg .= ": $::myxcatname" if ( $::myxcatname );
+
+                if ($req2manage == 1) {
                     # report error when it is under my control but I cannot handle it.
                     my $rsp;
                     $rsp->{data}->[0] = $msg;
@@ -619,7 +647,7 @@ sub process_request {
                 bootparams => \%bphash
                 }, \&pass_along);
         if ($errored) { 
-            xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: Failed in processing setdestiny.  Processing will not continue.");
+            xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: Failed in processing setdestiny.  Processing will not continue.");
             return; 
         }
     }
diff --git a/xCAT-server/lib/xcat/plugins/petitboot.pm b/xCAT-server/lib/xcat/plugins/petitboot.pm
index 04f7bcdf7..1b2248423 100644
--- a/xCAT-server/lib/xcat/plugins/petitboot.pm
+++ b/xCAT-server/lib/xcat/plugins/petitboot.pm
@@ -1,6 +1,7 @@
 # IBM(c) 2014 EPL license http://www.eclipse.org/legal/epl-v10.html
 package xCAT_plugin::petitboot;
 
+#use Data::Dumper;
 use File::Path;
 use Getopt::Long;
 use xCAT::Table;
@@ -125,12 +126,10 @@ sub setstate {
 
                     # We are in the service node pools, print error if no facing ip.
                     if (xCAT::InstUtils->is_me($sn)) {
-                        my @myself = xCAT::NetworkUtils->determinehostname();
-                        my $myname = $myself[ (scalar @myself) - 1 ];
                         $::callback->(
                             {
                                 error => [
-                                    "$myname: $ipfnd[1] on service node $sn"
+                                    "$::myxcatname: $ipfnd[1] on service node $sn"
                                 ],
                                 errorcode => [1]
                             }
@@ -142,7 +141,7 @@ sub setstate {
                 $::callback->(
                     {
                         error => [
-                            "$myname: $ipfnd[1]"
+                            "$::myxcatname: $ipfnd[1]"
                         ],
                         errorcode => [1]
                     }
@@ -363,6 +362,7 @@ sub preprocess_request {
             return xCAT::Scope->get_broadcast_scope_with_parallel($req);
         }
     }
+    # Do not dispatch to service nodes if non-sharedtftp or the node range contains only SNs.
     return xCAT::Scope->get_parallel_scope($req);
 }
 
@@ -408,27 +408,57 @@ sub process_request {
         return;
     }
 
-    #if not shared tftpdir, then filter, otherwise, set up everything
+    my @hostinfo = xCAT::NetworkUtils->determinehostname();
+    $::myxcatname = $hostinfo[(scalar @hostinfo) - 1];
+    xCAT::MsgUtils->trace(0, "d", "petitboot: running on $::myxcatname");
+
+    my @unmanagednodes = ();
+    #if not shared tftpdir, then broadcast, otherwise, set up everything
     if ($request->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
         @nodes = ();
-        my @hostinfo = xCAT::NetworkUtils->determinehostname();
-        my $cur_xmaster = pop @hostinfo;
-        xCAT::MsgUtils->trace(0, "d", "petitboot: running on $cur_xmaster");
 
-        # Get current server managed node list
+        my %iphash   = ();
+        # flag the IPs or names in iphash
+        foreach (@hostinfo) { $iphash{$_} = 1; }
+        #print Dumper(\%iphash);
+
+        my $mynodeonly  = 0;
+        my @entries = xCAT::TableUtils->get_site_attribute("disjointnetboot");
+        my $t_entry = $entries[0];
+        if (defined($t_entry)) {
+            $mynodeonly = $t_entry;
+        }
+        xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: disjointnetboot=$mynodeonly");
+
+        # Get managed node list under current server
+        # The node will be under under 'site.master' if no 'noderes.servicenode' is defined
         my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@rnodes, "xcat", "MN");
-        my %managed = {};
-        foreach (@{ $sn_hash->{$cur_xmaster} }) { $managed{$_} = 1; }
+        #print Dumper($sn_hash);
+        my %managed = ();
+        foreach (keys %$sn_hash) {
+            if (exists($iphash{$_})) {
+                my $cur_xmaster = $_;
+                foreach (@{ $sn_hash->{$cur_xmaster} }) { $managed{$_} = 1; }
+                last;
+            }
+        }
 
         foreach (@rnodes) {
+            # For MN, the scope is all CN, for SN, the scope is the nodes it managed if disjointnetboot is set.
+            my $req2manage = exists($managed{$_}) || xCAT::Utils->isMN();
+            if ($mynodeonly == 1 && $req2manage != 1) {
+                push @unmanagednodes, $_;
+                next;
+            }
+
+            # Only handle its boot configuration files if the node in same subnet
             if (xCAT::NetworkUtils->nodeonmynet($_)) {
                 push @nodes, $_;
             } else {
                 my $msg = "petitboot configuration file was not created for node [$_] because sharedtftp attribute is not set and the node is not on same network as this xcatmaster";
-                if ( $cur_xmaster ) {
-                    $msg .= ": $cur_xmaster";
-                }
-                if ( exists( $managed{$_} ) ) {
+                $msg .= ": $::myxcatname" if ( $::myxcatname );
+
+                if ($req2manage == 1) {
                     # report error when it is under my control but I cannot handle it.
                     my $rsp;
                     $rsp->{data}->[0] = $msg;
diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm
index dd8fe9d1c..773b75065 100644
--- a/xCAT-server/lib/xcat/plugins/xnba.pm
+++ b/xCAT-server/lib/xcat/plugins/xnba.pm
@@ -411,6 +411,7 @@ sub preprocess_request {
             return xCAT::Scope->get_broadcast_scope_with_parallel($req);
         }
     }
+    # Do not dispatch to service nodes if non-sharedtftp or the node range contains only SNs.
     return xCAT::Scope->get_parallel_scope($req);
 }
 
@@ -450,28 +451,56 @@ sub process_request {
         return;
     }
 
-    #if not shared, then help sync up
+    my @hostinfo = xCAT::NetworkUtils->determinehostname();
+    $::myxcatname = $hostinfo[(scalar @hostinfo) - 1];
+    xCAT::MsgUtils->trace(0, "d", "xnba: running on $::myxcatname");
+
+    my @unmanagednodes = ();
+    #if not shared tftpdir, then broadcast, otherwise, set up everything
     if ($::XNBA_request->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
         @nodes = ();
-        my @hostinfo = xCAT::NetworkUtils->determinehostname();
-        my $cur_xmaster = pop @hostinfo;
-        xCAT::MsgUtils->trace(0, "d", "xnba: running on $cur_xmaster");
-        
-        # Get current server managed node list
-        my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@rnodes, "xcat", "MN");
-        my %managed = {};
-        foreach (@{ $sn_hash->{$cur_xmaster} }) { $managed{$_} = 1; }
 
-        # Whatever the node managed by this xcatmaster explicitly, if the node in same subnet, we need to handle its boot configuration files
+        my %iphash   = ();
+        # flag the IPs or names in iphash
+        foreach (@hostinfo) { $iphash{$_} = 1; }
+        #print Dumper(\%iphash);
+
+        my $mynodeonly  = 0;
+        my @entries = xCAT::TableUtils->get_site_attribute("disjointnetboot");
+        my $t_entry = $entries[0];
+        if (defined($t_entry)) {
+            $mynodeonly = $t_entry;
+        }
+        xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: disjointnetboot=$mynodeonly");
+
+        # Get managed node list under current server
+        # The node will be under under 'site.master' if no 'noderes.servicenode' is defined
+        my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@rnodes, "xcat", "MN");
+        #print Dumper($sn_hash);
+        my %managed = ();
+        foreach (keys %$sn_hash) {
+            if (exists($iphash{$_})) {
+                my $cur_xmaster = $_;
+                foreach (@{ $sn_hash->{$cur_xmaster} }) { $managed{$_} = 1; }
+                last;
+            }
+        }
+
         foreach (@rnodes) {
+            # For MN, the scope is all CN, for SN, the scope is the nodes it managed if disjointnetboot is set.
+            my $req2manage = exists($managed{$_}) || xCAT::Utils->isMN();
+            if ($mynodeonly == 1 && $req2manage != 1) {
+                push @unmanagednodes, $_;
+                next;
+            }
+            # Only handle its boot configuration files if the node in same subnet
             if (xCAT::NetworkUtils->nodeonmynet($_)) {
                 push @nodes, $_;
             } else {
                 my $msg = "xnba configuration file was not created for node [$_] because sharedtftp attribute is not set and the node is not on same network as this xcatmaster";
-                if ( $cur_xmaster ) { 
-                    $msg .= ": $cur_xmaster"; 
-                }
-                if ( exists( $managed{$_} ) ) {
+                $msg .= ": $::myxcatname" if ( $::myxcatname );
+
+                if ($req2manage == 1) {
                     # report error when it is under my control but I cannot handle it.
                     my $rsp;
                     $rsp->{data}->[0] = $msg;

From 2e912290f951629dab2b7bacb133070cae856751 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Fri, 14 Jul 2017 03:09:25 -0400
Subject: [PATCH 157/283] add new test case to hardware control bundles

---
 xCAT-test/autotest/bundle/hdctrl_general.bundle           | 1 +
 xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle    | 5 +++++
 xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle | 2 ++
 xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle           | 1 +
 4 files changed, 9 insertions(+)

diff --git a/xCAT-test/autotest/bundle/hdctrl_general.bundle b/xCAT-test/autotest/bundle/hdctrl_general.bundle
index e7020b1d6..4e77d1625 100644
--- a/xCAT-test/autotest/bundle/hdctrl_general.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_general.bundle
@@ -17,6 +17,7 @@ rinv_serial
 rinv_model
 rinv_firm
 rinv_all
+rinv_mixnode
 rvitals_h
 rvitals_v
 rvitals_errorcommand
diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
index c44ce9d54..cadbed43c 100644
--- a/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
@@ -5,7 +5,12 @@ rinv_uuid
 rinv_guid
 rinv_vpd
 rinv_mprom
+rinv_wrongbmcpasswd
 rvitals_wattage
 rvitals_fanspeed
 rvitals_power
 rvitals_leds
+rpower_errorcommand_OpenpowerBmc
+rpower_softoff_OpenpowerBmc
+rpower_suspend_OpenpowerBmc
+rpower_wake_OpenpowerBmc
diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
index 42e3d05a2..e75690b30 100644
--- a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
@@ -5,10 +5,12 @@ rinv_uuid
 rinv_vpd
 rinv_cpu
 rinv_dimm
+rinv_wrongbmcpasswd
 rvitals_wattage
 rvitals_fanspeed
 rvitals_power
 rvitals_leds
+rvitals_altitude
 rsetboot_net_statcheck
 rsetboot_cd_statcheck
 rsetboot_default_statcheck
diff --git a/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle
index 51a886de1..cbd2d4d0a 100644
--- a/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle
@@ -4,4 +4,5 @@ rpower_softoff
 rpower_onstandby
 rinv_bus
 rinv_config
+rinv_wrongbmcpasswd
 rvitals_lcds

From 5e7b3f40e4476c065fb21f26ae87df6948f8a31e Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Fri, 14 Jul 2017 03:24:56 -0400
Subject: [PATCH 158/283] add new case mkdef_regex_nicsip to travis CI test
 bundle

---
 xCAT-test/autotest/bundle/MN_basic.bundle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xCAT-test/autotest/bundle/MN_basic.bundle b/xCAT-test/autotest/bundle/MN_basic.bundle
index 1b5b74063..b093ba584 100644
--- a/xCAT-test/autotest/bundle/MN_basic.bundle
+++ b/xCAT-test/autotest/bundle/MN_basic.bundle
@@ -103,6 +103,7 @@ mkdef_template_cec_template_without_remainder
 mkdef_template_invalid_template
 mkdef_template_switch_template_without_attribute
 mkdef_z
+mkdef_regex_nicsip
 nodeadd_err_symbol
 nodeadd_h
 nodeadd_noderange

From 6627df0307707b083b43a94f8e6031361609937e Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Fri, 14 Jul 2017 06:58:22 -0400
Subject: [PATCH 159/283] modify rpower testcase if ipmi using wrong passwd

---
 .../rpower/rpower_ipmi_wrongpasswd_test.sh    | 118 ------------------
 1 file changed, 118 deletions(-)
 delete mode 100755 xCAT-test/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh

diff --git a/xCAT-test/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh b/xCAT-test/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh
deleted file mode 100755
index a0b176bb0..000000000
--- a/xCAT-test/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-function check_passwd_table(){
-tabdump passwd |grep ipmi
-    if [ $? -eq 0 ];then
-        `tabdump passwd |grep ipmi>/tmp/xcat_test_rpower_ipmi_wrongpasswd`
-    else
-        return 1;
-    fi
-}
-function modify_passwd_table(){
-Username=`cat /tmp/xcat_test_rpower_ipmi_wrongpasswd |awk -F "\""  '{print $4}'`;
-Passwd=`cat /tmp/xcat_test_rpower_ipmi_wrongpasswd |awk -F "\""  '{print $6}'`;
-`chtab key=ipmi passwd.password=$Passwd.wrong passwd.username=$Username`;
-tabdump passwd;
-}
-function add_passwd_table()
-{
-echo i is $1,$2,$3
-`chtab key=ipmi passwd.password=$2 passwd.username=$3`;
-rpower $1 stat
-    if [ $? -eq 0 ];then
-        `chtab key=ipmi passwd.password=$2.wrong passwd.username=$3`;
-        tabdump passwd;
-    else
-        echo "wrong password";
-    fi
-}
-function modify_node_definition()
-{
-echo node is  $1,$2,$3
-chdef $1 bmcpassword=$2  bmcusername=$3
-rpower $1 stat
-    if [ $? -eq 0 ];then
-        chdef $1 bmcpassword=$2.wrong  bmcusername=$3;
-        tabdump passwd;
-    else
-         echo "wrong password";
-    fi
-}
-function clear_env(){
-    if [ -f /tmp/xcat_test_rpower_ipmi_wrongpasswd ];then
-        Username=`cat /tmp/xcat_test_rpower_ipmi_wrongpasswd |awk -F "\""  '{print $4}'`;
-        Passwd=`cat /tmp/xcat_test_rpower_ipmi_wrongpasswd |awk -F "\""  '{print $6}'`;
-        chtab key=ipmi passwd.password=$Passwd passwd.username=$Username;tabdump passwd; 
-        rm -rf /tmp/xcat_test_rpower_ipmi_wrongpasswd;
-    else
-        `chtab -d key=ipmi passwd`;
-        chdef $1 bmcpassword= bmcusername=;
-    fi
-}
-function check_result(){
-echo node is $1;
-output=$(rpower $1 stat /dev/null  2>&1)
-echo output is $output
-    if [[ $output =~ "Incorrect password provided" ]];then
-        return 0;
-    else
-        return 1;
-    fi
-}
-while [ "$#" -gt "0" ]
-do
-        case $1 in
-                "-pt"|"--passwdtable" )
-                check_passwd_table
-                    if [[ $? -eq 0 ]];then  
-                        modify_passwd_table
-                        check_result $2
-                            if [[ $? -eq 1 ]];then
-                                exit 1
-                            else
-                                exit 0
-                            fi
-
-                    else
-                        add_passwd_table $2 $3 $4
-                        check_result $2
-                            if [[ $? -eq 1 ]];then
-                                exit 1
-                            else
-                                exit 0
-                            fi
-                    fi
-                ;;
-                "-apt"|"--addpasswdtable" )
-                check_passwd_table
-                    if [[ $? -eq 0 ]];then
-                        `chtab -d key=ipmi passwd`;                        
-                            if [[ $? -eq 1 ]];then
-                                exit 1
-                            fi
-                    fi
-                    modify_node_definition  $2 $3 $4
-                    check_result $2
-                        if [[ $? -eq 1 ]];then
-                            exit 1
-                        else
-                            exit 0
-                        fi
-                ;;
-                "-c"|"--clear" )
-                clear_env $2 
-                if [[ $? -eq 1 ]];then
-                    exit 1
-                else
-                    exit 0
-                fi
-                ;;
-                *)
-                echo
-                echo "Please Insert $0: -pt|-apt|-c"
-                echo
-                exit 1;
-                ;;
-                esac
-done
-
-

From 25165bb81ab1df50f5a2bdfc5fa1aca58203c85c Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Fri, 14 Jul 2017 06:58:54 -0400
Subject: [PATCH 160/283] modify rpower testcase if ipmi using wrong passwd

---
 xCAT-test/autotest/testcase/rpower/cases0     |  35 ++---
 .../rpower/rpower_wrongpasswd_test.sh         | 136 ++++++++++++++++++
 2 files changed, 149 insertions(+), 22 deletions(-)
 create mode 100755 xCAT-test/autotest/testcase/rpower/rpower_wrongpasswd_test.sh

diff --git a/xCAT-test/autotest/testcase/rpower/cases0 b/xCAT-test/autotest/testcase/rpower/cases0
index 40dfa7a08..c7a1f70af 100644
--- a/xCAT-test/autotest/testcase/rpower/cases0
+++ b/xCAT-test/autotest/testcase/rpower/cases0
@@ -152,44 +152,35 @@ cmd:rpower $$CN onstandby
 cmd:a=0;while ! `rpower $$CN stat|grep "standby\|Standby" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 check:ouptut=~standby|Standby
 end
-start:rpower_suspend_OpenpowerBmc
-description:rpower openpowerbmc using suspend
+start:rpower__wrongpasswd
+description:rpower ipmi and openbmc using wrong passwd  
 Attribute: $$CN-The operation object of rpower command
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_wrongpasswd_test.sh  -pt $$CN  $$rightbmcpasswd $$rightbmcusername
+check:rc==0
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_wrongpasswd_test.sh  -c $$CN 
+check:rc==0
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_wrongpasswd_test.sh  -apt $$CN  $$rightbmcpasswd $$rightbmcusername
+check:rc==0
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_wrongpasswd_test.sh  -c $$CN
+check:rc==0
+end
+start:rpower_suspend_OpenpowerBmc
 cmd:rpower $$CN suspend
 check:output=~Error: unsupported command rpower suspend for OpenPOWER
 check:rc==1
 end
 start:rpower_softoff_OpenpowerBmc
-description:rpower openpowerbmc using softoff
-Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN softoff
 check:output=~Error: unsupported command rpower softoff for OpenPOWER
 check:rc==1
 end
 start:rpower_wake_OpenpowerBmc
-description:rpower openpowerbmc using wake
-Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN wake
 check:output=~Error: unsupported command rpower wake for OpenPOWER
 check:rc==1
 end
 start:rpower_errorcommand_OpenpowerBmc
-description:rpower openpowerbmc using errorcommand
-Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN ddd
-check:output=~Unsupported command:
+check:output=~Unsupported command: 
 check:rc==1
 end
-start:rpower_ipmi_wrongpasswd
-description:rpower ipmi and its password wrong
-Attribute: $$CN-The operation object of rpower command
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh  -pt $$CN  $$ipmipasswd $$ipminame
-check:rc==0
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh  -c $$CN
-check:rc==0
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh  -apt $$CN  $$ipmipasswd $$ipminame
-check:rc==0
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rpower/rpower_ipmi_wrongpasswd_test.sh  -c $$CN
-check:rc==0
-end
-
diff --git a/xCAT-test/autotest/testcase/rpower/rpower_wrongpasswd_test.sh b/xCAT-test/autotest/testcase/rpower/rpower_wrongpasswd_test.sh
new file mode 100755
index 000000000..1e0b41222
--- /dev/null
+++ b/xCAT-test/autotest/testcase/rpower/rpower_wrongpasswd_test.sh
@@ -0,0 +1,136 @@
+#!/bin/bash
+function check_passwd_table(){
+tabdump passwd |grep $MGT
+    if [ $? -eq 0 ];then
+        `tabdump passwd |grep $MGT>$TMPFILE`
+    else
+        return 1;
+    fi
+}
+function modify_passwd_table(){
+Username=`cat $TMPFILE |awk -F "\""  '{print $4}'`;
+Passwd=`cat $TMPFILE |awk -F "\""  '{print $6}'`;
+`chtab key=$MGT passwd.password=$Passwd.wrong passwd.username=$Username`;
+tabdump passwd;
+}
+function add_passwd_table()
+{
+`chtab key=$MGT passwd.password=$2 passwd.username=$3`;
+rpower $1 stat
+    if [ $? -eq 0 ];then
+        `chtab key=$MGT passwd.password=$2.wrong passwd.username=$3`;
+        tabdump passwd;
+    else
+        echo "wrong password";
+    fi
+}
+function modify_node_definition()
+{
+chdef $1 bmcpassword=$2  bmcusername=$3
+rpower $1 stat
+    if [ $? -eq 0 ];then
+        chdef $1 bmcpassword=$2.wrong  bmcusername=$3;
+        tabdump passwd;
+    else
+         echo "wrong password";
+    fi
+}
+function clear_env(){
+    if [ -f $TMPFILE ];then
+        Username=`cat $TMPFILE |awk -F "\""  '{print $4}'`;
+        Passwd=`cat $TMPFILE |awk -F "\""  '{print $6}'`;
+        chtab key=$MGT passwd.password=$Passwd passwd.username=$Username;tabdump passwd; 
+        chdef $1 bmcpassword= bmcusername=;
+        rm -rf $TMPFILE;
+    else
+        `chtab -d key=$MGT passwd`;
+        chdef $1 bmcpassword= bmcusername=;
+    fi
+}
+function check_result(){
+output=$(rpower $1 stat  2>&1)
+echo output is $output
+value="";
+    if [[ `lsdef $1 |grep mgt ` =~ "ipmi" ]];then 
+        value="Incorrect password provided";
+    else 
+        value="Error: Invalid username or password";
+    fi
+        if [[ $output =~ $value ]];then
+            return 0;
+        else
+            return 1;
+        fi
+}
+echo "0 ARG: $0"
+
+SCRIPT=$(readlink -f $0)
+echo "SCRIPT=$SCRIPT"
+
+TMPFILE="/tmp/xcat-test-`basename $SCRIPT`.tmp"
+echo "TMPFILE=$TMPFILE"
+MGT=""
+    if [[ `lsdef $2 |grep mgt` =~ "ipmi" ]];then
+        MGT="ipmi";
+    else
+        MGT="openbmc";
+    fi
+echo mgt is $MGT 
+while [ "$#" -gt "0" ]
+do
+        case $1 in
+                "-pt"|"--passwdtable" )
+                check_passwd_table
+                    if [[ $? -eq 0 ]];then  
+                        modify_passwd_table 
+                        check_result $2
+                            if [[ $? -eq 1 ]];then
+                                exit 1
+                            else
+                                exit 0
+                            fi
+
+                    else
+                        add_passwd_table $2 $3 $4
+                        check_result $2
+                            if [[ $? -eq 1 ]];then
+                                exit 1
+                            else
+                                exit 0
+                            fi
+                    fi
+                ;;
+                "-apt"|"--addpasswdtable" )
+                check_passwd_table
+                    if [[ $? -eq 0 ]];then
+                        `chtab -d key=ipmi passwd`;                        
+                            if [[ $? -eq 1 ]];then
+                                exit 1
+                            fi
+                    fi
+                    modify_node_definition  $2 $3 $4
+                    check_result $2
+                        if [[ $? -eq 1 ]];then
+                            exit 1
+                        else
+                            exit 0
+                        fi
+                ;;
+                "-c"|"--clear" )
+                clear_env $2 
+                if [[ $? -eq 1 ]];then
+                    exit 1
+                else
+                    exit 0
+                fi
+                ;;
+                *)
+                echo
+                echo "Please Insert $0: -pt|-apt|-c"
+                echo
+                exit 1;
+                ;;
+                esac
+done
+
+

From 469fc29013bb8488c64d8e5777660840b830725e Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Wed, 12 Jul 2017 18:09:39 -0400
Subject: [PATCH 161/283] Framework and code to support rbeacon on/off

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 5f1717548..721c717e4 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -30,6 +30,9 @@ use xCAT::GlobalDef;
 use xCAT_monitoring::monitorctrl;
 
 $::VERBOSE = 0;
+# String constants for rbeacon states
+$::BEACON_STATE_OFF="off";
+$::BEACON_STATE_ON="on";
 # String constants for rpower states
 $::POWER_STATE_OFF          = "off";
 $::POWER_STATE_ON           = "on";
@@ -106,6 +109,23 @@ my %status_info = (
         process        => \&login_response,
     },
 
+    RBEACON_ON_REQUEST  => {
+        method         => "PUT",
+        init_url       => "$openbmc_project_url/led/groups/enclosure_identify/attr/Asserted", 
+        data           => "true",
+    },
+    RBEACON_ON_RESPONSE => {
+        process        => \&rbeacon_response,
+    },
+    RBEACON_OFF_REQUEST  => {
+        method         => "PUT",
+        init_url       => "$openbmc_project_url/led/groups/enclosure_identify/attr/Asserted",
+        data           => "false",
+    },
+    RBEACON_OFF_RESPONSE => {
+        process        => \&rbeacon_response,
+    },
+
     REVENTLOG_REQUEST => {
         method         => "GET",
         init_url       => "$openbmc_project_url/logging/enumerate",
@@ -460,7 +480,11 @@ sub parse_args {
          $subcommand = $ARGV[0]
     }
 
-    if ($command eq "rpower") {
+    if ($command eq "rbeacon") { 
+        unless ($subcommand =~ /^on$|^off$/) {
+	    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" ]);
         }
@@ -582,6 +606,18 @@ sub parse_command_status {
         return 1;
     }
 
+    if ($command eq "rbeacon") { 
+        $subcommand = $ARGV[0];
+
+        if ($subcommand eq "on") {
+            $next_status{LOGIN_RESPONSE} = "RBEACON_ON_REQUEST";
+            $next_status{RBEACON_ON_REQUEST} = "RBEACON_ON_RESPONSE";
+        } elsif ($subcommand eq "off") {
+            $next_status{LOGIN_RESPONSE} = "RBEACON_OFF_REQUEST";
+            $next_status{RBEACON_OFF_REQUEST} = "RBEACON_OFF_RESPONSE";
+        }
+    }
+
     if ($command eq "rpower") {
         $subcommand = $$subcommands[0];
 
@@ -1331,6 +1367,45 @@ sub rsetboot_response {
     return;
 }
 
+#-------------------------------------------------------
+
+=head3  rbeacon_response
+
+  Deal with response of rbeacon command
+  Input:
+        $node: nodename of current response
+        $response: Async return response
+
+=cut
+
+#-------------------------------------------------------
+sub rbeacon_response {
+    my $node = shift;
+    my $response = shift;
+
+    my $response_info = decode_json $response->content;
+
+    if ($node_info{$node}{cur_status} eq "RBEACON_ON_RESPONSE") {
+        if ($response_info->{'message'} eq $::RESPONSE_OK) {
+            xCAT::SvrUtils::sendmsg("$::BEACON_STATE_ON", $callback, $node);
+        }
+    } 
+
+    if ($node_info{$node}{cur_status} eq "RBEACON_OFF_RESPONSE") {
+        if ($response_info->{'message'} eq $::RESPONSE_OK) {
+            xCAT::SvrUtils::sendmsg("$::BEACON_STATE_OFF", $callback, $node);
+        }
+    }
+
+    if ($next_status{ $node_info{$node}{cur_status} }) {
+        $node_info{$node}{cur_status} = $next_status{ $node_info{$node}{cur_status} };
+        gen_send_request($node);
+    } else {
+        $wait_node_num--;
+    }
+}
+
+
 #-------------------------------------------------------
 
 =head3  reventlog_response

From 2523fafe0a16966ba8e60789f4db0fe1c326c709 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Thu, 13 Jul 2017 16:13:59 -0400
Subject: [PATCH 162/283] Add support for passing in "boolean" values in the
 openbmc REST interfaces.  Perl doesn't really support this so pass in
 "true/false" as strings and we will create the JSON data object without
 quotes

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 721c717e4..9455aaf78 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -945,7 +945,12 @@ sub gen_send_request {
     }
 
     if ($status_info{ $node_info{$node}{cur_status} }{data}) {
-        $content = '{"data":"' . $status_info{ $node_info{$node}{cur_status} }{data} . '"}';
+        # Handle boolean values by create the json objects without wrapping with quotes
+        if ($status_info{ $node_info{$node}{cur_status} }{data} =~ /^1$|^true$|^True$|^0$|^false$|^False$/) {
+            $content = '{"data":' . $status_info{ $node_info{$node}{cur_status} }{data} . '}';
+        } else {
+            $content = '{"data":"' . $status_info{ $node_info{$node}{cur_status} }{data} . '"}';
+        }
     }
 
     if ($node_info{$node}{cur_url}) {

From 7667573a8197f0f06d02b6721be360354399104f Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Fri, 14 Jul 2017 09:03:39 -0400
Subject: [PATCH 163/283] Change to support hierarchy, implemented in PR #3450

---
 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 9455aaf78..d5335de51 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -607,7 +607,7 @@ sub parse_command_status {
     }
 
     if ($command eq "rbeacon") { 
-        $subcommand = $ARGV[0];
+        $subcommand = $$subcommands[0];
 
         if ($subcommand eq "on") {
             $next_status{LOGIN_RESPONSE} = "RBEACON_ON_REQUEST";

From 464ef135d564f18de2f563cc07c8e8d09ea51532 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Fri, 14 Jul 2017 11:21:19 -0400
Subject: [PATCH 164/283] rflash for Supermicro Briggs and Boston nodes

---
 .../admin-guides/references/man1/rflash.1.rst |  23 +++-
 perl-xCAT/xCAT/Usage.pm                       |   2 +-
 xCAT-client/pods/man1/rflash.1.pod            |  17 ++-
 xCAT-server/lib/xcat/plugins/ipmi.pm          | 126 ++++++++++++++++--
 4 files changed, 153 insertions(+), 15 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 087047ab6..a726a77b6 100644
--- a/docs/source/guides/admin-guides/references/man1/rflash.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rflash.1.rst
@@ -11,7 +11,7 @@ Name
 ****
 
 
-\ **rflash**\  - Performs Licensed Internal Code (LIC) update support for HMC-attached POWER5 and POWER6 Systems, and POWER7 systems using Direct FSP management. \ **rflash**\  is also able to update firmware for NextScale Fan Power Controllers (FPC).
+\ **rflash**\  - Performs Licensed Internal Code (LIC) update support for HMC-attached POWER5 and POWER6 Systems, and POWER7 systems using Direct FSP management. POWER8 and POWER9 systems are also supported. \ **rflash**\  is also able to update firmware for NextScale Fan Power Controllers (FPC).
 
 
 ****************
@@ -50,7 +50,7 @@ OpenPOWER BMC specific:
 =======================
 
 
-\ **rflash**\  \ *noderange*\  \ *hpm_file_path*\  [\ **-c | -**\ **-check**\ ] [\ **-**\ **-retry=**\ \ *count*\ ] [\ **-V**\ ]
+\ **rflash**\  \ *noderange*\  [\ *hpm_file_path*\  | \ **-d=**\ \ *data_directory] [\ \*\*-c\*\*\ |\ \*\*-**\ **-check\*\*\ ] [\ \*\*-**\ **-retry=\*\*\ \ \*count\*\ ] [\ \*\*-V\*\*\ ]*\ 
 
 
 
@@ -122,7 +122,8 @@ OpenPOWER specific:
 ===================
 
 
-The command will update firmware for OpenPOWER BMC when given an OpenPOWER node and the hpm1 formatted file path.
+The command will update firmware for OpenPOWER BMC when given an OpenPOWER node and either the hpm formatted file path or path to a data directory.
+\ **Note:**\  When using \ **rflash**\  in hierarchical environment, the hpm file or data directory must be accessible from Service Nodes. Shared storage can be used to accomplish that, alternatively the hpm file or contents of the data directory can be copied to Service Nodes.
 
 
 
@@ -156,6 +157,12 @@ The command will update firmware for OpenPOWER BMC when given an OpenPOWER node
  
 
 
+\ **-d=**\ \ *data_directory*\ 
+ 
+ Used for Supermicro systems only. Specifies the directory where the \ **pUpdate**\  utility and at least one of BMC or PNOR update files are located. The utility and update files can be downloaded from FixCentral.
+ 
+
+
 \ **-**\ **-activate**\  {\ **concurrent**\  | \ **disruptive**\ }
  
  Must be specified to activate the new Licensed Internal Code.  The "disruptive" option will cause the target systems to be recycled.  Without this flag, LIC updates will be installed only, not activated.
@@ -267,6 +274,16 @@ The command will update firmware for OpenPOWER BMC when given an OpenPOWER node
  
 
 
+6. To update the firmware on OpenPOWER Supermicro machine specify the node name and the file path of the data directory containing pUpdate utility and BMC and/or PNOR update files:
+ 
+ 
+ .. code-block:: perl
+ 
+   rflash briggs01 -d=/root/supermicro/OP825
+ 
+ 
+
+
 
 ****************
 \ **Location**\ 
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 4ca8093c0..70e915606 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -340,7 +340,7 @@ my %usage = (
 	rflash <noderange> [--commit | --recover] [-V|--verbose]
         rflash <noderange> [--bpa_acdl]
     PPC64LE (using BMC Management) specific:
-        rflash <noderange> [-c | --check] [--retry=<count>] [-V] <hpm_file>",
+        rflash <noderange> [-c | --check] [--retry=<count>] [-V] [<hpm_file>|-d=<data_directory>]",
     "mkhwconn" =>
       "Usage:
     mkhwconn [-h|--help]
diff --git a/xCAT-client/pods/man1/rflash.1.pod b/xCAT-client/pods/man1/rflash.1.pod
index 091eec11a..d1af6a58f 100644
--- a/xCAT-client/pods/man1/rflash.1.pod
+++ b/xCAT-client/pods/man1/rflash.1.pod
@@ -1,6 +1,6 @@
 =head1 Name
 
-B<rflash> - Performs Licensed Internal Code (LIC) update support for HMC-attached POWER5 and POWER6 Systems, and POWER7 systems using Direct FSP management. B<rflash> is also able to update firmware for NextScale Fan Power Controllers (FPC).
+B<rflash> - Performs Licensed Internal Code (LIC) update support for HMC-attached POWER5 and POWER6 Systems, and POWER7 systems using Direct FSP management. POWER8 and POWER9 systems are also supported. B<rflash> is also able to update firmware for NextScale Fan Power Controllers (FPC).
 
 =head1 B<Synopsis>
 
@@ -24,7 +24,7 @@ B<rflash> I<noderange> I<http_directory>
 
 =head2 OpenPOWER BMC specific:
 
-B<rflash> I<noderange> I<hpm_file_path> [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<-V>]
 
 =head1 B<Description>
 
@@ -38,6 +38,7 @@ The I<noderange> can be an CEC or CEC list, a Lpar or Lpar list and a Frame or F
 
 The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware. 
 
+
 =head2 PPC (with HMC) specific:
 
 The B<rflash> command uses the B<xdsh> command to connect to the HMC controlling the given managed system and perform the updates. Before running B<rflash>, use B<rspconfig> to check if the related HMC ssh is enabled. To enable a HMC ssh connection, use B<rspconfig> command.
@@ -80,7 +81,8 @@ The command will update firmware for NeXtScale FPC when given an FPC node and th
 
 =head2 OpenPOWER specific:
 
-The command will update firmware for OpenPOWER BMC when given an OpenPOWER node and the hpm1 formatted file path.
+The command will update firmware for OpenPOWER BMC when given an OpenPOWER node and either the hpm formatted file path or path to a data directory.
+B<Note:> When using B<rflash> in hierarchical environment, the hpm file or data directory must be accessible from Service Nodes. Shared storage can be used to accomplish that, alternatively the hpm file or contents of the data directory can be copied to Service Nodes.
 
 =head1 B<Options>
 
@@ -102,6 +104,10 @@ Specifies the directory where the packages are located.
 
 Specifies the directory where the raw data from rpm packages for each CEC/Frame are located. The default directory is /tmp. The option is only used in Direct FSP/BPA Management. 
 
+=item B<-d=>I<data_directory>
+
+Used for Supermicro systems only. Specifies the directory where the B<pUpdate> utility and at least one of BMC or PNOR update files are located. The utility and update files can be downloaded from FixCentral. 
+
 =item B<--activate> {B<concurrent> | B<disruptive>}
 
 Must be specified to activate the new Licensed Internal Code.  The "disruptive" option will cause the target systems to be recycled.  Without this flag, LIC updates will be installed only, not activated.
@@ -167,6 +173,11 @@ Print verbose message to rflash log file (/var/log/xcat/rflash/fs3.log) when upd
 
  rflash fs3 /firmware/8335_810.1543.20151021b_update.hpm -V
 
+=item 6.
+To update the firmware on OpenPOWER Supermicro machine specify the node name and the file path of the data directory containing pUpdate utility and BMC and/or PNOR update files:
+
+ rflash briggs01 -d=/root/supermicro/OP825
+
 =back
 
 =head1 B<Location>
diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 2c7d5abe4..fa267706c 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -1825,6 +1825,7 @@ sub do_firmware_update {
     my $is_firestone = 0;
     my $firestone_update_version;
     my $htm_update_version;
+    my $pUpdate_directory;
     $ret = get_ipmitool_version(\$ipmitool_ver);
     exit $ret if $ret < 0;
 
@@ -1866,12 +1867,6 @@ sub do_firmware_update {
                 errorcode => 1 });
         exit -1;
     }
-    if (($hpm_data_hash{deviceID} ne $sessdata->{device_id}) ||
-        ($hpm_data_hash{productID} ne $sessdata->{prod_id}) ||
-        ($hpm_data_hash{manufactureID} ne $sessdata->{mfg_id})) {
-        $exit_with_error_func->($sessdata->{node}, $callback,
-            "The image file doesn't match this machine");
-    }
 
     my $output;
     my $bmc_addr     = $sessdata->{ipmisession}->{bmc};
@@ -1885,6 +1880,7 @@ sub do_firmware_update {
         $hpm_file = xCAT::Utils->full_path($hpm_file, $::cwd);
     }
 
+    my $rflash_log_file = xCAT::Utils->full_path($sessdata->{node}.".log", RFLASH_LOG_DIR);
 
     # NOTE (chenglch) lanplus should be used for the task of hpm update
     # which indicate the bmc support ipmi protocol version 2.0.
@@ -1937,6 +1933,121 @@ sub do_firmware_update {
                 }
             }
         }
+        if ($opt =~ /-d=/) {
+            my ($attribute, $directory_name) = split(/=/, $opt);
+            if (defined $directory_name) {
+                # directory was passed in, verify it is valid
+                if (-d $directory_name) {
+                   # Passed in directory name exists
+                   $pUpdate_directory = $directory_name;
+                }
+                else {
+                    $exit_with_error_func->($sessdata->{node}, $callback,
+                    "Can not access data directory $directory_name");
+                }
+            }
+            else {
+                $exit_with_error_func->($sessdata->{node}, $callback,
+                    "Data directory must be specified.");
+            }
+        }
+    }
+
+    # For Supermicro machines such as P9 Boston (9006-22C) or P8 Briggs (8001-22C) 
+    # firmware update is done using pUpdate utility expected to be in the 
+    # specified data directory along with the update files .bin for BMC or .pnor for Host
+    if ($output =~ /8001-22C|9006-22C/) {
+        # Verify valid data directory was specified
+        unless ($pUpdate_directory) {
+            $exit_with_error_func->($sessdata->{node}, $callback,
+                "Directory name is required to update Boston or Briggs machines.");
+        }
+        
+        # Verify specified directory contains executable pUpdate utility
+        unless (-x "$pUpdate_directory/pUpdate") {
+            $exit_with_error_func->($sessdata->{node}, $callback,
+                "Can not find executable pUpdate utility in data directory $pUpdate_directory.");
+        }
+
+        # Verify there is at least one of update files inside data directory - .bin or .pnor
+
+        my @pnor_files = <"$pUpdate_directory/*.pnor">; # Get a list of all .pnor files
+        my @bmc_files  = <"$pUpdate_directory/*.bin">;  # Get a list of all .bin files
+
+        if (scalar(@pnor_files) > 1) {
+            # Error if more than one .pnor file in data directory
+            $exit_with_error_func->($sessdata->{node}, $callback,
+                "Multiple PNOR update files detected in data directory $pUpdate_directory.");
+        }
+
+        if (scalar(@bmc_files) > 1) {
+            # Error if more than one .bin file in data directory
+            $exit_with_error_func->($sessdata->{node}, $callback,
+                "Multiple BMC update files detected in data directory $pUpdate_directory.");
+        }
+
+        my $pnor_file;
+        if (scalar(@pnor_files) > 0) {
+            $pnor_file = $pnor_files[0];
+        }
+
+        my $bmc_file;
+        if (scalar(@bmc_files) > 0) {
+            $bmc_file = $bmc_files[0];
+        }
+
+        # At least one update file is needed, .bmc or .pnor
+        unless ($pnor_file || $bmc_file) {
+            $exit_with_error_func->($sessdata->{node}, $callback,
+                "At least one update file (.bin or .pnor) needs to be in data directory $pUpdate_directory.");
+        }
+        # All checks are done, run pUpdate utility on each of the update files found in 
+        # the specified data directory
+        xCAT::SvrUtils::sendmsg("rflash started, Please wait...", $callback, $sessdata->{node});
+
+        if ($bmc_file) {
+            # BMC file was found in data directory, run update with it
+            my $pUpdate_bmc_cmd = "$pUpdate_directory/pUpdate -f $bmc_file -i lan -h $bmc_addr -u $bmc_userid -p $bmc_password >".$rflash_log_file." 2>&1";
+            if ($verbose) {
+                xCAT::SvrUtils::sendmsg([ 0,
+                    "rflashing BMC, see the detail progress :\"tail -f $rflash_log_file\"" ],
+                    $callback, $sessdata->{node});
+            }
+            my $output = xCAT::Utils->runcmd($pUpdate_bmc_cmd, -1);
+            if ($::RUNCMD_RC != 0) {
+                $exit_with_error_func->($sessdata->{node}, $callback,
+                    "Error running command $pUpdate_bmc_cmd");
+            }
+            if ($verbose) {
+                xCAT::SvrUtils::sendmsg([ 0, "Waiting for BMC to reboot (2 min)..." ], $callback, $sessdata->{node});
+            }
+            sleep (120);
+        }
+
+
+        if ($pnor_file) {
+            # PNOR file was found in data directory, run update with it
+            my $pUpdate_pnor_cmd = "$pUpdate_directory/pUpdate -pnor $pnor_file -i lan -h $bmc_addr -u $bmc_userid -p $bmc_password >>".$rflash_log_file." 2>&1";
+            if ($verbose) {
+                xCAT::SvrUtils::sendmsg([ 0,
+                    "rflashing PNOR, see the detail progress :\"tail -f $rflash_log_file\"" ],
+                    $callback, $sessdata->{node});
+            }
+            my $output = xCAT::Utils->runcmd($pUpdate_pnor_cmd, -1);
+            if ($::RUNCMD_RC != 0) {
+                $exit_with_error_func->($sessdata->{node}, $callback,
+                    "Error running command $pUpdate_pnor_cmd");
+            }
+        }
+
+        $exit_with_success_func->($sessdata->{node}, $callback, "Firmware updated");
+    }
+
+    if (($hpm_data_hash{deviceID} ne $sessdata->{device_id}) ||
+        ($hpm_data_hash{productID} ne $sessdata->{prod_id}) ||
+        ($hpm_data_hash{manufactureID} ne $sessdata->{mfg_id})) {
+        $exit_with_error_func->($sessdata->{node}, $callback,
+            "The image file doesn't match this machine");
     }
 
     # check for 8335-GTB Firmware above 1610A release.  If below, exit
@@ -2060,7 +2171,6 @@ RETRY_UPGRADE:
     # step 4 upgrade firmware
     # For firestone machines if updating from 810 to 820 version or from 820 to 810,
     # extra steps are needed. Hanled in "if" block, "else" block is normal update in a single step.
-    my $rflash_log_file = xCAT::Utils->full_path($sessdata->{node}.".log", RFLASH_LOG_DIR);
     if ($is_firestone and 
         (($firestone_update_version eq "820" and $htm_update_version eq "810") or 
          ($firestone_update_version eq "810" and $htm_update_version eq "820")) 
@@ -2228,7 +2338,7 @@ sub rflash {
             if ($opt =~ /^(-c|--check)$/i) {
                 $sessdata->{subcommand} = "check";
                 # support verbose options for ipmitool command
-            } elsif ($opt !~ /.*\.hpm$/i && $opt !~ /^-V{1,4}$/ && $opt !~ /^--buffersize=/ && $opt !~ /^--retry=/) {
+            } elsif ($opt !~ /.*\.hpm$/i && $opt !~ /^-V{1,4}$|^--buffersize=|^--retry=|^-d=/) {
                 $callback->({ error => "The option $opt is not supported",
                         errorcode => 1 });
                 return;

From 3490fa5fed4c07c1164ba027ce43beb4aa048f4f Mon Sep 17 00:00:00 2001
From: Samveen <samveen@yahoo.com>
Date: Mon, 17 Jul 2017 09:00:47 +0700
Subject: [PATCH 165/283] Kickstart improvements for Centos templates (#3462)

* `pre.rh*` scripts: Whitespace cleanup

* Whitespace cleanup

* util-linux-ng back to util-linux in 2014

* Add Centos7 KVM template(based on rhels7)

* Minor improvements to Centos7 compute template
---
 .../xcat/install/centos/compute.centos7.tmpl  |  12 +-
 .../xcat/install/centos/kvm.centos7.pkglist   |  13 ++
 .../xcat/install/centos/kvm.centos7.tmpl      | 172 ++++++++++++++++++
 .../share/xcat/install/rh/compute.rhels7.tmpl |   3 +-
 .../share/xcat/install/rh/kvm.rhels7.pkglist  |   2 +-
 .../install/rh/service.rhels7.x86_64.pkglist  |   2 +-
 xCAT-server/share/xcat/install/scripts/pre.rh |   3 +-
 .../share/xcat/install/scripts/pre.rh.rhels7  |   4 +-
 8 files changed, 197 insertions(+), 14 deletions(-)
 create mode 100644 xCAT-server/share/xcat/install/centos/kvm.centos7.pkglist
 create mode 100644 xCAT-server/share/xcat/install/centos/kvm.centos7.tmpl

diff --git a/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl b/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl
index d48755fe0..c261d7bbc 100644
--- a/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl
+++ b/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl
@@ -36,9 +36,8 @@ clearpart --all --initlabel
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
 %include /tmp/partitionfile
-#part swap --size 1024 
+#part swap --size 1024
 #part / --size 1 --grow --fstype ext4
-#XCAT_PARTITION_END#
 
 #RAID 0 /scr for performance
 #part / --size 1024 --ondisk sda
@@ -69,6 +68,7 @@ clearpart --all --initlabel
 #part raid.41 --size 1 --grow --ondisk sda
 #part raid.42 --size 1 --grow --ondisk sdb
 #raid /scr --level 1 --device md4 raid.41 raid.42
+#XCAT_PARTITION_END#
 
 #
 # bootloader config
@@ -120,7 +120,7 @@ skipx
 #
 # perl -e 'print crypt("blah","Xa") . "\n";'p
 # openssl passwd -apr1 -salt xxxxxxxx password
-# 
+#
 # where "blah" is your root password.
 #
 #rootpw --iscrypted XaLGAVe1C41x2
@@ -128,7 +128,7 @@ skipx
 rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
 
 #
-# NIS setup: auth --enablenis --nisdomain sensenet 
+# NIS setup: auth --enablenis --nisdomain sensenet
 # --nisserver neptune --useshadow --enablemd5
 #
 # OR
@@ -155,7 +155,7 @@ reboot
 {
 echo "Running Kickstart Pre-Installation script..."
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh.rhels7#
-} >>/tmp/pre-install.log 2>&1
+} &>>/tmp/pre-install.log
 %end
 %post
 mkdir -p /var/log/xcat/
@@ -166,5 +166,5 @@ EOF
 echo "Running Kickstart Post-Installation script..."
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat#
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rhels7#
-} >>/var/log/xcat/xcat.log 2>&1
+} &>>/var/log/xcat/xcat.log
 %end
diff --git a/xCAT-server/share/xcat/install/centos/kvm.centos7.pkglist b/xCAT-server/share/xcat/install/centos/kvm.centos7.pkglist
new file mode 100644
index 000000000..418044bec
--- /dev/null
+++ b/xCAT-server/share/xcat/install/centos/kvm.centos7.pkglist
@@ -0,0 +1,13 @@
+#Please make sure there is a space between @ and group name
+libvirt
+net-snmp
+net-tools
+nfs-utils
+ntp
+openssh-server
+qemu-kvm
+rsync
+screen
+util-linux
+wget
+yp-tools
diff --git a/xCAT-server/share/xcat/install/centos/kvm.centos7.tmpl b/xCAT-server/share/xcat/install/centos/kvm.centos7.tmpl
new file mode 100644
index 000000000..24d0af830
--- /dev/null
+++ b/xCAT-server/share/xcat/install/centos/kvm.centos7.tmpl
@@ -0,0 +1,172 @@
+#
+#cmdline
+
+lang en_US
+#KICKSTARTNET#
+
+#
+# Where's the source?
+# nfs --server hostname.of.server or IP --dir /path/to/RH/CD/image
+#
+#nfs --server #XCATVAR:INSTALL_NFS# --dir #XCATVAR:INSTALL_SRC_DIR#
+
+%include /tmp/repos
+
+#INSTALL_SOURCES#
+
+#device ethernet e100
+keyboard "us"
+
+#
+# Clear the MBR
+#
+zerombr
+
+#
+# Wipe out the disk
+#
+# Clear partitioning via partitition file
+#clearpart --all --initlabel
+#clearpart --linux
+
+#
+# Customize to fit your needs
+#
+
+#XCAT_PARTITION_START#
+#Use script based partition table creation
+%include /tmp/partitionfile
+
+#No RAID
+#/boot really significant for this sort of setup nowadays?
+#part /boot --size 50 --fstype ext3
+#part swap --size 1024 
+#part / --size 1 --grow --fstype ext4
+
+#RAID 0 /scr for performance
+#part / --size 1024 --ondisk sda
+#part swap --size 512 --ondisk sda
+#part /var --size 1024 --ondisk sdb
+#part swap --size 512 --ondisk sdb
+#part raid.01 --size 1 --grow --ondisk sda
+#part raid.02 --size 1 --grow --ondisk sdb
+#raid /scr --level 0 --device md0 raid.01 raid.02
+
+#Full RAID 1 Sample
+#part raid.01 --size 50 --ondisk sda
+#part raid.02 --size 50 --ondisk sdb
+#raid /boot --level 1 --device md0 raid.01 raid.02
+#
+#part raid.11 --size 1024 --ondisk sda
+#part raid.12 --size 1024 --ondisk sdb
+#raid / --level 1 --device md1 raid.11 raid.12
+#
+#part raid.21 --size 1024 --ondisk sda
+#part raid.22 --size 1024 --ondisk sdb
+#raid /var --level 1 --device md2 raid.21 raid.22
+#
+#part raid.31 --size 1024 --ondisk sda
+#part raid.32 --size 1024 --ondisk sdb
+#raid swap --level 1 --device md3 raid.31 raid.32
+#
+#part raid.41 --size 1 --grow --ondisk sda
+#part raid.42 --size 1 --grow --ondisk sdb
+#raid /scr --level 1 --device md4 raid.41 raid.42
+#XCAT_PARTITION_END#
+
+#
+# bootloader config
+# --append <args>
+# --useLilo
+# --md5pass <crypted MD5 password for GRUB>
+#
+#The bootloader config here is commented out
+#For user customized partition file or partition script,
+#the bootloader configuration should be specified in the user customized partition file/script
+#For the xCAT default partition scheme, the bootloader configuration is in /tmp/partitionfile
+#which is generated in %pre section
+##KICKSTARTBOOTLOADER#
+
+#
+# install or upgrade
+#
+install
+
+#
+# text mode install (default is graphical)
+#
+text
+
+#
+# firewall
+#
+firewall --disabled
+
+#
+# Select a zone
+# Add the --utc switch if your hardware clock is set to GMT
+#
+#timezone US/Hawaii
+#timezone US/Pacific
+#timezone US/Mountain
+#timezone US/Central
+#timezone US/Eastern
+timezone --utc "#TABLE:site:key=timezone:value#"
+
+#
+# Don't do X
+#
+skipx
+
+
+#
+# To generate an encrypted root password use:
+#
+# perl -e 'print crypt("blah","Xa") . "\n";'p
+# openssl passwd -apr1 -salt xxxxxxxx password
+#
+# where "blah" is your root password.
+#
+#rootpw --iscrypted XaLGAVe1C41x2
+#rootpw XaLGAVe1C41x2 --iscrypted
+rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password#
+
+#
+# NIS setup: auth --enablenis --nisdomain sensenet
+# --nisserver neptune --useshadow --enablemd5
+#
+# OR
+auth --useshadow --enablemd5
+
+#
+# SE Linux
+#
+selinux --disabled
+
+#
+# Reboot after installation
+#
+reboot
+
+#
+#end of section
+#
+%packages
+#INCLUDE_DEFAULT_PKGLIST#
+%end
+%pre
+{
+echo "Running Kickstart Pre-Installation script..."
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh.rhels7#
+} &>>/tmp/pre-install.log
+%end
+%post
+mkdir -p /var/log/xcat/
+{
+cat >> /var/log/xcat/xcat.log << "EOF"
+%include /tmp/pre-install.log
+EOF
+echo "Running Kickstart Post-Installation script..."
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat#
+} &>>/var/log/xcat/xcat.log
+%end
diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels7.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels7.tmpl
index 1c346428d..cd9380a86 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhels7.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhels7.tmpl
@@ -76,13 +76,12 @@ clearpart --all --initlabel
 # --md5pass <crypted MD5 password for GRUB>
 #
 #The bootloader config here is commented out
-#For user customized partition file or partition script, 
+#For user customized partition file or partition script,
 #the bootloader configuration should be specified in the user customized partition file/script
 #For the xCAT default partition scheme, the bootloader configuration is in /tmp/partitionfile
 #which is generated in %pre section
 ##KICKSTARTBOOTLOADER#
 
-
 #
 # install or upgrade
 #
diff --git a/xCAT-server/share/xcat/install/rh/kvm.rhels7.pkglist b/xCAT-server/share/xcat/install/rh/kvm.rhels7.pkglist
index 7a6779c4b..fc9067f4d 100644
--- a/xCAT-server/share/xcat/install/rh/kvm.rhels7.pkglist
+++ b/xCAT-server/share/xcat/install/rh/kvm.rhels7.pkglist
@@ -6,7 +6,7 @@ net-snmp
 rsync
 yp-tools
 openssh-server
-util-linux-ng
+util-linux
 net-tools
 libvirt
 screen
diff --git a/xCAT-server/share/xcat/install/rh/service.rhels7.x86_64.pkglist b/xCAT-server/share/xcat/install/rh/service.rhels7.x86_64.pkglist
index 55b7cfd98..bc571151f 100644
--- a/xCAT-server/share/xcat/install/rh/service.rhels7.x86_64.pkglist
+++ b/xCAT-server/share/xcat/install/rh/service.rhels7.x86_64.pkglist
@@ -25,5 +25,5 @@ perl-DBD-MySQL
 mysql-connector-odbc
 perl-DBD-Pg
 wget
-util-linux-ng
+util-linux
 net-tools
diff --git a/xCAT-server/share/xcat/install/scripts/pre.rh b/xCAT-server/share/xcat/install/scripts/pre.rh
index 0e95da4e4..7cc7e1199 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.rh
+++ b/xCAT-server/share/xcat/install/scripts/pre.rh
@@ -193,7 +193,6 @@ if [ -e "/tmp/xcat.install_disk" ]; then
     instdisk=`cat /tmp/xcat.install_disk`
 fi
 
-
 modprobe ext4 >& /dev/null
 modprobe ext4dev >& /dev/null
 if grep ext4dev /proc/filesystems > /dev/null; then
@@ -211,7 +210,7 @@ if [ `uname -m` = "ppc64" ]; then
 fi
 if [ -d /sys/firmware/efi ]; then 
     echo 'bootloader --driveorder='$instdisk >> /tmp/partitionfile
-	echo 'part /boot/efi --size 50 --ondisk '$instdisk' --fstype '$EFIFSTYPE >> /tmp/partitionfile
+    echo 'part /boot/efi --size 50 --ondisk '$instdisk' --fstype '$EFIFSTYPE >> /tmp/partitionfile
 else
     echo 'bootloader' >> /tmp/partitionfile
 fi
diff --git a/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7 b/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7
index 225d24997..074ab0e62 100755
--- a/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7
+++ b/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7
@@ -149,7 +149,7 @@ fi
 shopt -s nullglob
 
 #
-# The getinstdisk script is common for RHEL/SLES/PowerKVM/Ubuntu. 
+# The getinstdisk script is common for RHEL/SLES/PowerKVM/Ubuntu.
 # It will attempt to select the install disk and write the selection to /tmp/xcat.install_disk
 #
 #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/getinstdisk#
@@ -180,7 +180,7 @@ if [ `uname -m` = "ppc64" -o `uname -m` = "ppc64le" ]; then
 	echo 'part None --fstype "PPC PReP Boot" --ondisk '$instdisk' --size 8' >> /tmp/partitionfile 
 fi
 if [ -d /sys/firmware/efi ]; then 
-	echo 'part /boot/efi --size 50 --ondisk '$instdisk' --fstype '$EFIFSTYPE >> /tmp/partitionfile
+    echo 'part /boot/efi --size 50 --ondisk '$instdisk' --fstype '$EFIFSTYPE >> /tmp/partitionfile
 fi
 
 #TODO: ondisk detection, /dev/disk/by-id/edd-int13_dev80 for legacy maybe, and no idea about efi.  at least maybe blacklist SAN if mptsas/mpt2sas/megaraid_sas seen...

From 4e2dd72e06220bc6b4b033f02f18c02d0d00043f Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Sun, 16 Jul 2017 22:29:08 -0400
Subject: [PATCH 166/283] remove confignetworks cases since daily regression
 environment does not support the cases

---
 xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle | 8 --------
 xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
index 2f56db766..361b75b9d 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
@@ -6,17 +6,9 @@ makehosts_help
 makehosts_n_noderange
 makehosts_n
 makehost_n_r
-confignetwork_s_installnic_secondarynic_updatenode
-confignetwork_secondarynic_updatenode
-confignetwork_secondarynic_nicaliases_updatenode
-confignetwork_secondarynic_nicextraparams_updatenode
 confignetwork_secondarynic_nicnetworks_updatenode_false
 confignetwork_secondarynic_nicips_updatenode_false
 confignetwork_secondarynic_nictype_updatenode_false
-confignetwork_disable_set_to_yes
-confignetwork_disable_set_to_1
-confignetwork_niccustomscripts
-confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 chdef_null
 chdef_z
 chdef_t_o_error
diff --git a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
index 178c2ee8b..b56746f85 100644
--- a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
@@ -7,17 +7,9 @@ makehosts_help
 makehosts_n_noderange
 makehosts_n
 makehost_n_r
-confignetwork_s_installnic_secondarynic_updatenode
-confignetwork_secondarynic_updatenode
-confignetwork_secondarynic_nicaliases_updatenode
-confignetwork_secondarynic_nicextraparams_updatenode
 confignetwork_secondarynic_nicnetworks_updatenode_false
 confignetwork_secondarynic_nicips_updatenode_false
 confignetwork_secondarynic_nictype_updatenode_false
-confignetwork_disable_set_to_yes
-confignetwork_disable_set_to_1
-confignetwork_niccustomscripts
-confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 chdef_null
 chdef_z
 chdef_t_o_error

From ff69156156661f126a321714d9d90b9796d9c389 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Fri, 14 Jul 2017 16:07:42 +0800
Subject: [PATCH 167/283] Revise test cases makehosts_null, makehosts_l,
 makehosts_n

---
 xCAT-test/autotest/testcase/makehosts/cases0 | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/xCAT-test/autotest/testcase/makehosts/cases0 b/xCAT-test/autotest/testcase/makehosts/cases0
index 82a088b29..3a2a504ac 100644
--- a/xCAT-test/autotest/testcase/makehosts/cases0
+++ b/xCAT-test/autotest/testcase/makehosts/cases0
@@ -15,9 +15,9 @@ end
 start:makehosts_null
 description:makehosts 
 cmd:cp -f /etc/hosts /etc/hosts.xcatbakautotest
-cmd:chtab node=compute hosts.ip="|node(\d+)|1.2.3.(\$1+0)|" hosts.hostnames="|(.*)|(\$1).cluster.net|"
+cmd:chtab node=nouse_compute hosts.ip="|node(\d+)|1.2.3.(\$1+0)|" hosts.hostnames="|(.*)|(\$1).cluster.net|"
 check:rc==0
-cmd:mkdef -t node -o node01,node02 groups="compute"
+cmd:mkdef -t node -o node01,node02 groups="nouse_compute"
 check:rc==0
 cmd:sleep 30
 cmd:XCATBYPASS=1 makehosts 
@@ -28,7 +28,7 @@ check:output=~1.2.3.2
 check:output=~1.2.3.1 
 check:output=~node01
 check:output=~node02
-cmd:chtab -d node=compute hosts
+cmd:chtab -d node=nouse_compute hosts
 cmd:rmdef node01
 cmd:rmdef node02
 cmd:mv -f /etc/hosts.xcatbakautotest /etc/hosts
@@ -36,9 +36,9 @@ end
 
 start:makehosts_l
 cmd:cp -f /etc/hosts /etc/hosts.xcatbakautotest
-cmd:chtab node=compute hosts.ip="|node(\d+)|1.2.3.(\$1+0)|" hosts.hostnames="|(.*)|(\$1).cluster.net|"
+cmd:chtab node=nouse_compute hosts.ip="|node(\d+)|1.2.3.(\$1+0)|" hosts.hostnames="|(.*)|(\$1).cluster.net|"
 check:rc==0
-cmd:chdef -t node -o node01,node02 groups="compute"
+cmd:chdef -t node -o node01,node02 groups="nouse_compute"
 check:rc==0
 cmd:sleep 30
 cmd:XCATBYPASS=1 makehosts -l
@@ -48,7 +48,7 @@ cmd:cp -f /etc/hosts /tmp/hosts
 cmd:cat /tmp/hosts|awk '{print $2}'
 check:output=~node01.cluster.net
 check:output=~node02.cluster.net
-cmd:chtab -d node=compute hosts
+cmd:chtab -d node=nouse_compute hosts
 cmd:rmdef node01
 cmd:rmdef node02
 cmd:mv -f /etc/hosts.xcatbakautotest /etc/hosts
@@ -79,9 +79,9 @@ end
 
 start:makehosts_n
 cmd:cp -f /etc/hosts /etc/hosts.xcatbakautotest
-cmd:chtab node=compute hosts.ip="|node(\d+)|1.2.3.(\$1+0)|" hosts.hostnames="|(.*)|(\$1).cluster.net|"
+cmd:chtab node=nouse_compute hosts.ip="|node(\d+)|1.2.3.(\$1+0)|" hosts.hostnames="|(.*)|(\$1).cluster.net|"
 check:rc==0
-cmd:chdef -t node -o node01 groups="compute"
+cmd:chdef -t node -o node01 groups="nouse_compute"
 check:rc==0
 cmd:sleep 30
 cmd:XCATBYPASS=1 makehosts -n
@@ -94,7 +94,7 @@ cmd:cat /tmp/hosts |wc -l
 check:rc==0
 cmd:cat /tmp/hosts
 check:output=~node01.cluster.net
-cmd:chtab -d node=compute hosts
+cmd:chtab -d node=nouse_compute hosts
 cmd:rmdef node01
 cmd:cp /etc/hosts /hosts
 cmd:mv -f /etc/hosts.xcatbakautotest /etc/hosts
@@ -171,5 +171,3 @@ cmd:if [ -e /tmp/s01r1b01.standa ]; then rmdef s01r1b01; cat /tmp/s01r1b01.stand
 check:rc==0
 cmd:mv -f /etc/hosts.xcatbakautotest /etc/hosts
 end
-
-

From 9b2f597ec2d6118174707344f899a84817803c6c Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Mon, 17 Jul 2017 14:44:34 +0800
Subject: [PATCH 168/283] Polish the code according to the review comments

---
 xCAT-server/lib/xcat/plugins/grub2.pm     | 49 +++++++++++++++--------
 xCAT-server/lib/xcat/plugins/petitboot.pm | 48 ++++++++++++++--------
 xCAT-server/lib/xcat/plugins/xnba.pm      | 48 ++++++++++++++--------
 3 files changed, 97 insertions(+), 48 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/grub2.pm b/xCAT-server/lib/xcat/plugins/grub2.pm
index 5d4fa8dd8..f2a0b0958 100644
--- a/xCAT-server/lib/xcat/plugins/grub2.pm
+++ b/xCAT-server/lib/xcat/plugins/grub2.pm
@@ -528,7 +528,7 @@ sub process_request {
     }
 
     my @hostinfo = xCAT::NetworkUtils->determinehostname();
-    $::myxcatname = $hostinfo[(scalar @hostinfo) - 1];
+    $::myxcatname = $hostinfo[-1];
     xCAT::MsgUtils->trace(0, "d", "grub2: running on $::myxcatname");
 
     my @unmanagednodes = ();
@@ -562,28 +562,45 @@ sub process_request {
             }
         }
 
+        my $notsamenet_nodes_err  = '';
+        my $notsamenet_nodes_warn = '';
+
         foreach (@rnodes) {
             # For MN, the scope is all CN, for SN, the scope is the nodes it managed if disjointnetboot is set.
-            my $req2manage = exists($managed{$_}) || xCAT::Utils->isMN();
-            if ($mynodeonly == 1 && $req2manage != 1) {
+            my $req2manage = exists($managed{$_});
+            if ($req2manage) {
                 push @unmanagednodes, $_;
-                next;
+                # quick pass through if disjoint is set.
+                next if ( $mynodeonly == 1 && xCAT::Utils->isMN() != 1 );
             }
+
             # Only handle its boot configuration files if the node in same subnet
             if (xCAT::NetworkUtils->nodeonmynet($_)) {
                 push @nodes, $_;
-            } else {
-                my $msg = "grub2 configuration file was not created for node [$_] because sharedtftp attribute is not set and the node is not on same network as this xcatmaster";
-                $msg .= ": $::myxcatname" if ( $::myxcatname );
+            } elsif ( $req2manage ) {
+                # report error when it is under my control but I cannot handle it.
+                $notsamenet_nodes_err .= " $_";
+            }
+            else {
+                $notsamenet_nodes_warn .= " $_";
+            }
+        }
 
-                if ($req2manage == 1) {
-                    # report error when it is under my control but I cannot handle it.
-                    my $rsp;
-                    $rsp->{data}->[0] = $msg;
-                    xCAT::MsgUtils->message("E", $rsp, $callback);
-                } else {
-                    xCAT::MsgUtils->message("S", $msg);
-                }
+        if ( $mynodeonly == 1 && scalar (@unmanagednodes) > 0 && xCAT::Utils->isMN() != 1) {
+            my $str_umnodes = join(" ", @unmanagednodes);
+            xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: unmanaged nodes are $str_umnodes");
+        }
+
+        if ( $notsamenet_nodes_err || $notsamenet_nodes_warn ) {
+            my $msg = "grub2 configuration file was not created ";
+            $msg .= "on $::myxcatname " if ( $::myxcatname );
+            $msg .= "for below nodes because sharedtftp attribute is not set and the nodes are not on same network as this xcatmaster: ";
+            xCAT::MsgUtils->message("S", $msg . $notsamenet_nodes_warn . $notsamenet_nodes_err);
+            # For managed children, need to report error
+            if ( $notsamenet_nodes_err ) {
+                my $rsp;
+                $rsp->{data}->[0] = $msg . $notsamenet_nodes_err;
+                xCAT::MsgUtils->message("E", $rsp, $callback);
             }
         }
     } else {
@@ -592,7 +609,7 @@ sub process_request {
 
     #>>>>>>>used for trace log>>>>>>>
     my $str_node = join(" ", @nodes);
-    xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: nodes are $str_node");
+    xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: nodes are $str_node") if ($str_node);
 
     # return directly if no nodes in the same network
     unless (@nodes) {
diff --git a/xCAT-server/lib/xcat/plugins/petitboot.pm b/xCAT-server/lib/xcat/plugins/petitboot.pm
index 1b2248423..23493336f 100644
--- a/xCAT-server/lib/xcat/plugins/petitboot.pm
+++ b/xCAT-server/lib/xcat/plugins/petitboot.pm
@@ -409,7 +409,7 @@ sub process_request {
     }
 
     my @hostinfo = xCAT::NetworkUtils->determinehostname();
-    $::myxcatname = $hostinfo[(scalar @hostinfo) - 1];
+    $::myxcatname = $hostinfo[-1];
     xCAT::MsgUtils->trace(0, "d", "petitboot: running on $::myxcatname");
 
     my @unmanagednodes = ();
@@ -443,29 +443,45 @@ sub process_request {
             }
         }
 
+        my $notsamenet_nodes_err  = '';
+        my $notsamenet_nodes_warn = '';
+
         foreach (@rnodes) {
             # For MN, the scope is all CN, for SN, the scope is the nodes it managed if disjointnetboot is set.
-            my $req2manage = exists($managed{$_}) || xCAT::Utils->isMN();
-            if ($mynodeonly == 1 && $req2manage != 1) {
+            my $req2manage = exists($managed{$_});
+            if ($req2manage) {
                 push @unmanagednodes, $_;
-                next;
+                # quick pass through if disjoint is set.
+                next if ( $mynodeonly == 1 && xCAT::Utils->isMN() != 1 );
             }
 
             # Only handle its boot configuration files if the node in same subnet
             if (xCAT::NetworkUtils->nodeonmynet($_)) {
                 push @nodes, $_;
-            } else {
-                my $msg = "petitboot configuration file was not created for node [$_] because sharedtftp attribute is not set and the node is not on same network as this xcatmaster";
-                $msg .= ": $::myxcatname" if ( $::myxcatname );
+            } elsif ( $req2manage ) {
+                # report error when it is under my control but I cannot handle it.
+                $notsamenet_nodes_err .= " $_";
+            }
+            else {
+                $notsamenet_nodes_warn .= " $_";
+            }
+        }
 
-                if ($req2manage == 1) {
-                    # report error when it is under my control but I cannot handle it.
-                    my $rsp;
-                    $rsp->{data}->[0] = $msg;
-                    xCAT::MsgUtils->message("E", $rsp, $callback);
-                } else {
-                    xCAT::MsgUtils->message("S", $msg);
-                }
+        if ( $mynodeonly == 1 && scalar (@unmanagednodes) > 0 && xCAT::Utils->isMN() != 1) {
+            my $str_umnodes = join(" ", @unmanagednodes);
+            xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: unmanaged nodes are $str_umnodes");
+        }
+
+        if ( $notsamenet_nodes_err || $notsamenet_nodes_warn ) {
+            my $msg = "petitboot configuration file was not created ";
+            $msg .= "on $::myxcatname " if ( $::myxcatname );
+            $msg .= "for below nodes because sharedtftp attribute is not set and the nodes are not on same network as this xcatmaster: ";
+            xCAT::MsgUtils->message("S", $msg . $notsamenet_nodes_warn . $notsamenet_nodes_err);
+            # For managed children, need to report error
+            if ( $notsamenet_nodes_err ) {
+                my $rsp;
+                $rsp->{data}->[0] = $msg . $notsamenet_nodes_err;
+                xCAT::MsgUtils->message("E", $rsp, $callback);
             }
         }
     } else {
@@ -474,7 +490,7 @@ sub process_request {
 
     #>>>>>>>used for trace log>>>>>>>
     my $str_node = join(" ", @nodes);
-    xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: nodes are $str_node");
+    xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: nodes are $str_node") if ($str_node);
 
     # return directly if no nodes in the same network
     unless (@nodes) {
diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm
index 773b75065..52b459ce2 100644
--- a/xCAT-server/lib/xcat/plugins/xnba.pm
+++ b/xCAT-server/lib/xcat/plugins/xnba.pm
@@ -452,7 +452,7 @@ sub process_request {
     }
 
     my @hostinfo = xCAT::NetworkUtils->determinehostname();
-    $::myxcatname = $hostinfo[(scalar @hostinfo) - 1];
+    $::myxcatname = $hostinfo[-1];
     xCAT::MsgUtils->trace(0, "d", "xnba: running on $::myxcatname");
 
     my @unmanagednodes = ();
@@ -486,29 +486,45 @@ sub process_request {
             }
         }
 
+        my $notsamenet_nodes_err  = '';
+        my $notsamenet_nodes_warn = '';
+
         foreach (@rnodes) {
             # For MN, the scope is all CN, for SN, the scope is the nodes it managed if disjointnetboot is set.
-            my $req2manage = exists($managed{$_}) || xCAT::Utils->isMN();
-            if ($mynodeonly == 1 && $req2manage != 1) {
+            my $req2manage = exists($managed{$_});
+            if ($req2manage) {
                 push @unmanagednodes, $_;
-                next;
+                # quick pass through if disjoint is set.
+                next if ( $mynodeonly == 1 && xCAT::Utils->isMN() != 1 );
             }
+
             # Only handle its boot configuration files if the node in same subnet
             if (xCAT::NetworkUtils->nodeonmynet($_)) {
                 push @nodes, $_;
-            } else {
-                my $msg = "xnba configuration file was not created for node [$_] because sharedtftp attribute is not set and the node is not on same network as this xcatmaster";
-                $msg .= ": $::myxcatname" if ( $::myxcatname );
+            } elsif ( $req2manage ) {
+                # report error when it is under my control but I cannot handle it.
+                $notsamenet_nodes_err .= " $_";
+            }
+            else {
+                $notsamenet_nodes_warn .= " $_";
+            }
+        }
 
-                if ($req2manage == 1) {
-                    # report error when it is under my control but I cannot handle it.
-                    my $rsp;
-                    $rsp->{data}->[0] = $msg;
-                    xCAT::MsgUtils->message("E", $rsp, $::XNBA_callback);
-                } else {
-                    xCAT::MsgUtils->message("S", $msg);
-                }
+        if ( $mynodeonly == 1 && scalar (@unmanagednodes) > 0 && xCAT::Utils->isMN() != 1) {
+            my $str_umnodes = join(" ", @unmanagednodes);
+            xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: unmanaged nodes are $str_umnodes");
+        }
 
+        if ( $notsamenet_nodes_err || $notsamenet_nodes_warn ) {
+            my $msg = "xnba configuration file was not created ";
+            $msg .= "on $::myxcatname " if ( $::myxcatname );
+            $msg .= "for below nodes because sharedtftp attribute is not set and the nodes are not on same network as this xcatmaster: ";
+            xCAT::MsgUtils->message("S", $msg . $notsamenet_nodes_warn . $notsamenet_nodes_err);
+            # For managed children, need to report error
+            if ( $notsamenet_nodes_err ) {
+                my $rsp;
+                $rsp->{data}->[0] = $msg . $notsamenet_nodes_err;
+                xCAT::MsgUtils->message("E", $rsp, $::XNBA_callback);
             }
         }
     } else {
@@ -517,7 +533,7 @@ sub process_request {
 
     #>>>>>>>used for trace log>>>>>>>
     my $str_node = join(" ", @nodes);
-    xCAT::MsgUtils->trace(0, "d", "xnba: nodes are $str_node");
+    xCAT::MsgUtils->trace(0, "d", "xnba: nodes are $str_node") if ($str_node);
 
     # return directly if no nodes in the same network
     unless (@nodes) {

From 1bc1650c82a2f6220d0ba5594bdb8cecc9b42635 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Mon, 17 Jul 2017 04:37:08 -0400
Subject: [PATCH 169/283] update bundle

---
 xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle | 8 --------
 xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
index b4b24da9c..8ea26b428 100644
--- a/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
@@ -20,17 +20,9 @@ updatenode_diskful_syncfiles_P_script1
 updatenode_script3
 updatenode_P_script1_script2
 updatenode_without_flag
-confignetwork_s_installnic_secondarynic_updatenode
-confignetwork_secondarynic_updatenode
-confignetwork_secondarynic_nicaliases_updatenode
-confignetwork_secondarynic_nicextraparams_updatenode
 confignetwork_secondarynic_nicnetworks_updatenode_false
 confignetwork_secondarynic_nicips_updatenode_false
 confignetwork_secondarynic_nictype_updatenode_false
-confignetwork_disable_set_to_yes
-confignetwork_disable_set_to_1
-confignetwork_niccustomscripts
-confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 chdef_null
 chdef_t_node
 chdef_t_network
diff --git a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
index cda0ea4f2..e315bf198 100644
--- a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
@@ -6,17 +6,9 @@ makehosts_help
 makehosts_n
 makehosts_n_noderange
 makehost_n_r
-confignetwork_s_installnic_secondarynic_updatenode
-confignetwork_secondarynic_updatenode
-confignetwork_secondarynic_nicaliases_updatenode
-confignetwork_secondarynic_nicextraparams_updatenode
 confignetwork_secondarynic_nicnetworks_updatenode_false
 confignetwork_secondarynic_nicips_updatenode_false
 confignetwork_secondarynic_nictype_updatenode_false
-confignetwork_disable_set_to_yes
-confignetwork_disable_set_to_1
-confignetwork_niccustomscripts
-confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 chdef_null
 chdef_z
 chdef_t_o_error

From f68d2630d44cc9b045fa160254cbf5cc2dc1abf5 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Mon, 17 Jul 2017 04:45:25 -0400
Subject: [PATCH 170/283] update bundle

---
 xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle | 8 --------
 xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle | 8 --------
 xCAT-test/autotest/bundle/sles11.4_ppc64.bundle | 8 --------
 3 files changed, 24 deletions(-)

diff --git a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
index c790b2146..ff947230c 100644
--- a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
@@ -17,17 +17,9 @@ updatenode_diskful_syncfiles_P_script1
 updatenode_script3
 updatenode_P_script1_script2
 updatenode_without_flag
-confignetwork_s_installnic_secondarynic_updatenode
-confignetwork_secondarynic_updatenode
-confignetwork_secondarynic_nicaliases_updatenode
-confignetwork_secondarynic_nicextraparams_updatenode
 confignetwork_secondarynic_nicnetworks_updatenode_false
 confignetwork_secondarynic_nicips_updatenode_false
 confignetwork_secondarynic_nictype_updatenode_false
-confignetwork_disable_set_to_yes
-confignetwork_disable_set_to_1
-confignetwork_niccustomscripts
-confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 chdef_null
 chdef_t_node
 chdef_t_network
diff --git a/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle b/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle
index b61c79e07..c0f227acf 100644
--- a/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle
@@ -17,17 +17,9 @@ updatenode_diskful_syncfiles_P_script1
 updatenode_script3
 updatenode_P_script1_script2
 updatenode_without_flag
-confignetwork_s_installnic_secondarynic_updatenode
-confignetwork_secondarynic_updatenode
-confignetwork_secondarynic_nicaliases_updatenode
-confignetwork_secondarynic_nicextraparams_updatenode
 confignetwork_secondarynic_nicnetworks_updatenode_false
 confignetwork_secondarynic_nicips_updatenode_false
 confignetwork_secondarynic_nictype_updatenode_false
-confignetwork_disable_set_to_yes
-confignetwork_disable_set_to_1
-confignetwork_niccustomscripts
-confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 chdef_null
 chdef_t_node
 chdef_t_network
diff --git a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
index ecc350e90..b214d526f 100644
--- a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
@@ -231,17 +231,9 @@ confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
 confignics_config_multiple_port_withnicaliases_multiple_value
 confignics_disable_set_to_yes
 confignics_disable_set_to_1
-confignetwork_s_installnic_secondarynic_updatenode
-confignetwork_secondarynic_updatenode
-confignetwork_secondarynic_nicaliases_updatenode
-confignetwork_secondarynic_nicextraparams_updatenode
 confignetwork_secondarynic_nicnetworks_updatenode_false
 confignetwork_secondarynic_nicips_updatenode_false
 confignetwork_secondarynic_nictype_updatenode_false
-confignetwork_disable_set_to_yes
-confignetwork_disable_set_to_1
-confignetwork_niccustomscripts
-confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 xdsh_h
 xdsh_V
 xdsh_regular_command

From 9dd5c3e986e41f1b5afa05dd2a80e399c4fc8e4b Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Mon, 17 Jul 2017 19:49:39 +0800
Subject: [PATCH 171/283] Fix typo

---
 xCAT-server/lib/xcat/plugins/grub2.pm     | 4 ++--
 xCAT-server/lib/xcat/plugins/petitboot.pm | 4 ++--
 xCAT-server/lib/xcat/plugins/xnba.pm      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/grub2.pm b/xCAT-server/lib/xcat/plugins/grub2.pm
index f2a0b0958..cbe35783f 100644
--- a/xCAT-server/lib/xcat/plugins/grub2.pm
+++ b/xCAT-server/lib/xcat/plugins/grub2.pm
@@ -626,8 +626,8 @@ sub process_request {
     #now run the begin part of the prescripts
     unless ($args[0] eq 'stat') {    # or $args[0] eq 'enact') {
         $errored = 0;
-        if ($request->{'_disparatetftp'}->[0]) { #the call is distrubuted to the service node already, so only need to handles my own children
-            xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: the call is distrubuted to the service node already, so only need to handles my own children");
+        if ($request->{'_disparatetftp'}->[0]) { #the call is distrubuted to the service node already, so only need to handle my own children
+            xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: the call is distrubuted to the service node already, so only need to handle my own children");
             xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: issue runbeginpre request");
             $sub_req->({ command => ['runbeginpre'],
                     node => \@nodes,
diff --git a/xCAT-server/lib/xcat/plugins/petitboot.pm b/xCAT-server/lib/xcat/plugins/petitboot.pm
index 23493336f..7b9487da3 100644
--- a/xCAT-server/lib/xcat/plugins/petitboot.pm
+++ b/xCAT-server/lib/xcat/plugins/petitboot.pm
@@ -507,8 +507,8 @@ sub process_request {
     #now run the begin part of the prescripts
     unless ($args[0] eq 'stat') {    # or $args[0] eq 'enact') {
         $errored = 0;
-        if ($request->{'_disparatetftp'}->[0]) { #the call is distrubuted to the service node already, so only need to handles my own children
-            xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: the call is distrubuted to the service node already, so only need to handles my own children");
+        if ($request->{'_disparatetftp'}->[0]) { #the call is distrubuted to the service node already, so only need to handle my own children
+            xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: the call is distrubuted to the service node already, so only need to handle my own children");
             xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: issue runbeginpre request");
             $sub_req->({ command => ['runbeginpre'],
                     node => \@nodes,
diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm
index 52b459ce2..6464a70c3 100644
--- a/xCAT-server/lib/xcat/plugins/xnba.pm
+++ b/xCAT-server/lib/xcat/plugins/xnba.pm
@@ -700,7 +700,7 @@ sub process_request {
     #now run the end part of the prescripts
     unless ($args[0] eq 'stat') {    # or $args[0] eq 'enact')
         $errored = 0;
-        if ($::XNBA_request->{'_disparatetftp'}->[0]) { #the call is distrubuted to the service node already, so only need to handles my own children
+        if ($::XNBA_request->{'_disparatetftp'}->[0]) { #the call is distrubuted to the service node already, so only need to handle my own children
             xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: issue runendpre request");
             $sub_req->({ command => ['runendpre'],
                     node => \@nodes,

From 9963d8e626cd64f44c919a79e868e184d8a99982 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Mon, 17 Jul 2017 12:35:11 -0400
Subject: [PATCH 172/283] Review fixes

---
 .../guides/admin-guides/references/man1/rflash.1.rst   | 10 +++++-----
 xCAT-client/pods/man1/rflash.1.pod                     |  8 ++++----
 xCAT-server/lib/xcat/plugins/ipmi.pm                   |  4 ++--
 3 files changed, 11 insertions(+), 11 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 a726a77b6..4c69921d0 100644
--- a/docs/source/guides/admin-guides/references/man1/rflash.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rflash.1.rst
@@ -11,7 +11,7 @@ Name
 ****
 
 
-\ **rflash**\  - Performs Licensed Internal Code (LIC) update support for HMC-attached POWER5 and POWER6 Systems, and POWER7 systems using Direct FSP management. POWER8 and POWER9 systems are also supported. \ **rflash**\  is also able to update firmware for NextScale Fan Power Controllers (FPC).
+\ **rflash**\  - Performs Licensed Internal Code (LIC) update or firmware update on supported xCAT managed nodes.
 
 
 ****************
@@ -50,7 +50,7 @@ OpenPOWER BMC specific:
 =======================
 
 
-\ **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*\ ] [\ **-V**\ ]
 
 
 
@@ -123,7 +123,7 @@ OpenPOWER specific:
 
 
 The command will update firmware for OpenPOWER BMC when given an OpenPOWER node and either the hpm formatted file path or path to a data directory.
-\ **Note:**\  When using \ **rflash**\  in hierarchical environment, the hpm file or data directory must be accessible from Service Nodes. Shared storage can be used to accomplish that, alternatively the hpm file or contents of the data directory can be copied to Service Nodes.
+\ **Note:**\  When using \ **rflash**\  in hierarchical environment, the hpm file or data directory must be accessible from Service Nodes.
 
 
 
@@ -159,7 +159,7 @@ The command will update firmware for OpenPOWER BMC when given an OpenPOWER node
 
 \ **-d=**\ \ *data_directory*\ 
  
- Used for Supermicro systems only. Specifies the directory where the \ **pUpdate**\  utility and at least one of BMC or PNOR update files are located. The utility and update files can be downloaded from FixCentral.
+ Used for IBM Power S822LC for Big Data systems only. Specifies the directory where the \ **pUpdate**\  utility and at least one of BMC or PNOR update files are located. The utility and update files can be downloaded from FixCentral.
  
 
 
@@ -274,7 +274,7 @@ The command will update firmware for OpenPOWER BMC when given an OpenPOWER node
  
 
 
-6. To update the firmware on OpenPOWER Supermicro machine specify the node name and the file path of the data directory containing pUpdate utility and BMC and/or PNOR update files:
+6. To update the firmware on IBM Power S822LC for Big Data machine specify the node name and the file path of the data directory containing pUpdate utility and BMC and/or PNOR update files:
  
  
  .. code-block:: perl
diff --git a/xCAT-client/pods/man1/rflash.1.pod b/xCAT-client/pods/man1/rflash.1.pod
index d1af6a58f..9f0cf29f4 100644
--- a/xCAT-client/pods/man1/rflash.1.pod
+++ b/xCAT-client/pods/man1/rflash.1.pod
@@ -1,6 +1,6 @@
 =head1 Name
 
-B<rflash> - Performs Licensed Internal Code (LIC) update support for HMC-attached POWER5 and POWER6 Systems, and POWER7 systems using Direct FSP management. POWER8 and POWER9 systems are also supported. B<rflash> is also able to update firmware for NextScale Fan Power Controllers (FPC).
+B<rflash> - Performs Licensed Internal Code (LIC) update or firmware update on supported xCAT managed nodes.
 
 =head1 B<Synopsis>
 
@@ -82,7 +82,7 @@ The command will update firmware for NeXtScale FPC when given an FPC node and th
 =head2 OpenPOWER specific:
 
 The command will update firmware for OpenPOWER BMC when given an OpenPOWER node and either the hpm formatted file path or path to a data directory.
-B<Note:> When using B<rflash> in hierarchical environment, the hpm file or data directory must be accessible from Service Nodes. Shared storage can be used to accomplish that, alternatively the hpm file or contents of the data directory can be copied to Service Nodes.
+B<Note:> When using B<rflash> in hierarchical environment, the hpm file or data directory must be accessible from Service Nodes.
 
 =head1 B<Options>
 
@@ -106,7 +106,7 @@ Specifies the directory where the raw data from rpm packages for each CEC/Frame
 
 =item B<-d=>I<data_directory>
 
-Used for Supermicro systems only. Specifies the directory where the B<pUpdate> utility and at least one of BMC or PNOR update files are located. The utility and update files can be downloaded from FixCentral. 
+Used for IBM Power S822LC for Big Data systems only. Specifies the directory where the B<pUpdate> utility and at least one of BMC or PNOR update files are located. The utility and update files can be downloaded from FixCentral. 
 
 =item B<--activate> {B<concurrent> | B<disruptive>}
 
@@ -174,7 +174,7 @@ Print verbose message to rflash log file (/var/log/xcat/rflash/fs3.log) when upd
  rflash fs3 /firmware/8335_810.1543.20151021b_update.hpm -V
 
 =item 6.
-To update the firmware on OpenPOWER Supermicro machine specify the node name and the file path of the data directory containing pUpdate utility and BMC and/or PNOR update files:
+To update the firmware on IBM Power S822LC for Big Data machine specify the node name and the file path of the data directory containing pUpdate utility and BMC and/or PNOR update files:
 
  rflash briggs01 -d=/root/supermicro/OP825
 
diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index fa267706c..1f3dc6b1e 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -1613,7 +1613,7 @@ sub isopenpower {
         # mft_id 0 and prod_id 43707 is for Firestone,Minsky
         return 1;
     } elsif (($sessdata->{prod_id} == 0 or $sessdata->{prod_id} == 2355) and $sessdata->{mfg_id} == 10876) {
-        # mfg_id 10876 is for Supermicro, prod_id 2355 for B&S, and 0 for Boston
+        # mfg_id 10876 is for IBM Power S822LC for Big Data (Supermicro), prod_id 2355 for B&S, and 0 for Boston
         return 1;
     } else {
         return 0;
@@ -1953,7 +1953,7 @@ sub do_firmware_update {
         }
     }
 
-    # For Supermicro machines such as P9 Boston (9006-22C) or P8 Briggs (8001-22C) 
+    # For IBM Power S822LC for Big Data (Supermicro) machines such as P9 Boston (9006-22C) or P8 Briggs (8001-22C) 
     # firmware update is done using pUpdate utility expected to be in the 
     # specified data directory along with the update files .bin for BMC or .pnor for Host
     if ($output =~ /8001-22C|9006-22C/) {

From 48ea5da204ed92548f3c7a1e7834f9aa873e890d Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Tue, 18 Jul 2017 01:50:29 -0400
Subject: [PATCH 173/283] fix typo of simulator testcase

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

diff --git a/xCAT-test/autotest/testcase/simulator/setup_simulator b/xCAT-test/autotest/testcase/simulator/setup_simulator
index 190705f3b..012b60c08 100644
--- a/xCAT-test/autotest/testcase/simulator/setup_simulator
+++ b/xCAT-test/autotest/testcase/simulator/setup_simulator
@@ -30,7 +30,7 @@ end
 
 start:setup_openbmc_simulator_multiple_5000_delay_random_1m
 description:install dependent packaages, setup and start 5000 openbmc simulator with random that the most delay time 1 minute
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN $$bmcusername $$bmcpasswd 5000 constant 1m
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN $$bmcusername $$bmcpasswd 5000 random 1m
 check:rc==0
 end
 

From 9e1008b18a911bd65409c0a74e994eae1222bcba Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Tue, 18 Jul 2017 05:30:39 -0400
Subject: [PATCH 174/283] fix issue 3490: "rscan <hmc> -w" will delete ip
 attribute of node which was defined ahead

---
 perl-xCAT/xCAT/PPCdb.pm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/perl-xCAT/xCAT/PPCdb.pm b/perl-xCAT/xCAT/PPCdb.pm
index af6eebead..51967544d 100644
--- a/perl-xCAT/xCAT/PPCdb.pm
+++ b/perl-xCAT/xCAT/PPCdb.pm
@@ -217,14 +217,16 @@ sub add_ppc {
         ###############################
         # Update hosts table
         ###############################
-        if ($otherinterfaces) {
-            $db{hosts}->setNodeAttribs($name,
-                { otherinterfaces => $ips });
-        } else {
-            $db{hosts}->setNodeAttribs($name,
-                { ip => $ips });
+        if ($ips) {
+            if ($otherinterfaces) {
+                $db{hosts}->setNodeAttribs($name,
+                    { otherinterfaces => $ips });
+            } else {
+                $db{hosts}->setNodeAttribs($name,
+                    { ip => $ips });
+            }
+            $db{hosts}{commit} = 1;
         }
-        $db{hosts}{commit} = 1;
 
         ###############################
         # Update mac table

From 4f0bd2b5ba73363d8720ac6bfd201bbf5a6751e9 Mon Sep 17 00:00:00 2001
From: zet809 <ertaozh@cn.ibm.com>
Date: Tue, 18 Jul 2017 18:17:14 +0800
Subject: [PATCH 175/283] fix issue 3297: rinstall could not set runcmd and
 runimg's currchain (#3491)

* fix issue 3297: rinstall could not set runcmd and runimg's currchain
---
 xCAT-server/lib/xcat/plugins/rinstall.pm | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/rinstall.pm b/xCAT-server/lib/xcat/plugins/rinstall.pm
index 421b4d71e..ea2f0003a 100644
--- a/xCAT-server/lib/xcat/plugins/rinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/rinstall.pm
@@ -69,6 +69,7 @@ sub rinstall {
     my $CONSOLE;
     my $OSIMAGE;
     my $STATES;
+    my $RESTSTATES;
     my $ignorekernelchk;
     my $VERBOSE;
     my $HELP;
@@ -108,8 +109,7 @@ sub rinstall {
         }
 
         my $state = $ARGV[0];
-        my $reststates;
-        ($state, $reststates) = split(/,/, $state, 2);
+        ($state, $RESTSTATES) = split(/,/, $state, 2);
         chomp($state);
         if ($state eq "image" or $state eq "winshell" or $state =~ /^osimage/) {
             my $target;
@@ -251,13 +251,20 @@ sub rinstall {
         #only provision the normal nodes
         @nodes = @validnodes;
 
-        push @parameter, "osimage=$OSIMAGE";
+        if ($RESTSTATES) {
+            push @parameter, "osimage=$OSIMAGE,$RESTSTATES";
+        } else {
+            push @parameter, "osimage=$OSIMAGE";
+        }
         if ($ignorekernelchk) {
             push @parameter, " --ignorekernelchk";
         }
     }
     elsif ($STATES) {
         push @parameter, "$STATES";
+        if ($RESTSTATES) {
+            $parameter[-1] .= ",$RESTSTATES";
+        }
     }
     else {
 
@@ -310,8 +317,10 @@ sub rinstall {
 
         #only provision the normal nodes
         @nodes = @validnodes;
-
         push @parameter, "osimage";
+        if ($RESTSTATES) {
+            $parameter[-1] .= ",$RESTSTATES";
+        }
     }
 
     if (scalar(@nodes) == 0) {

From 3957ca41db81e255eb2b55e5d6795fea0b6f750d Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Wed, 19 Jul 2017 02:51:40 -0400
Subject: [PATCH 176/283] fix 3496, depends on xcatdebugmode to print debug msg

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index d5335de51..d977907e8 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -29,10 +29,10 @@ use xCAT::SvrUtils;
 use xCAT::GlobalDef;
 use xCAT_monitoring::monitorctrl;
 
-$::VERBOSE = 0;
+$::VERBOSE                  = 0;
 # String constants for rbeacon states
-$::BEACON_STATE_OFF="off";
-$::BEACON_STATE_ON="on";
+$::BEACON_STATE_OFF         = "off";
+$::BEACON_STATE_ON          = "on";
 # String constants for rpower states
 $::POWER_STATE_OFF          = "off";
 $::POWER_STATE_ON           = "on";
@@ -41,9 +41,9 @@ $::POWER_STATE_POWERING_ON  = "powering-on";
 $::POWER_STATE_QUIESCED     = "quiesced";
 $::POWER_STATE_RESET        = "reset";
 $::POWER_STATE_REBOOT       = "reboot";
-$::UPLOAD_FILE="";
+$::UPLOAD_FILE              = "";
 
-$::NO_ATTRIBUTES_RETURNED="No attributes returned from the BMC.";
+$::NO_ATTRIBUTES_RETURNED   = "No attributes returned from the BMC.";
 
 sub unsupported {
     my $callback = shift;
@@ -301,8 +301,13 @@ my $async;
 my $cookie_jar;
 
 my $callback;
+
 my %allerrornodes = ();
 
+my $xcatdebugmode = 0;
+
+my $flag_debug = "[openbmc_debug]";
+
 #-------------------------------------------------------
 
 =head3  preprocess_request
@@ -387,6 +392,8 @@ sub process_request {
         @exargs = @$extrargs;
     }
 
+    if ($::XCATSITEVALS{xcatdebugmode}) { $xcatdebugmode = $::XCATSITEVALS{xcatdebugmode} }
+
     my $check = parse_node_info($noderange);
     my $rst = parse_command_status($command, \@exargs);
     return if ($rst);
@@ -422,7 +429,7 @@ sub process_request {
             $handle_id = xCAT::OPENBMC->new($async, $login_url, $content); 
             $handle_id_node{$handle_id} = $node;
             $node_info{$node}{cur_status} = $next_status{ $node_info{$node}{cur_status} };
-            print "$node: DEBUG POST $login_url -d $content\n";
+            xCAT::SvrUtils::sendmsg("$flag_debug POST $login_url -d $content", $callback, $node) if ($xcatdebugmode); 
         }
     }  
 
@@ -460,24 +467,28 @@ sub parse_args {
     my $noderange = shift;
     my $check = undef;
 
-    if (!defined($extrargs) and $command =~ /rpower|rsetboot|rspconfig|rflash/) {
-        return ([ 1, "No option specified for $command" ]);
-    }
+    xCAT::SvrUtils::sendmsg("[OpenBMC development support] Using this version of xCAT, ensure firware level is at v1.99.6-0-r1, or higher.", $callback);
 
     my $subcommand = undef;
-    if (scalar(@ARGV) > 2 and ($command =~ /rpower|rinv|rsetboot|rvitals/)) {
-        return ([ 1, "Only one option is supported at the same time" ]);
-    } elsif (scalar(@ARGV) == 2) {
-        # Check if one is calling for Verbose output
-        foreach (@ARGV) {
-           if ($_ =~ /V|verbose/) {
-              $::VERBOSE=1;
-           } else {
-               $subcommand = $_
-           }
-        }
+    my $verbose    = undef;
+    unless (GetOptions(
+        'V|verbose'  => \$verbose,
+    )) {
+        return ([ 1, "Error parsing arguments." ]);
+    }
+
+    # If command includes '-V', it must be the last one prarmeter. Or print error message.
+    if ($verbose) {
+        my $option = $$extrargs[-1];
+        return ([ 1, "Error parsing arguments." ]) if ($option !~ /V|verbose/);
+    }
+
+    if (scalar(@ARGV) >= 2 and ($command =~ /rpower|rinv|rsetboot|rvitals/)) {
+        return ([ 1, "Only one option is supported at the same time for $command" ]);
+    } elsif (scalar(@ARGV) == 0 and $command =~ /rpower|rsetboot|rspconfig|rflash/) {
+        return ([ 1, "No option specified for $command" ]);
     } else { 
-         $subcommand = $ARGV[0]
+        $subcommand = $ARGV[0];
     }
 
     if ($command eq "rbeacon") { 
@@ -504,10 +515,10 @@ sub parse_args {
             return ([ 1, "Unsupported command: $command $subcommand" ]);
         }
     } elsif ($command eq "reventlog") {
-        #
-        # disable function until fully tested
-        #
-        $check = unsupported($callback); if (ref($check) eq "ARRAY") { return $check; }
+        my $option_s = 0;
+        unless (GetOptions("s" => \$option_s,)) {
+            return ([1, "Error parsing arguments." ]);
+        }
         $subcommand = "all" if (!defined($ARGV[0]));
         unless ($subcommand =~ /^\d$|^\d+$|^all$|^clear$/) {
             return ([ 1, "Unsupported command: $command $subcommand" ]);
@@ -594,18 +605,13 @@ sub parse_command_status {
     my $subcommands = shift;
     my $subcommand;
 
-    xCAT::SvrUtils::sendmsg("[OpenBMC development support] Using this version of xCAT, ensure firware level is at v1.99.6-0-r1, or higher.", $callback);
+    if ($$subcommands[-1] =~ /V|verbose/) {
+        $::VERBOSE = 1;
+        pop(@$subcommands);
+    }
 
     $next_status{LOGIN_REQUEST} = "LOGIN_RESPONSE";
 
-    my $verbose = undef;
-    unless (GetOptions(
-        'V|verbose'  => \$verbose,
-    )) {
-        xCAT::SvrUtils::sendmsg("Error parsing arguments.", $callback);
-        return 1;
-    }
-
     if ($command eq "rbeacon") { 
         $subcommand = $$subcommands[0];
 
@@ -675,12 +681,6 @@ sub parse_command_status {
     }
 
     if ($command eq "rsetboot") {
-        my $persistent = 0;
-        unless (GetOptions("p" => \$persistent,)) {
-            xCAT::SvrUtils::sendmsg("Error parsing arguments.", $callback);
-            return 1;
-        }
-
         $subcommand = $$subcommands[0];
         if ($subcommand =~ /^hd$|^net$|^cd$|^default$|^def$/) {
             $next_status{LOGIN_RESPONSE} = "RSETBOOT_SET_REQUEST";
@@ -706,9 +706,9 @@ sub parse_command_status {
 
     if ($command eq "reventlog") {
         my $option_s = 0;
-        unless (GetOptions("s" => \$option_s,)) {
-            xCAT::SvrUtils::sendmsg("Error parsing arguments.", $callback);
-            return 1;
+        if ($$subcommands[-1] eq "-s") {
+            $option_s = 1; 
+            pop(@$subcommands);
         }
 
         if (defined($$subcommands[0])) {
@@ -780,14 +780,19 @@ sub parse_command_status {
         my $list = 0;
         my $delete = 0;
         my $upload = 0;
-        unless (GetOptions(
-            'c|check'  => \$check_version,
-            'l|list'   => \$list,
-            'd|delete' => \$delete,
-            'u|upload' => \$upload,
-        )) {
-            xCAT::SvrUtils::sendmsg("Error parsing arguments.", $callback);
-            return 1;
+
+        if ($$subcommands[-1] =~ /c|check/) {
+            $check_version = 1;
+            pop(@$subcommands);
+        } elsif ($$subcommands[-1] =~ /l|list/) {
+            $list = 1;
+            pop(@$subcommands);
+        } elsif ($$subcommands[-1] =~ /d|delete/) {
+            $delete = 1;
+            pop(@$subcommands);
+        } elsif ($$subcommands[-1] =~ /u|upload/) {
+            $upload = 1;
+            pop(@$subcommands);
         }
 
         my $update_file = $$subcommands[0]; 
@@ -966,17 +971,17 @@ sub gen_send_request {
 
     my $debug_info;
     if ($method eq "GET") {
-        $debug_info = "$node: DEBUG $method $request_url";
+        $debug_info = "$method $request_url";
     } else {
         if ($::UPLOAD_FILE) {
             # Slightly different debug message when doing a file upload
-            $debug_info = "$node: DEBUG $method $request_url -T " . $::UPLOAD_FILE;
+            $debug_info = "$method $request_url -T " . $::UPLOAD_FILE;
         }
         else {
-            $debug_info = "$node: DEBUG $method $request_url -d $content";
+            $debug_info = "$method $request_url -d $content";
         }
     }
-    print "$debug_info\n";
+    xCAT::SvrUtils::sendmsg("$flag_debug $debug_info", $callback, $node) if ($xcatdebugmode);
 
     return;
 }
@@ -1000,7 +1005,8 @@ sub deal_with_response {
 
     delete $handle_id_node{$handle_id};
 
-    print "$node: DEBUG " . lc ($node_info{$node}{cur_status}) . " " . $response->status_line . "\n";
+    my $debug_info = lc ($node_info{$node}{cur_status}) . " " . $response->status_line;
+    xCAT::SvrUtils::sendmsg("$flag_debug $debug_info", $callback, $node) if ($xcatdebugmode);
 
     if ($response->status_line ne $::RESPONSE_OK) {
         my $error;
@@ -1130,12 +1136,12 @@ sub rpower_response {
             }
         }
        
-        print "$node: DEBUG State CurrentBMCState=$bmc_state\n";
-        print "$node: DEBUG State RequestedBMCTransition=$bmc_transition_state\n";
-        print "$node: DEBUG State CurrentPowerState=$chassis_state\n";
-        print "$node: DEBUG State RequestedPowerTransition=$chassis_transition_state\n";
-        print "$node: DEBUG State CurrentHostState=$host_state\n";
-        print "$node: DEBUG State RequestedHostTransition=$host_transition_state\n";
+        xCAT::SvrUtils::sendmsg("$flag_debug State CurrentBMCState=$bmc_state", $callback, $node) if ($xcatdebugmode);
+        xCAT::SvrUtils::sendmsg("$flag_debug State RequestedBMCTransition=$bmc_transition_state", $callback, $node) if ($xcatdebugmode);
+        xCAT::SvrUtils::sendmsg("$flag_debug State CurrentPowerState=$chassis_state", $callback, $node) if ($xcatdebugmode);
+        xCAT::SvrUtils::sendmsg("$flag_debug State RequestedPowerTransition=$chassis_transition_state", $callback, $node) if ($xcatdebugmode);
+        xCAT::SvrUtils::sendmsg("$flag_debug State CurrentHostState=$host_state", $callback, $node) if ($xcatdebugmode);
+        xCAT::SvrUtils::sendmsg("$flag_debug State RequestedHostTransition=$host_transition_state", $callback, $node) if ($xcatdebugmode);
 
         if (defined $status_info{RPOWER_STATUS_RESPONSE}{argv} and $status_info{RPOWER_STATUS_RESPONSE}{argv} =~ /bmcstate$/) { 
             my $bmc_node = "$node BMC";
@@ -1512,13 +1518,6 @@ sub rspconfig_response {
         xCAT::SvrUtils::sendmsg("$_", $callback, $node) foreach (@output);
     }
 
-    if ($node_info{$node}{cur_status} eq "RSPCONFIG_SET_RESPONSE" and $response_info->{'message'} eq $::RESPONSE_OK) {
-        if ($status_info{RSPCONFIG_SET_RESPONSE}{ip}) {
-            $node_info{$node}{bmc} = $status_info{RSPCONFIG_SET_RESPONSE}{ip};
-            print "$node: DEBUG BMC IP is $node_info{$node}{bmc}\n";
-        }
-    }
-
     if ($next_status{ $node_info{$node}{cur_status} }) {
         $node_info{$node}{cur_status} = $next_status{ $node_info{$node}{cur_status} };
         gen_send_request($node);
@@ -1600,7 +1599,7 @@ sub rvitals_response {
     my $content_info;
     my @sorted_output;
     
-    print "$node: DEBUG Processing command: rvitals $grep_string \n";
+    xCAT::SvrUtils::sendmsg("$flag_debug Processing command: rvitals $grep_string", $callback, $node) if ($xcatdebugmode);
     print Dumper(%{$response_info->{data}});
 
     foreach my $key_url (keys %{$response_info->{data}}) {

From 970be4a7ddae4743dbc6f62e167d13b003483a33 Mon Sep 17 00:00:00 2001
From: yangsong <immarvin@users.noreply.github.com>
Date: Wed, 19 Jul 2017 04:41:06 -0500
Subject: [PATCH 177/283] fix issue:rinstall plugin bug when setup SN on
 sles12.2 ppc64le #3466;fix issue [FVT] rinstall will hung when it failed to
 terminate sub process with SIGKILL #3094 (#3507)

---
 xCAT-server/lib/xcat/plugins/kvm.pm | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/kvm.pm b/xCAT-server/lib/xcat/plugins/kvm.pm
index 48dc8b634..de8ff6273 100755
--- a/xCAT-server/lib/xcat/plugins/kvm.pm
+++ b/xCAT-server/lib/xcat/plugins/kvm.pm
@@ -3153,7 +3153,12 @@ sub power {
                 $allnodestatus{$node} = $::STATUS_POWERING_ON;
             }
         } elsif (not $dom->is_active()) {
-            $dom->create();
+            eval{
+                $dom->create();
+            };
+            if($@){
+                return (1, "Error: $@");
+            }
             $allnodestatus{$node} = $::STATUS_POWERING_ON;
         } else {
             $retstring .= "$status_noop";
@@ -3163,7 +3168,12 @@ sub power {
             my $newxml = $dom->get_xml_description();
             $updatetable->{kvm_nodedata}->{$node}->{xml} = $newxml;
             if ($dom->is_active()) {
-                $dom->destroy();
+                eval{
+                    $dom->destroy();
+                };
+                if($@){
+                    return (1, "Error: $@");
+                }               
                 $allnodestatus{$node} = $::STATUS_POWERING_OFF;
             }
             undef $dom;
@@ -3185,7 +3195,10 @@ sub power {
             if ($newxml) {    #need to destroy and repower..
                 $updatetable->{kvm_nodedata}->{$node}->{xml} = $newxml;
                 my $persist = $dom->is_persistent();
-                $dom->destroy();
+                eval {$dom->destroy();};
+                if($@){
+                    return (1, "Error: $@");
+                }
                 $allnodestatus{$node} = $::STATUS_POWERING_OFF;
                 if ($persist) { $dom->undefine(); }
                 undef $dom;
@@ -4176,7 +4189,9 @@ sub dohyp {
                 $desc =~ s/^\s+//;
                 $desc =~ s/\s+$//;
                 if ($desc) {
-                    $output{node}->[0]->{data}->[0]->{desc}->[0] = $desc;
+                    if($rc == 0){
+                        $output{node}->[0]->{data}->[0]->{desc}->[0] = $desc;
+                    }
                 }
             }
             $text =~ s/^\s+//;
@@ -4186,7 +4201,7 @@ sub dohyp {
             if ($rc == 0) {
                 $output{node}->[0]->{data}->[0]->{contents}->[0] = $text;
             } else {
-                $output{node}->[0]->{error} = $text;
+                $output{node}->[0]->{error}->[0] = $text;
             }
 
             if ($command eq 'rpower') {

From 8560975bc82a9bcc3c7542e66fef45cb87c1ef00 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Wed, 19 Jul 2017 06:04:55 -0400
Subject: [PATCH 178/283] T support predictable nicname on genesis based on
 Fedora26

---
 xCAT-genesis-builder/80-net-name-slot.rules | 14 ++++++++++++++
 xCAT-genesis-builder/buildrpm               |  4 ++++
 2 files changed, 18 insertions(+)
 create mode 100644 xCAT-genesis-builder/80-net-name-slot.rules

diff --git a/xCAT-genesis-builder/80-net-name-slot.rules b/xCAT-genesis-builder/80-net-name-slot.rules
new file mode 100644
index 000000000..c5f1b3885
--- /dev/null
+++ b/xCAT-genesis-builder/80-net-name-slot.rules
@@ -0,0 +1,14 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add", GOTO="net_name_slot_end"
+SUBSYSTEM!="net", GOTO="net_name_slot_end"
+NAME!="", GOTO="net_name_slot_end"
+
+IMPORT{cmdline}="net.ifnames"
+ENV{net.ifnames}=="0", GOTO="net_name_slot_end"
+
+NAME=="", ENV{ID_NET_NAME_ONBOARD}!="", NAME="$env{ID_NET_NAME_ONBOARD}"
+NAME=="", ENV{ID_NET_NAME_SLOT}!="", NAME="$env{ID_NET_NAME_SLOT}"
+NAME=="", ENV{ID_NET_NAME_PATH}!="", NAME="$env{ID_NET_NAME_PATH}"
+
+LABEL="net_name_slot_end"
diff --git a/xCAT-genesis-builder/buildrpm b/xCAT-genesis-builder/buildrpm
index 28f3985aa..45de0953a 100755
--- a/xCAT-genesis-builder/buildrpm
+++ b/xCAT-genesis-builder/buildrpm
@@ -178,6 +178,10 @@ for d in `echo $PERL_LIB_DIR`; do
     fi
 done
 
+# create the predictable naming for nics
+LIB_UDEV_RULES="/lib/udev/rules.d/"
+cp $DRACUTMODDIR/80-net-name-slot.rules /tmp/xcatgenesis.$$/opt/xcat/share/xcat/netboot/genesis/$BUILDARCH/fs/lib/udev/rules.d/ 
+
 if [ $? -ne 0 ]; then
     echo "ERROR - expanding the initramfs, please correct the issues and try again"
     exit 1

From c3159a5b20a3b529df4471f63d1aafd04d80cca8 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Wed, 19 Jul 2017 17:18:31 -0400
Subject: [PATCH 179/283] Support pdudiscover command to discover PDU

---
 perl-xCAT/xCAT/Usage.pm                       |  5 +-
 xCAT-client/debian/xcat-client.links          |  1 +
 xCAT-client/xCAT-client.spec                  |  1 +
 xCAT-server/lib/xcat/plugins/pdu.pm           | 40 ++++++++-
 .../lib/xcat/plugins/switchdiscover.pm        | 82 ++++++++++++++-----
 5 files changed, 107 insertions(+), 22 deletions(-)

diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index dac2b65ad..04cda85e2 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -321,9 +321,12 @@ my %usage = (
       "Usage: lsslp [-h|--help|-v|--version]
        lsslp [<noderange>][-V|--verbose][-i ip[,ip..]][-w][-r|-x|-z][-n][-I][-s FRAME|CEC|MM|IVM|RSA|HMC|CMM|IMM2|FSP]
              [-u] [--range IPranges][-t tries][--vpdtable][-C counts][-T timeout]",
+    "pdudiscover" =>
+      "Usage: pdudiscover [-h|--help|-v|--version]
+       pdudiscover [<noderange>|--range ipranges] [-r|-x|-z] [-w] [-V|--verbose] [--setup]",
     "switchdiscover" =>
       "Usage: switchdiscover [-h|--help|-v|--version]
-       switchdiscover [<noderange>|--range ipranges] [-s scan_methods] [-r|-x|-z] [-w] [-V|--verbose] [--setup]",
+       switchdiscover [<noderange>|--range ipranges] [-s scan_methods] [-r|-x|-z] [-w] [-V|--verbose] [--setup] [--pdu]",
     "switchprobe" =>
       "Usage: switchprobe [<noderange>] [-V|--verbose | -c|--check]",
     "makentp" =>
diff --git a/xCAT-client/debian/xcat-client.links b/xCAT-client/debian/xcat-client.links
index d1e323960..2ac5097fc 100644
--- a/xCAT-client/debian/xcat-client.links
+++ b/xCAT-client/debian/xcat-client.links
@@ -126,6 +126,7 @@ opt/xcat/bin/xcatclientnnr opt/xcat/bin/rmzone
 opt/xcat/bin/xcatclientnnr opt/xcat/bin/slpdiscover
 opt/xcat/bin/xcatclient    opt/xcat/bin/xCATWorld
 opt/xcat/bin/xcatclientnnr opt/xcat/bin/switchdiscover
+opt/xcat/bin/xcatclientnnr opt/xcat/bin/pdudiscover
 opt/xcat/bin/xcatclientnnr opt/xcat/bin/bmcdiscover
 opt/xcat/bin/xcatclientnnr opt/xcat/bin/makentp
 opt/xcat/bin/xcatclientnnr opt/xcat/sbin/rescanplugins
diff --git a/xCAT-client/xCAT-client.spec b/xCAT-client/xCAT-client.spec
index 44235d213..5b8b7ac3d 100644
--- a/xCAT-client/xCAT-client.spec
+++ b/xCAT-client/xCAT-client.spec
@@ -166,6 +166,7 @@ ln -sf ../bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/mkflexnode
 ln -sf ../bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/getadapter
 ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/lsslp
 ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/switchdiscover
+ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/pdudiscover
 ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/bmcdiscover
 ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/makentp
 ln -sf ../bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/imgcapture
diff --git a/xCAT-server/lib/xcat/plugins/pdu.pm b/xCAT-server/lib/xcat/plugins/pdu.pm
index e92a7dc0d..7242aaf80 100644
--- a/xCAT-server/lib/xcat/plugins/pdu.pm
+++ b/xCAT-server/lib/xcat/plugins/pdu.pm
@@ -62,6 +62,7 @@ sub handled_commands
        rpower => ["nodehm:mgt","pduoutlet:pdu=\.\*"],
        rinv   => ["nodehm:mgt"],
        nodeset => ["nodehm:mgt"],
+       pdudiscover => "pdu",
     };
 }
 
@@ -85,6 +86,7 @@ sub preprocess_request {
     if (ref($extrargs)) {
         @exargs=@$extrargs;
     }
+
     my $usage_string=xCAT::Usage->parseCommand($command, @exargs);
     if ($usage_string) {
         $callback->({data=>[$usage_string]});
@@ -92,7 +94,7 @@ sub preprocess_request {
         return;
     }
 
-    if (!$noderange) {
+    if ((!$noderange) && ($command ne "pdudiscover") ){
         $usage_string = xCAT::Usage->getUsage($command);
         $callback->({ data => $usage_string });
         $req = {};
@@ -168,6 +170,8 @@ sub process_request
                 }
             }
         }
+    }elsif($command eq "pdudiscover") {
+        process_pdudiscover($request, $subreq, $callback);
     }elsif($command eq "nodeset") {
         $callback->({ errorcode => [1],error => "The input $command is not support for pdu"});
     }else{
@@ -453,6 +457,40 @@ sub connectTopdu {
 
 }
 
+sub process_pdudiscover {
+    my $request  = shift;
+    my $sub_req  = shift;
+    my $callback = shift;
+    my $extrargs = $request->{arg};
+    my @exargs   = ($request->{arg});
+    if (ref($extrargs)) {
+        @exargs=@$extrargs;
+    }
+
+    #check case in GetOptions
+    $Getopt::Long::ignorecase = 0;
+    Getopt::Long::Configure( "bundling" );
+    Getopt::Long::Configure("no_pass_through");
+    my %opt;
+    if (!GetOptions( \%opt,
+                    qw(h|help V|Verbose x z w r n range=s setup))) {
+        my $usage_string = xCAT::Usage->getUsage($request->{command}->[0]);
+        $callback->({ data => $usage_string });
+        return;
+
+    }
+
+    push @exargs, "-s snmp --pdu";
+    my $cmd = "switchdiscover @exargs";
+    my $result = xCAT::Utils->runcmd($cmd, 0);
+
+    my $rsp = {};
+    push @{ $rsp->{data} }, "$result";
+    xCAT::MsgUtils->message("I", $rsp, $callback);
+
+
+}
+
 
 
 1;
diff --git a/xCAT-server/lib/xcat/plugins/switchdiscover.pm b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
index cef5c4801..ec1ebe953 100644
--- a/xCAT-server/lib/xcat/plugins/switchdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
@@ -143,7 +143,7 @@ sub parse_args {
     # Process command-line flags
     #############################################
     if (!GetOptions( \%opt,
-            qw(h|help V|Verbose v|version x z w r n range=s s=s setup))) {
+            qw(h|help V|Verbose v|version x z w r n range=s s=s setup pdu))) {
         return( usage() );
     }
 
@@ -258,6 +258,10 @@ sub parse_args {
             $globalopt{setup} = 1;
     }
 
+    if ( exists( $opt{pdu} )) {
+            $globalopt{pdu} = 1;
+    }
+
 
     return;
 }
@@ -880,7 +884,7 @@ sub snmp_scan {
 
     # snmpwalk command has to be available for snmp_scan
     if (-x "/usr/bin/snmpwalk" ){
-        send_msg($request, 0, "Discovering switches using snmpwalk for @$ranges .....");
+        send_msg($request, 0, "Discovering devices using snmpwalk for @$ranges .....");
     } else {
         send_msg($request, 0, "snmpwalk is not available, please install snmpwalk command first");
         return 1;
@@ -968,7 +972,7 @@ sub snmp_scan {
             $switches->{$mac}->{vendor} = $vendor;
             $switches->{$mac}->{name} = $hostname;
             if (exists($globalopt{verbose}))    {
-               send_msg($request, 0, "found switch: $hostname, $ip, $stype, $vendor");
+               send_msg($request, 0, "found device: $hostname, $ip, $stype, $vendor");
             }
         }
     }
@@ -1006,9 +1010,16 @@ sub get_snmpvendorinfo {
         }
         return $snmpwalk_vendor;
     }
-
+   
     my ($desc,$model) = split /: /, $result;
 
+    if (exists($globalopt{pdu})) {
+        if ( ($model =~ /pdu/) || ($model =~ /PDU/) ) {
+            return $model;
+        }
+        return $snmpwalk_vendor;
+    }
+
     if (exists($globalopt{verbose}))    {
         send_msg($request, 0, "switch model = $model\n" );
     }
@@ -1185,6 +1196,13 @@ sub xCATdB {
             $mac=" ";
         }
 
+        # check if this is for pdu or switches
+        my $device = "switch";
+        if (exists($globalopt{pdu})) {
+            $device = "pdu";
+        }
+
+
         #################################################
         # use lsdef command to check if this switch is
         # already in the switch table
@@ -1195,14 +1213,15 @@ sub xCATdB {
         $ret = xCAT::Utils->runxcmd( { command => ['lsdef'], arg => ['-t','node','-o',$host] }, $sub_req, 0, 1);
         if ($::RUNCMD_RC == 0)
         {
-            $ret = xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$host,"ip=$ip","mac=$mac",'nodetype=switch','mgt=switch',"switchtype=$stype","usercomment=$vendor"] }, $sub_req, 0, 1);
-            $ret = xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$host,'-p','groups=switch'] }, $sub_req, 0, 1);
+            $ret = xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$host,"ip=$ip","mac=$mac","nodetype=$device","mgt=$device","usercomment=$vendor"] }, $sub_req, 0, 1);
+            $ret = xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$host,'-p',"groups=$device"] }, $sub_req, 0, 1);
         } else {
-            $ret = xCAT::Utils->runxcmd( { command => ['mkdef'], arg => ['-t','node','-o',$host,'groups=switch',"ip=$ip","mac=$mac",'nodetype=switch','mgt=switch',"switchtype=$stype","usercomment=$vendor"] }, $sub_req, 0, 1);
+            $ret = xCAT::Utils->runxcmd( { command => ['mkdef'], arg => ['-t','node','-o',$host,"groups=$device","ip=$ip","mac=$mac","nodetype=$device","mgt=$device","usercomment=$vendor"] }, $sub_req, 0, 1);
         }
-        if ($::RUNCMD_RC != 0)
+
+        if (!exists($globalopt{pdu})) 
         {
-            send_msg($request, 0, "$$ret[0]");
+            $ret = xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$host,'-p',"switchtype=$stype"] }, $sub_req, 0, 1);
         }
     }
 }
@@ -1287,14 +1306,22 @@ sub format_stanza {
         if ($mac =~ /nomac/) {
             $mac = " ";
         }
+      
+        # check if this is for pdu or switches
+        my $device = "switch";
+        if (exists($globalopt{pdu})) {
+            $device = "pdu";
+        }
 
         $result .= "$host:\n\tobjtype=node\n";
-        $result .= "\tgroups=switch\n";
+        $result .= "\tgroups=$device\n";
         $result .= "\tip=$ip\n";
         $result .= "\tmac=$mac\n";
-        $result .= "\tmgt=switch\n";
-        $result .= "\tnodetype=switch\n";
-        $result .= "\tswitchtype=$stype\n";
+        $result .= "\tmgt=$device\n";
+        $result .= "\tnodetype=$device\n";
+        if (!exists($globalopt{pdu})) {
+            $result .= "\tswitchtype=$stype\n";
+        }
     }
     return ($result); 
 }
@@ -1327,14 +1354,22 @@ sub format_xml {
             $mac = " ";
         }
 
+        # check if this is for pdu or switches
+        my $device = "switch";
+        if (exists($globalopt{pdu})) {
+            $device = "pdu";
+        }
+
         $result .= "hostname=$host\n";
         $result .= "objtype=node\n";
-        $result .= "groups=switch\n";
+        $result .= "groups=$device\n";
         $result .= "ip=$ip\n";
         $result .= "mac=$mac\n";
-        $result .= "mgt=switch\n";
-        $result .= "nodetype=switch\n";
-        $result .= "switchtype=$stype\n";
+        $result .= "mgt=$device\n";
+        $result .= "nodetype=$device\n";
+        if (!exists($globalopt{pdu})) {
+            $result .= "switchtype=$stype\n";
+        }
 
         my $href = {
             Switch => { }
@@ -1353,7 +1388,7 @@ sub format_xml {
     return ($xml);    
 }
 
-#--------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
 =head3 matchPredefineSwitch 
       find discovered switches with predefine switches
       for each discovered switches:
@@ -1388,7 +1423,7 @@ sub matchPredefineSwitch {
 
         my $node = $macmap->find_mac($mac,0,1);
         if (!$node) {
-            send_msg($request, 0, "Switch discovered: $dswitch ");
+            send_msg($request, 0, "Device discovered: $dswitch ");
             $discoverswitch->{$mac}->{ip} = $ip;
             $discoverswitch->{$mac}->{vendor} = $vendor;
             $discoverswitch->{$mac}->{name} = $dswitch;
@@ -1397,11 +1432,14 @@ sub matchPredefineSwitch {
 
         my $stype = get_switchtype($vendor);
 
-        send_msg($request, 0, "Switch discovered and matched: $dswitch to $node" );
+        send_msg($request, 0, "Device discovered and matched: $dswitch to $node" );
 
         # only write to xcatdb if -w or --setup option specified
         if ( (exists($globalopt{w})) || (exists($globalopt{setup})) ) {
             xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$node,"otherinterfaces=$ip",'status=Matched',"mac=$mac","switchtype=$stype","usercomment=$vendor"] }, $sub_req, 0, 1);
+            if (!exists($globalopt{pdu})) {
+                xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$node,"switchtype=$stype"] }, $sub_req, 0, 1);
+            }
         }
 
         push (@{$configswitch->{$stype}}, $node);
@@ -1423,6 +1461,10 @@ sub switchsetup {
     my $nodes_to_config = shift;
     my $request = shift;
     my $sub_req = shift;
+    if (exists($globalopt{pdu})) {
+        return;
+    }
+
     foreach my $mytype (keys %$nodes_to_config) {
         my $config_script = "$::XCATROOT/share/xcat/scripts/config".$mytype;
         if (-r -x $config_script) {

From 90aead72175d29857741eb97a6eb2280f6e18e89 Mon Sep 17 00:00:00 2001
From: Samveen <samveen@yahoo.com>
Date: Thu, 20 Jul 2017 08:27:12 +0700
Subject: [PATCH 180/283] `doxcat`: Check if governor exists before applying
 (#3509)

---
 xCAT-genesis-scripts/bin/doxcat | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/xCAT-genesis-scripts/bin/doxcat b/xCAT-genesis-scripts/bin/doxcat
index b95a0e0e1..8896515f4 100755
--- a/xCAT-genesis-scripts/bin/doxcat
+++ b/xCAT-genesis-scripts/bin/doxcat
@@ -29,9 +29,11 @@ logger -s -t $log_label -p local4.info "Beginning doxcat process..."
 modprobe acpi_cpufreq 2>/dev/null		# on some machines this fails
 modprobe cpufreq_ondemand
 if ls /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor &>/dev/null; then
-	for gov in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do
-		echo -n ondemand > $gov
-	done
+    if grep -q ondemand /sys/devices/system/cpu/cpu*/cpufreq/scaling_available_governors; then 
+        for gov in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do
+            echo -n ondemand > $gov
+        done
+    fi
 fi
 if [ ! -z "$BOOTIF" ]; then
 	BOOTIF=`echo $BOOTIF|sed -e s/01-// -e s/-/:/g`

From 577e5cef28ed0b4224d7e29d3bf7e22e13e0acba Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Wed, 19 Jul 2017 22:46:23 -0400
Subject: [PATCH 181/283] modified depending on comments

---
 perl-xCAT/xCAT/Usage.pm                 | 2 +-
 xCAT-server/lib/xcat/plugins/openbmc.pm | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index dac2b65ad..33e1b1d68 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -118,7 +118,7 @@ my %usage = (
     pdu specific:
        rinv noderange ",
     "rsetboot" =>
-"Usage: rsetboot <noderange> [net|hd|cd|floppy|def|stat] [-V|--verbose] [-u] [-p]
+"Usage: rsetboot <noderange> [net|hd|cd|floppy|def|stat] [-u] [-p]
        rsetboot [-h|--help|-v|--version]",
     "rbootseq" =>
       "Usage: 
diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index d977907e8..7aabbee9d 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -485,7 +485,7 @@ sub parse_args {
 
     if (scalar(@ARGV) >= 2 and ($command =~ /rpower|rinv|rsetboot|rvitals/)) {
         return ([ 1, "Only one option is supported at the same time for $command" ]);
-    } elsif (scalar(@ARGV) == 0 and $command =~ /rpower|rsetboot|rspconfig|rflash/) {
+    } elsif (scalar(@ARGV) == 0 and $command =~ /rpower|rspconfig|rflash/) {
         return ([ 1, "No option specified for $command" ]);
     } else { 
         $subcommand = $ARGV[0];
@@ -511,10 +511,15 @@ sub parse_args {
         # disable function until fully tested
         #
         $check = unsupported($callback); if (ref($check) eq "ARRAY") { return $check; }
+        $subcommand = "stat" if (!defined($ARGV[0]));
         unless ($subcommand =~ /^net$|^hd$|^cd$|^def$|^default$|^stat$/) {
             return ([ 1, "Unsupported command: $command $subcommand" ]);
         }
     } elsif ($command eq "reventlog") {
+        #
+        # disable function until fully tested
+        #
+        $check = unsupported($callback); if (ref($check) eq "ARRAY") { return $check; }
         my $option_s = 0;
         unless (GetOptions("s" => \$option_s,)) {
             return ([1, "Error parsing arguments." ]);

From d1b823b4b3a562dde9f286b94f8f3dff1aa6dc39 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Thu, 20 Jul 2017 03:46:46 -0400
Subject: [PATCH 182/283] fix bug: failed to load config file which value
 include comma in object section

---
 xCAT-test/xcattest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-test/xcattest b/xCAT-test/xcattest
index 00133e425..be197d0d9 100755
--- a/xCAT-test/xcattest
+++ b/xCAT-test/xcattest
@@ -682,7 +682,7 @@ sub load_config_file {
             }
         } elsif ($type eq "Object") {
             ##OBJECT BLOCK##
-            if ($line =~ /(\w+)\s*=\s*([:\w\.\-\/]+)/) {
+            if ($line =~ /(\w+)\s*=\s*([:,\w\.\-\/]+)/) {
                 $attr  = $1;
                 $value = $2;
                 if ($attr eq "Name") {

From 44eebd897c6236909481c3cdf52c49bc24d38abb Mon Sep 17 00:00:00 2001
From: Yuan Bai <bybai@cn.ibm.com>
Date: Thu, 20 Jul 2017 15:48:36 +0800
Subject: [PATCH 183/283] Enhance confignetwork to integrate with configib
 (#3505)

---
 xCAT/postscripts/confignetwork | 84 ++++++++++++++++++++++++----------
 1 file changed, 59 insertions(+), 25 deletions(-)

diff --git a/xCAT/postscripts/confignetwork b/xCAT/postscripts/confignetwork
index 6fac25ac8..b5d20c15b 100755
--- a/xCAT/postscripts/confignetwork
+++ b/xCAT/postscripts/confignetwork
@@ -79,12 +79,15 @@ function get_nic_cfg_file_content {
 #
 #####################################################################
 boot_install_nic=0
+str_ib_nics=''
+num_iba_ports=
 for arg in "$@"
 do
     if [ "$arg" = "-s" ];then
         boot_install_nic=1
+    elif [ "${arg:0:10}" = "--ibaports" ];then
+        num_iba_ports=${arg#--ibaports=}
     fi
-    #TODO: IB support is TBD
 done
 if [ "$SETINSTALLNIC" = "1" ] || [ "$SETINSTALLNIC" = "yes" ]; then
     bool_install_nic=1
@@ -179,7 +182,7 @@ function find_nic_type {
     if [ ! "$1" ];then
         return
     fi
-    nic=$1
+    nic=$1 
     echo $(hashget "nictypes" $nic)
 }
 
@@ -296,6 +299,7 @@ function sort_nics_device_order {
     eth_slot=""
     bond_slot=""
     vlan_slot=""
+    ib_slots=""
     num=1
     alone_nics=`echo "$all_nics_list"|awk '{if(0<NF&&NF<2) print $0}'`
     nics_list=`echo "$all_nics_list"|awk '{if(NF>1) print $0}'`
@@ -313,11 +317,20 @@ function sort_nics_device_order {
             #pre-check nicips nictype nicnetworks for alone nic
             #nicips nictype and nicnetworks should be configured in nics table for alone nic
             alonenicips=`find_nic_ips $alonenic`
-            alonenictype=`find_nic_type $alonenic`
+            alonenictype=`find_nic_type $alonenic | $utolcmd`
             alonenicnetwork=`query_nicnetworks_net $alonenic`
+            #if alone nic configure nicips, it is valid
             if [ -n "$alonenicips" ] && [ -n "$alonenictype" ] && [ -n "$alonenicnetwork" ]; then
-                #if alone nic configure nicips, it is valid 
-                echo $alonenic
+                #if alone nic is ib type, append all ib nics in ib_slots
+                if [ x"$alonenictype" = "xinfiniband" ]; then
+                    if [ -z $ib_slots ]; then
+                        ib_slots=$alonenic
+                    else
+                        ib_slots=$ib_slots,$alonenic
+                    fi
+                else
+                    echo $alonenic
+                fi
             else
                 errorcode=1
                 echo "Error: nicips,nictypes and nicnetworks should be configured in nics table for $alonenic."
@@ -327,7 +340,11 @@ function sort_nics_device_order {
         fi
         ((num1+=1))
     done
-    
+    #get all ib nics, format is ib0,ib1,...
+    if [ -n "$ib_slots" ]; then
+        echo "$ib_slots"
+    fi   
+ 
     if [ -n "$nics_list" ]; then
       if [ $is_redhat -eq 1 ]; then  
         num=1
@@ -426,6 +443,7 @@ function configure_nicdevice {
     base_temp_nic=""
     base_nic_for_bond=""
     line_num=""
+    custom_configured=0
     noip=1
     ((max+=1))
     while [ $num -lt $max ];
@@ -437,26 +455,34 @@ function configure_nicdevice {
             ((num+=1))
             continue
         fi
-        #processing custom scripts for nic
-        customcmd=`find_nic_custom_scripts $nic_dev`
-        customscript=`echo $customcmd|awk '{print $1}'`
-        if [ -n "$customscript" ]; then
-            if [ -f "/install/postscript/$customscript" ]; then
-                #if there is no custom script in /install/postscript,exit this loop
-                log_error "/install/postscript/$customscript does not exist."
-                errorcode=1
-                ((num+=1))
-                continue
-            fi
-            echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-            log_info "processing custom scripts:\"$customcmd\"  for interface $nic_dev"
-            $customcmd
-            if [ $? -ne 0 ]; then
-                errorcode=1
+        #All IB devices are in one string format as "ib0,ib1,..." in $nic_dev
+        #Find customcmd and customscript for each sub-nic device
+        for subdev in `echo $nic_dev|sed 's/,/\n/g'`
+        do
+            #processing custom scripts for nic
+            customcmd=`find_nic_custom_scripts $subdev`
+            customscript=`echo $customcmd|awk '{print $1}'`
+            if [ -n "$customscript" ]; then
+                custom_configured=1
+                if [ -f "/install/postscript/$customscript" ]; then
+                    #if there is no custom script in /install/postscript,exit this loop
+                    log_error "/install/postscript/$customscript does not exist."
+                    errorcode=1
+                    continue
+                fi
+                echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+                log_info "processing custom scripts:\"$customcmd\"  for interface $subdev"
+                $customcmd
+                if [ $? -ne 0 ]; then
+                    errorcode=1
+                fi
             fi
 
-            #if custom script is finished, go to configure next nic/nic_pair
+        done
+        #If the $nic_dev is costom configured, go to configure next nic/nic_pair
+        if [ $custom_configured -eq 1 ]; then
             ((num+=1))
+            custom_configured=0
             continue
         fi
         #get base nic and its type
@@ -471,7 +497,9 @@ function configure_nicdevice {
         
             base_nic_type=`find_nic_type "$base_temp_nic" | $utolcmd`
         fi
-        nic_dev_type=`find_nic_type "$nic_dev" | $utolcmd`
+        #if there is ib nics
+        first_nic_dev=`echo "$nic_dev"|awk -F, '{print $1}'`
+        nic_dev_type=`find_nic_type "$first_nic_dev" | $utolcmd`
         echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
         nic_pair=`echo "$nics_pair" |sed -n "${num}p"`
         echo "configure nic and its device : $nic_pair"
@@ -519,7 +547,13 @@ function configure_nicdevice {
         elif [ x"$nic_dev_type" = "xbond" ]; then
             create_bond_interface ifname=$nic_dev slave_ports=$base_nic_for_bond       
         elif [ x"$nic_dev_type" = "xinfiniband" ]; then
-            log_error "confignetwork does not support configure IB. "
+            log_info "Call configib for IB nics: $nic_dev, ports: $num_iba_ports"
+            log_info "NIC_IBNICS=$nic_dev NIC_IBAPORTS=$num_iba_ports configib"
+            NIC_IBNICS=$nic_dev NIC_IBAPORTS=$num_iba_ports configib
+            if [ $? -ne 0 ]; then
+                log_error "configib failed."
+                errorcode=1
+            fi
         else
             log_error "Error : please check nic data in nics table."
             errorcode=1

From e8df039d4204a4d7ad0702f351baebc64094105e Mon Sep 17 00:00:00 2001
From: chenglch <chenglch@cn.ibm.com>
Date: Wed, 19 Jul 2017 15:01:37 +0800
Subject: [PATCH 184/283] Make getadapter work during discovery process

This patch redesign the original getadapter plugins. Currently,
getadapter do not work as a common command but only a chain command
works during discovery.
---
 docs/source/advanced/networks/getadapter.rst  |  59 +-
 .../references/man1/getadapter.1.rst          | 147 ----
 xCAT-client/debian/xcat-client.links          |   1 -
 xCAT-client/pods/man1/getadapter.1.pod        |  94 ---
 xCAT-client/xCAT-client.spec                  |   1 -
 xCAT-genesis-scripts/bin/getadapter           |   6 +-
 xCAT-server/lib/xcat/plugins/getadapter.pm    | 663 ++----------------
 xCAT-server/sbin/xcatconfig                   |   2 +
 8 files changed, 81 insertions(+), 892 deletions(-)
 delete mode 100644 docs/source/guides/admin-guides/references/man1/getadapter.1.rst
 delete mode 100644 xCAT-client/pods/man1/getadapter.1.pod

diff --git a/docs/source/advanced/networks/getadapter.rst b/docs/source/advanced/networks/getadapter.rst
index c1ce39e48..43cdaa1a9 100644
--- a/docs/source/advanced/networks/getadapter.rst
+++ b/docs/source/advanced/networks/getadapter.rst
@@ -1,51 +1,42 @@
-Predict network adapter name before deployment
+Predict network adapter name during discovery
 ==============================================
 
+Traditionally, network interfaces in Linux are enumerated as eth[0123…], but
+these names do not correspond to actual labels on the chassis. Now, most of
+the linux distribution support naming the adapter with slot information which
+makes adapter name predictable. xCAT add ``getadapter`` script which can be
+running during discovery stage to detect the adapter names and pci slot
+information to help customer configure the network.
 
 
-Traditionally, network interfaces in Linux are enumerated as eth[0123…], but these names do not necessarily correspond to actual labels on the chassis. customer need a methods to get consistent and predictable network device name before provision or network configuration. xCAT provide a tool ``getadapter`` to help customer to resolve this problem.
-
-
-**[Note]** : This feature needs to restart your target sever which you want to obtain network adapter from.
-
-How to use get adapters
+How to use getadapter
 -----------------------
 
+Set the chian table to run ``getadapter`` script ::
 
-Using below command to obtain the network adapters information ::
- 
-    getadapter <noderange>
+  chdef <noderange> chain="runcmd=getadapter"
 
-Then will get output like below ::
+When the discovery completed, the column ``nicsadapter`` of ```nics`` table is
+updated.
 
+View result with ``lsdef`` command ::
 
-    The whole scan result:
-    --------------------------------------
-    [node2] scan successfully, below are the latest data
-    node2:[1]->eno1!mac=34:40:b5:be:6a:80|pci=/pci0000:00/0000:00:01.0/0000:0c:00.0|candidatename=eno1/enp12s0f0/enx3440b5be6a80
-    node2:[2]->enp0s29u1u1u5!mac=36:40:b5:bf:44:33|pci=/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.1/2-1.1.5/2-1.1.5:1.0|candidatename=enp0s29u1u1u5/enx3640b5bf4433
-    --------------------------------------
-    [node1] scan successfully, below are the latest data
-    node1:[1]->eno1!mac=34:40:b5:be:6a:80|pci=/pci0000:00/0000:00:01.0/0000:0c:00.0|candidatename=eno1/enp12s0f0/enx3440b5be6a80
-    node1:[2]->enp0s29u1u1u5!mac=36:40:b5:bf:44:33|pci=/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.1/2-1.1.5/2-1.1.5:1.0|candidatename=enp0s29u1u1u5/enx3640b5bf4433
+  # lsdef <node>
+  .......
+  nicsadapter.enP3p3s0f0=mac=98:be:94:59:fa:cc linkstate=DOWN pci=/pci0003:00/0003:00:00.0/0003:01:00.0/0003:02:01.0/0003:03:00.0 candidatename=enP3p3s0f0/enx98be9459facc
+  nicsadapter.enP3p3s0f1=mac=98:be:94:59:fa:cd linkstate=DOWN pci=/pci0003:00/0003:00:00.0/0003:01:00.0/0003:02:01.0/0003:03:00.1 candidatename=enP3p3s0f1/enx98be9459facd
+  nicsadapter.enP3p3s0f2=mac=98:be:94:59:fa:ce linkstate=DOWN pci=/pci0003:00/0003:00:00.0/0003:01:00.0/0003:02:01.0/0003:03:00.2 candidatename=enP3p3s0f2/enx98be9459face
+  nicsadapter.enP3p3s0f3=mac=98:be:94:59:fa:cf linkstate=UP pci=/pci0003:00/0003:00:00.0/0003:01:00.0/0003:02:01.0/0003:03:00.3 candidatename=enP3p3s0f3/enx98be9459facf
+  .......
 
+Below are the information ``getadapter`` trying to inspect:
 
-Every node gets a separate section to display its all network adapters information, every network adapter owns single line which start as node name and followed by index and other information.
+* **name**: the real adapter name used by genesis operation system
 
-xCAT try its best to collect more information for each network adapter, but can’t guarantee collect same much information for every one. If a network adapter can be derived by xcat genesis, this adapter will have a predictable name, if it can’t be, it only has the information xcat can obtain.
-    
-below are the possible information:
-
-* **name**: the consistent name which can be used by confignic directly in operating system which follow the same naming scheme with rhels7
-
-* **pci**: the pci location
+* **pci**: the pci slot location
 
 * **mac**: the MAC address
 
-* **candidatename**: All the names which satisfy predictable network device naming scheme, if customer needs to customize their network adapter name, they can choose one of them. (``confignic`` needs to do more work to support this. if customer want to use their own name, xcat should offer a interface to get customer’s input and change this column) 
+* **candidatename**: All the names which satisfy predictable network device naming scheme, if customer needs to customize their network adapter name, they can choose one of them. (``confignetwork`` needs to do more work to support this. if customer want to use their own name, xcat should offer a interface to get customer’s input and change this column)
 
-* **vendor**:  the vender of network device
-
-* **modle**:  the modle of network device
-    
-* **linkstate**:  The link state of network device
+* **linkstate**:  The link state of network device
\ No newline at end of file
diff --git a/docs/source/guides/admin-guides/references/man1/getadapter.1.rst b/docs/source/guides/admin-guides/references/man1/getadapter.1.rst
deleted file mode 100644
index 316f4bcea..000000000
--- a/docs/source/guides/admin-guides/references/man1/getadapter.1.rst
+++ /dev/null
@@ -1,147 +0,0 @@
-
-############
-getadapter.1
-############
-
-.. highlight:: perl
-
-
-****
-NAME
-****
-
-
-\ **getadapter**\  - Obtain all network adapters's predictable name and some other information before provision or network configuration.
-
-
-********
-SYNOPSIS
-********
-
-
-\ **getadapter**\  \ *noderange*\  [\ **-f**\ ]
-
-\ **getadapter**\  [\ **-h | -**\ **-help | -v | -**\ **-version | -V**\ ]
-
-
-***********
-DESCRIPTION
-***********
-
-
-Traditionally, network interfaces in Linux are enumerated as eth[0123...], but these names do not necessarily correspond to actual labels on the chassis. \ **getadapter**\  help customer to get predictable network device name and some other network adapter information before provision or network configuration.
-
-\ **Since getadpter uses genesis to collect network adapters information, the target node will be restarted.**\ 
-
-\ **getadapter**\  For each node within the <noderange>, follows below scheme:
-
-If the target node is scanned for the first time, \ **getadapter**\  will trigger genesis to collect information then save the information at the \ **nicsadapter**\  column of nics table.
-If the target node has ever been scanned,  \ **getadapter**\  will use the information from nics table first.
-If user hopes to scan the adapter information for the node but these information already exist, \ **-f**\  option can be used to start rescan process.
-
-\ **getadapter**\  tries to collect more information for the  target network device,  but doesn't guarantee collect same much information for every network device.
-
-
-******************************
-\ **Collected information:**\ 
-******************************
-
-
-
-\ **name**\ : the consistent name which can be used by confignic directly in operating system which follow the same naming scheme with rhels7
-
-
-
-\ **pci**\ : the pci location
-
-
-
-\ **mac**\ : the MAC address
-
-
-
-\ **candidatename**\ : All the names which satisfy predictable network device naming scheme. \ *(if xcat enhance confignic command later, user can use these names to configure their network adapter, even customize their name)*\ 
-
-
-
-\ **vender**\ :  the vender of network device
-
-
-
-\ **model**\ :  the model of network device
-
-
-
-\ **linkstate**\ :  the link state of network device
-
-
-
-
-*******
-OPTIONS
-*******
-
-
-\ **-h**\ 
-
-Display usage message.
-
-\ **-v**\ 
-
-Command Version.
-
-\ **-V**\ 
-
-Display verbose message.
-
-\ **-f**\ 
-
-Force to trigger new round scan. ignore the data collected before.
-
-
-********
-EXAMPLES
-********
-
-
-1. To collect node[1-3]'s network device information, enter:
-
-
-.. code-block:: perl
-
-  getadapter  node[1-2]
-
-
-Output is similar to:
-
-
-.. code-block:: perl
-
-  -->Starting scan for: node1,node2
-  The whole scan result:
-  --------------------------------------
-  [node1]: Adapter information exists, no need to scan.
-  --------------------------------------
-  [node2] scan successfully, below are the latest data
-  node2:[1]->eno1!mac=34:40:b5:be:6a:80|pci=/pci0000:00/0000:00:01.0/0000:0c:00.0|candidatename=eno1/enp12s0f0/enx3440b5be6a80
-  node2:[2]->enp0s29u1u1u5!mac=36:40:b5:bf:44:33|pci=/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.1/2-1.1.5/2-1.1.5:1.0|candidatename=enp0s29u1u1u5/enx3640b5bf4433
-
-
-Every node gets a separate section to display its all network adapters information, every network adapter owns single line which start as node name and followed by index and other information.
-
-2. Force to trigger new round scan
-
-
-.. code-block:: perl
-
-   getadatper node -f
-
-
-
-********
-SEE ALSO
-********
-
-
-noderange(3)|noderange.3
-
diff --git a/xCAT-client/debian/xcat-client.links b/xCAT-client/debian/xcat-client.links
index d1e323960..c9c0dc1b3 100644
--- a/xCAT-client/debian/xcat-client.links
+++ b/xCAT-client/debian/xcat-client.links
@@ -37,7 +37,6 @@ opt/xcat/bin/xcatclient opt/xcat/bin/lstree
 opt/xcat/bin/xcatclient opt/xcat/bin/lsflexnode
 opt/xcat/bin/xcatclient opt/xcat/bin/rmflexnode
 opt/xcat/bin/xcatclient opt/xcat/bin/mkflexnode
-opt/xcat/bin/xcatclient opt/xcat/bin/getadapter
 opt/xcat/bin/xcatclientnnr opt/xcat/bin/lsslp
 opt/xcat/bin/xcatclient opt/xcat/bin/imgcapture
 opt/xcat/bin/xcatclientnnr opt/xcat/bin/swapnodes
diff --git a/xCAT-client/pods/man1/getadapter.1.pod b/xCAT-client/pods/man1/getadapter.1.pod
deleted file mode 100644
index 0bdb93c42..000000000
--- a/xCAT-client/pods/man1/getadapter.1.pod
+++ /dev/null
@@ -1,94 +0,0 @@
-=head1 NAME
-
-B<getadapter> - Obtain all network adapters's predictable name and some other information before provision or network configuration.
-
-=head1 SYNOPSIS
-
-B<getadapter> I<noderange> [B<-f>]
-
-B<getadapter> [B<-h>|B<--help>|B<-v>|B<--version>|B<-V>]
-
-=head1 DESCRIPTION
-
-Traditionally, network interfaces in Linux are enumerated as eth[0123...], but these names do not necessarily correspond to actual labels on the chassis. B<getadapter> help customer to get predictable network device name and some other network adapter information before provision or network configuration.
-
-B<Since getadpter uses genesis to collect network adapters information, the target node will be restarted.>
-
-B<getadapter> For each node within the <noderange>, follows below scheme:
-
-If the target node is scanned for the first time, B<getadapter> will trigger genesis to collect information then save the information at the B<nicsadapter> column of nics table.
-If the target node has ever been scanned,  B<getadapter> will use the information from nics table first.
-If user hopes to scan the adapter information for the node but these information already exist, B<-f> option can be used to start rescan process.
-
-B<getadapter> tries to collect more information for the  target network device,  but doesn't guarantee collect same much information for every network device.
-
-=head1 B<Collected information:>
-
-=over 2
-
-=item B<name>: the consistent name which can be used by confignic directly in operating system which follow the same naming scheme with rhels7
-
-=item B<pci>: the pci location
-
-=item B<mac>: the MAC address
-
-=item B<candidatename>: All the names which satisfy predictable network device naming scheme. I<(if xcat enhance confignic command later, user can use these names to configure their network adapter, even customize their name)>
-
-=item B<vender>:  the vender of network device
-
-=item B<model>:  the model of network device
-
-=item B<linkstate>:  the link state of network device
-
-=back
-
-=head1 OPTIONS
-
-B<-h>
-
-Display usage message.
-
-B<-v>
-
-Command Version.
-
-B<-V>
-
-Display verbose message.
-
-B<-f>
-
-Force to trigger new round scan. ignore the data collected before.
-
-
-=head1 EXAMPLES
-
-1. To collect node[1-3]'s network device information, enter:
-
- getadapter  node[1-2]
-
-Output is similar to:
-
- -->Starting scan for: node1,node2
- The whole scan result:
- --------------------------------------
- [node1]: Adapter information exists, no need to scan.
- --------------------------------------
- [node2] scan successfully, below are the latest data
- node2:[1]->eno1!mac=34:40:b5:be:6a:80|pci=/pci0000:00/0000:00:01.0/0000:0c:00.0|candidatename=eno1/enp12s0f0/enx3440b5be6a80
- node2:[2]->enp0s29u1u1u5!mac=36:40:b5:bf:44:33|pci=/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.1/2-1.1.5/2-1.1.5:1.0|candidatename=enp0s29u1u1u5/enx3640b5bf4433
-
-Every node gets a separate section to display its all network adapters information, every network adapter owns single line which start as node name and followed by index and other information.
-
-
-2. Force to trigger new round scan
-
-  getadatper node -f
-
-
-
-=head1 SEE ALSO
-
-L<noderange(3)|noderange.3>
-
-
diff --git a/xCAT-client/xCAT-client.spec b/xCAT-client/xCAT-client.spec
index 44235d213..d4d841dc6 100644
--- a/xCAT-client/xCAT-client.spec
+++ b/xCAT-client/xCAT-client.spec
@@ -163,7 +163,6 @@ ln -sf ../bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/lstree
 ln -sf ../bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/lsflexnode
 ln -sf ../bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rmflexnode
 ln -sf ../bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/mkflexnode
-ln -sf ../bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/getadapter
 ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/lsslp
 ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/switchdiscover
 ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/bmcdiscover
diff --git a/xCAT-genesis-scripts/bin/getadapter b/xCAT-genesis-scripts/bin/getadapter
index 25b11afaf..c91dae564 100755
--- a/xCAT-genesis-scripts/bin/getadapter
+++ b/xCAT-genesis-scripts/bin/getadapter
@@ -4,7 +4,6 @@
 XCATPORT=3001
 export XCATPORT
 
-#XCATMASTER="10.3.5.21"
 ADAPTERFILE="/tmp/adapterinfo"
 SCANNICLOG="/tmp/adapterscan.log"
 
@@ -17,8 +16,6 @@ fi
 
 echo "<xcatrequest>
 <command>getadapter</command>
-<clienttype>cli</clienttype>
-<noderange>$HOSTNAME</noderange>
 <action>update</action>"  >> "$ADAPTERFILE"
 
 #scan adapters have recognized by operating system
@@ -111,5 +108,4 @@ else
              openssl s_client -connect $dhcps:$XCATPORT  <"$ADAPTERFILE"  >>"$SCANNICLOG" 2>&1
         fi
     fi
-fi
-
+fi
\ No newline at end of file
diff --git a/xCAT-server/lib/xcat/plugins/getadapter.pm b/xCAT-server/lib/xcat/plugins/getadapter.pm
index 3cdbe5bff..9fc989daa 100644
--- a/xCAT-server/lib/xcat/plugins/getadapter.pm
+++ b/xCAT-server/lib/xcat/plugins/getadapter.pm
@@ -2,7 +2,7 @@
 #-------------------------------------------------------
 
 =head1
-  xCAT plugin package to handle getadapter management
+  xCAT plugin package to handle getadapter request from genesis.
 
    Supported command:
         getadapter->getadapter
@@ -18,37 +18,9 @@ BEGIN {
 use lib "$::XCATROOT/lib/perl";
 
 use xCAT::Table;
-use xCAT::Utils;
-use xCAT::FifoPipe;
-use xCAT::MsgUtils;
 use xCAT::State;
 use Data::Dumper;
-use Getopt::Long;
-use File::Path;
-use Term::ANSIColor;
-use Time::Local;
 use strict;
-use Class::Struct;
-use XML::Simple;
-use Storable qw(dclone);
-
-my %usage = (
-"getadapter" => "Usage:\n\tgetadapter [-h|--help|-v|--version|V]\n\tgetadapter <noderange> [-f]",
-);
-
-my $VERBOSE = 0;
-use constant OPT_FORCE  => 0;
-use constant OPT_UPDATE => 1;
-
-use constant GET_ADPATER_DIR => "/var/run/getadapter";
-use constant ALARM_TIMEOUT   => 1800;
-
-unless (-d GET_ADPATER_DIR) {
-    mkpath(GET_ADPATER_DIR);
-}
-
-my %child_pids;
-my $timeout_event = 0;
 
 #-------------------------------------------------------
 
@@ -67,50 +39,16 @@ sub handled_commands
     };
 }
 
-#-------------------------------------------------------
-
-=head3  process_request
-
-  Process the command.
-
-=cut
-
-#-------------------------------------------------------
-sub process_request
-{
-    my $request  = shift;
-    my $callback = shift;
-    my $subreq   = shift;
-    my $command  = $request->{command}->[0];
-
-    $SIG{INT} = $SIG{TERM} = sub {
-        xCAT::MsgUtils->message("W", "getadapter: int or term signal received, clean up task state");
-        exit(clean_up());
-    };
-
-    if ($command eq "getadapter") {
-        &handle_getadapter($request, $callback, $subreq);
-    }
-    return;
-}
-
 #------------------------------------------------------------------
 
 =head3  route_request
 
-  Route the request, this funciton is called in the reqeust process.
+  This subroutine is used for the command called from genesis. As the client of
+  genesis is not a command line interface, this hook comand can help save one
+  fork compare with a common command.
 
-  return REQUEST_UPDATE if update request arrived. Now just send
-         message to the waiting process with fifo pipe.
-
-         (TODO) If getadapter is used in chain table to complete
-         the discovery process, the adapter information can be
-         updated directly in immediate plugin and there is no need
-         to fork plugin process.
-
-  return REQUEST_WAIT if inspect request arrived. Tell xcatd fork
-         plugin process to handle this request.
-  return REQUEST_ERROR if error happened.
+  return REQUEST_UPDATE if request is received.
+  return REQUEST_ERROR if error happens.
 
   Usage example:
         This is a hook function in xcatd, do not use it directly.
@@ -118,565 +56,70 @@ sub process_request
 
 #-----------------------------------------------------------------
 sub route_request {
-    my ($request, $callback, $subreq) = @_;
+    my $request = shift;
     my $command = $request->{command}->[0];
-    my $ret     = xCAT::State->REQUEST_ERROR;
-
-    if (!$request->{node}) {
-        return xCAT::State->REQUEST_WAIT;
+    if ($command eq "getadapter") {
+        if (!defined($request->{'action'}) || $request->{action}->[0] ne xCAT::State->UPDATE_ACTION) {
+            return xCAT::State->REQUEST_ERROR;
+        }
+        my $node = $request->{'_xcat_clienthost'}->[0];
+        if (!$request->{nic}) {
+            xCAT::MsgUtils->message("S", "$node: Could not get any nic information");
+            return xCAT::State->REQUEST_ERROR;
+        }
+        my $nics = \@{ $request->{nic} };
+        xCAT::MsgUtils->message("S", "$node: callback message from getadapter received");
+        if (update_nics_info($node, $nics)!=0) {
+            return xCAT::State->REQUEST_ERROR;
+        }
     }
-
-    my $build_request_message_func = sub {
-        my $req = shift;
-        my $xs  = new XML::Simple();
-        my $nic_info;
-        $nic_info->{'nic'}  = $req->{'nic'};
-        $nic_info->{'node'} = $req->{node}->[0];
-        return $xs->XMLout($nic_info);
-    };
-
-    if (defined($request->{'action'}) and $request->{action}->[0] eq xCAT::State->UPDATE_ACTION) {
-
-        # may be a callback request, just check the state then send message
-        # no need to fork a plugin process.
-        my $node            = ${ $request->{'node'} }[0];
-        my $taskstate_table = xCAT::Table->new('taskstate');
-        unless ($taskstate_table) {
-            xCAT::MsgUtils->message("S", "Unable to open taskstate table, denying");
-            return $ret;
-        }
-        my $node_obj = $taskstate_table->getAttribs({ 'node' => $node, 'command' => $command }, 'state', 'pid');
-
-        if (defined($node_obj) and $node_obj->{'state'} eq xCAT::State->WAIT_STATE) {
-            my $msg_queue = xCAT::FifoPipe->send_message(
-                xCAT::Utils->full_path($node_obj->{'pid'}, GET_ADPATER_DIR),
-                &$build_request_message_func($request));
-            $ret = xCAT::State->REQUEST_UPDATE;
-        }
-        else {
-            xCAT::MsgUtils->message("S", "Error to find the node in waiting state");
-        }
-        $taskstate_table->close();
-    } elsif (!defined($request->{'action'}) or $request->{action}->[0] eq xCAT::State->INSPECT_ACTION) {
-
-        # new request, fork a plugin child process to handle this request.
-        $ret = xCAT::State->REQUEST_WAIT;
-    }
-    return $ret;
+    return xCAT::State->REQUEST_UPDATE;
 }
 
-#-------------------------------------------------------
-
-=head3  handle_getadapter
-
-  This function check the command option, then call the
-  function to complete the request.
-
-  Usage example:
-        This function is called from process_request,
-        do not call it directly.
-=cut
-
-#-------------------------------------------------------
-
-sub handle_getadapter {
-    my $request  = shift;
-    my $callback = shift;
-    my $subreq   = shift;
-    my $command  = $request->{command}->[0];
-    my @opts;
-
-    my @args = ();
-    my $HELP;
-    my $VERSION;
-    my $FORCE;
-    my $UPDATE;
-    if (ref($request->{arg})) {
-        @args = @{ $request->{arg} };
-    } else {
-        @args = ($request->{arg});
-    }
-    @ARGV = @args;
-    Getopt::Long::Configure("bundling");
-    Getopt::Long::Configure("no_pass_through");
-    if (!GetOptions("h|help" => \$HELP,
-            "v|version" => \$VERSION,
-            "f"         => \$FORCE,
-            "u"         => \$UPDATE,
-            "V"         => \$VERBOSE
-        )) {
-        if ($usage{$command}) {
-            my $rsp = {};
-            $rsp->{error}->[0]     = $usage{$command};
-            $rsp->{errorcode}->[0] = 1;
-            $callback->($rsp);
-        }
-        return;
-    }
-
-    if ($HELP) {
-        if ($usage{$command}) {
-            my %rsp;
-            $rsp{data}->[0] = $usage{$command};
-            $callback->(\%rsp);
-        }
-        return;
-    }
-
-    if ($VERSION) {
-        my $ver = xCAT::Utils->Version();
-        my %rsp;
-        $rsp{data}->[0] = "$ver";
-        $callback->(\%rsp);
-        return;
-    }
-    @opts = ($FORCE, $UPDATE);
-
-    if (!defined($request->{'action'}) or $request->{action}->[0] eq xCAT::State->INSPECT_ACTION) {
-        return inspect_adapter($request, $callback, $subreq, \@opts);
-    }
-
-    return;
-}
-
-#------------------------------------------------------------------
-
-=head3  clean_up
-
-  Clean up the getadapter running environment
-
-  return 1 if clean up failed
-
-  Usage example:
-        clean_up()
-=cut
-
-#-----------------------------------------------------------------
-sub clean_up {
-    my $ret = 0;
-    foreach (keys %child_pids) {
-        kill 2, $_;
-    }
-    xCAT::MsgUtils->message("S", "Getadapter: clean up task state in database");
-
-    # NOTE(chenglch): Currently xcatd listener process has bug in signal handler,
-    # just comment out these code.
-    my $taskstate_table = xCAT::Table->new('taskstate');
-
-    if ($taskstate_table) {
-        $taskstate_table->delEntries({ 'pid' => getppid() });
-        $taskstate_table->close();
-    }
-    else {
-        xCAT::MsgUtils->message("S", "Clean up taskstate error");
-        $ret = 1;
-    }
-    xCAT::FifoPipe->remove_pipe(xCAT::Utils->full_path(getppid(), GET_ADPATER_DIR));
-    return $ret;
-}
-
-
-#------------------------------------------------------------------
-
-=head3  deploy_genesis
-
-  Fork processes to boot the target node into genesis
-
-  return array of nodes which are booting geneses.
-
-  Usage example:
-        my @nodes= ('node1', 'node2', 'node3');
-        my $nodes_desc_ptr,  a hash pointer to the description of nodes array.
-        @nodes = deploy_genesis(\@nodes, $nodes_desc_ptr, $callback, $subreq);
-
-=cut
-
-#-----------------------------------------------------------------
-sub deploy_genesis {
-    my $nodes_ptr      = shift;
-    my $nodes_desc_ptr = shift;
-    my $callback       = shift;
-    my $subreq         = shift;
-    my @nodes          = @{$nodes_ptr};
-    my $pid;
-
-    my $child_process_func = sub {
-        my ($node, $node_desc_ptr, $callback, $subreq) = @_;
-        my $outref = xCAT::Utils->runxcmd(
-            {
-                command => ['rinstall'],
-                node    => ["$node"],
-                arg     => ['runcmd=getadapter'],
-            },
-            $subreq, 0, 1);
-        if ($::RUNCMD_RC != 0) {
-            foreach my $out (@$outref) {
-                $callback->({data => "$out"})
-            }
-            $callback->({ error => "failed to run command: rinstall $node runcmd=getadapter", errorcode => 1 });
-            return 1;
-        }
-        $callback->({ data => "$node: Booting into genesis, this could take several minutes..." });
-        return 0;
-    };    # end of child_process_func
-
-    $SIG{CHLD} = 'DEFAULT';
-    foreach my $node (@nodes) {
-        $pid = xCAT::Utils->xfork();
-        if (!defined($pid)) {
-            $callback->({ error => "failed to fork process to restart $node", errorcode => 1 });
-            $node = undef;
-            last;
-        } elsif ($pid == 0) {
-
-            # child process
-            $SIG{INT} = $SIG{TERM} = 'DEFAULT';
-            my $node_desc_ptr = $nodes_desc_ptr->{$node};
-            xCAT::MsgUtils->trace($VERBOSE, "d", "getadapter: fork new process $$ to start scaning $node");
-            my $ret = &$child_process_func($node, $node_desc_ptr, $callback, $subreq);
-            exit($ret);
-        } else {
-
-            # Parent process
-            $child_pids{$pid} = $node;
-        }
-    }
-
-    # Wait for all processes to end
-    my $cpid = 0;
-    while (keys %child_pids) {
-        if (($cpid = wait()) > 0) {
-            my $status = $?;
-            if ($status != 0) {
-                my $node = $child_pids{$cpid};
-
-                #delete nodes if child process error.
-                map { $_ = undef if $_ eq $node } @nodes;
-            }
-            delete $child_pids{$cpid};
-        }
-    }
-
-    # delete undef
-    @nodes = grep /./, @nodes;
-    return @nodes;
-}
-
-#------------------------------------------------------------------
-
-=head3  update_adapter_result
-
-  Update the adapter information in the nics table.
-  Print the adapter information to STDOUT.
-
-  Input:
-        $msg: A hash pointer parsed from message from fifopipe
-        $nodes_desc_ptr: Nodes description pointer
-        $opts_ptr: A pointer to the nodes option
-        $callback: callback object
-
-  return -1 if unexpectd error.
-  return 0 success
-
-  Usage example:
-        my $msg;
-        my $nodes_desc_ptr;
-        my $opts_ptr;
-        my $callback
-        update_adapter_result($msg, $nodes_desc_ptr, $opts_ptr, $callback));
-
-=cut
-
-#-----------------------------------------------------------------
-sub update_adapter_result {
-    my $msg            = shift;
-    my $nodes_desc_ptr = shift;
-    my $opts_ptr       = shift;
-    my $callback       = shift;
-    my $node           = $msg->{'node'};
-    my $nicnum         = scalar @{ $msg->{nic} };
-    my ($output, $data, $interface_exists, $has_nic, %updates);
-
-    $data   = "";
-    $output = "[$node] scan successfully below is result:\n";
-    for (my $i = 0 ; $i < $nicnum ; $i++) {
-        $output .= "$node:[$i]->";
-        $interface_exists = 0;
-
-        if (exists($msg->{nic}->[$i]->{interface})) {
-            $output .= $msg->{nic}->[$i]->{interface}."!";
-            if ($has_nic) {
-                $data .= "," . $msg->{nic}->[$i]->{interface} . "!";
-            }
-            else {
-                $data .= $msg->{nic}->[$i]->{interface} . "!";
-            }
-            $interface_exists = 1;
-            $has_nic          = 1;
-        }
-        my @nic_attrs = ();
-        my @output_attrs = ();
-        if (exists($msg->{nic}->[$i]->{mac})) {
-            push(@output_attrs, "mac=" . $msg->{nic}->[$i]->{mac});
-            if ($interface_exists) {
-                push(@nic_attrs, "mac=" . $msg->{nic}->[$i]->{mac});
-            }
-        }
-        if (exists($msg->{nic}->[$i]->{pcilocation})) {
-            push(@output_attrs, "pci=" . $msg->{nic}->[$i]->{pcilocation});
-            if ($interface_exists) {
-                push(@nic_attrs, "pci=" . $msg->{nic}->[$i]->{pcilocation});
-            }
-        }
-        if (exists($msg->{nic}->[$i]->{predictablename})) {
-            push(@output_attrs, "candidatename=" . $msg->{nic}->[$i]->{predictablename});
-        }
-        if (exists($msg->{nic}->[$i]->{vendor})) {
-            $msg->{nic}->[$i]->{vendor} =~ s/^\s+|\s+$//g;
-            push(@output_attrs, "vendor=" . $msg->{nic}->[$i]->{vendor});
-        }
-        if (exists($msg->{nic}->[$i]->{model})) {
-            $msg->{nic}->[$i]->{model} =~ s/^\s+|\s+$//g;
-            push(@output_attrs, "model=" . $msg->{nic}->[$i]->{model});
-        }
-        if (exists($msg->{nic}->[$i]->{linkstate})) {
-            push(@output_attrs, "linkstate=" . (split(' ', $msg->{nic}->[$i]->{linkstate}))[0]);
-            if ($interface_exists) {
-                push(@nic_attrs, "linkstate=". (split(' ', $msg->{nic}->[$i]->{linkstate}))[0]);
-            }
-        }
-        if (@nic_attrs) {
-            $data .= join(" ", @nic_attrs);
-        }
-        $output .= join("|", @output_attrs);
-        $output .= "\n";
-    }
-    $callback->({ data => "$output" });
-    if (!$has_nic) {
-        $callback->({ data => "$node: nics table will not be updated as not any ".
-                    "useful information could be found with udevadm command." });
-        return 0;
-    }
-    my $nics_table = xCAT::Table->new('nics');
-    unless ($nics_table) {
-        xCAT::MsgUtils->message("S", "Unable to open nics table, denying");
-        $callback->({ error => "Error to connect to nics table.",
-                errorcode => 1 });
-        return -1;
-    }
-    $updates{'nicsadapter'} = $data;
-    if ($nics_table->setAttribs({ 'node' => $node }, \%updates) != 0) {
-        xCAT::MsgUtils->message("S", "Error to update nics table.");
-        $callback->({ error => "Error to update nics table.",
-                errorcode => 1 });
-        return -1;
-    }
-    return 0;
-}
-
-#------------------------------------------------------------------
-
-=head3  do_inspect
-
-  The main function to run the getadapter process
-
-
-  Input:
-        $nodesptr: The nodes pointer
-        $nodes_desc_ptr: Nodes description pointer
-        $opts_ptr: Option pointer
-        $callback: callback object
-        $subreq: xcat sub request
-
-  return -1 if unexpectd error.
-  return 0 success
-
-=cut
-
-#-----------------------------------------------------------------
-
-sub do_inspect {
-    my $nodesptr       = shift;
-    my $nodes_desc_ptr = shift;
-    my $opts_ptr       = shift;
-    my $callback       = shift;
-    my $subreq         = shift;
-    my @nodes          = @{$nodesptr};
-    my $updates;
-    my $msg;    # parse from xml
-
-    my $parse_request_message_func = sub {
-        my $xml = shift;
-        my $xs  = new XML::Simple();
-        return $xs->XMLin($xml);
-    };
-
-    my $timeout_output_func = sub {
-        my $nodes_ptr = shift;
-        my $callback  = shift;
-        foreach my $node (@{$nodes_ptr}) {
-            if ($node) {
-                $callback->({ error => "$node: Timeout to get the adapter information",
-                        errorcode => 1 });
-            }
-        }
-    };
-
-    my $taskstate_table = xCAT::Table->new('taskstate');
-    unless ($taskstate_table) {
-        xCAT::MsgUtils->message("S", "Unable to open taskstate table, denying");
-        $callback->({ error => "Error to connect to taskstate table.",
-                errorcode => 1 });
-        return -1;
-    }
-
-    # TODO(chenglch) Currently xcat db access is a single process model, this is
-    # safe. In the future:
-    # 1. If database is refactored, we need to protect the task
-    #    state with Optimistic Lock of database.
-    # 2. If we leverage the memcache or other cache database, we can make use of
-    #    the feature of the CAS to provide the atomic operation.
-    foreach my $node (@nodes) {
-        $updates->{$node}->{'command'} = "getadapter";
-        $updates->{$node}->{'state'}   = xCAT::State->WAIT_STATE;
-        $updates->{$node}->{'pid'}     = getppid();
-    }
-    $taskstate_table->setNodesAttribs($updates);
-    $taskstate_table->close();
-    @nodes = deploy_genesis(\@nodes, $nodes_desc_ptr, $callback, $subreq);
-    my $total = scalar(@nodes);
-    my $count = 0;
-    my @node_buf;
-
-    $SIG{ALRM} = sub {
-        xCAT::MsgUtils->message("W", "getadapter: alarm signal received");
-        $timeout_event = 1;
-
-        # pipe broken, wake up the wait fifo pipe
-        xCAT::FifoPipe->remove_pipe(xCAT::Utils->full_path(getppid(), GET_ADPATER_DIR));
-    };
-    alarm(ALARM_TIMEOUT);
-
-    while ($count < $total) {
-        my $c = xCAT::FifoPipe->recv_message(
-            xCAT::Utils->full_path(getppid(), GET_ADPATER_DIR),
-            \@node_buf);
-        if ($c <= 0) {
-            if ($timeout_event == 1) {
-                &$timeout_output_func(\@nodes, $callback);
-                clean_up();
-                return -1;
-            }
-            xCAT::MsgUtils->message("S", "Unexpected pipe error, abort.");
-            return -1;
-        }
+sub update_nics_info {
+    my $node = shift;
+    my $nics_ptr = shift;
+    my (@nics, @data, %updates);
+    @nics = @{$nics_ptr};
 
+    my $update_nics_table_func = sub {
+        my $node = shift;
+        my $nics = shift;
         my $nics_table = xCAT::Table->new('nics');
         unless ($nics_table) {
-            xCAT::MsgUtils->message("S", "Unable to open nics table, denying");
+            xCAT::MsgUtils->message("S", "Unable to open nics table for getadapter, denying");
             return -1;
         }
-
-        my $taskstate_table = xCAT::Table->new('taskstate');
-        unless ($taskstate_table) {
-            xCAT::MsgUtils->message("S", "Unable to open taskstate table, denying");
+        $updates{'nicsadapter'} = $nics;
+        if ($nics_table->setAttribs({ 'node' => $node }, \%updates) != 0) {
+            xCAT::MsgUtils->message("S", "Error to update nics table for getadapter.");
             return -1;
         }
-
-        for (my $i = 0 ; $i < $c ; $i++) {
-            $msg = &$parse_request_message_func($node_buf[$i]);
-
-            # delete the node
-            map { $_ = undef if $_ eq $msg->{'node'} } @nodes;
-            if (update_adapter_result($msg, $nodes_desc_ptr, $opts_ptr, $callback)) {
-                return -1;
-            }
-            $taskstate_table->delEntries({ 'node' => $msg->{'node'} });
-        }
-        $count += $c;
-        $taskstate_table->close();
         $nics_table->close();
-    }
-    xCAT::MsgUtils->trace($VERBOSE, "d", "getadapter: remove pipe " . xCAT::Utils->full_path(getppid(), GET_ADPATER_DIR));
-    xCAT::FifoPipe->remove_pipe(xCAT::Utils->full_path(getppid(), GET_ADPATER_DIR));
-    return 0;
-}
-
-#------------------------------------------------------------------
-
-=head3  inspect_adapter
-
-  Process the getadapter command option.
-
-  return -1 if unexpectd error.
-  return 0 success.
-
-=cut
-
-#-----------------------------------------------------------------
-sub inspect_adapter {
-    my $request  = shift;
-    my $callback = shift;
-    my $subreq   = shift;
-    my $opts_ptr = shift;
-    my @nodes;
-    my @entries;
-    my %nodes_desc;
-
-    my $init_desc_func = sub {
-        my $nodes_ptr      = shift;
-        my $callback       = shift;
-        my $nodes_desc_ptr = shift;
-        my @nodes          = @{$nodes_ptr};
-        my $nodehm_table   = xCAT::Table->new('nodehm');
-        unless ($nodehm_table) {
-            xCAT::MsgUtils->message("S", "Unable to open nodehm table, denying");
-            return -1;
-        }
-        my $entries = $nodehm_table->getNodesAttribs($nodes_ptr, ['mgt']);
-        unless ($entries) {
-            xCAT::MsgUtils->message("S", "No records about " . join(",", @nodes) . " in nodehm table");
-            return -1;
-        }
-        $nodehm_table->close();
-        foreach my $node (@nodes) {
-            if (!defined($entries->{$node}) || !defined($entries->{$node}->[0]->{mgt})) {
-                $callback->({ error => "$node: mgt configuration can not be found.",
-                        errorcode => 1 });
-                next;
-            }
-            $nodes_desc_ptr->{$node}->{'mgt'} = $entries->{$node}->[0]->{mgt};
-        }
         return 0;
-    };    # end of init_desc_func
+    };
 
-    # Get the nodes should be inspect.
-    if ($opts_ptr->[OPT_FORCE]) {
-        @nodes = @{ $request->{node} };
-    } else {
-        my $nics_table = xCAT::Table->new('nics');
-        unless ($nics_table) {
-            xCAT::MsgUtils->message("S", "Unable to open nics table, denying");
-            return -1;
-        }
-        my $entries = $nics_table->getNodesAttribs($request->{node}, ['nicsadapter']);
-        foreach my $node (@{ $request->{node} }) {
-            if ($entries->{$node} && $entries->{$node}->[0]->{nicsadapter}) {
-                $callback->({ data => "$node: Adapter information exists, no need to inspect." });
-                next;
+    for (my $i = 0; $i < scalar(@nics); $i++) {
+        if ($nics[$i]->{interface}) {
+            my @nic_attrs = ();
+            if ($nics[$i]->{mac}) {
+                push(@nic_attrs, "mac=".$nics[$i]->{mac}->[0]);
+            }
+            if ($nics[$i]->{linkstate}) {
+                push (@nic_attrs, "linkstate=". (split(' ', $nics[$i]->{linkstate}->[0]))[0]);
+            }
+            if($nics[$i]->{pcilocation}) {
+                push(@nic_attrs, "pci=" . $nics[$i]->{pcilocation}->[0]);
+            }
+            if ($nics[$i]->{predictablename}) {
+                push(@nic_attrs, "candidatename=" . $nics[$i]->{predictablename}->[0]);
+            }
+            if (@nic_attrs) {
+                push(@data, $nics[$i]->{interface}->[0]."!".join(" ", @nic_attrs));
             }
-            push(@nodes, $node);
         }
     }
-    if (scalar(@nodes) == 0) {
-        $callback->({ data => "No adapter information need to inspect." });
-        return -1;
-    }
-    xCAT::MsgUtils->trace($VERBOSE, "d", "getadapter: scaning start for " . join(",", @nodes));
-    if (&$init_desc_func(\@nodes, $callback, \%nodes_desc)) {
-        return -1;
-    }
-    return do_inspect(\@nodes, \%nodes_desc, $opts_ptr, $callback, $subreq);
+    return $update_nics_table_func->($node, join(",", @data));
 }
 
 1;
diff --git a/xCAT-server/sbin/xcatconfig b/xCAT-server/sbin/xcatconfig
index 51a3f1469..be5e512ca 100755
--- a/xCAT-server/sbin/xcatconfig
+++ b/xCAT-server/sbin/xcatconfig
@@ -1383,6 +1383,8 @@ sub initDB
 "$::XCATROOT/sbin/chtab priority=2.3 policy.commands=lsxcatd policy.rule=allow;";
         $chtabcmds .=
 "$::XCATROOT/sbin/chtab priority=2.1 policy.commands=remoteimmsetup policy.rule=allow;";
+        $chtabcmds .=
+"$::XCATROOT/sbin/chtab priority=4.9 policy.commands=getadapter policy.rule=allow;";
         my $outref = xCAT::Utils->runcmd("$chtabcmds", 0);
 
         if ($::RUNCMD_RC != 0)

From e569dcddd81e864e183caed9e3d2f924adb6803f Mon Sep 17 00:00:00 2001
From: Yuan Bai <bybai@cn.ibm.com>
Date: Thu, 20 Jul 2017 17:06:20 +0800
Subject: [PATCH 185/283] fix issue 3430 confignetwork could not config network
 if MTU is not set (#3455)

* fix issue 3430 confignetwork could not config network if MTU is not set

* polished based on comments.

* polished

* polished
---
 xCAT/postscripts/nicutils.sh | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/xCAT/postscripts/nicutils.sh b/xCAT/postscripts/nicutils.sh
index c3292831c..d00155256 100755
--- a/xCAT/postscripts/nicutils.sh
+++ b/xCAT/postscripts/nicutils.sh
@@ -288,6 +288,7 @@ function query_extra_params {
     if [ ${#array_nic_params[@]} -gt 0 ]; then
         #Current confignetwork only support one ip for vlan/bond/bridge
         #So only need the first ${array_nic_params[0]} for first nicips
+        #TODO: support multiple nicips for vlan/bond/bridge
         str_extra_params=${array_nic_params[0]}
         parse_nic_extra_params "$str_extra_params"
     fi
@@ -381,8 +382,7 @@ function get_network_attr {
    if [ $index -le $NETWORKS_LINES ]; then
        echo "$netline" | $sed -e 's/||/\n/g' | $awk -F'=' '$1 == "'$attrname'" {print $2}'
    else
-       log_error "Fail to get \"$attrname\" for network \"$netname\""
-       exit 1
+       return 1
    fi
 }
 
@@ -496,11 +496,18 @@ function create_persistent_ifcfg {
         fi
         if [ -z "$_netmask" ]; then
             _netmask=`get_network_attr $xcatnet mask`
+            if [ $? -ne 0 ]; then
+                log_error "There is no netmask configured for network $xcatnet in networks table"
+                _netmask=""
+            fi
         fi
 
         # Query mtu value from "networks" table
         if [ -z "$_mtu" ]; then
             _mtu=`get_network_attr $xcatnet mtu`
+            if [ $? -ne 0 ]; then
+                _mtu=""
+            fi
         fi
 
     fi
@@ -886,6 +893,9 @@ function create_bridge_interface {
     # Query mtu value from "networks" table
     if [ -z "$_mtu" ]; then
         _mtu=`get_network_attr $xcatnet mtu`
+        if [ $? -ne 0 ]; then
+            _mtu=""
+        fi
     fi
 
     if [ x$_pretype == "xethernet" ]; then 
@@ -1007,6 +1017,10 @@ function create_ethernet_interface {
     # Query mtu value from "networks" table
     if [ -z "$_mtu" ]; then
         _mtu=`get_network_attr $xcatnet mtu`
+        if [ $? -ne 0 ]; then
+            _mtu=""
+        fi
+
     fi
 
     # define and bring up interface
@@ -1094,6 +1108,10 @@ function create_vlan_interface {
     # Query mtu value from "networks" table
     if [ -z "$_mtu" ]; then
         _mtu=`get_network_attr $xcatnet mtu`
+        if [ $? -ne 0 ]; then
+            _mtu=""
+        fi
+
     fi
 
 
@@ -1271,8 +1289,10 @@ function create_bond_interface {
     # Query mtu value from "networks" table   
     if [ -z "$_mtu" ]; then
         _mtu=`get_network_attr $xcatnet mtu`
+        if [ $? -ne 0 ]; then
+            _mtu=""
+        fi
     fi
- 
     ##############################
     # Create target bond interface
     # if target bond device was already exists, assume succ.

From 4c8dfad42dc43ccab8497f386cc35e0c2b07630d Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Thu, 20 Jul 2017 13:50:04 -0400
Subject: [PATCH 186/283] OpenBMC rspconfig display

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 7aabbee9d..ae6eb3c68 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -233,7 +233,7 @@ my %status_info = (
 
     RSPCONFIG_GET_REQUEST => {
         method         => "GET",
-        init_url       => "",
+        init_url       => "$openbmc_project_url/network/enumerate",
     },
     RSPCONFIG_GET_RESPONSE => {
         process        => \&rspconfig_response,
@@ -467,7 +467,7 @@ sub parse_args {
     my $noderange = shift;
     my $check = undef;
 
-    xCAT::SvrUtils::sendmsg("[OpenBMC development support] Using this version of xCAT, ensure firware level is at v1.99.6-0-r1, or higher.", $callback);
+    xCAT::SvrUtils::sendmsg("[OpenBMC development support] Using this version of xCAT, ensure firmware level is at v1.99.6-0-r1, or higher.", $callback);
 
     my $subcommand = undef;
     my $verbose    = undef;
@@ -763,9 +763,7 @@ sub parse_command_status {
                 push @options, $key;
             }
         }
-        $next_status{RSPCONFIG_GET_RESPONSE}{argv} = join(",", @options);
-        xCAT::SvrUtils::sendmsg("Command $command is not available now!", $callback);
-        return 1;
+        $status_info{RSPCONFIG_GET_RESPONSE}{argv} = join(",", @options);
     }
 
     if ($command eq "rvitals") {
@@ -1500,24 +1498,55 @@ sub rspconfig_response {
     my $response_info = decode_json $response->content; 
 
     if ($node_info{$node}{cur_status} eq "RSPCONFIG_GET_RESPONSE") {
-        my $grep_string = $status_info{RSPCONFIG_GET_RESPONSE}{argv};
-        my $data;
+        my $address         = "n/a";
+        my $gateway         = "n/a";
+        my $prefix          = "n/a";
+        my $vlan            = "n/a";
+        my $default_gateway = "n/a";
+        my $adapter_id      = "n/a";
+        my $path;
         my @output;
+        my $grep_string = $status_info{RSPCONFIG_GET_RESPONSE}{argv};
+        foreach my $key_url (keys %{$response_info->{data}}) {
+            my %content = %{ ${ $response_info->{data} }{$key_url} };
+
+            #xCAT::SvrUtils::sendmsg("Content for $key_url\n " . Dumper(%content) , $callback);
+            if ($key_url =~ /network\/config/) {
+                if (defined($content{DefaultGateway}) and $content{DefaultGateway}) {
+                    $default_gateway = $content{DefaultGateway};
+                }
+            }
+
+
+            ($path, $adapter_id) = (split(/ipv4\//, $key_url));
+
+            if ($adapter_id) {
+                if (defined($content{Address}) and $content{Address}) {
+                    $address = $content{Address};
+                }
+                if (defined($content{Gateway}) and $content{Gateway}) {
+                    $gateway = $content{Gateway};
+                }
+                if (defined($content{PrefixLength}) and $content{PrefixLength}) {
+                    $prefix = $content{PrefixLength};
+                }
+            }
+        }
         if ($grep_string =~ "ip") {
-            $data = ""; # got data from response
-            push @output, "BMC IP: $data";
+            push @output, "BMC IP: $address"; 
         } 
         if ($grep_string =~ "netmask") {
-            $data = ""; # got data from response
-            push @output, "BMC Netmask: $data"; 
+            if ($address) {
+                my $decimal_mask = (2 ** $prefix - 1) << (32 - $prefix);
+                my $netmask = join('.', unpack("C4", pack("N", $decimal_mask)));
+                push @output, "BMC Netmask: " . $netmask; 
+            }
         } 
         if ($grep_string =~ "gateway") {
-            $data = ""; # got data from response
-            push @output, "BMC Gateway: $data";
-        }
+            push @output, "BMC Gateway: $gateway (default: $default_gateway)";
+        }  
         if ($grep_string =~ "vlan") {
-            $data = ""; # got data from response
-            push @output, "BMC VLAN ID enabled: $data";
+            push @output, "BMC VLAN ID enabled: $vlan";
         }
 
         xCAT::SvrUtils::sendmsg("$_", $callback, $node) foreach (@output);

From 7841a6a015e6de81b6048c7ddaa9a381fd660d45 Mon Sep 17 00:00:00 2001
From: Tom Indelli <tindelli@gmail.com>
Date: Thu, 20 Jul 2017 14:40:48 -0500
Subject: [PATCH 187/283] blacklist HP trunk interfaces

---
 perl-xCAT/xCAT/MacMap.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/perl-xCAT/xCAT/MacMap.pm b/perl-xCAT/xCAT/MacMap.pm
index f95d01091..426cf1619 100644
--- a/perl-xCAT/xCAT/MacMap.pm
+++ b/perl-xCAT/xCAT/MacMap.pm
@@ -147,6 +147,12 @@ OID, and have the switch table port value match exactly the format suggested by
         return 0;
     }
 
+    #HP calls their PortChannel interfaces "trunks"
+    #designated as Trk1, etc. don't match those
+    if ($namepersnmp =~ /Trk/) {
+        return 0;
+    }
+
     #The blacklist approach has been exhausted.  For now, assuming that means good,
     #if something ambiguous happens, the whitelist would have been:
     #'Port','Port #','/' (if namepercfg has no /, then / would be...),

From e97523d790824c87d59a9249db42dc4c07f1748a Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Thu, 20 Jul 2017 17:30:23 -0400
Subject: [PATCH 188/283] Open up the rsetboot function for OpenBMC Print
 message that informs user and dev teams that function is not yet exposed in
 the firmware

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 7aabbee9d..a33b14318 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -265,6 +265,7 @@ my %status_info = (
 $::RESPONSE_OK                  = "200 OK";
 $::RESPONSE_SERVER_ERROR        = "500 Internal Server Error";
 $::RESPONSE_SERVICE_UNAVAILABLE = "503 Service Unavailable";
+$::RESPONSE_FORBIDDEN           = "403 Forbidden";
 $::RESPONSE_METHOD_NOT_ALLOWED  = "405 Method Not Allowed";
 $::RESPONSE_SERVICE_TIMEOUT     = "504 Gateway Timeout";
 
@@ -507,11 +508,6 @@ sub parse_args {
     } elsif ($command eq "getopenbmccons") {
         # command for openbmc rcons
     } elsif ($command eq "rsetboot") {
-        #
-        # disable function until fully tested
-        #
-        $check = unsupported($callback); if (ref($check) eq "ARRAY") { return $check; }
-        $subcommand = "stat" if (!defined($ARGV[0]));
         unless ($subcommand =~ /^net$|^hd$|^cd$|^def$|^default$|^stat$/) {
             return ([ 1, "Unsupported command: $command $subcommand" ]);
         }
@@ -705,8 +701,6 @@ sub parse_command_status {
             $next_status{LOGIN_RESPONSE} = "RSETBOOT_STATUS_REQUEST";
             $next_status{RSETBOOT_STATUS_REQUEST} = "RSETBOOT_STATUS_RESPONSE";
         }
-        xCAT::SvrUtils::sendmsg("Command $command is not available now!", $callback);
-        return 1;
     }
 
     if ($command eq "reventlog") {
@@ -1031,6 +1025,8 @@ sub deal_with_response {
             my $response_info = decode_json $response->content;
             if ($response->status_line eq $::RESPONSE_SERVER_ERROR) {
                 $error = $response_info->{'data'}->{'exception'};
+            } elsif ($response->status_line eq $::RESPONSE_FORBIDDEN) {
+                $error = "$::RESPONSE_FORBIDDEN - This function is not yet available in OpenBMC firmware.";
             } elsif ($response_info->{'data'}->{'description'} =~ /path or object not found: (.+)/) {
                 $error = "path or object not found $1";
             } else {

From cac418514f86adcce4737f85e67cc5d3119b36de Mon Sep 17 00:00:00 2001
From: khm <khm@users.noreply.github.com>
Date: Thu, 20 Jul 2017 19:14:04 -0700
Subject: [PATCH 189/283] xCAT-client:  allow pgsqlsetup(1) to accept
 additional listen_addresses (#3519)

---
 xCAT-client/bin/pgsqlsetup             | 19 ++++++++++++++++++-
 xCAT-client/pods/man1/pgsqlsetup.1.pod |  6 +++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/xCAT-client/bin/pgsqlsetup b/xCAT-client/bin/pgsqlsetup
index 2f97f50b3..4007cb797 100755
--- a/xCAT-client/bin/pgsqlsetup
+++ b/xCAT-client/bin/pgsqlsetup
@@ -72,6 +72,7 @@ $::pgcmddir       = "/usr/bin";                   # pg cmds location
 $::debiancfgdir   = "/etc/postgresql/9.1/main";
 my $INIT;
 my $SETUPODBC;
+my @LISTENADDRS;
 my $NOSTART;
 my $SETUPPCM;
 my $HELP;
@@ -83,6 +84,7 @@ if (
     !GetOptions(
         'i|init'    => \$INIT,
         'o|odbc'    => \$SETUPODBC,
+        'l|listen=s'=> \@LISTENADDRS,
         'N|nostart' => \$NOSTART,
         'P|PCM'     => \$SETUPPCM,
         'h|help'    => \$HELP,
@@ -128,6 +130,13 @@ if ((!($INIT)) && ($SETUPODBC))
 
 }
 
+# create comma-separated list of additional listen addresses
+my $listenaddrs = undef;
+if (@LISTENADDRS)
+{
+    $listenaddrs = join ',', @LISTENADDRS;  
+}
+
 #
 # Get OS
 #
@@ -428,7 +437,7 @@ sub usage
 "Usage:\npgsqlsetup - Performs the setup of PostgreSQL for xCAT to use as its database. See man pgsqlsetup for more information."
     );
     my $msg =
-"pgsqlsetup <-h|--help>\n           <-v|--version>\n           <-i|--init> [-N|--nostart] [-P|--PCM] [-o|--odbc] [-V|--verbose]\n           <-o|--odbc> [-V|--verbose]";
+"pgsqlsetup <-h|--help>\n           <-v|--version>\n           <-i|--init> [-N|--nostart] [-l|--listen address] [-P|--PCM] [-o|--odbc] [-V|--verbose]\n           <-o|--odbc> [-V|--verbose]";
 
     xCAT::MsgUtils->message('I', "$msg");
 }
@@ -789,6 +798,10 @@ sub initpgdb
         if ($::osname eq 'Linux')
         {
             $cmd = qq~ echo listen_addresses = \\'localhost,$::MN\\' >> $pgconf~;
+             if ($::listenaddrs) 
+             {
+                 $cmd = qq~ echo listen_addresses = \\'localhost,$::MN,$::listenaddrs\\' >> $pgconf~;
+             }
             `$cmd`;
         }
 
@@ -796,6 +809,10 @@ sub initpgdb
         if ($::osname eq 'AIX')
         {
             $cmd = qq~ echo listen_addresses = \\'$::MN\\' >> $pgconf~;
+            if ($::listenaddrs)
+            {
+                $cmd = qq~ echo listen_addresses = \\'$::MN,$::listenaddrs\\' >> $pgconf~;
+            }
             `$cmd`;
             $cmd = qq~echo logging_collector = on >> $pgconf~;
             `$cmd`;
diff --git a/xCAT-client/pods/man1/pgsqlsetup.1.pod b/xCAT-client/pods/man1/pgsqlsetup.1.pod
index 939d16a17..c2bbccaf4 100644
--- a/xCAT-client/pods/man1/pgsqlsetup.1.pod
+++ b/xCAT-client/pods/man1/pgsqlsetup.1.pod
@@ -9,7 +9,7 @@ B<pgsqlsetup> {B<-h> | B<--help>}
 
 B<pgsqlsetup> {B<-v> | B<--version>}
 
-B<pgsqlsetup> {B<-i> | B<--init>} [B<-N> | B<--nostart>] [B<-P> | B<--PCM>] [B<-o> | B<--odbc>] [B<-V> | B<--verbose>]
+B<pgsqlsetup> {B<-i> | B<--init>} [B<-N> | B<--nostart>] [B<--listen> | B<-l> I<address>] [B<-P> | B<--PCM>] [B<-o> | B<--odbc>] [B<-V> | B<--verbose>]
 
 B<pgsqlsetup> {B<-o> | B<--setupODBC>} [B<-V> | B<--verbose>] 
 
@@ -46,6 +46,10 @@ For more documentation see:Setting_Up_PostgreSQL_as_the_xCAT_DB
 
 This option with the -i flag will create the database, but will not backup and restore xCAT tables into the database. It will create the cfgloc file such that the next start of xcatd will try and contact the database.  This can be used to setup the xCAT PostgreSQL database during or before install.
 
+=item B<-l|--listen> I<address>
+
+This option is used to specify additional IP addresses on which the PostgreSQL database will listen.  Without it, only localhost (on Linux) and the management node's main IP (on Linux and AIX) will be configured.  This option can be specified multiple times.
+
 =item B<-P|--PCM>
 
 This option sets up PostgreSQL database to be used with xCAT running with PCM.

From 97fde0db98e011c48a8de8b0989ff2f808b51d4e Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Fri, 21 Jul 2017 03:24:51 -0400
Subject: [PATCH 190/283] update bundles for confignetwork and confignics

---
 xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle   |  8 --------
 xCAT-test/autotest/bundle/rhels6.8_ppc64.bundle   |  8 --------
 xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle   |  7 -------
 xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle   |  8 --------
 xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle |  8 --------
 xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle   |  7 -------
 xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle | 15 ++++++++-------
 xCAT-test/autotest/bundle/rhels7.3_x86_64.bundle  | 11 +++++++++++
 xCAT-test/autotest/bundle/sles11.4_ppc64.bundle   |  7 -------
 xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle |  8 ++++++++
 xCAT-test/autotest/bundle/sles12.2_x86_64.bundle  | 11 +++++++++++
 11 files changed, 38 insertions(+), 60 deletions(-)

diff --git a/xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle
index 2ce66a4df..a8baaf719 100644
--- a/xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle
@@ -241,14 +241,6 @@ noderange_XCAT_NODE_PREFIX
 noderange_XCAT_NODE_SUFFIX
 noderange_exclusion
 noderange_group_intersection
-confignics_config_one_port_single_value
-confignics_config_multiple_ports_single_value
-confignics_config_multiple_ports_multiple_value
-confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
-confignics_config_multiple_port_withnicaliases_multiple_value
-confignics_disable_set_to_yes
-confignics_disable_set_to_1
-confignics_s
 xdsh_h
 xdsh_V
 xdsh_regular_command
diff --git a/xCAT-test/autotest/bundle/rhels6.8_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.8_ppc64.bundle
index bc3c1e95c..8e2b31650 100644
--- a/xCAT-test/autotest/bundle/rhels6.8_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels6.8_ppc64.bundle
@@ -241,14 +241,6 @@ noderange_XCAT_NODE_PREFIX
 noderange_XCAT_NODE_SUFFIX
 noderange_exclusion
 noderange_group_intersection
-confignics_config_one_port_single_value
-confignics_config_multiple_ports_single_value
-confignics_config_multiple_ports_multiple_value
-confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
-confignics_config_multiple_port_withnicaliases_multiple_value
-confignics_disable_set_to_yes
-confignics_disable_set_to_1
-confignics_s
 xdsh_h
 xdsh_V
 xdsh_regular_command
diff --git a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
index ff947230c..f0de4360a 100644
--- a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
@@ -245,13 +245,6 @@ noderange_XCAT_NODE_PREFIX
 noderange_XCAT_NODE_SUFFIX
 noderange_exclusion
 noderange_group_intersection
-confignics_config_one_port_single_value
-confignics_config_multiple_ports_single_value
-confignics_config_multiple_ports_multiple_value
-confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
-confignics_config_multiple_port_withnicaliases_multiple_value
-confignics_disable_set_to_yes
-confignics_disable_set_to_1
 xdsh_h
 xdsh_V
 xdsh_regular_command
diff --git a/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle b/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle
index 23cd9366a..9052328cc 100644
--- a/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle
@@ -241,14 +241,6 @@ noderange_XCAT_NODE_PREFIX
 noderange_XCAT_NODE_SUFFIX
 noderange_exclusion
 noderange_group_intersection
-confignics_config_one_port_single_value
-confignics_config_multiple_ports_single_value
-confignics_config_multiple_ports_multiple_value
-confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
-confignics_config_multiple_port_withnicaliases_multiple_value
-confignics_disable_set_to_yes
-confignics_disable_set_to_1
-confignics_s
 xdsh_h
 xdsh_V
 xdsh_regular_command
diff --git a/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle
index bf359ac0c..5d0b84fc1 100644
--- a/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle
@@ -234,14 +234,6 @@ noderange_XCAT_NODE_PREFIX
 noderange_XCAT_NODE_SUFFIX
 noderange_exclusion
 noderange_group_intersection
-confignics_config_one_port_single_value
-confignics_config_multiple_ports_single_value
-confignics_config_multiple_ports_multiple_value
-confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
-confignics_config_multiple_port_withnicaliases_multiple_value
-confignics_disable_set_to_yes
-confignics_disable_set_to_1
-confignics_s
 xdsh_h
 xdsh_V
 xdsh_regular_command
diff --git a/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle b/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle
index c0f227acf..34e13e857 100644
--- a/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle
@@ -242,13 +242,6 @@ noderange_XCAT_NODE_PREFIX
 noderange_XCAT_NODE_SUFFIX
 noderange_exclusion
 noderange_group_intersection
-confignics_config_one_port_single_value
-confignics_config_multiple_ports_single_value
-confignics_config_multiple_ports_multiple_value
-confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
-confignics_config_multiple_port_withnicaliases_multiple_value
-confignics_disable_set_to_yes
-confignics_disable_set_to_1
 copycds_iso
 copycds_a
 copycds_n_a
diff --git a/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
index 8ea26b428..2984952bb 100644
--- a/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
@@ -20,6 +20,14 @@ updatenode_diskful_syncfiles_P_script1
 updatenode_script3
 updatenode_P_script1_script2
 updatenode_without_flag
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 confignetwork_secondarynic_nicnetworks_updatenode_false
 confignetwork_secondarynic_nicips_updatenode_false
 confignetwork_secondarynic_nictype_updatenode_false
@@ -231,13 +239,6 @@ noderange_XCAT_NODE_PREFIX
 noderange_XCAT_NODE_SUFFIX
 noderange_exclusion
 noderange_group_intersection
-confignics_config_one_port_single_value
-confignics_config_multiple_ports_single_value
-confignics_config_multiple_ports_multiple_value
-confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
-confignics_config_multiple_port_withnicaliases_multiple_value
-confignics_disable_set_to_yes
-confignics_disable_set_to_1
 xdsh_h
 xdsh_V
 xdsh_regular_command
diff --git a/xCAT-test/autotest/bundle/rhels7.3_x86_64.bundle b/xCAT-test/autotest/bundle/rhels7.3_x86_64.bundle
index 63e7b5294..13f6f53c7 100644
--- a/xCAT-test/autotest/bundle/rhels7.3_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.3_x86_64.bundle
@@ -5,6 +5,17 @@ makehosts_help
 makehosts_n
 makehosts_n_noderange
 makehost_n_r
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
 chdef_null
 chdef_z
 chdef_t_o_error
diff --git a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
index b214d526f..8e4b0b669 100644
--- a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
@@ -224,13 +224,6 @@ noderange_XCAT_NODE_PREFIX
 noderange_XCAT_NODE_SUFFIX
 noderange_exclusion
 noderange_group_intersection
-confignics_config_one_port_single_value
-confignics_config_multiple_ports_single_value
-confignics_config_multiple_ports_multiple_value
-confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
-confignics_config_multiple_port_withnicaliases_multiple_value
-confignics_disable_set_to_yes
-confignics_disable_set_to_1
 confignetwork_secondarynic_nicnetworks_updatenode_false
 confignetwork_secondarynic_nicips_updatenode_false
 confignetwork_secondarynic_nictype_updatenode_false
diff --git a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
index e315bf198..7393f4f68 100644
--- a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
@@ -6,6 +6,14 @@ makehosts_help
 makehosts_n
 makehosts_n_noderange
 makehost_n_r
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
 confignetwork_secondarynic_nicnetworks_updatenode_false
 confignetwork_secondarynic_nicips_updatenode_false
 confignetwork_secondarynic_nictype_updatenode_false
diff --git a/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle b/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle
index 1c9cedf37..3e3486c92 100644
--- a/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle
@@ -5,6 +5,17 @@ makehosts_help
 makehosts_n
 makehosts_n_noderange
 makehost_n_r
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
 chdef_null
 chdef_z
 chdef_t_o_error

From 725444cdd1bbd0bdb0408a45479cf64649e99084 Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Fri, 21 Jul 2017 03:37:33 -0400
Subject: [PATCH 191/283] fix issue#3515: check the version of xCAT between MN
 and SN while processing the forwarded request

---
 xCAT-server/sbin/xcatd | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index 99792c097..b86e523eb 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -2301,7 +2301,8 @@ sub dispatch_request {
                 my $errstr;
                 eval {
                     undef $_->{'_xcatdest'};
-
+                    #the xCAT version is included in the request which will be forwarded
+                    $_->{'_xcatver'}=xCAT::Version->Version();
                     # mainly used by SN to filter out the incorrect module that xcat command came into
                     $_->{'_modname'} = $modname;
 
@@ -2803,6 +2804,23 @@ sub service_connection {
                     delete($req->{tokenid});
                 }
 
+                #for xcat requests forwarded from other nodes, such as MN<-->SN
+                # compare the version of xCAT which forwarded the request and the
+                # one which processes the forwarded command
+                #if the 2 versions are different, a warning message is included in the response
+                if($req->{'_xcatver'} and $req->{'_xcatver'}->[0]){
+                    my $myxcatver=xCAT::Version->Version();
+                    if($req->{'_xcatver'}->[0] ne $myxcatver){
+                        require Sys::Hostname;
+                        my $myhostname=Sys::Hostname::hostname;
+                        my $resp = { warning => ["$myhostname: my xCAT version \"$myxcatver\" does not match the forwarder's xCAT version \"$req->{'_xcatver'}->[0]\" on $peerhost"]};
+                        $resp->{serverdone} = [undef];
+                        send_response($resp, $sock);
+                        #return;
+                    }
+                }
+
+    
                 # we have a full request..
                 #printf $request."\n";
                 $request = "";

From 4d54889a36b580bd6aba851037625febe24609b2 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Fri, 21 Jul 2017 03:39:01 -0400
Subject: [PATCH 192/283] Task 3406, add BMC MAC in bmcdiscover and discovery
 process

---
 xCAT-genesis-scripts/bin/dodiscovery         | 11 ++-
 xCAT-server/lib/xcat/plugins/bmcdiscover.pm  | 91 +++++++++++++-------
 xCAT-server/lib/xcat/plugins/seqdiscovery.pm |  8 ++
 xCAT-server/lib/xcat/plugins/switch.pm       |  9 ++
 xCAT-server/lib/xcat/plugins/typemtms.pm     | 10 +++
 5 files changed, 95 insertions(+), 34 deletions(-)

diff --git a/xCAT-genesis-scripts/bin/dodiscovery b/xCAT-genesis-scripts/bin/dodiscovery
index 41ecb8c05..e870783fb 100755
--- a/xCAT-genesis-scripts/bin/dodiscovery
+++ b/xCAT-genesis-scripts/bin/dodiscovery
@@ -141,10 +141,12 @@ if [ "$UUID" != "unknown" ]; then
         echo "<uuid>$UUID</uuid>" >> /tmp/discopacket
 fi
 
-if [ "$MTM" != "unknown" ]; then
+flag_mtm=`echo '$MTM' | sed 's/0//g'`
+if [ $flag_mtm ] && [ "$MTM" != "unknown" ]; then
 	echo "<mtm>$MTM</mtm>" >> /tmp/discopacket
 fi
-if [ "$SERIAL" != "unknown" ]; then
+flag_serial=`echo '$SERIAL' | sed 's/0//g'`
+if [ $flag_serial ] && [ "$SERIAL" != "unknown" ]; then
 	echo "<serial>$SERIAL</serial>" >> /tmp/discopacket
 fi
 if [ "$PLATFORM" != "unknown" ]; then
@@ -159,6 +161,11 @@ if [ "$IsStatic" ]; then
     fi
 fi
 
+BMCMAC=`ipmitool lan print 1 | grep 'MAC Address' | cut -d ":" -f2-7 | sed 's/ //'`
+if [ "$BMCMAC" ]; then
+    echo "<bmcmac>$BMCMAC</bmcmac>" >> /tmp/discopacket
+fi
+
 # Check whether the hardware support in-band BMC configuration with the IPMI device
 if [ -r /dev/ipmi0 -o -r /dev/ipmi/0 -o -r /dev/ipmidev/0 ]; then
     echo "<bmcinband>1</bmcinband>" >> /tmp/discopacket
diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
index e29059be1..b0406a037 100644
--- a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
@@ -35,6 +35,7 @@ use HTTP::Response;
 use JSON;
 
 my $nmap_path;
+my %ipmac = ();
 
 my $debianflag = 0;
 my $tempstring = xCAT::Utils->osver();
@@ -508,43 +509,56 @@ sub scan_process {
     # Handle commas in $range for nmap
     $range =~ tr/,/ /;
 
-    my $ip_list;
     ############################################################
     # get live ip list
     ###########################################################
-    if ($method eq "nmap") {
-
-        #check nmap version first
-        my $nmap_version = xCAT::Utils->get_nmapversion();
-
-        # the output of nmap is different for version under 5.10
-        if (xCAT::Utils->version_cmp($nmap_version, "5.10") < 0) {
-            $bcmd = join(" ", $nmap_path, " -sP -n $range | grep \"appears to be up\" |cut -d ' ' -f2 |tr -s '\n' ' ' ");
-        } else {
-            $bcmd = join(" ", $nmap_path, " -sn -n $range | grep -B1 up | grep \"Nmap scan report\" |cut -d ' ' -f5 |tr -s '\n' ' ' ");
-        }
-
-        $ip_list = xCAT::Utils->runcmd("$bcmd", -1);
-        if ($::RUNCMD_RC != 0) {
-            my $rsp = {};
-            push @{ $rsp->{data} }, "Nmap scan is failed.\n";
-            xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
-            return 2;
-        }
-
-    }
-    else
-    {
+    if ($method ne "nmap") {
         my $rsp = {};
         push @{ $rsp->{data} }, "The bmcdiscover method should be nmap.\n";
         xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
         return 2;
     }
 
-    my $live_ip = split_comma_delim_str($ip_list);
+    #check nmap version first
+    my $nmap_version = xCAT::Utils->get_nmapversion();
+    my $ip_info_list;
+
+    #  the output of nmap is different for version under 5.10
+    if (xCAT::Utils->version_cmp($nmap_version, "5.10") < 0) {
+        $bcmd = join(" ", $nmap_path, " -sP -n $range");
+    } else {
+        $bcmd = join(" ", $nmap_path, " -sn -n $range");
+    }
+
+    $ip_info_list = xCAT::Utils->runcmd("$bcmd", -1);
+    if ($::RUNCMD_RC != 0) {
+        my $rsp = {};
+        push @{ $rsp->{data} }, "Nmap scan is failed.\n";
+        xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
+        return 2;
+    }
+
+    my $ip_list;
+    my $mac_list;
+    if (xCAT::Utils->version_cmp($nmap_version, "5.10") < 0) {
+        $ip_list  = `echo -e "$ip_info_list" | grep \"appears to be up\" |cut -d ' ' -f2 |tr -s '\n' ' '`;
+        $mac_list = `echo -e "$ip_info_list" | grep -A1 up | grep "MAC Address" | cut -d ' ' -f3 | tr -s '\n' ' '`;  
+    } else {
+        $ip_list  = `echo -e "$ip_info_list" | grep -B1 up | grep "Nmap scan report" |cut -d ' ' -f5 | tr -s '\n' ' '`;
+        $mac_list = `echo -e "$ip_info_list" | grep -A1 up | grep "MAC Address" | cut -d ' ' -f3 | tr -s '\n' ' '`; 
+    }
+
+    my $live_ip  = split_comma_delim_str($ip_list);
+    my $live_mac = split_comma_delim_str($mac_list);
+
+    if (scalar(@{$live_ip}) > 0) {
+
+        foreach (@{$live_ip}) {
+            my $new_mac = lc(shift @{$live_mac});
+            $new_mac =~ s/\://g;
+            $ipmac{$_} = $new_mac;
+        }
 
-    if (scalar(@{$live_ip}) > 0)
-    {
         ###############################
         # Set the signal handler for ^c
         ###############################
@@ -984,8 +998,12 @@ sub bmcdiscovery_ipmi {
 
                 }
             }
-            if ($mtm eq '' or $serial eq '') {
-                xCAT::MsgUtils->message("W", { data => ["BMC Type/Model and/or Serial is unavailable for $ip"] }, $::CALLBACK);
+
+            $mtm = '' if ($mtm =~ /^0+$/);
+            $serial = '' if ($serial =~ /^0+$/); 
+
+            unless (($mtm or $serial) or $ipmac{$ip}) {
+                xCAT::MsgUtils->message("W", { data => ["BMC Type/Model and/or Serial and MAC Address is unavailable for $ip"] }, $::CALLBACK);
                 return;
             }
 
@@ -1005,6 +1023,8 @@ sub bmcdiscovery_ipmi {
                 $node = "node-$mtm-$serial";
                 $node =~ s/(.*)/\L$1/g;
                 $node =~ s/[\s:\._]/-/g;
+            } else {
+                $node = "node-$ipmac{$ip}";
             }
         } elsif ($output =~ /error : unauthorized name/) {
             xCAT::MsgUtils->message("W", { data => ["BMC username is incorrect for $ip"] }, $::CALLBACK);
@@ -1093,9 +1113,6 @@ sub bmcdiscovery_openbmc{
                     $mtm = "";
                 }
                 $serial = $response->{data}->{SerialNumber}; 
-            } else {
-                xCAT::MsgUtils->message("W", { data => ["Could not obtain Model Type and/or Serial Number for BMC at $ip"] }, $::CALLBACK);
-                return;
             }
  
         } else { 
@@ -1107,6 +1124,14 @@ sub bmcdiscovery_openbmc{
         $mtm =~ s/^\s+|\s+$//g; 
         $serial =~ s/^\s+|\s+$//g;
 
+        $mtm = '' if ($mtm =~ /^0+$/);
+        $serial = '' if ($serial =~ /^0+$/);
+
+        unless (($mtm or $serial) or $ipmac{$ip}) {
+            xCAT::MsgUtils->message("W", { data => ["Could not obtain Valid Model Type and/or Serial Number and MAC Address for BMC at $ip"] }, $::CALLBACK);
+            return;
+        }
+
         # format info string for format_stanza function
         $node_data .= ",$mtm";
         $node_data .= ",$serial";
@@ -1124,6 +1149,8 @@ sub bmcdiscovery_openbmc{
             $node = "node-$mtm-$serial";
             $node =~ s/(.*)/\L$1/g;
             $node =~ s/[\s:\._]/-/g;
+        } else {
+            $node = "node-$ipmac{$ip}";
         }
     } else {
         if ($login_response->status_line =~ /401 Unauthorized/) {
diff --git a/xCAT-server/lib/xcat/plugins/seqdiscovery.pm b/xCAT-server/lib/xcat/plugins/seqdiscovery.pm
index 3bc482215..ea114681f 100755
--- a/xCAT-server/lib/xcat/plugins/seqdiscovery.pm
+++ b/xCAT-server/lib/xcat/plugins/seqdiscovery.pm
@@ -141,6 +141,14 @@ sub findme {
         }
     }
 
+    unless ($bmc_node) {
+        if ($request->{'bmcmac'}->[0]) {
+            my $bmcmac = lc($request->{'bmcmac'}->[0]);
+            $bmcmac =~ s/\://g;
+            my $tmp_node = "node-$bmcmac";
+            $bmc_node = $tmp_node if ($::XCATMPHASH{$tmp_node});
+        }
+    }
 
     if ($node) {
         my $skiphostip;
diff --git a/xCAT-server/lib/xcat/plugins/switch.pm b/xCAT-server/lib/xcat/plugins/switch.pm
index 09e4052d9..dff93d270 100644
--- a/xCAT-server/lib/xcat/plugins/switch.pm
+++ b/xCAT-server/lib/xcat/plugins/switch.pm
@@ -346,6 +346,15 @@ sub process_request {
             }
         }
 
+        unless ($bmc_node) {
+            if ($req->{'bmcmac'}->[0]) {
+                my $bmcmac = lc($req->{'bmcmac'}->[0]);
+                $bmcmac =~ s/\://g;
+                my $tmp_node = "node-$bmcmac";
+                $bmc_node = $tmp_node if ($::XCATMPHASH{$tmp_node});
+            }
+        }
+
         if ($node) {
             xCAT::MsgUtils->message("S", "xcat.discovery.switch: ($req->{_xcat_clientmac}->[0]) Found node: $node");
 
diff --git a/xCAT-server/lib/xcat/plugins/typemtms.pm b/xCAT-server/lib/xcat/plugins/typemtms.pm
index bd30c9503..b6bcb9817 100644
--- a/xCAT-server/lib/xcat/plugins/typemtms.pm
+++ b/xCAT-server/lib/xcat/plugins/typemtms.pm
@@ -34,6 +34,16 @@ sub findme {
             push @nodes, $_;
         }
     }
+
+    unless ($bmc_node) {
+        if ($request->{'bmcmac'}->[0]) {
+            my $bmcmac = lc($request->{'bmcmac'}->[0]);
+            $bmcmac =~ s/\://g;
+            my $tmp_node = "node-$bmcmac";
+            $bmc_node = $tmp_node if ($::XCATMPHASH{$tmp_node});
+        }
+    }
+
     my $nodenum = $#nodes;
     if ($nodenum < 0) {
         xCAT::MsgUtils->message("S", "xcat.discovery.mtms: ($request->{_xcat_clientmac}->[0]) Warning: Could not find any node for $mtms using mtms-based discovery");

From bc6ddccbd06e3600d438c58bc45f2629d8920aed Mon Sep 17 00:00:00 2001
From: chenglch <chenglch@cn.ibm.com>
Date: Fri, 21 Jul 2017 16:19:24 +0800
Subject: [PATCH 193/283] Modify the document and nics schema based on review
 comments.

---
 docs/source/advanced/networks/getadapter.rst | 4 ++--
 perl-xCAT/xCAT/Schema.pm                     | 2 +-
 xCAT-server/lib/xcat/plugins/getadapter.pm   | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/source/advanced/networks/getadapter.rst b/docs/source/advanced/networks/getadapter.rst
index 43cdaa1a9..38188f486 100644
--- a/docs/source/advanced/networks/getadapter.rst
+++ b/docs/source/advanced/networks/getadapter.rst
@@ -5,7 +5,7 @@ Traditionally, network interfaces in Linux are enumerated as eth[0123…], but
 these names do not correspond to actual labels on the chassis. Now, most of
 the linux distribution support naming the adapter with slot information which
 makes adapter name predictable. xCAT add ``getadapter`` script which can be
-running during discovery stage to detect the adapter names and pci slot
+run during discovery stage to detect the adapter names and pci slot
 information to help customer configure the network.
 
 
@@ -16,7 +16,7 @@ Set the chian table to run ``getadapter`` script ::
 
   chdef <noderange> chain="runcmd=getadapter"
 
-When the discovery completed, the column ``nicsadapter`` of ```nics`` table is
+After the discovery completed, the column ``nicsadapter`` of ```nics`` table is
 updated.
 
 View result with ``lsdef`` command ::
diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index a19207611..832c8566d 100755
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -1566,7 +1566,7 @@ passed as argument rather than by table value',
             The xCAT object definition commands support to use nicextraparams.<nicname> as the sub attributes.',
             nicdevices => 'Comma-separated list of NIC device per NIC, multiple ethernet devices can be bonded as bond device, these ethernet devices are separated by | . <nic1>!<dev1>|<dev3>,<nic2>!<dev2>, e.g. bond0!eth0|eth2,br0!bond0. The xCAT object definition commands support to use nicdevices.<nicname> as the sub attributes.',
             nicsadapter => 'Comma-separated list of extra parameters that will be used for each NIC configuration.
-                    <nic1>!<param1=value1 param2=value2>|<param3=value3>,<nic2>!<param4=value4 param5=value5>|<param6=value6>, for example, eth0!MTU=1500|MTU=1460,ib0!MTU=65520 CONNECTED_MODE=yes.',
+                    <nic1>!<param1=value1 param2=value2>,<nic2>!<param4=value4 param5=value5>, for example, enP3p3s0f1!mac=98:be:94:59:fa:cd linkstate=DOWN,enP3p3s0f2!mac=98:be:94:59:fa:ce candidatename=enP3p3s0f2/enx98be9459face',
             comments => 'Any user-written notes.',
             disable  => "Set to 'yes' or '1' to comment out this row.",
         },
diff --git a/xCAT-server/lib/xcat/plugins/getadapter.pm b/xCAT-server/lib/xcat/plugins/getadapter.pm
index 9fc989daa..5cf212a2f 100644
--- a/xCAT-server/lib/xcat/plugins/getadapter.pm
+++ b/xCAT-server/lib/xcat/plugins/getadapter.pm
@@ -19,7 +19,6 @@ use lib "$::XCATROOT/lib/perl";
 
 use xCAT::Table;
 use xCAT::State;
-use Data::Dumper;
 use strict;
 
 #-------------------------------------------------------

From 5bb6bd7131c47d6d942512fa1455e9dda9066b6e Mon Sep 17 00:00:00 2001
From: yangsong <immarvin@users.noreply.github.com>
Date: Fri, 21 Jul 2017 05:12:52 -0500
Subject: [PATCH 194/283] fix issue noderange in xCAT commands might be broken
 by shell expansion #3319 (#3524)

---
 docs/source/guides/admin-guides/references/man3/noderange.3.rst | 2 ++
 xCAT-client/pods/man3/noderange.3.pod                           | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/docs/source/guides/admin-guides/references/man3/noderange.3.rst b/docs/source/guides/admin-guides/references/man3/noderange.3.rst
index da8266d5e..2505ae4ae 100644
--- a/docs/source/guides/admin-guides/references/man3/noderange.3.rst
+++ b/docs/source/guides/admin-guides/references/man3/noderange.3.rst
@@ -59,6 +59,8 @@ Name
 conveniently specify a list of nodes.  The result is that the  command  will
 be applied to a range of nodes, often in parallel.
 
+To avoid shell expansion, \ **noderange**\  should better be quoted with single quotes('') or double quotes("").
+
 \ **noderange**\  is a comma-separated list.  Each token (text between commas)
 in the list can be any of the forms listed below:
 
diff --git a/xCAT-client/pods/man3/noderange.3.pod b/xCAT-client/pods/man3/noderange.3.pod
index b89434bab..ea2d4bf47 100644
--- a/xCAT-client/pods/man3/noderange.3.pod
+++ b/xCAT-client/pods/man3/noderange.3.pod
@@ -36,6 +36,8 @@ B<noderange> is a syntax that can be used in most xCAT commands to
 conveniently specify a list of nodes.  The result is that the  command  will
 be applied to a range of nodes, often in parallel.
 
+To avoid shell expansion, B<noderange> should better be quoted with single quotes('') or double quotes(""). 
+
 B<noderange> is a comma-separated list.  Each token (text between commas)
 in the list can be any of the forms listed below:
 

From 762ee316281242291324ab78c20db2b657c0dddf Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Fri, 21 Jul 2017 10:38:31 -0400
Subject: [PATCH 195/283] modified from review

---
 perl-xCAT/xCAT/Usage.pm                       |  2 +-
 xCAT-server/lib/xcat/plugins/pdu.pm           |  2 +-
 .../lib/xcat/plugins/switchdiscover.pm        | 62 ++++++-------------
 3 files changed, 20 insertions(+), 46 deletions(-)

diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 04cda85e2..9e44a774c 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -326,7 +326,7 @@ my %usage = (
        pdudiscover [<noderange>|--range ipranges] [-r|-x|-z] [-w] [-V|--verbose] [--setup]",
     "switchdiscover" =>
       "Usage: switchdiscover [-h|--help|-v|--version]
-       switchdiscover [<noderange>|--range ipranges] [-s scan_methods] [-r|-x|-z] [-w] [-V|--verbose] [--setup] [--pdu]",
+       switchdiscover [<noderange>|--range ipranges] [-s scan_methods] [-r|-x|-z] [-w] [-V|--verbose] [--setup]",
     "switchprobe" =>
       "Usage: switchprobe [<noderange>] [-V|--verbose | -c|--check]",
     "makentp" =>
diff --git a/xCAT-server/lib/xcat/plugins/pdu.pm b/xCAT-server/lib/xcat/plugins/pdu.pm
index 7242aaf80..e79b906e0 100644
--- a/xCAT-server/lib/xcat/plugins/pdu.pm
+++ b/xCAT-server/lib/xcat/plugins/pdu.pm
@@ -473,7 +473,7 @@ sub process_pdudiscover {
     Getopt::Long::Configure("no_pass_through");
     my %opt;
     if (!GetOptions( \%opt,
-                    qw(h|help V|Verbose x z w r n range=s setup))) {
+                    qw(h|help V|verbose x z w r range=s setup))) {
         my $usage_string = xCAT::Usage->getUsage($request->{command}->[0]);
         $callback->({ data => $usage_string });
         return;
diff --git a/xCAT-server/lib/xcat/plugins/switchdiscover.pm b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
index ec1ebe953..f39141092 100644
--- a/xCAT-server/lib/xcat/plugins/switchdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
@@ -24,6 +24,7 @@ use Expect;
 use xCAT::data::switchinfo;
 
 #global variables for this module
+my $device;
 my $community;
 my %globalopt;
 my @filternodes;
@@ -143,7 +144,7 @@ sub parse_args {
     # Process command-line flags
     #############################################
     if (!GetOptions( \%opt,
-            qw(h|help V|Verbose v|version x z w r n range=s s=s setup pdu))) {
+            qw(h|help V|verbose v|version x z w r n range=s s=s setup pdu))) {
         return( usage() );
     }
 
@@ -258,8 +259,10 @@ sub parse_args {
             $globalopt{setup} = 1;
     }
 
+    $device = "switch";
     if ( exists( $opt{pdu} )) {
-            $globalopt{pdu} = 1;
+        $globalopt{pdu} = 1;
+        $device = "pdu";
     }
 
 
@@ -884,7 +887,7 @@ sub snmp_scan {
 
     # snmpwalk command has to be available for snmp_scan
     if (-x "/usr/bin/snmpwalk" ){
-        send_msg($request, 0, "Discovering devices using snmpwalk for @$ranges .....");
+        send_msg($request, 0, "Discovering $device using snmpwalk for @$ranges .....");
     } else {
         send_msg($request, 0, "snmpwalk is not available, please install snmpwalk command first");
         return 1;
@@ -972,7 +975,7 @@ sub snmp_scan {
             $switches->{$mac}->{vendor} = $vendor;
             $switches->{$mac}->{name} = $hostname;
             if (exists($globalopt{verbose}))    {
-               send_msg($request, 0, "found device: $hostname, $ip, $stype, $vendor");
+               send_msg($request, 0, "found $device: $hostname, $ip, $stype, $vendor");
             }
         }
     }
@@ -1196,32 +1199,14 @@ sub xCATdB {
             $mac=" ";
         }
 
-        # check if this is for pdu or switches
-        my $device = "switch";
-        if (exists($globalopt{pdu})) {
-            $device = "pdu";
-        }
-
-
         #################################################
-        # use lsdef command to check if this switch is
-        # already in the switch table
-        # if it is, use chdef to update it's attribute
-        # otherwise, use mkdef to add this switch to
-        # switch table
+        # use chdef command to make new device or update 
+        # it's attribute 
         ##################################################
-        $ret = xCAT::Utils->runxcmd( { command => ['lsdef'], arg => ['-t','node','-o',$host] }, $sub_req, 0, 1);
-        if ($::RUNCMD_RC == 0)
-        {
-            $ret = xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$host,"ip=$ip","mac=$mac","nodetype=$device","mgt=$device","usercomment=$vendor"] }, $sub_req, 0, 1);
-            $ret = xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$host,'-p',"groups=$device"] }, $sub_req, 0, 1);
+        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"] }, $sub_req, 0, 1);
         } else {
-            $ret = xCAT::Utils->runxcmd( { command => ['mkdef'], arg => ['-t','node','-o',$host,"groups=$device","ip=$ip","mac=$mac","nodetype=$device","mgt=$device","usercomment=$vendor"] }, $sub_req, 0, 1);
-        }
-
-        if (!exists($globalopt{pdu})) 
-        {
-            $ret = xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$host,'-p',"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"] }, $sub_req, 0, 1);
         }
     }
 }
@@ -1307,12 +1292,6 @@ sub format_stanza {
             $mac = " ";
         }
       
-        # check if this is for pdu or switches
-        my $device = "switch";
-        if (exists($globalopt{pdu})) {
-            $device = "pdu";
-        }
-
         $result .= "$host:\n\tobjtype=node\n";
         $result .= "\tgroups=$device\n";
         $result .= "\tip=$ip\n";
@@ -1354,12 +1333,6 @@ sub format_xml {
             $mac = " ";
         }
 
-        # check if this is for pdu or switches
-        my $device = "switch";
-        if (exists($globalopt{pdu})) {
-            $device = "pdu";
-        }
-
         $result .= "hostname=$host\n";
         $result .= "objtype=node\n";
         $result .= "groups=$device\n";
@@ -1423,7 +1396,7 @@ sub matchPredefineSwitch {
 
         my $node = $macmap->find_mac($mac,0,1);
         if (!$node) {
-            send_msg($request, 0, "Device discovered: $dswitch ");
+            send_msg($request, 0, "$device discovered: $dswitch ");
             $discoverswitch->{$mac}->{ip} = $ip;
             $discoverswitch->{$mac}->{vendor} = $vendor;
             $discoverswitch->{$mac}->{name} = $dswitch;
@@ -1432,13 +1405,14 @@ sub matchPredefineSwitch {
 
         my $stype = get_switchtype($vendor);
 
-        send_msg($request, 0, "Device discovered and matched: $dswitch to $node" );
+        send_msg($request, 0, "$device discovered and matched: $dswitch to $node" );
 
         # only write to xcatdb if -w or --setup option specified
         if ( (exists($globalopt{w})) || (exists($globalopt{setup})) ) {
-            xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$node,"otherinterfaces=$ip",'status=Matched',"mac=$mac","switchtype=$stype","usercomment=$vendor"] }, $sub_req, 0, 1);
-            if (!exists($globalopt{pdu})) {
-                xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$node,"switchtype=$stype"] }, $sub_req, 0, 1);
+            if (exists($globalopt{pdu})) {
+                xCAT::Utils->runxcmd({ command => ['chdef'], arg => ['-t','node','-o',$node,"otherinterfaces=$ip",'status=Matched',"mac=$mac","switchtype=$stype","usercomment=$vendor"] }, $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","switchtype=$stype"] }, $sub_req, 0, 1);
             }
         }
 

From 8b31e6328704c0c3e52fa02e829eaed63ae96507 Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Sun, 23 Jul 2017 23:26:03 -0400
Subject: [PATCH 196/283] load Sys::Hostname module with use intead of require
 to avoid performance decrease; refine the warning message;remove some
 commented out lines

---
 xCAT-server/sbin/xcatd | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index b86e523eb..cc8303261 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -42,6 +42,7 @@ if ($^O =~ /^aix/i) {
 }
 use lib "$::XCATROOT/lib/perl";
 use Storable qw(freeze thaw nstore_fd store_fd fd_retrieve);
+use Sys::Hostname;
 use xCAT::Utils;
 use xCAT::TableUtils;
 use xCAT::NetworkUtils;
@@ -2811,18 +2812,15 @@ sub service_connection {
                 if($req->{'_xcatver'} and $req->{'_xcatver'}->[0]){
                     my $myxcatver=xCAT::Version->Version();
                     if($req->{'_xcatver'}->[0] ne $myxcatver){
-                        require Sys::Hostname;
                         my $myhostname=Sys::Hostname::hostname;
-                        my $resp = { warning => ["$myhostname: my xCAT version \"$myxcatver\" does not match the forwarder's xCAT version \"$req->{'_xcatver'}->[0]\" on $peerhost"]};
+                        my $resp = { warning => ["xCAT Version mismatch! \"$myxcatver\" on $myhostname does not match \"$req->{'_xcatver'}->[0]\" on $peerhost!"]};
                         $resp->{serverdone} = [undef];
                         send_response($resp, $sock);
-                        #return;
                     }
                 }
 
     
                 # we have a full request..
-                #printf $request."\n";
                 $request = "";
                 if (xCAT::xcatd->validate($peername, $peerhost, $req, $peerhostorg, \@deferredmsgargs)) {
                     $req->{'_xcat_authname'}   = [$peername];

From a8bf700c68c88abfad07927fdc614f6771dabd9a Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Sun, 23 Jul 2017 23:29:35 -0400
Subject: [PATCH 197/283] put back stat option for rsetboot

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index a33b14318..229555314 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -508,6 +508,7 @@ sub parse_args {
     } elsif ($command eq "getopenbmccons") {
         # command for openbmc rcons
     } elsif ($command eq "rsetboot") {
+        $subcommand = "stat" if (!defined($ARGV[0]));
         unless ($subcommand =~ /^net$|^hd$|^cd$|^def$|^default$|^stat$/) {
             return ([ 1, "Unsupported command: $command $subcommand" ]);
         }

From 53d3b1bcedb077242ff4f2fb3a6c21ec5c5e2076 Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Mon, 24 Jul 2017 13:32:40 +0800
Subject: [PATCH 198/283] 1, use 'disjointdhcps' for nodeset disjoint mode 2,
 handle 'disjoint' in preprocess method, to make sure that no request will be
 sent to SN which does not manage the nodes. 3, refine 'stat' to make sure it
 could query unmanaged nodes on-demand.

---
 .../admin-guides/references/man5/site.5.rst   |   9 +-
 .../references/man8/nodeset.8.rst             |   4 +-
 perl-xCAT/xCAT/NetworkUtils.pm                |  55 +++-
 perl-xCAT/xCAT/Schema.pm                      |   8 +-
 perl-xCAT/xCAT/Scope.pm                       |  69 +++-
 perl-xCAT/xCAT/Usage.pm                       |   2 +-
 xCAT-client/pods/man8/nodeset.8.pod           |   4 +-
 xCAT-server/lib/xcat/plugins/grub2.pm         | 252 +++++++-------
 xCAT-server/lib/xcat/plugins/petitboot.pm     | 310 ++++++++++--------
 xCAT-server/lib/xcat/plugins/xnba.pm          | 250 +++++++-------
 10 files changed, 574 insertions(+), 389 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man5/site.5.rst b/docs/source/guides/admin-guides/references/man5/site.5.rst
index 39a8fdc5b..7fb2bf6cc 100644
--- a/docs/source/guides/admin-guides/references/man5/site.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/site.5.rst
@@ -110,8 +110,9 @@ site Attributes:
    dhcplease:  The lease time for the dhcp client. The default value is 43200.
   
    disjointdhcps:  If set to '1', the .leases file on a service node only contains
-                   the nodes it manages. The default value is '0'.
-                   '0' value means include all the nodes in the subnet.
+                   the nodes it manages. And when 'sharedtftp' is disabled, nodeset handles
+                   boot loader configuration on a service node only for the nodes it manages.
+                   The default value is '0'. It means include all the nodes in the subnet.
   
    pruneservices:  Whether to enable service pruning when noderm is run (i.e.
                    removing DHCP entries when noderm is executed)
@@ -298,10 +299,6 @@ site Attributes:
                 If value is set to a hostname, the directory in tftpdir
                 will be mounted from that hostname on the SN
   
-   disjointnetboot:  Only avaialbe when sharedtftp is set to 0/no. If set to '1', a service node
-                handles the netboot (petitboot/grub2/xnba) config file only for the nodes it manages.
-                The default value is '0'. '0' means handle all the nodes in the same subnet.
-  
    sharedinstall:  Indicates if a shared file system will be used for installation
                    resources. Possible values are: 'no', 'sns', or 'all'.  'no' 
                    means a shared file system is not being used.  'sns' means a
diff --git a/docs/source/guides/admin-guides/references/man8/nodeset.8.rst b/docs/source/guides/admin-guides/references/man8/nodeset.8.rst
index 35edfcd45..50d12e87c 100644
--- a/docs/source/guides/admin-guides/references/man8/nodeset.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/nodeset.8.rst
@@ -19,7 +19,7 @@ Name
 ****************
 
 
-\ **nodeset**\  \ *noderange*\  [\ **boot**\  | \ **stat**\  | \ **offline**\  | \ **runcmd=bmcsetup**\  | \ **osimage**\ [=\ *imagename*\ ] | \ **shell**\  | \ **shutdown**\ ]
+\ **nodeset**\  \ *noderange*\  [\ **boot**\  | \ **stat**\  [\ **-a**\ ]| \ **offline**\  | \ **runcmd=bmcsetup**\  | \ **osimage**\ [=\ *imagename*\ ] | \ **shell**\  | \ **shutdown**\ ]
 
 \ **nodeset**\  \ *noderange*\  \ **osimage**\ [=\ *imagename*\ ] [\ **-**\ **-noupdateinitrd**\ ] [\ **-**\ **-ignorekernelchk**\ ]
 
@@ -101,7 +101,7 @@ A user can supply their own scripts to be run on the mn or on the service node (
 
 \ **stat**\ 
  
- Display the current boot loader config file description for the nodes requested
+ Display the current boot loader config file description for the nodes requested. When \ **disjointdhcps**\  is set, using \ **-a**\  to display them on all available service nodes.
  
 
 
diff --git a/perl-xCAT/xCAT/NetworkUtils.pm b/perl-xCAT/xCAT/NetworkUtils.pm
index d54bf253b..9b65054a2 100755
--- a/perl-xCAT/xCAT/NetworkUtils.pm
+++ b/perl-xCAT/xCAT/NetworkUtils.pm
@@ -1645,10 +1645,14 @@ sub getNodeIPaddress
 {
     require xCAT::Table;
     my $nodetocheck = shift;
-    my $port        = shift;
-    my $nodeip;
+    if ($nodetocheck eq 'xCAT::NetworkUtils') {    #was called with -> syntax
+        $nodetocheck = shift;
+    }
 
-    $nodeip = xCAT::NetworkUtils->getipaddr($nodetocheck);
+    # Quick return if pass in an IP
+    return $nodetocheck if (xCAT::NetworkUtils->isIpaddr($nodetocheck));
+
+    my $nodeip = xCAT::NetworkUtils->getipaddr($nodetocheck);
     if (!$nodeip)
     {
         my $hoststab = xCAT::Table->new('hosts');
@@ -1666,6 +1670,51 @@ sub getNodeIPaddress
 }
 
 
+#-------------------------------------------------------------------------------
+
+=head3   checkNodeIPaddress
+    Arguments:
+       Node name  only one at a time 
+    Returns: a hash object contains IP or Error
+    Globals:
+        none
+    Example:   my $ipresult = xCAT::NetworkUtils::checkNodeIPaddress($nodetocheck);
+
+=cut
+
+#-------------------------------------------------------------------------------
+
+sub checkNodeIPaddress
+{
+    require xCAT::Table;
+    my $nodetocheck = shift;
+    if ($nodetocheck eq 'xCAT::NetworkUtils') {    #was called with -> syntax
+        $nodetocheck = shift;
+    }
+    my $ret;
+
+    my $nodeip;
+    my $hoststab = xCAT::Table->new('hosts');
+    my $ent = $hoststab->getNodeAttribs($nodetocheck, ['ip']);
+    if ($ent->{'ip'}) {
+        $nodeip = $ent->{'ip'};
+    }
+
+    # Get the IP from DNS
+    my $dnsip = xCAT::NetworkUtils->getipaddr($nodetocheck);
+    if (!$dnsip)
+    {
+        $ret->{'error'} = "The $nodetocheck can not be resolved.";
+        $ret->{'ip'} = $nodeip if ($nodeip);
+    } elsif (!$nodeip) {
+        $ret->{'ip'} = $dnsip;
+    } else {
+        $ret->{'ip'} = $nodeip;
+        $ret->{'error'} = "Defined IP address of $nodetocheck is inconsistent with DNS." if ($nodeip ne $dnsip);
+    }
+    return $ret;
+}
+
 
 #-------------------------------------------------------------------------------
 
diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index b5badda23..67a220457 100755
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -1029,8 +1029,9 @@ passed as argument rather than by table value',
 " dhcpsetup:  If set to 'n', it will skip the dhcp setup process in the nodeset cmd.\n\n" .
 " dhcplease:  The lease time for the dhcp client. The default value is 43200.\n\n" .
 " disjointdhcps:  If set to '1', the .leases file on a service node only contains\n" .
-"                 the nodes it manages. The default value is '0'.\n" .
-"                 '0' value means include all the nodes in the subnet.\n\n" .
+"                 the nodes it manages. And when 'sharedtftp' is disabled, nodeset handles\n" .
+"                 boot loader configuration on a service node only for the nodes it manages.\n" .
+"                 The default value is '0'. It means include all the nodes in the subnet.\n\n" .
 " pruneservices:  Whether to enable service pruning when noderm is run (i.e.\n" .
 "                 removing DHCP entries when noderm is executed)\n\n" .
 " managedaddressmode: The mode of networking configuration during node provision.\n" .
@@ -1171,9 +1172,6 @@ passed as argument rather than by table value',
 "              in tftpdir is mounted on all on Service Nodes. Default is 1/yes.\n" .
 "              If value is set to a hostname, the directory in tftpdir\n" .
 "              will be mounted from that hostname on the SN\n\n" .
-" disjointnetboot:  Only available when sharedtftp is set to 0/no. If set to '1', a service node\n" .
-"              handles the netboot (petitboot/grub2/xnba) config file only for the nodes it manages.\n" .
-"              The default value is '0'. '0' means handle all the nodes in the same subnet.\n\n" .
 " sharedinstall:  Indicates if a shared file system will be used for installation\n" .
 "                 resources. Possible values are: 'no', 'sns', or 'all'.  'no' \n" .
 "                 means a shared file system is not being used.  'sns' means a\n" .
diff --git a/perl-xCAT/xCAT/Scope.pm b/perl-xCAT/xCAT/Scope.pm
index a7aaf2588..e58d1a279 100644
--- a/perl-xCAT/xCAT/Scope.pm
+++ b/perl-xCAT/xCAT/Scope.pm
@@ -1,5 +1,6 @@
 package xCAT::Scope;
 
+#use Data::Dumper;
 use xCAT::Utils;
 use xCAT::Table;
 use xCAT::ServiceNodeUtils qw(getSNList);
@@ -129,12 +130,12 @@ sub get_parallel_scope {
 
     Arguments:
        Reference of request
-       Callback: TODO, Optional, the Callback will be used to filter the nodes
+       SN list: Array of target service nodes
     Returns: An array of requests
     Error:
         none
     Example:
-        my $reqs = xCAT::Scope->get_broadcast_scope($request);
+        my $reqs = xCAT::Scope->get_broadcast_scope_with_parallel($request, \@snlist);
 =cut
 
 #-----------------------------------------------------------------------------
@@ -146,18 +147,19 @@ sub get_broadcast_scope_with_parallel {
     #Exit if the packet has been preprocessed in its history
     if ($req->{_xcatpreprocessed}->[0] == 1) { return [$req]; }
 
+    my $snlist = shift;
     #Handle the one for current management/service node
     my $reqs = get_parallel_scope($req); 
     my @requests = @$reqs;
 
     #Broadcast the request to other management/service nodes
-    foreach (xCAT::ServiceNodeUtils->getSNList()) {
-        if (xCAT::NetworkUtils->thishostisnot($_)) {
-            my $xcatdest = $_;
+    foreach (@$snlist) {
+        my $xcatdest = $_;
+        if (xCAT::NetworkUtils->thishostisnot($xcatdest)) {
             my $reqcopy = {%$req};
-            $reqcopy->{'_xcatdest'} = $_;
+            $reqcopy->{'_xcatdest'} = $xcatdest;
             $reqcopy->{_xcatpreprocessed}->[0] = 1;
-            #Apply callback to filter the node range in future.
+
             $reqs = get_parallel_scope($reqcopy);
             foreach (@$reqs) {
                 push @requests, {%$_};
@@ -167,6 +169,59 @@ sub get_broadcast_scope_with_parallel {
     return \@requests;
 }
 
+#-----------------------------------------------------------------------------
+
+=head3 get_broadcast_disjoint_scope_with_parallel
+
+    Convert a request object to an array of multiple requests according to the 
+    splitted node range. (Work under disjoint mode)
+
+    Arguments:
+       Reference of request
+       SN hash: Hash of target service nodes => Managed CNs
+    Returns: An array of requests
+    Error:
+        none
+    Example:
+        my $reqs = xCAT::Scope->get_broadcast_disjoint_scope_with_parallel($request, \@snhash);
+=cut
+
+#-----------------------------------------------------------------------------
+sub get_broadcast_disjoint_scope_with_parallel {
+    my $req = shift;
+    if ($req =~ /xCAT::Scope/) {
+        $req = shift;
+    }
+    #Exit if the packet has been preprocessed in its history
+    if ($req->{_xcatpreprocessed}->[0] == 1) { return [$req]; }
+
+    my $sn_hash = shift;
+    my @reqs = ();
+    #Handle the one for current management/service node
+    if ( xCAT::Utils->isMN() ) {
+        $reqs = get_parallel_scope($req); 
+    }
+    my @requests = @$reqs;
+
+    #Broadcast the request to other management/service nodes
+    foreach (keys %$sn_hash) {
+        my $xcatdest = $_;
+        if (xCAT::NetworkUtils->thishostisnot($xcatdest)) {
+            my $reqcopy = {%$req};
+            $reqcopy->{'_xcatdest'} = $xcatdest;
+            $reqcopy->{'node'} = $sn_hash->{$xcatdest};
+            $reqcopy->{_xcatpreprocessed}->[0] = 1;
+
+            $reqs = get_parallel_scope($reqcopy);
+            foreach (@$reqs) {
+                push @requests, {%$_};
+            }
+        }
+    }
+    #print Dumper(\@requests);
+    return \@requests;
+}
+
 
 sub get_broadcast_scope {
     my $req = shift;
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 4ca8093c0..1377d56ce 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -481,7 +481,7 @@ Options:
       "Usage:
    Common:
       nodeset [-h|--help|-v|--version]
-      nodeset <noderange> [shell|boot|runcmd=bmcsetup|osimage[=<imagename>]|offline|shutdown|stat]",
+      nodeset <noderange> [shell|boot|runcmd=bmcsetup|osimage[=<imagename>]|offline|shutdown|stat [-a]]",
     "rmflexnode" =>
       "Usage:
     rmflexnode [-h|--help|-v|--version]
diff --git a/xCAT-client/pods/man8/nodeset.8.pod b/xCAT-client/pods/man8/nodeset.8.pod
index 15618d46d..2fd8bc957 100644
--- a/xCAT-client/pods/man8/nodeset.8.pod
+++ b/xCAT-client/pods/man8/nodeset.8.pod
@@ -4,7 +4,7 @@ B<nodeset> - set the boot state for a noderange
 
 =head1 B<Synopsis>
 
-B<nodeset> I<noderange> [B<boot> | B<stat> | B<offline> | B<runcmd=bmcsetup> | B<osimage>[=I<imagename>] | B<shell> | B<shutdown>]
+B<nodeset> I<noderange> [B<boot> | B<stat> [B<-a>]| B<offline> | B<runcmd=bmcsetup> | B<osimage>[=I<imagename>] | B<shell> | B<shutdown>]
 
 B<nodeset> I<noderange> B<osimage>[=I<imagename>] [B<--noupdateinitrd>] [B<--ignorekernelchk>]
 
@@ -68,7 +68,7 @@ If you would like to run a task after deployment, you can define that task with
 
 =item B<stat>
 
-Display the current boot loader config file description for the nodes requested
+Display the current boot loader config file description for the nodes requested. When B<disjointdhcps> is set, using B<-a> to display them on all available service nodes.
 
 =item B<runcmd=bmcsetup>
 
diff --git a/xCAT-server/lib/xcat/plugins/grub2.pm b/xCAT-server/lib/xcat/plugins/grub2.pm
index cbe35783f..4820f4307 100644
--- a/xCAT-server/lib/xcat/plugins/grub2.pm
+++ b/xCAT-server/lib/xcat/plugins/grub2.pm
@@ -174,9 +174,9 @@ sub setstate {
         $kern->{kcmdline} .= " " . $cmdhashref->{volatile};
     }
 
-    my $pcfg;
-    unless (-d "$tftpdir/boot/grub2") {
-        mkpath("$tftpdir/boot/grub2");
+    my $bootloader_root = "$tftpdir/boot/grub2";
+    unless (-d "$bootloader_root") {
+        mkpath("$bootloader_root");
     }
     my $nodemac;
     my %client_nethash = xCAT::DBobjUtils->getNetwkInfo([$node]);
@@ -184,9 +184,10 @@ sub setstate {
     my $cref = $chainhash{$node}->[0]; #$chaintab->getNodeAttribs($node,['currstate']);
 
     # remove the old boot configuration files and create a new one, but only if not offline directive
-    system("find $tftpdir/boot/grub2/ -inum \$(stat --printf \%i $tftpdir/boot/grub2/$node 2>/dev/null) -exec rm -f {} \\; 2>/dev/null");
+    system("find $bootloader_root/ -inum \$(stat --printf \%i $bootloader_root/$node 2>/dev/null) -exec rm -f {} \\; 2>/dev/null");
+    my $pcfg;
     if ($cref and $cref->{currstate} ne "offline") {
-        open($pcfg, '>', $tftpdir . "/boot/grub2/" . $node);
+        open($pcfg, '>', "$bootloader_root/" . $node);
         print $pcfg "#" . $cref->{currstate} . "\n";
 
         if (($::XCATSITEVALS{xcatdebugmode} eq "1") or ($::XCATSITEVALS{xcatdebugmode} eq "2")) {
@@ -292,11 +293,6 @@ sub setstate {
             print $pcfg "}";
             close($pcfg);
         }
-        my $inetn = xCAT::NetworkUtils->getipaddr($node);
-        unless ($inetn) {
-            syslog("local1|err", "xCAT unable to resolve IP for $node in grub2 plugin");
-            return;
-        }
     } else {
         close($pcfg);
     }
@@ -332,9 +328,9 @@ sub setstate {
         my $pname = "grub.cfg-" . sprintf("%02X%02X%02X%02X", @ipa);
 
         # remove the old boot configuration file and copy (link) a new one, but only if not offline directive
-        unlink($tftpdir . "/boot/grub2/" . $pname);
+        unlink("$bootloader_root/" . $pname);
         if ($cref and $cref->{currstate} ne "offline") {
-            link($tftpdir . "/boot/grub2/" . $node, $tftpdir . "/boot/grub2/" . $pname);
+            link("$bootloader_root/" . $node, "$bootloader_root/" . $pname);
         }
     }
     
@@ -357,9 +353,9 @@ sub setstate {
         my $pname = "grub.cfg-01-" . $tmp;
 
         # remove the old boot configuration file and copy (link) a new one, but only if not offline directive
-        unlink($tftpdir . "/boot/grub2/" . $pname);
+        unlink("$bootloader_root/" . $pname);
         if ($cref and $cref->{currstate} ne "offline") {
-            link($tftpdir . "/boot/grub2/" . $node, $tftpdir . "/boot/grub2/" . $pname);
+            link("$bootloader_root/" . $node, "$bootloader_root/" . $pname);
         }
     }
     return;
@@ -400,12 +396,14 @@ sub preprocess_request {
 
     #use Getopt::Long;
     my $HELP;
+    my $ALLFLAG;
     my $VERSION;
     my $VERBOSE;
     Getopt::Long::Configure("bundling");
     Getopt::Long::Configure("pass_through");
     if (!GetOptions('h|?|help' => \$HELP,
             'v|version' => \$VERSION,
+            'a'           =>\$ALLFLAG,
             'V'         => \$VERBOSE    #>>>>>>>used for trace log>>>>>>>
         )) {
         if ($usage{$command}) {
@@ -467,12 +465,12 @@ sub preprocess_request {
         xCAT::ServiceNodeUtils->getSNandCPnodes(\@$nodes, \@SN, \@CN);
         unless (($args[0] eq 'stat') or ($args[0] eq 'enact')) {
             if ((@SN > 0) && (@CN > 0)) {    # there are both SN and CN
-                my $rsp;
-                $rsp->{data}->[0] =
+                my %rsp;
+                $rsp{errorcode}->[0] = 1;
+                $rsp{error}->[0] =
 "Nodeset was run with a noderange containing both service nodes and compute nodes. This is not valid. You must submit with either compute nodes in the noderange or service nodes. \n";
-                xCAT::MsgUtils->message("E", $rsp, $callback1);
+                $callback1->(\%rsp);
                 return;
-
             }
         }
 
@@ -480,8 +478,28 @@ sub preprocess_request {
         if ($req->{inittime}->[0]) {
             return [$req];
         }
-        if (@CN > 0) {    # if compute nodes broadcast to all servicenodes
-            return xCAT::Scope->get_broadcast_scope_with_parallel($req);
+        if (@CN > 0) {    # if compute nodes only, then broadcast to servic enodes
+
+            my @sn = xCAT::ServiceNodeUtils->getSNList();
+            unless ( @sn > 0 ) {
+                return xCAT::Scope->get_parallel_scope($req)
+            }
+
+            my $mynodeonly  = 0;
+            my @entries = xCAT::TableUtils->get_site_attribute("disjointdhcps");
+            my $t_entry = $entries[0];
+            if (defined($t_entry)) {
+                $mynodeonly = $t_entry;
+            }
+            $req->{'_disjointmode'} = [$mynodeonly];
+            xCAT::MsgUtils->trace(0, "d", "grub2: disjointdhcps=$mynodeonly");
+
+            if ($mynodeonly == 0 || $ALLFLAG) { # broadcast to all service nodes
+                return xCAT::Scope->get_broadcast_scope_with_parallel($req, \@sn);
+            }
+
+            my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@CN, "xcat", "MN");
+            return xCAT::Scope->get_broadcast_disjoint_scope_with_parallel($req, $sn_hash);
         }
     }
     # Do not dispatch to service nodes if non-sharedtftp or the node range contains only SNs.
@@ -495,19 +513,16 @@ sub process_request {
     $sub_req    = shift;
     my $command = $request->{command}->[0];
     %breaknetbootnodes = ();
-    %normalnodes       = ();
+    %normalnodes       = (); # It will be fill-up by method: setstate.
 
     my @args;
-    my @nodes;
-    my @rnodes;
-
     #>>>>>>>used for trace log start>>>>>>>
     my %opt;
     my $verbose_on_off = 0;
-    if (ref($::XNBA_request->{arg})) {
-        @args = @{ $::XNBA_request->{arg} };
+    if (ref($request->{arg})) {
+        @args = @{ $request->{arg} };
     } else {
-        @args = ($::XNBA_request->{arg});
+        @args = ($request->{arg});
     }
     @ARGV = @args;
     GetOptions('V' => \$opt{V});
@@ -515,6 +530,10 @@ sub process_request {
 
     #>>>>>>>used for trace log end>>>>>>>
 
+    my @hostinfo = xCAT::NetworkUtils->determinehostname();
+    $::myxcatname = $hostinfo[-1];
+    xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: running on $::myxcatname");
+    my @rnodes;
     if (ref($request->{node})) {
         @rnodes = @{ $request->{node} };
     } else {
@@ -527,104 +546,101 @@ sub process_request {
         return;
     }
 
-    my @hostinfo = xCAT::NetworkUtils->determinehostname();
-    $::myxcatname = $hostinfo[-1];
-    xCAT::MsgUtils->trace(0, "d", "grub2: running on $::myxcatname");
+    if ($args[0] eq 'stat') {
+        my $noderestab = xCAT::Table->new('noderes'); #in order to detect per-node tftp directories
+        my %nrhash = %{ $noderestab->getNodesAttribs(\@rnodes, [qw(tftpdir)]) };
+        foreach my $node (@rnodes) {
+            my %response;
+            my $tftpdir;
+            if ($nrhash{$node}->[0] and $nrhash{$node}->[0]->{tftpdir}) {
+                $tftpdir = $nrhash{$node}->[0]->{tftpdir};
+            } else {
+                $tftpdir = $globaltftpdir;
+            }
+            $response{node}->[0]->{name}->[0] = $node;
+            $response{node}->[0]->{data}->[0] = getstate($node, $tftpdir);
+            $callback->(\%response);
+        }
+        return;
+    }
 
-    my @unmanagednodes = ();
-    #if not shared tftpdir, then broadcast, otherwise, set up everything
+    my @nodes = ();
+    # Filter those nodes which have bad DNS: not resolvable or inconsistent IP
+    my %failurenodes = ();
+    my %preparednodes = ();
+    foreach (@rnodes) {
+        my $ipret = xCAT::NetworkUtils->checkNodeIPaddress($_);
+        my $errormsg = $ipret->{'error'};
+        my $nodeip = $ipret->{'ip'};
+        if ($errormsg) {# Add the node to failure set
+            xCAT::MsgUtils->trace(0, "E", "grub2: IP address of $_ is $nodeip. $errormsg");
+            unless ($nodeip) {
+                $failurenodes{$_} = 1;
+            }
+        }
+        if ($nodeip) {
+            $preparednodes{$_} = $nodeip;
+        }
+    }
+
+    #if not shared tftpdir, then filter, otherwise, set up everything
     if ($request->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
-        @nodes = ();
-
-        my %iphash   = ();
-        # flag the IPs or names in iphash
-        foreach (@hostinfo) { $iphash{$_} = 1; }
-        #print Dumper(\%iphash);
-
-        my $mynodeonly  = 0;
-        my @entries = xCAT::TableUtils->get_site_attribute("disjointnetboot");
-        my $t_entry = $entries[0];
-        if (defined($t_entry)) {
-            $mynodeonly = $t_entry;
-        }
-        xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: disjointnetboot=$mynodeonly");
-
-        # Get managed node list under current server
-        # The node will be under under 'site.master' if no 'noderes.servicenode' is defined
-        my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@rnodes, "xcat", "MN");
-        #print Dumper($sn_hash);
-        my %managed = ();
-        foreach (keys %$sn_hash) {
-            if (exists($iphash{$_})) {
-                my $cur_xmaster = $_;
-                foreach (@{ $sn_hash->{$cur_xmaster} }) { $managed{$_} = 1; }
-                last;
-            }
-        }
-
-        my $notsamenet_nodes_err  = '';
-        my $notsamenet_nodes_warn = '';
-
-        foreach (@rnodes) {
-            # For MN, the scope is all CN, for SN, the scope is the nodes it managed if disjointnetboot is set.
-            my $req2manage = exists($managed{$_});
-            if ($req2manage) {
-                push @unmanagednodes, $_;
-                # quick pass through if disjoint is set.
-                next if ( $mynodeonly == 1 && xCAT::Utils->isMN() != 1 );
-            }
-
+        # Filter those nodes not in the same subnet, and print error message in log file.
+        foreach (keys %preparednodes) {
             # Only handle its boot configuration files if the node in same subnet
-            if (xCAT::NetworkUtils->nodeonmynet($_)) {
+            if (xCAT::NetworkUtils->nodeonmynet($preparednodes{$_})) {
                 push @nodes, $_;
-            } elsif ( $req2manage ) {
-                # report error when it is under my control but I cannot handle it.
-                $notsamenet_nodes_err .= " $_";
-            }
-            else {
-                $notsamenet_nodes_warn .= " $_";
-            }
-        }
-
-        if ( $mynodeonly == 1 && scalar (@unmanagednodes) > 0 && xCAT::Utils->isMN() != 1) {
-            my $str_umnodes = join(" ", @unmanagednodes);
-            xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: unmanaged nodes are $str_umnodes");
-        }
-
-        if ( $notsamenet_nodes_err || $notsamenet_nodes_warn ) {
-            my $msg = "grub2 configuration file was not created ";
-            $msg .= "on $::myxcatname " if ( $::myxcatname );
-            $msg .= "for below nodes because sharedtftp attribute is not set and the nodes are not on same network as this xcatmaster: ";
-            xCAT::MsgUtils->message("S", $msg . $notsamenet_nodes_warn . $notsamenet_nodes_err);
-            # For managed children, need to report error
-            if ( $notsamenet_nodes_err ) {
-                my $rsp;
-                $rsp->{data}->[0] = $msg . $notsamenet_nodes_err;
-                xCAT::MsgUtils->message("E", $rsp, $callback);
+            } else {
+                xCAT::MsgUtils->trace(0, "W", "grub2: configuration file was not created for [$_] because the node is not on the same network as this server");
+                delete $preparednodes{$_};
             }
         }
     } else {
-        @nodes = @rnodes;
+        @nodes = keys %preparednodes;
     }
 
-    #>>>>>>>used for trace log>>>>>>>
     my $str_node = join(" ", @nodes);
     xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: nodes are $str_node") if ($str_node);
 
     # return directly if no nodes in the same network
     unless (@nodes) {
         xCAT::MsgUtils->message("S", "xCAT: grub2 netboot: no valid nodes. Stop the operation on this server.");
+
+        # It must be an error if my managed nodes are not handled.
+        if (xCAT::Utils->isMN() != 1 && $request->{'_disparatetftp'}->[0] && $request->{'_disjointmode'}->[0] != 1) {
+            # Find out which nodes are really mine only when not sharedtftp and not disjoint mode.
+            # For other case, all passing node range are required to be handled.
+            my %iphash   = ();
+            # flag the IPs or names in iphash
+            foreach (@hostinfo) { $iphash{$_} = 1; }
+
+            # Get managed node list under current server
+            # The node will be under under 'site.master' if no 'noderes.servicenode' is defined
+            my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@rnodes, "xcat", "MN");
+            #my %managed = ();
+            my $req2manage = 0;
+            foreach (keys %$sn_hash) {
+                if (exists($iphash{$_})) {
+                    #my $cur_xmaster = $_;
+                    #foreach (@{ $sn_hash->{$cur_xmaster} }) { $managed{$_} = 1; }
+                    $req2manage = 1;
+                    last;
+                }
+            }
+            if ($req2manage == 0) {
+                xCAT::MsgUtils->trace(0, "d", "grub2: No nodes are required to be managed on this server");
+                return;
+            }
+        }
+        my $rsp;
+        $rsp->{errorcode}->[0] = 1;
+        $rsp->{error}->[0]     = "Failed to generate grub2 configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.\n";
+        $callback->($rsp);
         return;
     }
 
-    if (ref($request->{arg})) {
-        @args = @{ $request->{arg} };
-    } else {
-        @args = ($request->{arg});
-    }
-
     #now run the begin part of the prescripts
-    unless ($args[0] eq 'stat') {    # or $args[0] eq 'enact') {
+    unless ($args[0] eq '') {    # or $args[0] eq 'enact') {
         $errored = 0;
         if ($request->{'_disparatetftp'}->[0]) { #the call is distrubuted to the service node already, so only need to handle my own children
             xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: the call is distrubuted to the service node already, so only need to handle my own children");
@@ -654,7 +670,7 @@ sub process_request {
     if (!$inittime) { $inittime = 0; }
 
     my %bphash;
-    unless ($args[0] eq 'stat') {    # or $args[0] eq 'enact') {
+    unless ($args[0] eq '') {    # or $args[0] eq 'enact') {
         $errored = 0;
         xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: issue setdestiny request");
         $sub_req->({ command => ['setdestiny'],
@@ -669,6 +685,7 @@ sub process_request {
         }
     }
 
+    xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: starting to handle configuration...");
     my $chaintab = xCAT::Table->new('chain', -create => 1);
     my $chainhash = $chaintab->getNodesAttribs(\@nodes, ['currstate']);
     my $noderestab = xCAT::Table->new('noderes', -create => 1);
@@ -694,10 +711,7 @@ sub process_request {
             $tftpdir = $globaltftpdir;
         }
         $response{node}->[0]->{name}->[0] = $_;
-        if ($args[0] eq 'stat') {
-            $response{node}->[0]->{data}->[0] = getstate($_, $tftpdir);
-            $callback->(\%response);
-        } elsif ($args[0]) { #If anything else, send it on to the destiny plugin, then setstate
+        if ($args[0]) { # Send it on to the destiny plugin, then setstate
             my $ent          = $typehash->{$_}->[0];
             my $osimgname    = $ent->{'provmethod'};
             my $linuximghash = undef;
@@ -713,11 +727,11 @@ sub process_request {
             }
         }
     }    # end of foreach node
+    xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: Finish to handle configurations");
 
     my @normalnodeset = keys %normalnodes;
     my @breaknetboot  = keys %breaknetbootnodes;
 
-    #print "grub2 :inittime=$inittime; normalnodeset=@normalnodeset; breaknetboot=@breaknetboot\n";
     my %osimagenodehash;
     for my $nn (@normalnodeset) {
 
@@ -738,7 +752,7 @@ sub process_request {
     }
 
     #Don't bother to try dhcp binding changes if sub_req not passed, i.e. service node build time
-    unless (($args[0] eq 'stat') || ($inittime) || ($args[0] eq 'offline')) {
+    unless (($inittime) || ($args[0] eq 'offline')) {
         foreach my $osimage (keys %osimagenodehash) {
 
             #TOTO check the existence of grub2 executable files for corresponding arch
@@ -838,7 +852,7 @@ sub process_request {
     }
 
     #now run the end part of the prescripts
-    unless ($args[0] eq 'stat') {    # or $args[0] eq 'enact')
+    unless ($args[0] eq '') {    # or $args[0] eq 'enact')
         $errored = 0;
         if ($request->{'_disparatetftp'}->[0]) { #the call is distrubuted to the service node already, so only need to handles my own children
             xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: issue runendpre request");
@@ -859,6 +873,16 @@ sub process_request {
             return;
         }
     }
+
+    # Return error codes if there are failed nodes
+    if (%failurenodes) {
+        my $rsp;
+        $rsp->{errorcode}->[0] = 1;
+        $rsp->{error}->[0]     = "Failed to generate grub2 configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.\n";
+        $callback->($rsp);
+        return;
+    }
+
 }
 
 #----------------------------------------------------------------------------
diff --git a/xCAT-server/lib/xcat/plugins/petitboot.pm b/xCAT-server/lib/xcat/plugins/petitboot.pm
index 7b9487da3..89c02fd3b 100644
--- a/xCAT-server/lib/xcat/plugins/petitboot.pm
+++ b/xCAT-server/lib/xcat/plugins/petitboot.pm
@@ -79,7 +79,7 @@ sub setstate {
 
 =pod
 
-  This function will manipulate the yaboot structure to match what the noderes/chain tables indicate the node should be booting.
+  This function will manipulate the petitboot structure to match what the noderes/chain tables indicate the node should be booting.
 
 =cut
 
@@ -169,18 +169,19 @@ sub setstate {
         }
     }
 
-    my $pcfg;
-    unless (-d "$tftpdir/petitboot") {
-        mkpath("$tftpdir/petitboot");
+    my $bootloader_root = "$tftpdir/petitboot";
+    unless (-d "$bootloader_root") {
+        mkpath("$bootloader_root");
     }
     my $nodemac;
 
     my $cref = $chainhash{$node}->[0]; #$chaintab->getNodeAttribs($node,['currstate']);
 
+    my $pcfg;
     # remove the old boot configuration file and create a new one, but only if not offline directive
-    unlink($tftpdir . "/petitboot/" . $node);
+    unlink("$bootloader_root/" . $node);
     if ($cref and $cref->{currstate} ne "offline") {
-        open($pcfg, '>', $tftpdir . "/petitboot/" . $node);
+        open($pcfg, '>', "$bootloader_root/" . $node);
         print $pcfg "#" . $cref->{currstate} . "\n";
     }
     $normalnodes{$node} = 1;   #Assume a normal netboot (well, normal dhcp,
@@ -216,18 +217,13 @@ sub setstate {
             print $pcfg "\tappend \"" . $kern->{kcmdline} . "\"\n";
         }
         close($pcfg);
-        my $inetn = xCAT::NetworkUtils->getipaddr($node);
-        unless ($inetn) {
-            syslog("local1|err", "xCAT unable to resolve IP for $node in petitboot plugin");
-            return;
-        }
     } else {    #TODO: actually, should possibly default to xCAT image?
                 #print $pcfg "bye\n";
         close($pcfg);
     }
     my $ip = xCAT::NetworkUtils->getipaddr($node);
     unless ($ip) {
-        syslog("local1|err", "xCAT unable to resolve IP in petitboot plugin");
+        syslog("local1|err", "xCAT unable to resolve IP for $node in petitboot plugin");
         return;
     }
 
@@ -236,9 +232,9 @@ sub setstate {
     $pname = uc($pname);
 
     # remove the old boot configuration file and copy (link) a new one, but only if not offline directive
-    unlink($tftpdir . "/" . $pname);
+    unlink("$tftpdir/" . $pname);
     if ($cref and $cref->{currstate} ne "offline") {
-        link($tftpdir . "/petitboot/" . $node, $tftpdir . "/" . $pname);
+        link("$bootloader_root/" . $node, "$tftpdir/" . $pname);
     }
     return;
 }
@@ -282,12 +278,14 @@ sub preprocess_request {
 
     #use Getopt::Long;
     my $HELP;
+    my $ALLFLAG;
     my $VERSION;
     my $VERBOSE;
     Getopt::Long::Configure("bundling");
     Getopt::Long::Configure("pass_through");
     if (!GetOptions('h|?|help' => \$HELP,
             'v|version' => \$VERSION,
+            'a'           =>\$ALLFLAG,
             'V'         => \$VERBOSE    #>>>>>>>used for trace log>>>>>>>
         )) {
         if ($usage{$command}) {
@@ -333,6 +331,13 @@ sub preprocess_request {
         return;
     }
 
+    if ($ARGV[0] ne "stat" && $ALLFLAG) {
+        my %rsp;
+        $rsp{error}->[0] = "'-a' could only be used with 'stat' subcommand.";
+        $rsp{errorcode}->[0] = 1;
+        $callback1->(\%rsp);
+        return;
+    }
 
     #Assume shared tftp directory for boring people, but for cool people, help sync up tftpdirectory contents when
     #if they specify no sharedtftp in site table
@@ -345,21 +350,43 @@ sub preprocess_request {
         my @SN;
         my @CN;
         xCAT::ServiceNodeUtils->getSNandCPnodes(\@$nodes, \@SN, \@CN);
-        if ((@SN > 0) && (@CN > 0)) {    # there are both SN and CN
-            my $rsp;
-            $rsp->{data}->[0] =
-"Nodeset was run with a noderange containing both service nodes and compute nodes. This is not valid. You must submit with either compute nodes in the noderange or service nodes. \n";
-            xCAT::MsgUtils->message("E", $rsp, $callback1);
-            return;
-
+        unless (($args[0] eq 'stat') or ($args[0] eq 'enact')) {
+            if ((@SN > 0) && (@CN > 0)) {    # there are both SN and CN
+                my %rsp;
+                $rsp{errorcode}->[0] = 1;
+                $rsp{error}->[0] =
+    "Nodeset was run with a noderange containing both service nodes and compute nodes. This is not valid. You must submit with either compute nodes in the noderange or service nodes. \n";
+                $callback1->(\%rsp);
+                return;
+            }
         }
 
         $req->{'_disparatetftp'} = [1];
         if ($req->{inittime}->[0]) {
             return [$req];
         }
-        if (@CN > 0) {    # if compute nodes broadcast to all servicenodes
-            return xCAT::Scope->get_broadcast_scope_with_parallel($req);
+        if (@CN > 0) {    # if compute nodes only, then broadcast to servic enodes
+
+            my @sn = xCAT::ServiceNodeUtils->getSNList();
+            unless ( @sn > 0 ) {
+                return xCAT::Scope->get_parallel_scope($req)
+            }
+
+            my $mynodeonly  = 0;
+            my @entries = xCAT::TableUtils->get_site_attribute("disjointdhcps");
+            my $t_entry = $entries[0];
+            if (defined($t_entry)) {
+                $mynodeonly = $t_entry;
+            }
+            $req->{'_disjointmode'} = [$mynodeonly];
+            xCAT::MsgUtils->trace(0, "d", "petitboot: disjointdhcps=$mynodeonly");
+
+            if ($mynodeonly == 0 || $ALLFLAG) { # broadcast to all service nodes
+                return xCAT::Scope->get_broadcast_scope_with_parallel($req, \@sn);
+            }
+
+            my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@CN, "xcat", "MN");
+            return xCAT::Scope->get_broadcast_disjoint_scope_with_parallel($req, $sn_hash);
         }
     }
     # Do not dispatch to service nodes if non-sharedtftp or the node range contains only SNs.
@@ -374,16 +401,16 @@ sub process_request {
     $sub_req    = shift;
     my $command = $request->{command}->[0];
     %breaknetbootnodes = ();
-    %normalnodes       = ();
+    %normalnodes       = (); # It will be fill-up by method: setstate.
 
     #>>>>>>>used for trace log start>>>>>>>
     my @args = ();
     my %opt;
     my $verbose_on_off = 0;
-    if (ref($::request->{arg})) {
-        @args = @{ $::request->{arg} };
+    if (ref($request->{arg})) {
+        @args = @{ $request->{arg} };
     } else {
-        @args = ($::request->{arg});
+        @args = ($request->{arg});
     }
     @ARGV = @args;
     GetOptions('V' => \$opt{V});
@@ -394,7 +421,9 @@ sub process_request {
     if ($::XCATSITEVALS{"httpmethod"}) { $httpmethod = $::XCATSITEVALS{"httpmethod"}; }
     if ($::XCATSITEVALS{"httpport"}) { $httpport = $::XCATSITEVALS{"httpport"}; }
 
-    my @nodes;
+    my @hostinfo = xCAT::NetworkUtils->determinehostname();
+    $::myxcatname = $hostinfo[-1];
+    xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: running on $::myxcatname");
     my @rnodes;
     if (ref($request->{node})) {
         @rnodes = @{ $request->{node} };
@@ -408,104 +437,101 @@ sub process_request {
         return;
     }
 
-    my @hostinfo = xCAT::NetworkUtils->determinehostname();
-    $::myxcatname = $hostinfo[-1];
-    xCAT::MsgUtils->trace(0, "d", "petitboot: running on $::myxcatname");
-
-    my @unmanagednodes = ();
-    #if not shared tftpdir, then broadcast, otherwise, set up everything
-    if ($request->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
-        @nodes = ();
-
-        my %iphash   = ();
-        # flag the IPs or names in iphash
-        foreach (@hostinfo) { $iphash{$_} = 1; }
-        #print Dumper(\%iphash);
-
-        my $mynodeonly  = 0;
-        my @entries = xCAT::TableUtils->get_site_attribute("disjointnetboot");
-        my $t_entry = $entries[0];
-        if (defined($t_entry)) {
-            $mynodeonly = $t_entry;
-        }
-        xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: disjointnetboot=$mynodeonly");
-
-        # Get managed node list under current server
-        # The node will be under under 'site.master' if no 'noderes.servicenode' is defined
-        my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@rnodes, "xcat", "MN");
-        #print Dumper($sn_hash);
-        my %managed = ();
-        foreach (keys %$sn_hash) {
-            if (exists($iphash{$_})) {
-                my $cur_xmaster = $_;
-                foreach (@{ $sn_hash->{$cur_xmaster} }) { $managed{$_} = 1; }
-                last;
+    if ($args[0] eq 'stat') {
+        my $noderestab = xCAT::Table->new('noderes'); #in order to detect per-node tftp directories
+        my %nrhash = %{ $noderestab->getNodesAttribs(\@rnodes, [qw(tftpdir)]) };
+        foreach my $node (@rnodes) {
+            my %response;
+            my $tftpdir;
+            if ($nrhash{$node}->[0] and $nrhash{$node}->[0]->{tftpdir}) {
+                $tftpdir = $nrhash{$node}->[0]->{tftpdir};
+            } else {
+                $tftpdir = $globaltftpdir;
             }
+            $response{node}->[0]->{name}->[0] = $node;
+            $response{node}->[0]->{data}->[0] = getstate($node, $tftpdir);
+            $callback->(\%response);
         }
-
-        my $notsamenet_nodes_err  = '';
-        my $notsamenet_nodes_warn = '';
-
-        foreach (@rnodes) {
-            # For MN, the scope is all CN, for SN, the scope is the nodes it managed if disjointnetboot is set.
-            my $req2manage = exists($managed{$_});
-            if ($req2manage) {
-                push @unmanagednodes, $_;
-                # quick pass through if disjoint is set.
-                next if ( $mynodeonly == 1 && xCAT::Utils->isMN() != 1 );
-            }
-
-            # Only handle its boot configuration files if the node in same subnet
-            if (xCAT::NetworkUtils->nodeonmynet($_)) {
-                push @nodes, $_;
-            } elsif ( $req2manage ) {
-                # report error when it is under my control but I cannot handle it.
-                $notsamenet_nodes_err .= " $_";
-            }
-            else {
-                $notsamenet_nodes_warn .= " $_";
-            }
-        }
-
-        if ( $mynodeonly == 1 && scalar (@unmanagednodes) > 0 && xCAT::Utils->isMN() != 1) {
-            my $str_umnodes = join(" ", @unmanagednodes);
-            xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: unmanaged nodes are $str_umnodes");
-        }
-
-        if ( $notsamenet_nodes_err || $notsamenet_nodes_warn ) {
-            my $msg = "petitboot configuration file was not created ";
-            $msg .= "on $::myxcatname " if ( $::myxcatname );
-            $msg .= "for below nodes because sharedtftp attribute is not set and the nodes are not on same network as this xcatmaster: ";
-            xCAT::MsgUtils->message("S", $msg . $notsamenet_nodes_warn . $notsamenet_nodes_err);
-            # For managed children, need to report error
-            if ( $notsamenet_nodes_err ) {
-                my $rsp;
-                $rsp->{data}->[0] = $msg . $notsamenet_nodes_err;
-                xCAT::MsgUtils->message("E", $rsp, $callback);
-            }
-        }
-    } else {
-        @nodes = @rnodes;
-    }
-
-    #>>>>>>>used for trace log>>>>>>>
-    my $str_node = join(" ", @nodes);
-    xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: nodes are $str_node") if ($str_node);
-
-    # return directly if no nodes in the same network
-    unless (@nodes) {
-        xCAT::MsgUtils->message("S", "xCAT: petitboot netboot: no valid nodes. Stop the operation on this server.");
         return;
     }
 
-    if (ref($request->{arg})) {
-        @args = @{ $request->{arg} };
+    my @nodes = ();
+    # Filter those nodes which have bad DNS: not resolvable or inconsistent IP
+    my %failurenodes = ();
+    my %preparednodes = ();
+    foreach (@rnodes) {
+        my $ipret = xCAT::NetworkUtils->checkNodeIPaddress($_);
+        my $errormsg = $ipret->{'error'};
+        my $nodeip = $ipret->{'ip'};
+        if ($errormsg) {# Add the node to failure set
+            xCAT::MsgUtils->trace(0, "E", "petitboot: IP address of $_ is $nodeip. $errormsg");
+            unless ($nodeip) {
+                $failurenodes{$_} = 1;
+            }
+        }
+        if ($nodeip) {
+            $preparednodes{$_} = $nodeip;
+        }
+    }
+
+    #if not shared tftpdir, then filter, otherwise, set up everything
+    if ($request->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
+        # Filter those nodes not in the same subnet, and print error message in log file.
+        foreach (keys %preparednodes) {
+            # Only handle its boot configuration files if the node in same subnet
+            if (xCAT::NetworkUtils->nodeonmynet($preparednodes{$_})) {
+                push @nodes, $_;
+            } else {
+                xCAT::MsgUtils->trace(0, "W", "petitboot: configuration file was not created for [$_] because the node is not on the same network as this server");
+                delete $preparednodes{$_};
+            }
+        }
     } else {
-        @args = ($request->{arg});
+        @nodes = keys %preparednodes;
+    }
+
+    my $str_node = join(" ", @nodes);
+    xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: nodes are $str_node") if ($str_node);
+
+    # Return directly if no nodes in the same network
+    unless (@nodes) {
+        xCAT::MsgUtils->message("S", "xCAT: petitboot netboot: no valid nodes. Stop the operation on this server.");
+
+        # It must be an error if my managed nodes are not handled.
+        if (xCAT::Utils->isMN() != 1 && $request->{'_disparatetftp'}->[0] && $request->{'_disjointmode'}->[0] != 1) {
+            # Find out which nodes are really mine only when not sharedtftp and not disjoint mode.
+            # For other case, all passing node range are required to be handled.
+            my %iphash   = ();
+            # flag the IPs or names in iphash
+            foreach (@hostinfo) { $iphash{$_} = 1; }
+
+            # Get managed node list under current server
+            # The node will be under under 'site.master' if no 'noderes.servicenode' is defined
+            my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@rnodes, "xcat", "MN");
+            #my %managed = ();
+            my $req2manage = 0;
+            foreach (keys %$sn_hash) {
+                if (exists($iphash{$_})) {
+                    #my $cur_xmaster = $_;
+                    #foreach (@{ $sn_hash->{$cur_xmaster} }) { $managed{$_} = 1; }
+                    $req2manage = 1;
+                    last;
+                }
+            }
+            if ($req2manage == 0) {
+                xCAT::MsgUtils->trace(0, "d", "petitboot: No nodes are required to be managed on this server");
+                return;
+            }
+        }
+        my $rsp;
+        $rsp->{errorcode}->[0] = 1;
+        $rsp->{error}->[0]     = "Failed to generate petitboot configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.\n";
+        $callback->($rsp);
+        return;
     }
 
     #now run the begin part of the prescripts
-    unless ($args[0] eq 'stat') {    # or $args[0] eq 'enact') {
+    unless ($args[0] eq '') {    # or $args[0] eq 'enact') {
         $errored = 0;
         if ($request->{'_disparatetftp'}->[0]) { #the call is distrubuted to the service node already, so only need to handle my own children
             xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: the call is distrubuted to the service node already, so only need to handle my own children");
@@ -517,7 +543,7 @@ sub process_request {
             xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: nodeset did not distribute to the service node");
             xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: issue runbeginpre request");
             $sub_req->({ command => ['runbeginpre'],
-                    node => \@rnodes,
+                    node => \@nodes,
                     arg => [ $args[0] ] }, \&pass_along);
         }
         if ($errored) {
@@ -535,7 +561,7 @@ sub process_request {
     if (!$inittime) { $inittime = 0; }
 
     my %bphash;
-    unless ($args[0] eq 'stat') {    # or $args[0] eq 'enact') {
+    unless ($args[0] eq '') {    # or $args[0] eq 'enact') {
         $errored = 0;
         xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: issue setdestiny request");
         $sub_req->({ command => ['setdestiny'],
@@ -561,6 +587,8 @@ sub process_request {
                 });
         xCAT::MsgUtils->message("S", "xCAT: petitboot netboot: clear node(s): @nodes boot device setting.");
     }
+
+    xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: starting to handle configuration...");
     my $chaintab = xCAT::Table->new('chain', -create => 1);
     my $chainhash = $chaintab->getNodesAttribs(\@nodes, ['currstate']);
     my $noderestab = xCAT::Table->new('noderes', -create => 1);
@@ -584,13 +612,10 @@ sub process_request {
             $tftpdir = $globaltftpdir;
         }
         $response{node}->[0]->{name}->[0] = $_;
-        if ($args[0] eq 'stat') {
-            $response{node}->[0]->{data}->[0] = getstate($_, $tftpdir);
-            $callback->(\%response);
-        } elsif ($args[0]) { #If anything else, send it on to the destiny plugin, then setstate
+        if ($args[0]) { # send it on to the destiny plugin, then setstate
             my $ent       = $typehash->{$_}->[0];
             my $osimgname = $ent->{'provmethod'};
-            my $linuximghash = $linuximghash = $linuximgtab->getAttribs({ imagename => $osimgname }, 'boottarget', 'addkcmdline');
+            my $linuximghash = $linuximgtab->getAttribs({ imagename => $osimgname }, 'boottarget', 'addkcmdline');
 
 
             ($rc, $errstr) = setstate($_, \%bphash, $chainhash, $machash, $tftpdir, $nodereshash, $linuximghash);
@@ -601,11 +626,10 @@ sub process_request {
             }
         }
     }    # end of foreach node
+    xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: Finish to handle configurations");
 
     my @normalnodeset = keys %normalnodes;
     my @breaknetboot  = keys %breaknetbootnodes;
-
-    #print "yaboot:inittime=$inittime; normalnodeset=@normalnodeset; breaknetboot=@breaknetboot\n";
     my %osimagenodehash;
     for my $nn (@normalnodeset) {
 
@@ -616,7 +640,7 @@ sub process_request {
     }
 
     #Don't bother to try dhcp binding changes if sub_req not passed, i.e. service node build time
-    unless (($args[0] eq 'stat') || ($inittime) || ($args[0] eq 'offline')) {
+    unless (($inittime) || ($args[0] eq 'offline')) {
 
         #dhcp stuff
         my $do_dhcpsetup = 1;
@@ -626,16 +650,17 @@ sub process_request {
             if ($t_entry =~ /0|n|N/) { $do_dhcpsetup = 0; }
         }
         if ($do_dhcpsetup) {
-            if ($::request->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
-                xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: issue makedhcp request");
-                $sub_req->({ command => ['makedhcp'], arg => ['-l'],
-                        node => \@normalnodeset }, $callback);
-            } else {
-                xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: issue makedhcp request");
-                $sub_req->({ command => ['makedhcp'],
-                        node => \@normalnodeset }, $callback);
-            }
+            my @parameter;
+            push @parameter, '-l' if ($::request->{'_disparatetftp'}->[0]);
+            xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: issue makedhcp request");
+
+            $sub_req->({ command => ['makedhcp'],
+                         arg => \@parameter,
+                         node => \@normalnodeset }, $callback);
+        } else {
+            xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: dhcpsetup=$do_dhcpsetup");
         }
+
     }
 
     if ($args[0] eq 'offline') {
@@ -645,7 +670,7 @@ sub process_request {
     }
 
     #now run the end part of the prescripts
-    unless ($args[0] eq 'stat') {    # or $args[0] eq 'enact')
+    unless ($args[0] eq '') {    # or $args[0] eq 'enact')
         $errored = 0;
         if ($request->{'_disparatetftp'}->[0]) { #the call is distrubuted to the service node already, so only need to handles my own children
             xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: issue runendpre request");
@@ -655,7 +680,7 @@ sub process_request {
         } else { #nodeset did not distribute to the service node, here we need to let runednpre to distribute the nodes to their masters
             xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: issue runendpre request");
             $sub_req->({ command => ['runendpre'],
-                    node => \@rnodes,
+                    node => \@nodes,
                     arg => [ $args[0] ] }, \&pass_along);
         }
         if ($errored) {
@@ -666,6 +691,15 @@ sub process_request {
             return;
         }
     }
+
+    # Return error codes if there are failed nodes
+    if (%failurenodes) {
+        my $rsp;
+        $rsp->{errorcode}->[0] = 1;
+        $rsp->{error}->[0]     = "Failed to generate petitboot configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.\n";
+        $callback->($rsp);
+        return;
+    }
 }
 
 #----------------------------------------------------------------------------
diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm
index 6464a70c3..da8d8d467 100644
--- a/xCAT-server/lib/xcat/plugins/xnba.pm
+++ b/xCAT-server/lib/xcat/plugins/xnba.pm
@@ -331,10 +331,12 @@ sub preprocess_request {
     Getopt::Long::Configure("bundling");
     Getopt::Long::Configure("pass_through");
     my $HELP;
+    my $ALLFLAG;
     my $VERSION;
     my $VERBOSE;
     if (!GetOptions('h|?|help' => \$HELP,
             'v|version' => \$VERSION,
+            'a'           =>\$ALLFLAG,
             'V'         => \$VERBOSE    #>>>>>>>used for trace log>>>>>>>
         )) {
         if ($usage{$command}) {
@@ -380,6 +382,13 @@ sub preprocess_request {
         return;
     }
 
+    if ($ARGV[0] ne "stat" && $ALLFLAG) {
+        my %rsp;
+        $rsp{error}->[0] = "'-a' could only be used with 'stat' subcommand.";
+        $rsp{errorcode}->[0] = 1;
+        $callback1->(\%rsp);
+        return;
+    }
 
     #Assume shared tftp directory for boring people, but for cool people, help sync up tftpdirectory contents when
     #they specify no sharedtftp in site table
@@ -394,12 +403,12 @@ sub preprocess_request {
         xCAT::ServiceNodeUtils->getSNandCPnodes(\@$nodes, \@SN, \@CN);
         unless (($args[0] eq 'stat') or ($args[0] eq 'enact')) { # mix is ok for these options
             if ((@SN > 0) && (@CN > 0)) {    # there are both SN and CN
-                my $rsp;
-                $rsp->{data}->[0] =
+                my %rsp;
+                $rsp{errorcode}->[0] = 1;
+                $rsp{error}->[0] =
 "Nodeset was run with a noderange containing both service nodes and compute nodes. This is not valid. You must submit with either compute nodes in the noderange or service nodes. \n";
-                xCAT::MsgUtils->message("E", $rsp, $callback1);
+                $callback1->(\%rsp);
                 return;
-
             }
         }
 
@@ -408,7 +417,27 @@ sub preprocess_request {
             return [$req];
         }
         if (@CN > 0) {    # if compute nodes broadcast to all servicenodes
-            return xCAT::Scope->get_broadcast_scope_with_parallel($req);
+
+            my @sn = xCAT::ServiceNodeUtils->getSNList();
+            unless ( @sn > 0 ) {
+                return xCAT::Scope->get_parallel_scope($req)
+            }
+
+            my $mynodeonly  = 0;
+            my @entries = xCAT::TableUtils->get_site_attribute("disjointdhcps");
+            my $t_entry = $entries[0];
+            if (defined($t_entry)) {
+                $mynodeonly = $t_entry;
+            }
+            $req->{'_disjointmode'} = [$mynodeonly];
+            xCAT::MsgUtils->trace(0, "d", "xnba: disjointdhcps=$mynodeonly");
+
+            if ($mynodeonly == 0 || $ALLFLAG) { # broadcast to all service nodes
+                return xCAT::Scope->get_broadcast_scope_with_parallel($req, \@sn);
+            }
+
+            my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@CN, "xcat", "MN");
+            return xCAT::Scope->get_broadcast_disjoint_scope_with_parallel($req, $sn_hash);
         }
     }
     # Do not dispatch to service nodes if non-sharedtftp or the node range contains only SNs.
@@ -438,12 +467,14 @@ sub process_request {
 
     #>>>>>>>used for trace log end>>>>>>>
 
+    my @hostinfo = xCAT::NetworkUtils->determinehostname();
+    $::myxcatname = $hostinfo[-1];
+    xCAT::MsgUtils->trace(0, "d", "xnba: running on $::myxcatname");
     if (ref($::XNBA_request->{node})) {
         @rnodes = @{ $::XNBA_request->{node} };
     } else {
         if ($::XNBA_request->{node}) { @rnodes = ($::XNBA_request->{node}); }
     }
-
     unless (@rnodes) {
         if ($usage{ $::XNBA_request->{command}->[0] }) {
             $::XNBA_callback->({ data => $usage{ $::XNBA_request->{command}->[0] } });
@@ -451,104 +482,101 @@ sub process_request {
         return;
     }
 
-    my @hostinfo = xCAT::NetworkUtils->determinehostname();
-    $::myxcatname = $hostinfo[-1];
-    xCAT::MsgUtils->trace(0, "d", "xnba: running on $::myxcatname");
+    if ($args[0] eq 'stat') {
+        my $noderestab = xCAT::Table->new('noderes'); #in order to detect per-node tftp directories
+        my %nrhash = %{ $noderestab->getNodesAttribs(\@rnodes, [qw(tftpdir)]) };
+        foreach my $node (@rnodes) {
+            my %response;
+            my $tftpdir;
+            if ($nrhash{$node}->[0] and $nrhash{$node}->[0]->{tftpdir}) {
+                $tftpdir = $nrhash{$node}->[0]->{tftpdir};
+            } else {
+                $tftpdir = $globaltftpdir;
+            }
+            $response{node}->[0]->{name}->[0] = $node;
+            $response{node}->[0]->{data}->[0] = getstate($node, $tftpdir);
+            $::XNBA_callback->(\%response);
+        }
+        return;
+    }
 
-    my @unmanagednodes = ();
-    #if not shared tftpdir, then broadcast, otherwise, set up everything
+    my @nodes = ();
+    # Filter those nodes which have bad DNS: not resolvable or inconsistent IP
+    my %failurenodes = ();
+    my %preparednodes = ();
+    foreach (@rnodes) {
+        my $ipret = xCAT::NetworkUtils->checkNodeIPaddress($_);
+        my $errormsg = $ipret->{'error'};
+        my $nodeip = $ipret->{'ip'};
+        if ($errormsg) {# Add the node to failure set
+            xCAT::MsgUtils->trace(0, "E", "xnba: IP address of $_ is $nodeip. $errormsg");
+            unless ($nodeip) {
+                $failurenodes{$_} = 1;
+            }
+        }
+        if ($nodeip) {
+            $preparednodes{$_} = $nodeip;
+        }
+    }
+
+    #if not shared tftpdir, then filter, otherwise, set up everything
     if ($::XNBA_request->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
-        @nodes = ();
-
-        my %iphash   = ();
-        # flag the IPs or names in iphash
-        foreach (@hostinfo) { $iphash{$_} = 1; }
-        #print Dumper(\%iphash);
-
-        my $mynodeonly  = 0;
-        my @entries = xCAT::TableUtils->get_site_attribute("disjointnetboot");
-        my $t_entry = $entries[0];
-        if (defined($t_entry)) {
-            $mynodeonly = $t_entry;
-        }
-        xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: disjointnetboot=$mynodeonly");
-
-        # Get managed node list under current server
-        # The node will be under under 'site.master' if no 'noderes.servicenode' is defined
-        my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@rnodes, "xcat", "MN");
-        #print Dumper($sn_hash);
-        my %managed = ();
-        foreach (keys %$sn_hash) {
-            if (exists($iphash{$_})) {
-                my $cur_xmaster = $_;
-                foreach (@{ $sn_hash->{$cur_xmaster} }) { $managed{$_} = 1; }
-                last;
-            }
-        }
-
-        my $notsamenet_nodes_err  = '';
-        my $notsamenet_nodes_warn = '';
-
-        foreach (@rnodes) {
-            # For MN, the scope is all CN, for SN, the scope is the nodes it managed if disjointnetboot is set.
-            my $req2manage = exists($managed{$_});
-            if ($req2manage) {
-                push @unmanagednodes, $_;
-                # quick pass through if disjoint is set.
-                next if ( $mynodeonly == 1 && xCAT::Utils->isMN() != 1 );
-            }
-
+        # Filter those nodes not in the same subnet, and print error message in log file.
+        foreach (keys %preparednodes) {
             # Only handle its boot configuration files if the node in same subnet
-            if (xCAT::NetworkUtils->nodeonmynet($_)) {
+            if (xCAT::NetworkUtils->nodeonmynet($preparednodes{$_})) {
                 push @nodes, $_;
-            } elsif ( $req2manage ) {
-                # report error when it is under my control but I cannot handle it.
-                $notsamenet_nodes_err .= " $_";
-            }
-            else {
-                $notsamenet_nodes_warn .= " $_";
-            }
-        }
-
-        if ( $mynodeonly == 1 && scalar (@unmanagednodes) > 0 && xCAT::Utils->isMN() != 1) {
-            my $str_umnodes = join(" ", @unmanagednodes);
-            xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: unmanaged nodes are $str_umnodes");
-        }
-
-        if ( $notsamenet_nodes_err || $notsamenet_nodes_warn ) {
-            my $msg = "xnba configuration file was not created ";
-            $msg .= "on $::myxcatname " if ( $::myxcatname );
-            $msg .= "for below nodes because sharedtftp attribute is not set and the nodes are not on same network as this xcatmaster: ";
-            xCAT::MsgUtils->message("S", $msg . $notsamenet_nodes_warn . $notsamenet_nodes_err);
-            # For managed children, need to report error
-            if ( $notsamenet_nodes_err ) {
-                my $rsp;
-                $rsp->{data}->[0] = $msg . $notsamenet_nodes_err;
-                xCAT::MsgUtils->message("E", $rsp, $::XNBA_callback);
+            } else {
+                xCAT::MsgUtils->trace(0, "W", "xnba: configuration file was not created for [$_] because the node is not on the same network as this server");
+                delete $preparednodes{$_};
             }
         }
     } else {
-        @nodes = @rnodes;
+        @nodes = keys %preparednodes;
     }
 
-    #>>>>>>>used for trace log>>>>>>>
     my $str_node = join(" ", @nodes);
     xCAT::MsgUtils->trace(0, "d", "xnba: nodes are $str_node") if ($str_node);
 
     # return directly if no nodes in the same network
     unless (@nodes) {
         xCAT::MsgUtils->message("S", "xCAT: xnba netboot: no valid nodes. Stop the operation on this server.");
+
+        # It must be an error if my managed nodes are not handled.
+        if (xCAT::Utils->isMN() != 1 && $::XNBA_request->{'_disparatetftp'}->[0] && $::XNBA_request->{'_disjointmode'}->[0] != 1) {
+            # Find out which nodes are really mine only when not sharedtftp and not disjoint mode.
+            # For other case, all passing node range are required to be handled.
+            my %iphash   = ();
+            # flag the IPs or names in iphash
+            foreach (@hostinfo) { $iphash{$_} = 1; }
+
+            # Get managed node list under current server
+            # The node will be under under 'site.master' if no 'noderes.servicenode' is defined
+            my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@rnodes, "xcat", "MN");
+            #my %managed = ();
+            my $req2manage = 0;
+            foreach (keys %$sn_hash) {
+                if (exists($iphash{$_})) {
+                    #my $cur_xmaster = $_;
+                    #foreach (@{ $sn_hash->{$cur_xmaster} }) { $managed{$_} = 1; }
+                    $req2manage = 1;
+                    last;
+                }
+            }
+            if ($req2manage == 0) {
+                xCAT::MsgUtils->trace(0, "d", "xnba: No nodes are required to be managed on this server");
+                return;
+            }
+        }
+        my $rsp;
+        $rsp->{errorcode}->[0] = 1;
+        $rsp->{error}->[0]     = "Failed to generate xnba configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.\n";
+        $::XNBA_callback->($rsp);
         return;
     }
 
-    if (ref($::XNBA_request->{arg})) {
-        @args = @{ $::XNBA_request->{arg} };
-    } else {
-        @args = ($::XNBA_request->{arg});
-    }
-
     #now run the begin part of the prescripts
-    unless ($args[0] eq 'stat') {    # or $args[0] eq 'enact') {
+    unless ($args[0] eq '') {    # or $args[0] eq 'enact') {
         $errored = 0;
         if ($::XNBA_request->{'_disparatetftp'}->[0]) { #the call is distrubuted to the service node already, so only need to handles my own children
             xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: the call is distrubuted to the service node already, so only need to handles my own children");
@@ -560,7 +588,7 @@ sub process_request {
             xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: nodeset did not distribute to the service node");
             xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: issue runbeginpre request");
             $sub_req->({ command => ['runbeginpre'],
-                    node => \@rnodes,
+                    node => \@nodes,
                     arg => [ $args[0] ] }, \&pass_along);
         }
         if ($errored) {
@@ -592,7 +620,7 @@ sub process_request {
     if (!$inittime) { $inittime = 0; }
 
     my %bphash;
-    unless ($args[0] eq 'stat') {    # or $args[0] eq 'enact') {
+    unless ($args[0] eq '') {    # or $args[0] eq 'enact') {
         $errored = 0;
         xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: issue setdestiny request");
         $sub_req->({ command => ['setdestiny'],
@@ -607,6 +635,7 @@ sub process_request {
         }
     }
 
+    xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: starting to handle configuration...");
     #Time to actually configure the nodes, first extract database data with the scalable calls
     my $chaintab = xCAT::Table->new('chain');
     my $noderestab = xCAT::Table->new('noderes'); #in order to detect per-node tftp directories
@@ -634,10 +663,7 @@ sub process_request {
         mkpath($tftpdir . "/xcat/xnba/nodes/");
         my %response;
         $response{node}->[0]->{name}->[0] = $_;
-        if ($args[0] eq 'stat') {
-            $response{node}->[0]->{data}->[0] = getstate($_, $tftpdir);
-            $::XNBA_callback->(\%response);
-        } elsif ($args[0]) { #If anything else, send it on to the destiny plugin, then setstate
+        if ($args[0]) { # Send it on to the destiny plugin, then setstate
             my $rc;
             my $errstr;
             my $ent          = $typehash->{$_}->[0];
@@ -662,43 +688,36 @@ sub process_request {
             }
         }
     }
+    xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: Finish to handle configurations");
 
     # for offline operation, remove the dhcp entries
     if ($args[0] eq 'offline') {
         $sub_req->({ command => ['makedhcp'], arg => ['-d'], node => \@nodes }, $::XNBA_callback);
     }
 
-
     #dhcp stuff -- inittime is set when xcatd on sn is started
-    unless (($args[0] eq 'stat') || ($inittime) || ($args[0] eq 'offline')) {
+    unless (($inittime) || ($args[0] eq 'offline')) {
         my $do_dhcpsetup = 1;
-
-        #my $sitetab = xCAT::Table->new('site');
-        #if ($sitetab) {
-        #(my $ref) = $sitetab->getAttribs({key => 'dhcpsetup'}, 'value');
         my @entries = xCAT::TableUtils->get_site_attribute("dhcpsetup");
         my $t_entry = $entries[0];
         if (defined($t_entry)) {
             if ($t_entry =~ /0|n|N/) { $do_dhcpsetup = 0; }
         }
-
-        #}
-
         if ($do_dhcpsetup) {
-            if ($::XNBA_request->{'_disparatetftp'}->[0]) { #reading hint from preprocess_command
-                xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: issue makedhcp request");
-                $sub_req->({ command => ['makedhcp'], arg => ['-l'],
-                        node => \@nodes }, $::XNBA_callback);
-            } else {
-                xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: issue makedhcp request");
-                $sub_req->({ command => ['makedhcp'],
-                        node => \@nodes }, $::XNBA_callback);
-            }
+            my @parameter;
+            push @parameter, '-l' if ($::request->{'_disparatetftp'}->[0]);
+            xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: issue makedhcp request");
+
+            $sub_req->({ command => ['makedhcp'],
+                         arg => \@parameter,
+                         node => \@nodes }, $::XNBA_callback);
+        } else {
+            xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: dhcpsetup=$do_dhcpsetup");
         }
     }
 
     #now run the end part of the prescripts
-    unless ($args[0] eq 'stat') {    # or $args[0] eq 'enact')
+    unless ($args[0] eq '') {    # or $args[0] eq 'enact')
         $errored = 0;
         if ($::XNBA_request->{'_disparatetftp'}->[0]) { #the call is distrubuted to the service node already, so only need to handle my own children
             xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: issue runendpre request");
@@ -708,7 +727,7 @@ sub process_request {
         } else { #nodeset did not distribute to the service node, here we need to let runednpre to distribute the nodes to their masters
             xCAT::MsgUtils->trace($verbose_on_off, "d", "xnba: issue runendpre request");
             $sub_req->({ command => ['runendpre'],
-                    node => \@rnodes,
+                    node => \@nodes,
                     arg => [ $args[0] ] }, \&pass_along);
         }
         if ($errored) {
@@ -719,6 +738,15 @@ sub process_request {
         }
     }
 
+    # Return error codes if there are failed nodes
+    if (%failurenodes) {
+        my $rsp;
+        $rsp->{errorcode}->[0] = 1;
+        $rsp->{error}->[0]     = "Failed to generate xnba configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.\n";
+        $::XNBA_callback->($rsp);
+        return;
+    }
+
 }
 
 

From f6b16d24bd206257bfb1591ec714b60e2c10d027 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Mon, 24 Jul 2017 02:51:35 -0400
Subject: [PATCH 199/283] enhance configeth configure instnic

---
 xCAT-server/lib/perl/xCAT/Postage.pm                  | 5 ++++-
 xCAT-server/share/xcat/mypostscript/mypostscript.tmpl | 4 ++++
 xCAT/postscripts/configeth                            | 8 +++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/Postage.pm b/xCAT-server/lib/perl/xCAT/Postage.pm
index 16ee4a23c..d1f56e36b 100644
--- a/xCAT-server/lib/perl/xCAT/Postage.pm
+++ b/xCAT-server/lib/perl/xCAT/Postage.pm
@@ -421,6 +421,9 @@ sub makescript {
         #get the node type, service node or compute node
         my $nodetype = getNodeType($node);
 
+        #get the node ip address
+        my $cnipaddr = xCAT::NetworkUtils->getipaddr($node);
+        #print "hello $cnipaddr $node";
         #print Dumper($noderesent);
         #print Dumper($routes);
         #routes
@@ -556,7 +559,7 @@ sub makescript {
         #$inc =~ s/#NODE#/$node/eg;
         $inc =~ s/#MASTER_IP_ADDR#/$master_ip/eg;
         $inc =~ s/\$NODE/$node/eg;
-
+        $inc =~ s/#IPADDR#/$cnipaddr/eg;
         #$inc =~ s/#TABLE:([^:]+):([^:]+):([^:]+):BLANKOKAY#/tabdb($1,$2,$3,1)/eg;
         $inc =~ s/#TABLE:([^:]+):([^:]+):([^#]+)#/xCAT::Template::tabdb($1,$2,$3)/eg;
         $inc =~ s/#ROUTES_VARS_EXPORT#/$route_vars/eg;
diff --git a/xCAT-server/share/xcat/mypostscript/mypostscript.tmpl b/xCAT-server/share/xcat/mypostscript/mypostscript.tmpl
index 2ed561e34..7196a3806 100755
--- a/xCAT-server/share/xcat/mypostscript/mypostscript.tmpl
+++ b/xCAT-server/share/xcat/mypostscript/mypostscript.tmpl
@@ -25,6 +25,10 @@ tabdump(networks)
 NODE=$NODE
 export NODE
 
+#get compute node ip address
+IPADDR=#IPADDR#
+export IPADDR
+
 # get GROUP list
 GROUP=#TABLE:nodelist:$NODE:groups#
 export GROUP 
diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth
index 745b4524c..f57e84305 100755
--- a/xCAT/postscripts/configeth
+++ b/xCAT/postscripts/configeth
@@ -425,7 +425,6 @@ elif [ "$1" = "-s" ];then
     str_inst_mask=''
     str_inst_gateway=''
     str_inst_mtu=''
-
     if [ "$str_os_type" = "aix" ];then
         logger -t xcat -p local4.err "configeth: aix does not support -s flag"
         log_error "configeth on $NODE: aix does not support -s flag"
@@ -476,7 +475,7 @@ elif [ "$1" = "-s" ];then
             fi
        fi
     else
-        str_lease_file=`ls /var/lib/dhclient/*$str_inst_nic* | grep lease >& /dev/null`
+        str_lease_file=`ls /var/lib/dhclient/*$str_inst_nic* | grep lease`
         if [ -e "$str_lease_file" ];then
             str_inst_ip=`grep fixed-address $str_lease_file | tail -n 1 | awk '{print $2}' | sed 's/;$//'`
             str_inst_mask=`grep subnet-mask $str_lease_file | tail -n 1 | awk '{print $3}' | sed 's/;$//'`
@@ -498,13 +497,16 @@ elif [ "$1" = "-s" ];then
             fi
         fi
     fi
+    if [ -n "$IPADDR" ];then
+        str_inst_ip=$IPADDR
+    fi
+    
     if [ -n "$MACADDRESS" ];then
         str_inst_mac=$MACADDRESS
     else
         #str_inst_mac=`ifconfig $str_inst_nic | grep HWaddr | awk -F'HWaddr' '{print $2}' | sed 's/\s*//'`
         str_inst_mac=`ip link show $netdev | grep ether | awk '{print $2}'`
     fi
-
     if [ -z "$str_inst_ip" -o -z "$str_inst_mask" ];then
         logger -t xcat -p local4.err "configeth: config install nic, can not find the information from lease file, return."
         log_info "configeth on $NODE: config install nic, can not find information from dhcp lease file, return."

From de9b4b575fcd625163a00c0c10003f48ca23e647 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Mon, 24 Jul 2017 10:18:30 -0400
Subject: [PATCH 200/283] Support passwordless ssh for pdu

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

diff --git a/xCAT-server/lib/xcat/plugins/pdu.pm b/xCAT-server/lib/xcat/plugins/pdu.pm
index e79b906e0..83d6ad888 100644
--- a/xCAT-server/lib/xcat/plugins/pdu.pm
+++ b/xCAT-server/lib/xcat/plugins/pdu.pm
@@ -36,6 +36,8 @@ use Class::Struct;
 use XML::Simple;
 use Storable qw(dclone);
 use SNMP;
+use Expect;
+use Net::Ping;
 
 my $VERBOSE = 0;
 my %allerrornodes = ();
@@ -62,6 +64,7 @@ sub handled_commands
        rpower => ["nodehm:mgt","pduoutlet:pdu=\.\*"],
        rinv   => ["nodehm:mgt"],
        nodeset => ["nodehm:mgt"],
+       rspconfig => ["nodehm:mgt"],
        pdudiscover => "pdu",
     };
 }
@@ -170,6 +173,13 @@ sub process_request
                 }
             }
         }
+    }elsif($command eq "rspconfig") {
+        my $subcmd = $exargs[0];
+        if ($subcmd eq 'sshcfg') {
+            process_sshcfg($noderange, $subcmd, $callback);
+        } else {
+            $callback->({ errorcode => [1],error => "The input $command $subcmd is not support for pdu"});
+        }
     }elsif($command eq "pdudiscover") {
         process_pdudiscover($request, $subreq, $callback);
     }elsif($command eq "nodeset") {
@@ -457,6 +467,123 @@ sub connectTopdu {
 
 }
 
+sub process_sshcfg { 
+    my $noderange = shift;
+    my $subcmd = shift;
+    my $callback = shift;
+
+    my $password = "password8";
+    my $userid = "root";
+    my $timeout = 10;
+    my $keyfile = "/root/.ssh/id_rsa.pub";
+    my $rootkey = `cat /root/.ssh/id_rsa.pub`;
+    my $cmd;
+
+    my $nodetab = xCAT::Table->new('hosts');
+    my $nodehash = $nodetab->getNodesAttribs($noderange,['ip','otherinterfaces']);
+    
+    foreach my $pdu (@$noderange) {
+        my $msg = " process_sshcfg";
+        xCAT::SvrUtils::sendmsg($msg, $callback, $pdu, %allerrornodes);
+
+        #remove old host key from /root/.ssh/known_hosts
+        $cmd = `ssh-keygen -R $pdu`;
+
+        my $static_ip = $nodehash->{$pdu}->[0]->{ip};
+        my $discover_ip = $nodehash->{$pdu}->[0]->{otherinterfaces};
+        my $ssh_ip;
+
+        my $p = Net::Ping->new();
+        if ($p->ping($static_ip)) {
+            $ssh_ip = $static_ip;
+        } elsif ($p->ping($discover_ip)) {
+            $ssh_ip = $discover_ip;
+        } else {
+            $msg = " is not reachable";
+            xCAT::SvrUtils::sendmsg($msg, $callback, $pdu, %allerrornodes);
+            next;
+        }
+
+        my ($exp, $errstr) = session_connect($ssh_ip, $userid, $password, $timeout);
+        if (!defined $exp) {
+            $msg = " Failed to connect $errstr";
+            xCAT::SvrUtils::sendmsg($msg, $callback, $pdu, %allerrornodes);
+            next;
+        }
+
+        my $ret;
+        my $err;
+
+        ($ret, $err) = session_exec($exp, "mkdir -p /home/root/.ssh");
+        ($ret, $err) = session_exec($exp, "chmod 700 /home/root/.ssh");
+        ($ret, $err) = session_exec($exp, "echo \"$rootkey\" >/home/root/.ssh/authorized_keys");
+        ($ret, $err) = session_exec($exp, "chmod 644 /home/root/.ssh/authorized_keys");
+        #config dhcp ip address to static
+        if ($ssh_ip eq $discover_ip) {
+            # ($ret, $err) = session_exec($exp, "ifconfig eth0 $static_ip");
+        }
+
+        $exp->hard_close();
+    }
+
+    return;
+}
+
+sub session_connect {
+     my $server   = shift;
+     my $userid   = shift;
+     my $password = shift;
+     my $timeout  = shift;
+
+     my $ssh      = Expect->new;
+     my $command     = 'ssh';
+     my @parameters  = ($userid . "@" . $server);
+
+     $ssh->debug(0);
+     $ssh->log_stdout(0);    # suppress stdout output..
+     $ssh->slave->stty(qw(sane -echo));
+
+     unless ($ssh->spawn($command, @parameters))
+     {
+         my $err = $!;
+         $ssh->soft_close();
+         my $rsp;
+         return(undef, "unable to run command $command $err\n");
+     }
+
+     $ssh->expect($timeout,
+                   [ "-re", qr/WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED/, sub {die "WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!\n"; } ],
+                   [ "-re", qr/\(yes\/no\)\?\s*$/, sub { $ssh->send("yes\n");  exp_continue; } ],
+                   [ "-re", qr/ password:/,        sub {$ssh->send("$password\n"); exp_continue; } ],
+                   [ "-re", qr/:~\$/,              sub { $ssh->send("sudo su\n"); exp_continue; } ],
+                   [ "-re", qr/.*#/,               sub { $ssh->clear_accum(); } ],
+                   [ timeout => sub { die "No login.\n"; } ]
+                  );
+     $ssh->clear_accum();
+     return ($ssh);
+}
+
+
+sub session_exec {
+     my $exp = shift;
+     my $cmd = shift;
+     my $timeout    = shift;
+     my $prompt =  shift;
+
+     $timeout = 10 unless defined $timeout;
+     $prompt = qr/.*#/ unless defined $prompt;
+
+
+     $exp->clear_accum();
+     $exp->send("$cmd\n");
+     my ($mpos, $merr, $mstr, $mbmatch, $mamatch) = $exp->expect(6,  "-re", $prompt);
+
+     if (defined $merr) {
+         return(undef,$merr);
+     }
+     return($mbmatch);
+}
+
 sub process_pdudiscover {
     my $request  = shift;
     my $sub_req  = shift;

From debfefb9de50ad9ecb269641e0cd266071212b18 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Mon, 24 Jul 2017 11:02:06 -0400
Subject: [PATCH 201/283] openbmc rspconfig query command

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index ae6eb3c68..af4f42edb 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -1504,13 +1504,13 @@ sub rspconfig_response {
         my $vlan            = "n/a";
         my $default_gateway = "n/a";
         my $adapter_id      = "n/a";
+        my $error;
         my $path;
         my @output;
         my $grep_string = $status_info{RSPCONFIG_GET_RESPONSE}{argv};
         foreach my $key_url (keys %{$response_info->{data}}) {
             my %content = %{ ${ $response_info->{data} }{$key_url} };
 
-            #xCAT::SvrUtils::sendmsg("Content for $key_url\n " . Dumper(%content) , $callback);
             if ($key_url =~ /network\/config/) {
                 if (defined($content{DefaultGateway}) and $content{DefaultGateway}) {
                     $default_gateway = $content{DefaultGateway};
@@ -1519,6 +1519,13 @@ sub rspconfig_response {
 
 
             ($path, $adapter_id) = (split(/ipv4\//, $key_url));
+            unless ($address =~ /n\/a/) {
+                # We have already processed an entry with adapter information.
+                # This must be a second entry. Display an error. Currently only supporting
+                # an adapter with a single IP address set.
+                $error = "Interfaces with multiple IP addresses are not supported";
+                last;
+            }
 
             if ($adapter_id) {
                 if (defined($content{Address}) and $content{Address}) {
@@ -1532,21 +1539,27 @@ sub rspconfig_response {
                 }
             }
         }
-        if ($grep_string =~ "ip") {
-            push @output, "BMC IP: $address"; 
-        } 
-        if ($grep_string =~ "netmask") {
-            if ($address) {
-                my $decimal_mask = (2 ** $prefix - 1) << (32 - $prefix);
-                my $netmask = join('.', unpack("C4", pack("N", $decimal_mask)));
-                push @output, "BMC Netmask: " . $netmask; 
+        if ($error) {
+            # Display error message once, regardless of how many subcommands were specified
+            push @output, $error;
+        }
+        else {
+            if ($grep_string =~ "ip") {
+                push @output, "BMC IP: $address"; 
+            } 
+            if ($grep_string =~ "netmask") {
+                if ($address) {
+                    my $decimal_mask = (2 ** $prefix - 1) << (32 - $prefix);
+                    my $netmask = join('.', unpack("C4", pack("N", $decimal_mask)));
+                    push @output, "BMC Netmask: " . $netmask; 
+                }
+            } 
+            if ($grep_string =~ "gateway") {
+                push @output, "BMC Gateway: $gateway (default: $default_gateway)";
+            }  
+            if ($grep_string =~ "vlan") {
+                push @output, "BMC VLAN ID enabled: $vlan";
             }
-        } 
-        if ($grep_string =~ "gateway") {
-            push @output, "BMC Gateway: $gateway (default: $default_gateway)";
-        }  
-        if ($grep_string =~ "vlan") {
-            push @output, "BMC VLAN ID enabled: $vlan";
         }
 
         xCAT::SvrUtils::sendmsg("$_", $callback, $node) foreach (@output);

From 9fd5f98bf2b22658a8f091f3d66d7c9530f3864a Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Mon, 24 Jul 2017 11:48:46 -0400
Subject: [PATCH 202/283] Supermicro rflash wait for ready RC from BMC

---
 xCAT-server/lib/xcat/plugins/ipmi.pm | 56 +++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 10 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 3627df69b..16a213695 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -1705,6 +1705,9 @@ sub calc_ipmitool_version {
 #        zz_retry: minimum number of 00 to receive before exiting
 #        sessdata: session data for display
 #        verbose:  verbose output
+#        use_rc:   Some machines, like IBM Power S822LC for Big Data (Supermicro), do not return
+#                  a "00" ready string from calling ipmi raw command. Instead they return RC=0. This
+#                  flag tells the check_bmc_status_with_ipmitool() to check the RC instead of "00" string
 #    Returns:
 #        1 when bmc is up
 #        0 when no response from bmc
@@ -1716,11 +1719,19 @@ sub check_bmc_status_with_ipmitool {
     my $zz_retry     = shift;
     my $sessdata     = shift;
     my $verbose      = shift;
+    my $use_rc       = shift;
     my $count        = 0;
     my $zz_count     = 0;
     my $bmc_response = 0;
     my $cmd          = $pre_cmd . " raw 0x3a 0x0a";
+    my $bmc_ready_code = "00";
+    my $code_type    = "ready";
 
+    if ($use_rc) {
+        $cmd            = $pre_cmd . " raw 0x3a 0x0a >> /dev/null 2>&1 ; echo \$?";
+        $bmc_ready_code = "0";
+        $code_type      = "return";
+    }
     # BMC response of " c0" means BMC still running IPL
     # BMC response of " 00" means ready to flash
     #
@@ -1730,18 +1741,18 @@ sub check_bmc_status_with_ipmitool {
     # interrupts it.
     while ($count < $retry) {
         $bmc_response = xCAT::Utils->runcmd($cmd, -1);
-        if ($bmc_response =~ /00/) {
+        if ($bmc_response =~ /$bmc_ready_code/) {
             if ($zz_count > $zz_retry) {
                 # zero-zero ready code was received for $zz_count iterations - good to exit
                 if ($verbose) {
-                    xCAT::SvrUtils::sendmsg("Received BMC ready code 00 for $zz_count iterations - BMC is ready.", $callback, $sessdata->{node}, %allerrornodes);
+                    xCAT::SvrUtils::sendmsg("Received BMC $code_type code $bmc_ready_code for $zz_count iterations - BMC is ready.", $callback, $sessdata->{node}, %allerrornodes);
                 }
                 return 1;
             }
             else {
                 # check to make sure zero-zero is received again
                 if ($verbose) {
-                    xCAT::SvrUtils::sendmsg("($zz_count) BMC ready code - 00", $callback, $sessdata->{node}, %allerrornodes);
+                    xCAT::SvrUtils::sendmsg("($zz_count) BMC $code_type code - $bmc_ready_code", $callback, $sessdata->{node}, %allerrornodes);
                 }
                 $zz_count++;
             }
@@ -1751,7 +1762,7 @@ sub check_bmc_status_with_ipmitool {
                 # zero-zero was received before, but now we get something else.
                 # reset the zero-zero counter to make sure we get $zz_count iterations of zero-zero
                 if ($verbose) {
-                    xCAT::SvrUtils::sendmsg("Resetting counter because BMC ready code - $bmc_response", $callback, $sessdata->{node}, %allerrornodes);
+                    xCAT::SvrUtils::sendmsg("Resetting counter because BMC $code_type code - $bmc_response", $callback, $sessdata->{node}, %allerrornodes);
                 }
                 $zz_count = 0;
             }
@@ -1760,7 +1771,7 @@ sub check_bmc_status_with_ipmitool {
         $count++;
     }
     if ($verbose) {
-        xCAT::SvrUtils::sendmsg("Never received 00 code after $count retries - BMC not ready.", $callback, $sessdata->{node}, %allerrornodes);
+        xCAT::SvrUtils::sendmsg("Never received $code_type code $bmc_ready_code after $count retries - BMC not ready.", $callback, $sessdata->{node}, %allerrornodes);
     }
     return 0;
 }
@@ -2005,6 +2016,22 @@ sub do_firmware_update {
         # the specified data directory
         xCAT::SvrUtils::sendmsg("rflash started, Please wait...", $callback, $sessdata->{node});
 
+        # step 1 power off
+        $cmd = $pre_cmd . " chassis power off";
+        if ($verbose) {
+            xCAT::SvrUtils::sendmsg("Preparing to upgrade firmware, powering chassis off...", $callback, $sessdata->{node}, %allerrornodes);
+        }
+        $output = xCAT::Utils->runcmd($cmd, -1);
+        if ($::RUNCMD_RC != 0) {
+            $exit_with_error_func->($sessdata->{node}, $callback,
+                "Running ipmitool command $cmd failed: $output");
+        }
+        unless (check_bmc_status_with_ipmitool($pre_cmd, 5, 10, 2, $sessdata, $verbose, 1)) {
+            $exit_with_error_func->($sessdata->{node}, $callback,
+            "Timeout to check the bmc status");
+        }
+
+        # step 2 update BMC file or PNOR file, or both
         if ($bmc_file) {
             # BMC file was found in data directory, run update with it
             my $pUpdate_bmc_cmd = "$pUpdate_directory/pUpdate -f $bmc_file -i lan -h $bmc_addr -u $bmc_userid -p $bmc_password >".$rflash_log_file." 2>&1";
@@ -2018,10 +2045,12 @@ sub do_firmware_update {
                 $exit_with_error_func->($sessdata->{node}, $callback,
                     "Error running command $pUpdate_bmc_cmd");
             }
-            if ($verbose) {
-                xCAT::SvrUtils::sendmsg([ 0, "Waiting for BMC to reboot (2 min)..." ], $callback, $sessdata->{node});
+            # Wait for BMC to reboot before continuing to next step.
+            # Since this is a IBM Power S822LC for Big Data (Supermicro) machine, use RC to check if ready 
+            unless (check_bmc_status_with_ipmitool($pre_cmd, 5, 60, 10, $sessdata, $verbose, 1)) {
+                $exit_with_error_func->($sessdata->{node}, $callback,
+                "Timeout to check the bmc status");
             }
-            sleep (120);
         }
 
 
@@ -2039,8 +2068,15 @@ sub do_firmware_update {
                     "Error running command $pUpdate_pnor_cmd");
             }
         }
+        # step 3 power on
+        $cmd = $pre_cmd . " chassis power on";
+        $output = xCAT::Utils->runcmd($cmd, -1);
+        if ($::RUNCMD_RC != 0) {
+            $exit_with_error_func->($sessdata->{node}, $callback,
+                "Running ipmitool command $cmd failed: $output");
+        }
 
-        $exit_with_success_func->($sessdata->{node}, $callback, "Firmware updated");
+        $exit_with_success_func->($sessdata->{node}, $callback, "Firmware updated, powering chassis on to populate FRU information...");
     }
 
     if (($hpm_data_hash{deviceID} ne $sessdata->{device_id}) ||
@@ -2339,7 +2375,7 @@ sub rflash {
                 $sessdata->{subcommand} = "check";
                 # support verbose options for ipmitool command
             } elsif ($opt !~ /.*\.hpm$/i && $opt !~ /^-V{1,4}$|^--buffersize=|^--retry=|^-d=/) {
-                $callback->({ error => "The option $opt is not supported",
+                $callback->({ error => "The option $opt is not supported or invalid update file specified",
                         errorcode => 1 });
                 return;
             }

From cb8ce84249ef9d8c283e3ec17540c7f027138d2a Mon Sep 17 00:00:00 2001
From: khm <khm@users.noreply.github.com>
Date: Tue, 25 Jul 2017 00:34:50 -0700
Subject: [PATCH 203/283] xCAT-client:  allow pgsqlsetup(1) to accept
 additional pg_hba entries (#3527)

* xCAT-client:  allow pgsqlsetup(1) to accept additional pg_hba.conf entries

Currently pgsqlsetup(1) only sets up the MN ip address for access via
pg_hba.conf.  This change adds a -a flag to allow the user to specify
additional addresses for use in that file.

This is useful for users who already know what IP addresses will be
used by their service nodes, so they can pass them directly to the
pgsqlsetup program, without needing to edit pg_hba.conf (and avoiding
needing to restart postgresql and xcat after the edit).

* xCAT-client: fix formatting in pgsqlsetup(1)

* pgsqlsetup.1.pod:  clarify default setup

* pgsqlsetup.1.pod:  update usage section to reflect access flag

* pgsqlsetup.1:  refresh documentation

* xCAT-client/bin/pgsqlsetup: add -a/--access to usage statement
---
 .../references/man1/pgsqlsetup.1.rst          | 16 +++-
 xCAT-client/bin/pgsqlsetup                    | 74 ++++++++++---------
 xCAT-client/pods/man1/pgsqlsetup.1.pod        |  8 +-
 3 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man1/pgsqlsetup.1.rst b/docs/source/guides/admin-guides/references/man1/pgsqlsetup.1.rst
index b29252858..e0b7b8298 100644
--- a/docs/source/guides/admin-guides/references/man1/pgsqlsetup.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/pgsqlsetup.1.rst
@@ -23,7 +23,7 @@ SYNOPSIS
 
 \ **pgsqlsetup**\  {\ **-v**\  | \ **-**\ **-version**\ }
 
-\ **pgsqlsetup**\  {\ **-i**\  | \ **-**\ **-init**\ } [\ **-N**\  | \ **-**\ **-nostart**\ ] [\ **-P**\  | \ **-**\ **-PCM**\ ] [\ **-o**\  | \ **-**\ **-odbc**\ ] [\ **-V**\  | \ **-**\ **-verbose**\ ]
+\ **pgsqlsetup**\  {\ **-i**\  | \ **-**\ **-init**\ } [\ **-N**\  | \ **-**\ **-nostart**\ ] [\ **-**\ **-listen**\  | \ **-l**\  \ *address*\ ] [\ **-**\ **-access**\  | \ **-a**\  \ *address*\ ] [\ **-P**\  | \ **-**\ **-PCM**\ ] [\ **-o**\  | \ **-**\ **-odbc**\ ] [\ **-V**\  | \ **-**\ **-verbose**\ ]
 
 \ **pgsqlsetup**\  {\ **-o**\  | \ **-**\ **-setupODBC**\ } [\ **-V**\  | \ **-**\ **-verbose**\ ]
 
@@ -65,7 +65,7 @@ OPTIONS
  
  The init option is used to setup an installed PostgreSQL database so that xCAT can use the database.  This involves creating the xcat database, the xcat admin id, allowing access to the xcatdb database by the Management Node. It customizes the postgresql.conf configuration file, adds the management server to the pg_hba.conf and starts the PostgreSQL server.  It also backs up the current xCAT database and restores it into the newly setup xcatdb PostgreSQL database.  It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the PostgreSQL database and restarts the xcatd daemon using the database. 
  On AIX, it additionally setup the xcatadm unix id and the postgres id and group. For AIX, you should be using the PostgreSQL rpms available from the xCAT website. For Linux, you should use the PostgreSQL rpms shipped with the OS. You can chose the -o option, to run after the init.
- To add additional nodes to access the PostgreSQL server, setup on the Management Node,  edit the pg_hba.conf file.
+ To add additional nodes to access the PostgreSQL server, setup on the Management Node, use the -a option.
  
  For more documentation see:Setting_Up_PostgreSQL_as_the_xCAT_DB
  
@@ -77,6 +77,18 @@ OPTIONS
  
 
 
+\ **-l|-**\ **-listen**\  \ *address*\ 
+ 
+ This option is used to specify additional IP addresses on which the PostgreSQL database will listen.  Without it, only localhost (on Linux) and the management node's main IP (on Linux and AIX) will be configured.  This option can be specified multiple times.
+ 
+
+
+\ **-a|-**\ **-access**\  \ *address*\ 
+ 
+ This option is used to specify additional IP addresses from which the service nodes will connect to the PostgreSQL database.  Without it, only the management node will be configured for database access.  This option can be specified multiple times.
+ 
+
+
 \ **-P|-**\ **-PCM**\ 
  
  This option sets up PostgreSQL database to be used with xCAT running with PCM.
diff --git a/xCAT-client/bin/pgsqlsetup b/xCAT-client/bin/pgsqlsetup
index 4007cb797..7446f7aeb 100755
--- a/xCAT-client/bin/pgsqlsetup
+++ b/xCAT-client/bin/pgsqlsetup
@@ -73,6 +73,7 @@ $::debiancfgdir   = "/etc/postgresql/9.1/main";
 my $INIT;
 my $SETUPODBC;
 my @LISTENADDRS;
+my @ACCESSADDRS;
 my $NOSTART;
 my $SETUPPCM;
 my $HELP;
@@ -85,6 +86,7 @@ if (
         'i|init'    => \$INIT,
         'o|odbc'    => \$SETUPODBC,
         'l|listen=s'=> \@LISTENADDRS,
+        'a|access=s'=> \@ACCESSADDRS,
         'N|nostart' => \$NOSTART,
         'P|PCM'     => \$SETUPPCM,
         'h|help'    => \$HELP,
@@ -437,7 +439,7 @@ sub usage
 "Usage:\npgsqlsetup - Performs the setup of PostgreSQL for xCAT to use as its database. See man pgsqlsetup for more information."
     );
     my $msg =
-"pgsqlsetup <-h|--help>\n           <-v|--version>\n           <-i|--init> [-N|--nostart] [-l|--listen address] [-P|--PCM] [-o|--odbc] [-V|--verbose]\n           <-o|--odbc> [-V|--verbose]";
+"pgsqlsetup <-h|--help>\n           <-v|--version>\n           <-i|--init> [-N|--nostart] [-l|--listen address] [-a|--access address] [-P|--PCM] [-o|--odbc] [-V|--verbose]\n           <-o|--odbc> [-V|--verbose]";
 
     xCAT::MsgUtils->message('I', "$msg");
 }
@@ -735,7 +737,8 @@ sub initpgdb
     }
     &runpostgrescmd($cmd);
 
-    # insert  MN ip address in the # IPv4 local connections: stanza of
+    # insert  MN ip address and any -a addresses 
+    # in the # IPv4 local connections: stanza of
     # the /var/lib/pgsql/data/pg_hba.conf file
     # if it is not already there
 
@@ -744,43 +747,44 @@ sub initpgdb
     if ($debianflag) {
         $hbafile = $::debiancfgdir . "/pg_hba.conf";
     }
-    $cmd = "fgrep  $::MN $hbafile";
+    $cmd = "cp $hbafile $hbafile.org";    # backup the original
     xCAT::Utils->runcmd($cmd, -1);
-    if ($::RUNCMD_RC != 0)    # not already there
-    {
-        $cmd = "cp $hbafile $hbafile.org";    # backup the original
+
+    push @ACCESSADDRS, $::MN;  # add management node to list
+    my $insertstr = undef;     # start with empty string
+    for my $hbaaccess (@ACCESSADDRS)
+      {
+        $cmd = "fgrep $hbaaccess $hbafile";
         xCAT::Utils->runcmd($cmd, -1);
-        my $insertstr = "host    all          all        ";
-        $insertstr .= $::MN;
-        $insertstr .= "\/32      md5 ";
-        $cmd =
-"awk '{gsub(\"\IPv4 local connections:\",\"\IPv4 local connections:\\n$insertstr \"); print}'   $hbafile > $hbafile.xcat";
-        xCAT::Utils->runcmd($cmd, 0);
-
-        if ($::RUNCMD_RC != 0)
+        if ($::RUNCMD_RC != 0)    # not already there
         {
-
-            xCAT::MsgUtils->message("E", " $cmd failed.");
-            exit(1);
+            $insertstr .= "host    all          all        ";
+            $insertstr .= $hbaaccess;
+            $insertstr .= "\/32      md5\n "; # add entry line to string
         }
-        $cmd = "cp -p  $hbafile.xcat $hbafile  ";
-        xCAT::Utils->runcmd($cmd, 0);
-        if ($::RUNCMD_RC != 0)
-        {
-
-            xCAT::MsgUtils->message("E", " $cmd failed.");
-            exit(1);
-        }
-        $cmd = "rm  $hbafile.xcat ";
-        xCAT::Utils->runcmd($cmd, 0);
-        if ($::RUNCMD_RC != 0)
-        {
-
-            xCAT::MsgUtils->message("E", " $cmd failed.");
-            exit(1);
-        }
-        $dbrestart = 1;
-    }
+      }
+    $cmd = "awk '{gsub(\"\IPv4 local connections:\",\"\IPv4 local connections:\\n$insertstr \"); print}'   $hbafile > $hbafile.xcat";
+    xCAT::Utils->runcmd($cmd, 0);
+    if ($::RUNCMD_RC != 0)
+      {
+         xCAT::MsgUtils->message("E", " $cmd failed.");
+         exit(1);
+      }
+    $cmd = "cp -p  $hbafile.xcat $hbafile  ";
+    xCAT::Utils->runcmd($cmd, 0);
+    if ($::RUNCMD_RC != 0)
+      {
+         xCAT::MsgUtils->message("E", " $cmd failed.");
+         exit(1);
+      }
+    $cmd = "rm  $hbafile.xcat ";
+    xCAT::Utils->runcmd($cmd, 0);
+    if ($::RUNCMD_RC != 0)
+      {
+        xCAT::MsgUtils->message("E", " $cmd failed.");
+        exit(1);
+      }
+	  $dbrestart = 1;
 
     # setup the postgresql.conf file
     my $pgconf = $::installdatadir;
diff --git a/xCAT-client/pods/man1/pgsqlsetup.1.pod b/xCAT-client/pods/man1/pgsqlsetup.1.pod
index c2bbccaf4..3115b1bc8 100644
--- a/xCAT-client/pods/man1/pgsqlsetup.1.pod
+++ b/xCAT-client/pods/man1/pgsqlsetup.1.pod
@@ -9,7 +9,7 @@ B<pgsqlsetup> {B<-h> | B<--help>}
 
 B<pgsqlsetup> {B<-v> | B<--version>}
 
-B<pgsqlsetup> {B<-i> | B<--init>} [B<-N> | B<--nostart>] [B<--listen> | B<-l> I<address>] [B<-P> | B<--PCM>] [B<-o> | B<--odbc>] [B<-V> | B<--verbose>]
+B<pgsqlsetup> {B<-i> | B<--init>} [B<-N> | B<--nostart>] [B<--listen> | B<-l> I<address>] [B<--access> | B<-a> I<address>] [B<-P> | B<--PCM>] [B<-o> | B<--odbc>] [B<-V> | B<--verbose>]
 
 B<pgsqlsetup> {B<-o> | B<--setupODBC>} [B<-V> | B<--verbose>] 
 
@@ -38,7 +38,7 @@ Displays verbose messages.
 
 The init option is used to setup an installed PostgreSQL database so that xCAT can use the database.  This involves creating the xcat database, the xcat admin id, allowing access to the xcatdb database by the Management Node. It customizes the postgresql.conf configuration file, adds the management server to the pg_hba.conf and starts the PostgreSQL server.  It also backs up the current xCAT database and restores it into the newly setup xcatdb PostgreSQL database.  It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the PostgreSQL database and restarts the xcatd daemon using the database. 
 On AIX, it additionally setup the xcatadm unix id and the postgres id and group. For AIX, you should be using the PostgreSQL rpms available from the xCAT website. For Linux, you should use the PostgreSQL rpms shipped with the OS. You can chose the -o option, to run after the init.
-To add additional nodes to access the PostgreSQL server, setup on the Management Node,  edit the pg_hba.conf file.   
+To add additional nodes to access the PostgreSQL server, setup on the Management Node, use the -a option.   
 
 For more documentation see:Setting_Up_PostgreSQL_as_the_xCAT_DB
 
@@ -50,6 +50,10 @@ This option with the -i flag will create the database, but will not backup and r
 
 This option is used to specify additional IP addresses on which the PostgreSQL database will listen.  Without it, only localhost (on Linux) and the management node's main IP (on Linux and AIX) will be configured.  This option can be specified multiple times.
 
+=item B<-a|--access> I<address>
+
+This option is used to specify additional IP addresses from which the service nodes will connect to the PostgreSQL database.  Without it, only the management node will be configured for database access.  This option can be specified multiple times.
+
 =item B<-P|--PCM>
 
 This option sets up PostgreSQL database to be used with xCAT running with PCM.

From 86e4b9ccb35f7b41d2a1ea8263b364cb90e2dbc6 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Tue, 25 Jul 2017 10:18:04 -0400
Subject: [PATCH 204/283] modify sshcfg

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

diff --git a/xCAT-server/lib/xcat/plugins/pdu.pm b/xCAT-server/lib/xcat/plugins/pdu.pm
index 83d6ad888..facdc5ff8 100644
--- a/xCAT-server/lib/xcat/plugins/pdu.pm
+++ b/xCAT-server/lib/xcat/plugins/pdu.pm
@@ -487,7 +487,8 @@ sub process_sshcfg {
         xCAT::SvrUtils::sendmsg($msg, $callback, $pdu, %allerrornodes);
 
         #remove old host key from /root/.ssh/known_hosts
-        $cmd = `ssh-keygen -R $pdu`;
+        $cmd = "ssh-keygen -R $pdu";
+        my $result = xCAT::Utils->runcmd($cmd, 0);
 
         my $static_ip = $nodehash->{$pdu}->[0]->{ip};
         my $discover_ip = $nodehash->{$pdu}->[0]->{otherinterfaces};

From 91ac7b3488f458ee5fbdde9471a0956dccfb04ec Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Tue, 25 Jul 2017 16:04:14 -0400
Subject: [PATCH 205/283] Catch multiple ips on the same adapter better

---
 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 af4f42edb..d60978882 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -1519,16 +1519,16 @@ sub rspconfig_response {
 
 
             ($path, $adapter_id) = (split(/ipv4\//, $key_url));
-            unless ($address =~ /n\/a/) {
-                # We have already processed an entry with adapter information.
-                # This must be a second entry. Display an error. Currently only supporting
-                # an adapter with a single IP address set.
-                $error = "Interfaces with multiple IP addresses are not supported";
-                last;
-            }
 
             if ($adapter_id) {
                 if (defined($content{Address}) and $content{Address}) {
+                    unless ($address =~ /n\/a/) {
+                        # We have already processed an entry with adapter information.
+                        # This must be a second entry. Display an error. Currently only supporting
+                        # an adapter with a single IP address set.
+                        $error = "Interfaces with multiple IP addresses are not supported";
+                        last;
+                    }
                     $address = $content{Address};
                 }
                 if (defined($content{Gateway}) and $content{Gateway}) {

From 649efc396e9d1283a6ea337bff439a7b478f57a3 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Tue, 25 Jul 2017 23:08:11 -0400
Subject: [PATCH 206/283] modify rsetboot depending on URL & data

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 229555314..e5839a0f7 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -217,15 +217,15 @@ my %status_info = (
 
     RSETBOOT_SET_REQUEST => {
         method         => "PUT",
-        init_url       => "$openbmc_project_url/control/boot/bootsource/attr/Sources",
-        data           => "xyz.openbmc_project.Control.Boot.Sources.",
+        init_url       => "$openbmc_project_url/control/host0/boot_source/attr/BootSource",
+        data           => "xyz.openbmc_project.Control.Boot.Source.Sources.",
     },
     RSETBOOT_SET_RESPONSE => {
         process        => \&rsetboot_response,
     },
     RSETBOOT_STATUS_REQUEST  => {
         method         => "GET",
-        init_url       => "$openbmc_project_url/control/boot/bootsource",
+        init_url       => "$openbmc_project_url/control/host0/boot_source",
     },
     RSETBOOT_STATUS_RESPONSE => {
         process        => \&rsetboot_response,
@@ -1363,7 +1363,7 @@ sub rsetboot_response {
 
     my $response_info = decode_json $response->content;    
 
-    if ($node_info{$node}{cur_status} eq "RSETBOOT_GET_RESPONSE") {
+    if ($node_info{$node}{cur_status} eq "RSETBOOT_STATUS_RESPONSE") {
         xCAT::SvrUtils::sendmsg("Hard Drive", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /Disk$/);
         xCAT::SvrUtils::sendmsg("Network", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /Network$/);
         xCAT::SvrUtils::sendmsg("CD/DVD", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /ExternalMedia$/);

From 27416f3d79569042eed1ed1e0b6626a445f8a28b Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 26 Jul 2017 02:51:48 -0400
Subject: [PATCH 207/283] remove rinv_mprom and rinv_guid from
 hdctrl_openpower_ipmi.bundle since these 2 cases is just available in x86. 
 remove rinv_deviceid since it does not exist.

---
 xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle    | 3 ---
 xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle | 1 -
 2 files changed, 4 deletions(-)

diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
index cadbed43c..ac555451a 100644
--- a/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
@@ -1,10 +1,7 @@
 description:the cases in this bundle is to verify xCAT hardware control functions on servers which are managed using IPMI. 
 #INCLUDE:hdctrl_general.bundle#
-rinv_deviceid
 rinv_uuid
-rinv_guid
 rinv_vpd
-rinv_mprom
 rinv_wrongbmcpasswd
 rvitals_wattage
 rvitals_fanspeed
diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
index e75690b30..cf6c48acc 100644
--- a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
@@ -1,6 +1,5 @@
 description:the cases in this bundle is to used to verify xCAT hardware control funtions on openpower servers which are mananged using openbmc. 
 #INCLUDE:hdctrl_general.bundle#
-rinv_deviceid
 rinv_uuid
 rinv_vpd
 rinv_cpu

From bd88e86214ce9d9ec243c644efaffc3b35b28f6c Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Wed, 26 Jul 2017 03:46:05 -0400
Subject: [PATCH 208/283] fix issue 3460: Changes required for 'rflash -c' to
 support more detailed firmware information for LC Big Data boxes

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

diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 3627df69b..9c96245b8 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -1622,6 +1622,13 @@ sub isopenpower {
 
 sub check_firmware_version {
 
+    sub _on_receive_ugp {
+        my $rsp     = shift;
+        my $sessdta = shift;
+        shift @{ $rsp->{data} };
+        return;
+    }
+
     sub _on_receive_version {
         my $rsp      = shift;
         my $sessdata = shift;
@@ -1650,6 +1657,15 @@ sub check_firmware_version {
     my $sessdata         = shift;
     my $firmware_version = shift;
     my $component_string = shift;
+
+    # GET TARGET UPGRADE CAPABILITIES
+    $sessdata->{ipmisession}->subcmd(netfn => 0x2c, command => 0x2e,
+            data => [ 0 ],
+            callback      => \&_on_receive_ugp,
+            callback_args => $sessdata);
+        while (xCAT::IPMI->waitforrsp()) { yield }
+
+
     foreach my $c_id (@{ $sessdata->{component_ids} }) {
         $sessdata->{c_id} = $c_id;
 

From 2caa6e9d58f8832ca9de45f935f7c1e7f3ef67a6 Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Wed, 26 Jul 2017 07:52:00 -0400
Subject: [PATCH 209/283] modify rinv testcase

---
 xCAT-test/autotest/testcase/rinv/cases0 | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/xCAT-test/autotest/testcase/rinv/cases0 b/xCAT-test/autotest/testcase/rinv/cases0
index 466b95bf2..68fb4b2c7 100644
--- a/xCAT-test/autotest/testcase/rinv/cases0
+++ b/xCAT-test/autotest/testcase/rinv/cases0
@@ -11,6 +11,13 @@ check:rc==0
 check:output=~Usage
 check:output=~rinv
 end
+start:rinv_help
+description:show help information for rinv
+cmd:rinv --help
+check:rc==0
+check:output=~Usage
+check:output=~rinv
+end
 start:rinv_v
 description:show version for Version
 cmd:rinv -v
@@ -118,3 +125,9 @@ check:output=~$$CN: Error: Invalid username or password
 cmd:cat /tmp/testnode.stanza | chdef -z;rm -rf /tmp/testnode.stanza 
 check:rc==0
 end
+start:rinv_errorcommand
+description:get right return if input error command
+cmd:rinv $$CN dafds
+check:rc==1
+check:output=~Unsupported command
+end

From 71a7151d97c0db044c7eb5d0743a178d8f16808a Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Wed, 26 Jul 2017 09:11:12 -0400
Subject: [PATCH 210/283] remove results

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

diff --git a/xCAT-server/lib/xcat/plugins/pdu.pm b/xCAT-server/lib/xcat/plugins/pdu.pm
index facdc5ff8..c4e71ef96 100644
--- a/xCAT-server/lib/xcat/plugins/pdu.pm
+++ b/xCAT-server/lib/xcat/plugins/pdu.pm
@@ -488,7 +488,7 @@ sub process_sshcfg {
 
         #remove old host key from /root/.ssh/known_hosts
         $cmd = "ssh-keygen -R $pdu";
-        my $result = xCAT::Utils->runcmd($cmd, 0);
+        xCAT::Utils->runcmd($cmd, 0);
 
         my $static_ip = $nodehash->{$pdu}->[0]->{ip};
         my $discover_ip = $nodehash->{$pdu}->[0]->{otherinterfaces};

From 876ab8c7e71c4b218be01e43ca05bd4763c6ae08 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Tue, 25 Jul 2017 15:38:45 -0400
Subject: [PATCH 211/283] Fixes after the review

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

diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 16a213695..d8c8b5c9d 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -1707,7 +1707,8 @@ sub calc_ipmitool_version {
 #        verbose:  verbose output
 #        use_rc:   Some machines, like IBM Power S822LC for Big Data (Supermicro), do not return
 #                  a "00" ready string from calling ipmi raw command. Instead they return RC=0. This
-#                  flag tells the check_bmc_status_with_ipmitool() to check the RC instead of "00" string
+#                  flag if 1, tells the check_bmc_status_with_ipmitool() to check the RC 
+#                  instead of "00" string. If set to 0, the "00" ready string is checked.
 #    Returns:
 #        1 when bmc is up
 #        0 when no response from bmc
@@ -1728,7 +1729,7 @@ sub check_bmc_status_with_ipmitool {
     my $code_type    = "ready";
 
     if ($use_rc) {
-        $cmd            = $pre_cmd . " raw 0x3a 0x0a >> /dev/null 2>&1 ; echo \$?";
+        $cmd            = $cmd . " >> /dev/null 2>&1 ; echo \$?";
         $bmc_ready_code = "0";
         $code_type      = "return";
     }
@@ -1874,7 +1875,7 @@ sub do_firmware_update {
     # only 1.8.15 or above support hpm update for firestone machines.
     if (calc_ipmitool_version($ipmitool_ver) < calc_ipmitool_version("1.8.15")) {
         $callback->({ error => "IPMITool $ipmitool_ver do not support firmware update for " .
-                  "firestone mathines, please setup IPMITool 1.8.15 or above.",
+                  "firestone machines, please setup IPMITool 1.8.15 or above.",
                 errorcode => 1 });
         exit -1;
     }
@@ -2191,7 +2192,7 @@ RETRY_UPGRADE:
     }
 
     # check reset status
-    unless (check_bmc_status_with_ipmitool($pre_cmd, 5, 60, 2, $sessdata, $verbose)) {
+    unless (check_bmc_status_with_ipmitool($pre_cmd, 5, 60, 2, $sessdata, $verbose, 0)) {
         $exit_with_error_func->($sessdata->{node}, $callback,
             "Timeout to check the bmc status");
     }
@@ -2257,7 +2258,7 @@ RETRY_UPGRADE:
         }
 
         # Wait for BMC to reboot before continuing to next step
-        unless (check_bmc_status_with_ipmitool($pre_cmd, 5, 60, 10, $sessdata, $verbose)) {
+        unless (check_bmc_status_with_ipmitool($pre_cmd, 5, 60, 10, $sessdata, $verbose, 0)) {
             $exit_with_error_func->($sessdata->{node}, $callback,
                 "Timeout waiting for the bmc ready status. Firmware update suspended");
         }
@@ -2321,7 +2322,7 @@ RETRY_UPGRADE:
 
     # step 5 power on
     # check reset status
-    unless (check_bmc_status_with_ipmitool($pre_cmd, 5, 60, 10, $sessdata, $verbose)) {
+    unless (check_bmc_status_with_ipmitool($pre_cmd, 5, 60, 10, $sessdata, $verbose, 0)) {
         $exit_with_error_func->($sessdata->{node}, $callback,
             "Timeout to check the bmc status");
     }

From 24c78e6b1a4c0645d09dd4fc2cfa99cf0f7722f6 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Wed, 26 Jul 2017 22:51:40 -0400
Subject: [PATCH 212/283] modified depending on comments

---
 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 e5839a0f7..63c8bb413 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -1367,7 +1367,7 @@ sub rsetboot_response {
         xCAT::SvrUtils::sendmsg("Hard Drive", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /Disk$/);
         xCAT::SvrUtils::sendmsg("Network", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /Network$/);
         xCAT::SvrUtils::sendmsg("CD/DVD", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /ExternalMedia$/);
-        xCAT::SvrUtils::sendmsg("boot override inactive", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /Default$/);
+        xCAT::SvrUtils::sendmsg("Default", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /Default$/);
     }
 
     if ($next_status{ $node_info{$node}{cur_status} }) {

From f3e9b5a2e286ee750c204bd33c2de084ee2474fd Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Thu, 27 Jul 2017 02:21:43 -0400
Subject: [PATCH 213/283] Will not print EnergyManager error msg when run
 rvitals power

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

diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 3627df69b..5cf301979 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -6702,9 +6702,9 @@ sub vitals {
     if ($sensor_filters{energy}) {
         if ($iem_support) {
             push @{ $sessdata->{sensorstoread} }, "energy";
-        } elsif (not $doall) {
-            xCAT::SvrUtils::sendmsg([ 1, ":Energy data requires additional IBM::EnergyManager plugin in conjunction with IMM managed IBM equipment" ], $callback, $sessdata->{node}, %allerrornodes);
-        }
+        } #elsif (not $doall) {
+            #xCAT::SvrUtils::sendmsg([ 1, ":Energy data requires additional IBM::EnergyManager plugin in conjunction with IMM managed IBM equipment" ], $callback, $sessdata->{node}, %allerrornodes);
+        #}
 
         #my @energies;
         #($rc,@energies)=readenergy();

From 31ba541657272b12332ae0c34f0ef0f0888f3661 Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Thu, 27 Jul 2017 15:55:30 +0800
Subject: [PATCH 214/283] Forwarding to MN if the request is accepted by SN

---
 perl-xCAT/xCAT/Scope.pm                   | 58 +++++++++++++++++------
 xCAT-server/lib/xcat/plugins/grub2.pm     | 11 +++--
 xCAT-server/lib/xcat/plugins/petitboot.pm | 12 +++--
 xCAT-server/lib/xcat/plugins/xnba.pm      | 11 +++--
 4 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/perl-xCAT/xCAT/Scope.pm b/perl-xCAT/xCAT/Scope.pm
index e58d1a279..103e1b65b 100644
--- a/perl-xCAT/xCAT/Scope.pm
+++ b/perl-xCAT/xCAT/Scope.pm
@@ -1,8 +1,8 @@
 package xCAT::Scope;
 
-#use Data::Dumper;
 use xCAT::Utils;
 use xCAT::Table;
+use xCAT::TableUtils;
 use xCAT::ServiceNodeUtils qw(getSNList);
 
 
@@ -148,22 +148,31 @@ sub get_broadcast_scope_with_parallel {
     if ($req->{_xcatpreprocessed}->[0] == 1) { return [$req]; }
 
     my $snlist = shift;
+    my @reqs = ();
+    $req->{_xcatpreprocessed}->[0] = 1;
+    my $isMN = xCAT::Utils->isMN();
     #Handle the one for current management/service node
-    my $reqs = get_parallel_scope($req); 
+    if ( $isMN ) {
+        $reqs = get_parallel_scope($req);
+    } else {
+        # get site.master and broadcast to it as MN will not be in SN list or defined in noderes.servicenode.
+        my @entries = xCAT::TableUtils->get_site_attribute("master");
+        my $master = $entries[0];
+        my $reqcopy = {%$req};
+        $reqcopy->{'_xcatdest'} = $master;
+        $reqs = get_parallel_scope($reqcopy);
+    }
     my @requests = @$reqs;
 
     #Broadcast the request to other management/service nodes
     foreach (@$snlist) {
         my $xcatdest = $_;
-        if (xCAT::NetworkUtils->thishostisnot($xcatdest)) {
-            my $reqcopy = {%$req};
-            $reqcopy->{'_xcatdest'} = $xcatdest;
-            $reqcopy->{_xcatpreprocessed}->[0] = 1;
+        my $reqcopy = {%$req};
+        $reqcopy->{'_xcatdest'} = $xcatdest;
 
-            $reqs = get_parallel_scope($reqcopy);
-            foreach (@$reqs) {
-                push @requests, {%$_};
-            }
+        $reqs = get_parallel_scope($reqcopy);
+        foreach (@$reqs) {
+            push @requests, {%$_};
         }
     }
     return \@requests;
@@ -197,12 +206,22 @@ sub get_broadcast_disjoint_scope_with_parallel {
 
     my $sn_hash = shift;
     my @reqs = ();
+    $req->{_xcatpreprocessed}->[0] = 1;
+    my $isMN = xCAT::Utils->isMN();
     #Handle the one for current management/service node
-    if ( xCAT::Utils->isMN() ) {
-        $reqs = get_parallel_scope($req); 
+    if ( $isMN ) {
+        $reqs = get_parallel_scope($req);
+    } else {
+        # get site.master and broadcast to it as MN will not be in SN list or defined in noderes.servicenode.
+        my @entries = xCAT::TableUtils->get_site_attribute("master");
+        my $master = $entries[0];
+        my $reqcopy = {%$req};
+        $reqcopy->{'_xcatdest'} = $master;
+        $reqs = get_parallel_scope($reqcopy);
     }
     my @requests = @$reqs;
 
+    my $handled4me = 0;
     #Broadcast the request to other management/service nodes
     foreach (keys %$sn_hash) {
         my $xcatdest = $_;
@@ -210,15 +229,26 @@ sub get_broadcast_disjoint_scope_with_parallel {
             my $reqcopy = {%$req};
             $reqcopy->{'_xcatdest'} = $xcatdest;
             $reqcopy->{'node'} = $sn_hash->{$xcatdest};
-            $reqcopy->{_xcatpreprocessed}->[0] = 1;
 
             $reqs = get_parallel_scope($reqcopy);
             foreach (@$reqs) {
                 push @requests, {%$_};
             }
+        } elsif ($isMN == 0) {
+            # avoid handle myself multiple times when different IP address used in `noderes.servicenode`.
+            next if $handled4me;
+            my $reqcopy = {%$req};
+            $reqcopy->{'_xcatdest'} = $xcatdest;
+            $reqcopy->{'node'} = $sn_hash->{$xcatdest};
+
+            $reqs = get_parallel_scope($reqcopy);
+            foreach (@$reqs) {
+                push @requests, {%$_};
+            }
+            $handled4me = 1;
         }
     }
-    #print Dumper(\@requests);
+
     return \@requests;
 }
 
diff --git a/xCAT-server/lib/xcat/plugins/grub2.pm b/xCAT-server/lib/xcat/plugins/grub2.pm
index 4820f4307..a09612745 100644
--- a/xCAT-server/lib/xcat/plugins/grub2.pm
+++ b/xCAT-server/lib/xcat/plugins/grub2.pm
@@ -573,7 +573,7 @@ sub process_request {
         my $errormsg = $ipret->{'error'};
         my $nodeip = $ipret->{'ip'};
         if ($errormsg) {# Add the node to failure set
-            xCAT::MsgUtils->trace(0, "E", "grub2: IP address of $_ is $nodeip. $errormsg");
+            xCAT::MsgUtils->trace(0, "E", "grub2: Defined IP address of $_ is $nodeip. $errormsg");
             unless ($nodeip) {
                 $failurenodes{$_} = 1;
             }
@@ -606,7 +606,10 @@ sub process_request {
     unless (@nodes) {
         xCAT::MsgUtils->message("S", "xCAT: grub2 netboot: no valid nodes. Stop the operation on this server.");
 
-        # It must be an error if my managed nodes are not handled.
+        # We need special hanlding to see if the plugin needs report error.
+        # - For MN, it is designed to handle all nodes, any error is required to be reqport. (All nodes are handled on MN if sharedtftp=1)
+        # - For SN, if disjointdhcps=1 AND sharedtftp=0, all nodes in the request are the nodes managed by this SN, so we need report error
+        #           if disjointdhcps=1 AND sharedtftp=0, report error only if there are nodes are managed by me.
         if (xCAT::Utils->isMN() != 1 && $request->{'_disparatetftp'}->[0] && $request->{'_disjointmode'}->[0] != 1) {
             # Find out which nodes are really mine only when not sharedtftp and not disjoint mode.
             # For other case, all passing node range are required to be handled.
@@ -634,7 +637,7 @@ sub process_request {
         }
         my $rsp;
         $rsp->{errorcode}->[0] = 1;
-        $rsp->{error}->[0]     = "Failed to generate grub2 configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.\n";
+        $rsp->{error}->[0]     = "Failed to generate grub2 configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.";
         $callback->($rsp);
         return;
     }
@@ -878,7 +881,7 @@ sub process_request {
     if (%failurenodes) {
         my $rsp;
         $rsp->{errorcode}->[0] = 1;
-        $rsp->{error}->[0]     = "Failed to generate grub2 configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.\n";
+        $rsp->{error}->[0]     = "Failed to generate grub2 configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.";
         $callback->($rsp);
         return;
     }
diff --git a/xCAT-server/lib/xcat/plugins/petitboot.pm b/xCAT-server/lib/xcat/plugins/petitboot.pm
index 89c02fd3b..58d2bd794 100644
--- a/xCAT-server/lib/xcat/plugins/petitboot.pm
+++ b/xCAT-server/lib/xcat/plugins/petitboot.pm
@@ -1,7 +1,6 @@
 # IBM(c) 2014 EPL license http://www.eclipse.org/legal/epl-v10.html
 package xCAT_plugin::petitboot;
 
-#use Data::Dumper;
 use File::Path;
 use Getopt::Long;
 use xCAT::Table;
@@ -464,7 +463,7 @@ sub process_request {
         my $errormsg = $ipret->{'error'};
         my $nodeip = $ipret->{'ip'};
         if ($errormsg) {# Add the node to failure set
-            xCAT::MsgUtils->trace(0, "E", "petitboot: IP address of $_ is $nodeip. $errormsg");
+            xCAT::MsgUtils->trace(0, "E", "petitboot: Defined IP address of $_ is $nodeip. $errormsg");
             unless ($nodeip) {
                 $failurenodes{$_} = 1;
             }
@@ -497,7 +496,10 @@ sub process_request {
     unless (@nodes) {
         xCAT::MsgUtils->message("S", "xCAT: petitboot netboot: no valid nodes. Stop the operation on this server.");
 
-        # It must be an error if my managed nodes are not handled.
+        # We need special hanlding to see if the plugin needs report error.
+        # - For MN, it is designed to handle all nodes, any error is required to be reqport. (All nodes are handled on MN if sharedtftp=1)
+        # - For SN, if disjointdhcps=1 AND sharedtftp=0, all nodes in the request are the nodes managed by this SN, so we need report error
+        #           if disjointdhcps=1 AND sharedtftp=0, report error only if there are nodes are managed by me.
         if (xCAT::Utils->isMN() != 1 && $request->{'_disparatetftp'}->[0] && $request->{'_disjointmode'}->[0] != 1) {
             # Find out which nodes are really mine only when not sharedtftp and not disjoint mode.
             # For other case, all passing node range are required to be handled.
@@ -525,7 +527,7 @@ sub process_request {
         }
         my $rsp;
         $rsp->{errorcode}->[0] = 1;
-        $rsp->{error}->[0]     = "Failed to generate petitboot configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.\n";
+        $rsp->{error}->[0]     = "Failed to generate petitboot configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.";
         $callback->($rsp);
         return;
     }
@@ -696,7 +698,7 @@ sub process_request {
     if (%failurenodes) {
         my $rsp;
         $rsp->{errorcode}->[0] = 1;
-        $rsp->{error}->[0]     = "Failed to generate petitboot configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.\n";
+        $rsp->{error}->[0]     = "Failed to generate petitboot configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.";
         $callback->($rsp);
         return;
     }
diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm
index da8d8d467..d18b3d004 100644
--- a/xCAT-server/lib/xcat/plugins/xnba.pm
+++ b/xCAT-server/lib/xcat/plugins/xnba.pm
@@ -509,7 +509,7 @@ sub process_request {
         my $errormsg = $ipret->{'error'};
         my $nodeip = $ipret->{'ip'};
         if ($errormsg) {# Add the node to failure set
-            xCAT::MsgUtils->trace(0, "E", "xnba: IP address of $_ is $nodeip. $errormsg");
+            xCAT::MsgUtils->trace(0, "E", "xnba: Defined IP address of $_ is $nodeip. $errormsg");
             unless ($nodeip) {
                 $failurenodes{$_} = 1;
             }
@@ -542,7 +542,10 @@ sub process_request {
     unless (@nodes) {
         xCAT::MsgUtils->message("S", "xCAT: xnba netboot: no valid nodes. Stop the operation on this server.");
 
-        # It must be an error if my managed nodes are not handled.
+        # We need special hanlding to see if the plugin needs report error.
+        # - For MN, it is designed to handle all nodes, any error is required to be reqport. (All nodes are handled on MN if sharedtftp=1)
+        # - For SN, if disjointdhcps=1 AND sharedtftp=0, all nodes in the request are the nodes managed by this SN, so we need report error
+        #           if disjointdhcps=1 AND sharedtftp=0, report error only if there are nodes are managed by me.
         if (xCAT::Utils->isMN() != 1 && $::XNBA_request->{'_disparatetftp'}->[0] && $::XNBA_request->{'_disjointmode'}->[0] != 1) {
             # Find out which nodes are really mine only when not sharedtftp and not disjoint mode.
             # For other case, all passing node range are required to be handled.
@@ -570,7 +573,7 @@ sub process_request {
         }
         my $rsp;
         $rsp->{errorcode}->[0] = 1;
-        $rsp->{error}->[0]     = "Failed to generate xnba configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.\n";
+        $rsp->{error}->[0]     = "Failed to generate xnba configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.";
         $::XNBA_callback->($rsp);
         return;
     }
@@ -742,7 +745,7 @@ sub process_request {
     if (%failurenodes) {
         my $rsp;
         $rsp->{errorcode}->[0] = 1;
-        $rsp->{error}->[0]     = "Failed to generate xnba configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.\n";
+        $rsp->{error}->[0]     = "Failed to generate xnba configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.";
         $::XNBA_callback->($rsp);
         return;
     }

From 6aadfc2055bb4d92fe429f75611506547b103f19 Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Thu, 27 Jul 2017 16:08:14 +0800
Subject: [PATCH 215/283] Fix 3474, introduce 'XCATSHOWSVR' to control whether
 to show where the message is from.

---
 perl-xCAT/xCAT/Client.pm | 64 +++++++++++++++++++++++++---------------
 xCAT-server/sbin/xcatd   | 16 ++++++++++
 2 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/perl-xCAT/xCAT/Client.pm b/perl-xCAT/xCAT/Client.pm
index d7df0a9fc..ae0d19d98 100644
--- a/perl-xCAT/xCAT/Client.pm
+++ b/perl-xCAT/xCAT/Client.pm
@@ -1129,6 +1129,13 @@ sub handle_response {
         return;
     }
 
+    my $msgsource;
+    if ($ENV{'XCATSHOWSVR'}) {
+        unless ($rsp->{NoSvrPrefix}) { # some plugins could disable the prefix forcely by seting the flag in response.
+            $msgsource = $rsp->{xcatdsource}->[0] if ($rsp->{xcatdsource});
+        }
+    }
+
     #print "in handle_response\n";
     # Handle errors
     if (defined($rsp->{errorcode})) {
@@ -1141,24 +1148,23 @@ sub handle_response {
             $xCAT::Client::EXITCODE |= $rsp->{errorcode};
         }    # assume it is a non-reference scalar
     }
+
     if ($rsp->{error}) {
 
         #print "printing error\n";
         if (ref($rsp->{error}) eq 'ARRAY') {
             foreach my $text (@{ $rsp->{error} }) {
-                if ($rsp->{NoErrorPrefix}) {
-                    print STDERR "$text\n";
-                } else {
-                    print STDERR "Error: $text\n";
-                }
+                my $desc = "$text";
+                $desc = "[$msgsource]: $desc" if ($msgsource && $desc);
+                $desc = "Error: $desc" unless ($rsp->{NoErrorPrefix});
+                print STDERR "$desc\n";
             }
         }
         else {
-            if ($rsp->{NoErrorPrefix}) {
-                print STDERR ($rsp->{error} . "\n");
-            } else {
-                print STDERR ("Error: " . $rsp->{error} . "\n");
-            }
+            my $desc = $rsp->{error};
+            $desc = "[$msgsource]: $desc" if ($msgsource && $desc);
+            $desc = "Error: $desc" unless ($rsp->{NoErrorPrefix});
+            print STDERR "$desc\n";
         }
     }
     if ($rsp->{warning}) {
@@ -1166,19 +1172,17 @@ sub handle_response {
         #print "printing warning\n";
         if (ref($rsp->{warning}) eq 'ARRAY') {
             foreach my $text (@{ $rsp->{warning} }) {
-                if ($rsp->{NoWarnPrefix}) {
-                    print STDERR "$text\n";
-                } else {
-                    print STDERR "Warning: $text\n";
-                }
+                my $desc = "$text";
+                $desc = "[$msgsource]: $desc" if ($msgsource && $desc);
+                $desc = "Warning: $desc" unless ($rsp->{NoWarnPrefix});
+                print STDERR "$desc\n";
             }
         }
         else {
-            if ($rsp->{NoWarnPrefix}) {
-                print STDERR ($rsp->{warning} . "\n");
-            } else {
-                print STDERR ("Warning: " . $rsp->{warning} . "\n");
-            }
+            my $desc = $rsp->{warning};
+            $desc = "[$msgsource]: $desc" if ($msgsource && $desc);
+            $desc = "Warning: $desc" unless ($rsp->{NoWarnPrefix});
+            print STDERR "$desc\n";
         }
     }
     if ($rsp->{info}) {
@@ -1186,11 +1190,15 @@ sub handle_response {
         #print "printing info\n";
         if (ref($rsp->{info}) eq 'ARRAY') {
             foreach my $text (@{ $rsp->{info} }) {
-                print "$text\n";
+                my $desc = "$text";
+                $desc = "[$msgsource]: $desc" if ($msgsource && $desc);
+                print "$desc\n";
             }
         }
         else {
-            print($rsp->{info} . "\n");
+            my $desc = $rsp->{info};
+            $desc = "[$msgsource]: $desc" if ($msgsource && $desc);
+            print "$desc\n";
         }
     }
 
@@ -1224,6 +1232,11 @@ sub handle_response {
             } else {
                 $desc = $node->{name};
             }
+            if ($desc) {
+                $desc = "$desc: [$msgsource]" if ($msgsource);
+            } else {
+                $desc = "[$msgsource]" if ($msgsource);
+            }
             if ($node->{errorcode}) {
                 if (ref($node->{errorcode}) eq 'ARRAY') {
                     foreach my $ecode (@{ $node->{errorcode} }) {
@@ -1274,7 +1287,7 @@ sub handle_response {
             if ($node->{base64_data}) {
                 $desc = $desc . ": " . decode_base64($node->{base64_data}->[0]);
             }
-            if ($desc) {
+            if ($desc && $desc ne "[$msgsource]") {
                 if ($errflg == 1) {
                     print STDERR ("$desc\n");
                 } else {
@@ -1306,7 +1319,10 @@ sub handle_response {
                     }
                 }
             }
-            if ($desc) { print "$desc\n"; }
+            if ($desc) {
+                $desc = "[$msgsource]: $desc" if ($msgsource);
+                print "$desc\n"; 
+            }
         }
     }
 }    # end of handle_response
diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index cc8303261..e462ce99a 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -940,6 +940,9 @@ unless ($foreground) {
     daemonize;
 }
 
+my @hostinfo = xCAT::NetworkUtils->determinehostname();
+my $XCATSERVER = $hostinfo[-1];
+
 $dbmaster = xCAT::Table::init_dbworker;
 if ($enable_perf) {
     xCAT::MsgUtils->perf_log_process( "db", undef, "dbprocess", $dbmaster );
@@ -2585,8 +2588,21 @@ sub send_response {
     if ($encode eq "xml") {
         my $xml;
         if ($response->{xcatresponse}) {    # it's an aggregate, keeproot
+            if ($XCATSERVER) {
+                my $rsp = $response->{xcatresponse};
+                if ( (ref($rsp) eq 'ARRAY') && scalar(@$rsp) > 0 ) {
+                    foreach (@$rsp) {
+                        $_->{xcatdsource}->[0] = $XCATSERVER unless ($_->{xcatdsource});
+                    }
+                }
+            }
             $xml = XMLout($response, KeyAttr => [], NoAttr => 1, KeepRoot => 1);
         } else {
+            if ($XCATSERVER) {
+                unless (exists($response->{serverdone})) {
+                    $response->{xcatdsource}->[0] = $XCATSERVER;
+                }
+            }
             $xml = XMLout($response, RootName => 'xcatresponse', NoAttr => 1);
         }
         $xml =~ tr/\011-\177/?/c;

From c45fd291232bb093be41651072299fc3d0a9fc8d Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Thu, 27 Jul 2017 21:27:17 -0400
Subject: [PATCH 216/283] modified depending on comments

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 63c8bb413..d00075d8a 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -1364,10 +1364,18 @@ sub rsetboot_response {
     my $response_info = decode_json $response->content;    
 
     if ($node_info{$node}{cur_status} eq "RSETBOOT_STATUS_RESPONSE") {
-        xCAT::SvrUtils::sendmsg("Hard Drive", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /Disk$/);
-        xCAT::SvrUtils::sendmsg("Network", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /Network$/);
-        xCAT::SvrUtils::sendmsg("CD/DVD", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /ExternalMedia$/);
-        xCAT::SvrUtils::sendmsg("Default", $callback, $node) if ($response_info->{'data'}->{BootSource} =~ /Default$/);
+        if ($response_info->{'data'}->{BootSource} =~ /Disk$/) {
+            xCAT::SvrUtils::sendmsg("Hard Drive", $callback, $node);
+        } elsif ($response_info->{'data'}->{BootSource} =~ /Network$/) {
+            xCAT::SvrUtils::sendmsg("Network", $callback, $node);
+        } elsif ($response_info->{'data'}->{BootSource} =~ /ExternalMedia$/) {
+            xCAT::SvrUtils::sendmsg("CD/DVD", $callback, $node);
+        } elsif ($response_info->{'data'}->{BootSource} =~ /Default$/) {
+            xCAT::SvrUtils::sendmsg("Default", $callback, $node);
+        } else {
+            my $error_msg = "Can not get valid rsetboot status, the data is " . $response_info->{'data'}->{BootSource};
+            xCAT::SvrUtils::sendmsg("$error_msg", $callback, $node);
+        }
     }
 
     if ($next_status{ $node_info{$node}{cur_status} }) {

From 915248a41952281f56c85219ccb46e49b9f1fecb Mon Sep 17 00:00:00 2001
From: yangsong <immarvin@users.noreply.github.com>
Date: Thu, 27 Jul 2017 22:23:31 -0500
Subject: [PATCH 217/283] fix addkcmdline for deployed kernel only #3532,
 refine the document (#3536)

---
 .../guides/admin-guides/references/man5/bootparams.5.rst    | 2 +-
 .../guides/admin-guides/references/man5/linuximage.5.rst    | 2 +-
 perl-xCAT/xCAT/Schema.pm                                    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man5/bootparams.5.rst b/docs/source/guides/admin-guides/references/man5/bootparams.5.rst
index e6596fcb4..13f261616 100644
--- a/docs/source/guides/admin-guides/references/man5/bootparams.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/bootparams.5.rst
@@ -62,7 +62,7 @@ bootparams Attributes:
 
 \ **addkcmdline**\ 
  
- User specified one or more parameters to be passed to the kernel. For the kernel options need to be persistent after installation, specify them with prefix "R::"
+ User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" ")
  
 
 
diff --git a/docs/source/guides/admin-guides/references/man5/linuximage.5.rst b/docs/source/guides/admin-guides/references/man5/linuximage.5.rst
index 74810be1c..66569e8c4 100644
--- a/docs/source/guides/admin-guides/references/man5/linuximage.5.rst
+++ b/docs/source/guides/admin-guides/references/man5/linuximage.5.rst
@@ -56,7 +56,7 @@ linuximage Attributes:
 
 \ **addkcmdline**\ 
  
- User specified arguments to be passed to the kernel.  The user arguments are appended to xCAT.s default kernel arguments. For the kernel options need to be persistent after installation, specify them with prefix "R::".  This attribute is ignored if linuximage.boottarget is set.
+ User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" "). This attribute is ignored if linuximage.boottarget is set.
  
 
 
diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index 832c8566d..1314d5249 100755
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -331,8 +331,8 @@ passed as argument rather than by table value',
 'kernel' => 'The kernel that network boot actions should currently acquire and use.  Note this could be a chained boot loader such as memdisk or a non-linux boot loader',
 'initrd' => 'The initial ramdisk image that network boot actions should use (could be a DOS floppy or hard drive image if using memdisk as kernel)',
             'kcmdline' => 'Arguments to be passed to the kernel',
-'addkcmdline' => 'User specified one or more parameters to be passed to the kernel. For the kernel options need to be persistent after installation, specify them with prefix "R::"',
-'dhcpstatements' => 'xCAT manipulated custom dhcp statements (not intended for user manipulation)',
+            'addkcmdline' => 'User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" ")',
+            'dhcpstatements' => 'xCAT manipulated custom dhcp statements (not intended for user manipulation)',
 'adddhcpstatements' => 'Custom dhcp statements for administrator use (not implemneted yet)',
             comments => 'Any user-written notes.',
             disable  => "Set to 'yes' or '1' to comment out this row.",
@@ -799,7 +799,7 @@ passed as argument rather than by table value',
             imagename => 'The name of this xCAT OS image definition.',
             template => 'The fully qualified name of the template file that will be used to create the OS installer configuration file for stateful installations (e.g.  kickstart for RedHat, autoyast for SLES).',
             boottarget => 'The name of the boottarget definition.  When this attribute is set, xCAT will use the kernel, initrd and kernel params defined in the boottarget definition instead of the default.',
-            addkcmdline => 'User specified arguments to be passed to the kernel.  The user arguments are appended to xCAT.s default kernel arguments. For the kernel options need to be persistent after installation, specify them with prefix "R::".  This attribute is ignored if linuximage.boottarget is set.',
+            addkcmdline => 'User specified kernel options for os provision process(no prefix) or the provisioned os(with prefix "R::"). The options should be delimited with spaces(" "). This attribute is ignored if linuximage.boottarget is set.',
             pkglist => 'The fully qualified name of the file that stores the distro  packages list that will be included in the image. Make sure that if the pkgs in the pkglist have dependency pkgs, the dependency pkgs should be found in one of the pkgdir',
             pkgdir => 'The name of the directory where the distro packages are stored. It could be set to multiple paths. The multiple paths must be separated by ",". The first path in the value of osimage.pkgdir must be the OS base pkg dir path, such as pkgdir=/install/rhels6.2/x86_64,/install/updates . In the os base pkg path, there are default repository data. And in the other pkg path(s), the users should make sure there are repository data. If not, use "createrepo" command to create them. For ubuntu, multiple mirrors can be specified in the pkgdir attribute, the mirrors must be prefixed by the protocol(http/ssh) and delimited with "," between each other.',
             otherpkglist => 'The fully qualified name of the file that stores non-distro package lists that will be included in the image. It could be set to multiple paths. The multiple paths must be separated by ",".',

From 38539f48bdc0e961d5bf81258859466238977929 Mon Sep 17 00:00:00 2001
From: yangsong <immarvin@users.noreply.github.com>
Date: Fri, 28 Jul 2017 00:00:35 -0500
Subject: [PATCH 218/283] correct the generation of conf/distributions for
 xcat-dep (#3553)

---
 build-ubunturepo | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/build-ubunturepo b/build-ubunturepo
index 4d1fbfb04..65e44c88d 100755
--- a/build-ubunturepo
+++ b/build-ubunturepo
@@ -338,7 +338,7 @@ __EOF__
            echo "SignWith: yes" >> conf/distributions
            echo "" >> conf/distributions
        fi
-     done
+    done
 
     cat << __EOF__ > conf/options
 verbose
@@ -457,15 +457,18 @@ Architectures: $tmp_out_arch
 Components: main
 Description: Repository automatically genereted conf
 __EOF__
+
+        if [ "$GPGSIGN" = "0" ];then
+            echo "GPGSIGN=$GPGSIGN specified, the repo will not be signed"
+            echo "" >> conf/distributions
+        else
+            echo "SignWith: yes" >> conf/distributions
+            echo "" >> conf/distributions
+        fi
+
     done
 
-    if [ "$GPGSIGN" = "0" ];then
-        echo "GPGSIGN=$GPGSIGN specified, the repo will not be signed"
-        echo "" >> conf/distributions
-    else
-        echo "SignWith: yes" >> conf/distributions
-        echo "" >> conf/distributions
-    fi
+
 
     cat << __EOF__ > conf/options
 verbose

From fdaeb5d76168d9eb5d0130ad4c6a430a174dc274 Mon Sep 17 00:00:00 2001
From: chenglch <chenglch@cn.ibm.com>
Date: Fri, 28 Jul 2017 13:53:34 +0800
Subject: [PATCH 219/283] Retry 3 times if database connection can not be
 established

As connection may fail due to the limit or error from database side,
this patch add retry mechanism to reduce probability of failure.

fix-issue: #2529
---
 perl-xCAT/xCAT/Table.pm | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/perl-xCAT/xCAT/Table.pm b/perl-xCAT/xCAT/Table.pm
index 576598ef9..8de4a4528 100644
--- a/perl-xCAT/xCAT/Table.pm
+++ b/perl-xCAT/xCAT/Table.pm
@@ -844,12 +844,28 @@ sub new
         }
 
         my $oldumask = umask 0077;
-        unless ($::XCAT_DBHS->{ $self->{connstring}, $self->{dbuser}, $self->{dbpass}, $self->{realautocommit} }) { #= $self->{tabname};
-            $::XCAT_DBHS->{ $self->{connstring}, $self->{dbuser}, $self->{dbpass}, $self->{realautocommit} } =
-              DBI->connect($self->{connstring}, $self->{dbuser}, $self->{dbpass}, { AutoCommit => $self->{realautocommit} });
+        my $retry = 0;
+        while (!$::XCAT_DBHS->{ $self->{connstring}, $self->{dbuser}, $self->{dbpass}, $self->{realautocommit} }) {
+            eval {
+                local $SIG{__WARN__} = sub {
+                    my $message = shift;
+                    if ($retry == 3 && $message) {
+                        xCAT::MsgUtils->message("S", "Failed to connect to ".$self->{tabname}." table after retrying $retry times: $message");
+                    }
+                };
+                $::XCAT_DBHS->{ $self->{connstring}, $self->{dbuser}, $self->{dbpass}, $self->{realautocommit} } =
+                    DBI->connect($self->{connstring}, $self->{dbuser}, $self->{dbpass}, { AutoCommit => $self->{realautocommit} });
+            };
+            if ($::XCAT_DBHS->{ $self->{connstring}, $self->{dbuser}, $self->{dbpass}, $self->{realautocommit} }) {
+                last;
+            } elsif ($retry == 3) {
+                last;
+            } else {
+                sleep (2**$retry);
+            }
+            $retry++;
         }
         umask $oldumask;
-
         $self->{dbh} = $::XCAT_DBHS->{ $self->{connstring}, $self->{dbuser}, $self->{dbpass}, $self->{realautocommit} };
 
         #Store the Table object reference as afflicted by changes to the DBH

From d4fe16ddc1f3b2176c672611436489bd337604ec Mon Sep 17 00:00:00 2001
From: zet809 <ertaozh@cn.ibm.com>
Date: Fri, 28 Jul 2017 15:58:22 +0800
Subject: [PATCH 220/283] =?UTF-8?q?remove=20the=20build=20mlx4-en=20and=20?=
 =?UTF-8?q?i40e=20section=20when=20building=20xcat-genesis-=E2=80=A6=20(#3?=
 =?UTF-8?q?514)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* remove the build mlx4-en and i40e section when building xcat-genesis-base

* Add build env in description for xcat-genesis-base
---
 xCAT-genesis-builder/buildrpm               | 32 ++-------------------
 xCAT-genesis-builder/xCAT-genesis-base.spec |  1 +
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/xCAT-genesis-builder/buildrpm b/xCAT-genesis-builder/buildrpm
index 45de0953a..2b4a42964 100755
--- a/xCAT-genesis-builder/buildrpm
+++ b/xCAT-genesis-builder/buildrpm
@@ -5,7 +5,7 @@
 #            this whole dir into it somewhere (like /tmp).
 # Then run this script.  The optional 1st arg should be mcp if you are building against mcp.
 
-# Currently, *Fedora 23* is the only OS supported to build genesis-base for ppc64, and Centos 6.5 for x86_64
+# Currently, *Fedora 26* is the only OS supported to build genesis-base for ppc64, and Centos 6.5 for x86_64
 
 HOSTOS="$1"
 DIR=`dirname $0`
@@ -18,37 +18,9 @@ if [ $BUILDARCH = "ppc64le" ]; then
     BUILDARCH="ppc64"
 fi
 
-# For xcat-genesis-base-ppc64, we need to update mlx4-en driver for Mellanox ethernet nics. 
-# IF you are sure you have installed newer driver on the build server you can use 'buildrpm -y' to skip the nodification
 if [ -z $1 ]; then
-    HOSTOS="fedora23"
+    HOSTOS="fedora26"
 fi
-if [ $BUILDARCH = 'ppc64' -a $HOSTOS != 'mcp' -a $HOSTOS != '-y' ]; then
-    echo "The steps below are used to install mlnx driver 3.2-1 and i40e driver 1.5.16, if you are sure you have these or newer drivers, pls use \"-y\" to skip!"
-    echo "1. Install OS related packages"
-    echo "    yum install rpmbuild"
-    echo "    yum install kernel-devel-`uname -r`"
-    echo "    yum install kernel-headers-`uname -r`"
-    echo "    yum install gcc-c++"
-    echo "2. Download Mellanox EN Driver for Linux from http://www.mellanox.com/downloads/Drivers/mlnx-en-3.2-1.0.1.1.tgz"
-    echo "   Download Intel EN Driver follow this link and download from webpage https://downloadcenter.intel.com/downloads/eula/26370/Intel-Network-Adapter-Driver-for-PCI-E-Intel-40-Gigabit-Ethernet-Network-Connections-under-Linux-?httpDown=https%3A%2F%2Fdownloadmirror.intel.com%2F26370%2Feng%2Fi40e-1.5.16.tar.gz"
-    echo "3. To install Mellanox Driver, extract it and run ./install.sh from the extracted directory"
-    echo "    tar -xvf mlnx-en-3.2-1.0.1.1.tgz"
-    echo "    ./mlnx-en-3.2-1.0.1.1/install.sh"
-    echo "   To install Intel Driver, create rpm and install"
-    echo "    rpmbuild -tb i40e-1.5.16.tar.gz"
-    echo "    rpm -i /<path-to>/i40e-1.5.16-1.ppc64le.rpm"
-    echo "    Additional Intel instructions can be found in README included in i40e-1.5.16.tar.gz"
-    echo "4. Check whether the drivers are updated"
-    echo "    modprobe mlx4-en"
-    echo "    modinfo mlx4-en | grep version"
-    echo "    version:        3.2-1.0.1.1 (31 Jan 2016)"
-    echo "    modinfo i40e | grep version"
-    echo "    version:        1.5.16"
-    echo "5. Once the steps above done, run \"$0 -y\" to build xCAT-genesis-base-ppc64"
-    exit 0
-fi
-
 
 # get the input files for dracut in the right place
 # Fedora 20 ppc64 uses /usr/lib/dracut/modules.d
diff --git a/xCAT-genesis-builder/xCAT-genesis-base.spec b/xCAT-genesis-builder/xCAT-genesis-base.spec
index 95e1e719d..f716c87db 100755
--- a/xCAT-genesis-builder/xCAT-genesis-base.spec
+++ b/xCAT-genesis-builder/xCAT-genesis-base.spec
@@ -37,6 +37,7 @@ Packager: IBM Corp.
 %Description
 xCAT genesis (Genesis Enhanced Netboot Environment for System Information and Servicing) is a small, embedded-like environment for xCAT's use in discovery and management actions when interaction with an OS is infeasible.
 This package comprises the base platform with most of the xCAT specific behavior left to xCAT-genesis-scripts package.
+Built in environment "%dist" on %{_arch}.
 %Prep
 
 

From c22d145c328c7799898c1e9d25158f911a494602 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Fri, 28 Jul 2017 04:16:47 -0400
Subject: [PATCH 221/283] add bunlds for rhels7.4

---
 .../autotest/bundle/rhels7.4_ppc64.bundle     | 314 ++++++++++++++++++
 .../autotest/bundle/rhels7.4_ppc64le.bundle   | 310 +++++++++++++++++
 .../autotest/bundle/rhels7.4_x86_64.bundle    | 239 +++++++++++++
 3 files changed, 863 insertions(+)
 create mode 100644 xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle
 create mode 100644 xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle
 create mode 100644 xCAT-test/autotest/bundle/rhels7.4_x86_64.bundle

diff --git a/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle b/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle
new file mode 100644
index 000000000..34e13e857
--- /dev/null
+++ b/xCAT-test/autotest/bundle/rhels7.4_ppc64.bundle
@@ -0,0 +1,314 @@
+reg_linux_diskfull_installation_flat
+updatenode_h
+updatenode_v
+updatenode_diskful_syncfiles
+updatenode_diskful_syncfiles_rename
+updatenode_diskful_syncfiles_dir
+updatenode_diskful_syncfiles_multi_files
+updatenode_syncfile_EXECUTE
+updatenode_syncfile_EXECUTEALWAYS
+updatenode_syncfile_APPEND
+updatenode_syncfile_MERGE
+updatenode_P_script1
+updatenode_P_script2
+updatenode_f_incompatible_flags
+updatenode_k_incompatible_flags
+updatenode_diskful_syncfiles_P_script1
+updatenode_script3
+updatenode_P_script1_script2
+updatenode_without_flag
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
+chdef_null
+chdef_t_node
+chdef_t_network
+chdef_p
+chdef_m
+chdef_z
+chdef_group
+chdef_group_p
+chdef_dynamic_group
+chdef_multiple_keys
+chdef_n
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+copycds_n
+copycds_a_err
+copycds_n_err
+packimage_o_p_a_m
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+getmacs_noderange
+getmacs_d
+getmacs_f_D
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_err_node
+rinv_bus
+rinv_config
+rinv_serial
+rinv_model
+rinv_firm
+rinv_all
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_off
+rpower_stat
+rpower_boot
+rpower_on
+rpower_reset
+rpower_noderange
+rpower_noderange_nodeps
+rpower_err_noderange
+rscan_noderange
+rscan_x
+rscan_z
+rscan_w
+rscan_x_w
+rscan_z_w
+rvitals_lcds
+rvitals_all
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_p_auditlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makehosts_help
+makehosts_n_noderange
+makehosts_h
+makehosts_null
+makehosts_l
+makehosts_d
+makehosts_n
+makehost_n_r
+xdcp_src_dst
+makedns_h
+makedns_d_node
+makedns_n
+makedns
+noderange_individual_node
+noderange_individual_grp
+noderange_node01-node10
+noderange_group1-group3
+noderange_10-20
+noderange_XCAT_NODE_PREFIX
+noderange_XCAT_NODE_SUFFIX
+noderange_exclusion
+noderange_group_intersection
+copycds_iso
+copycds_a
+copycds_n_a
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_i_linux
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+psh_h
+psh_v
+psh_node_cmd_linux
+psh_l
+psh_i
+prsync_h
+prsync_v
+prsync_dir_node
+prsync_file_node
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+makentp_v
+makentp_h
+nodeset_check_warninginfo
+runcmdinstaller_h
+runcmdinstaller_command
+get_xcat_postscripts_loginfo
+updatenode_postscripts_loginfo
+bmcdiscover_h
+bmcdiscover_nmap_range
+bmcdiscover_v
+bmcdiscover_check_paswd
+bmcdiscover_check_passwd_wrong
+bmcdiscover_get_ipsource
+bmcdiscover_range_w
+bmcdiscover_range_z
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
+xcatconfig_u_check_xcatsslversion_rhels_sles
+reg_linux_diskless_installation_flat
+packimage_m_cpio_c_gzip
+packimage_m_cpio_c_xz
+packimage_m_tar_c_gzip
+packimage_m_tar_c_xz
+packimage_m_invalid_archive_method
+packimage_m_invalid_compress_method
+reg_linux_statelite_installation_flat
+SN_setup_case
+reg_linux_diskfull_installation_hierarchy
+reg_linux_diskless_installation_hierarchy
+reg_linux_statelite_installation_hierarchy_by_ramdisk
+reg_linux_statelite_installation_hierarchy_by_nfs
+redhat_migration1
+redhat_migration2
+clean_up_env
diff --git a/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle
new file mode 100644
index 000000000..2984952bb
--- /dev/null
+++ b/xCAT-test/autotest/bundle/rhels7.4_ppc64le.bundle
@@ -0,0 +1,310 @@
+setup_vm
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
+go_xcat_noinput
+updatenode_h
+updatenode_v
+updatenode_diskful_syncfiles
+updatenode_diskful_syncfiles_rename
+updatenode_diskful_syncfiles_dir
+updatenode_diskful_syncfiles_multi_files
+updatenode_syncfile_EXECUTE
+updatenode_syncfile_EXECUTEALWAYS
+updatenode_syncfile_APPEND
+updatenode_syncfile_MERGE
+updatenode_P_script1
+updatenode_P_script2
+updatenode_f_incompatible_flags
+updatenode_k_incompatible_flags
+updatenode_diskful_syncfiles_P_script1
+updatenode_script3
+updatenode_P_script1_script2
+updatenode_without_flag
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
+chdef_null
+chdef_t_node
+chdef_t_network
+chdef_p
+chdef_m
+chdef_z
+chdef_group
+chdef_group_p
+chdef_dynamic_group
+chdef_multiple_keys
+chdef_n
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+packimage_o_p_a_m
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_err_node
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_off
+rpower_stat
+rpower_boot
+rpower_on
+rpower_reset
+rpower_noderange
+rpower_noderange_nodeps
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_p_auditlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makehosts_h
+makehosts_help
+makehosts_null
+makehosts_l
+makehosts_d
+makehosts_n
+makehosts_n_noderange
+makehost_n_r
+xdcp_src_dst
+makedns_h
+makedns_d_node
+makedns_n
+makedns
+noderange_individual_node
+noderange_individual_grp
+noderange_node01-node10
+noderange_group1-group3
+noderange_10-20
+noderange_XCAT_NODE_PREFIX
+noderange_XCAT_NODE_SUFFIX
+noderange_exclusion
+noderange_group_intersection
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_i_linux
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+psh_h
+psh_v
+psh_node_cmd_linux
+psh_l
+psh_i
+prsync_h
+prsync_v
+prsync_dir_node
+prsync_file_node
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+makentp_v
+makentp_h
+nodeset_check_warninginfo
+runcmdinstaller_h
+runcmdinstaller_command
+get_xcat_postscripts_loginfo
+updatenode_postscripts_loginfo
+bmcdiscover_h
+bmcdiscover_nmap_range
+bmcdiscover_v
+bmcdiscover_check_paswd
+bmcdiscover_check_passwd_wrong
+bmcdiscover_get_ipsource
+bmcdiscover_range_w
+bmcdiscover_range_z
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
+xcatconfig_u_check_xcatsslversion_rhels_sles
+packimage_m_cpio_c_gzip
+packimage_m_cpio_c_xz
+packimage_m_tar_c_gzip
+packimage_m_tar_c_xz
+packimage_m_invalid_archive_method
+packimage_m_invalid_compress_method
+reg_linux_statelite_installation_flat
+SN_setup_case
+reg_linux_diskfull_installation_hierarchy
+reg_linux_diskless_installation_hierarchy
+reg_linux_statelite_installation_hierarchy_by_ramdisk
+reg_linux_statelite_installation_hierarchy_by_nfs
+redhat_migration1
+redhat_migration2
+clean_up_env
diff --git a/xCAT-test/autotest/bundle/rhels7.4_x86_64.bundle b/xCAT-test/autotest/bundle/rhels7.4_x86_64.bundle
new file mode 100644
index 000000000..13f6f53c7
--- /dev/null
+++ b/xCAT-test/autotest/bundle/rhels7.4_x86_64.bundle
@@ -0,0 +1,239 @@
+setup_vm
+reg_linux_diskfull_installation_flat
+makehosts_h
+makehosts_help
+makehosts_n
+makehosts_n_noderange
+makehost_n_r
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_imagename
+packimage_h
+packimage_v
+packimage_m_cpio_c_gzip
+packimage_m_cpio_c_xz
+packimage_m_tar_c_gzip
+packimage_m_tar_c_xz
+packimage_m_invalid_archive_method
+packimage_m_invalid_compress_method
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_noderange
+nodestat_err_node
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_n
+makedns
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_i_linux
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+psh_h
+psh_v
+psh_node_cmd_linux
+psh_l
+psh_i
+prsync_h
+prsync_v
+prsync_dir_node
+prsync_file_node
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_check_warninginfo
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+xcatconfig_u_check_xcatsslversion_rhels_sles
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat
+SN_setup_case
+reg_linux_diskfull_installation_hierarchy
+reg_linux_diskless_installation_hierarchy
+reg_linux_statelite_installation_hierarchy_by_ramdisk
+reg_linux_statelite_installation_hierarchy_by_nfs
+redhat_migration1
+redhat_migration2
+clean_up_env

From 939c75cad02968e51343a86310c5d15f1945fca8 Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Fri, 28 Jul 2017 07:45:23 -0400
Subject: [PATCH 222/283] modify hardware control testcase for physical machine

---
 xCAT-test/autotest/testcase/reventlog/cases0 |  8 ++++----
 xCAT-test/autotest/testcase/rinv/cases0      |  4 ++--
 xCAT-test/autotest/testcase/rpower/cases0    | 11 ++---------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/xCAT-test/autotest/testcase/reventlog/cases0 b/xCAT-test/autotest/testcase/reventlog/cases0
index d772ed285..7c65a6035 100644
--- a/xCAT-test/autotest/testcase/reventlog/cases0
+++ b/xCAT-test/autotest/testcase/reventlog/cases0
@@ -1,6 +1,6 @@
 start:reventlog_null
 cmd:reventlog
-check:rc!=0
+check:rc==0
 check:output=~Usage
 end
 start:reventlog_all
@@ -11,12 +11,12 @@ end
 start:reventlog_clear
 cmd:reventlog $$CN clear
 check:rc==0
-check:output=~$$CN\s*:\s*clear
+check:output=~$$CN\s*:\s*clear |SEL cleared
 end
 start:reventlog_numofentries
 cmd:reventlog $$CN 5
 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+ |$$CN: no SEL entries
 cmd:reventlog $$CN 3 | wc -l
-check:output=~\s*3\s*
+check:output=~\s*1\s*
 end
diff --git a/xCAT-test/autotest/testcase/rinv/cases0 b/xCAT-test/autotest/testcase/rinv/cases0
index 68fb4b2c7..1958a8d7e 100644
--- a/xCAT-test/autotest/testcase/rinv/cases0
+++ b/xCAT-test/autotest/testcase/rinv/cases0
@@ -106,7 +106,7 @@ cmd:chdef -p -t node  -o $$CN  groups="test"
 check:rc==0
 cmd:rinv test all
 check:rc==1
-check:output=~$$CN: SYSTEM
+check:output=~$$CN: SYSTEM |$$CN: System
 cmd:chdef -m -t node -o $$CN groups="test"
 check:rc==0
 cmd:rmdef testnode;if [[ -e /tmp/testnode.stanza ]]; then cat /tmp/testnode.stanza | chdef -z;rm -rf /tmp/testnode.stanza;fi
@@ -129,5 +129,5 @@ start:rinv_errorcommand
 description:get right return if input error command
 cmd:rinv $$CN dafds
 check:rc==1
-check:output=~Unsupported command
+check:output=~Unsupported command|Error: Usage:
 end
diff --git a/xCAT-test/autotest/testcase/rpower/cases0 b/xCAT-test/autotest/testcase/rpower/cases0
index c7a1f70af..fd3890ed5 100644
--- a/xCAT-test/autotest/testcase/rpower/cases0
+++ b/xCAT-test/autotest/testcase/rpower/cases0
@@ -91,15 +91,8 @@ end
 start:rpower_reset
 description:This case is to test reset option could hard reset nodes when nodes are in on state.
 Attribute: $$CN-The operation object of rpower command
-cmd:rpower $$CN on
-cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
-cmd:rpower $$CN stat
-check:ouptut=~Running|on
-cmd:rpower $$CN reset
+cmd:stat=`rpower $$CN stat`;if ([[ $stat =~ on ]] || [[ $stat =~ Running ]]) ;then rpower $$CN reset;sleep 30;stat1=`rpower $$CN stat`;if ([[ $stat1 =~ on ]] || [[ $stat1 =~ Running ]]);then exit 0;else exit 1;fi;else rpower $$CN reset;sleep 30;stat1=`rpower $$CN stat`;if ([[ $stat1 =~ off ]] || [[ $stat1 =~ "Not Activated" ]]);then exit 0;else exit 1;fi;fi
 check:rc==0
-cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
-cmd:rpower $$CN stat
-check:output=~Running|on
 end
 
 start:rpower_noderange
@@ -107,7 +100,7 @@ description:This case is to test rpower could process error usage and return hel
 Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN
 check:rc!=0
-check:output=~Unsupported|Usage
+check:output=~Unsupported|Usage|Please enter an action
 end
 
 start:rpower_noderange_nodeps

From 4660bed50777c450bd62ccaec66d61080e280ab0 Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Fri, 28 Jul 2017 08:14:10 -0400
Subject: [PATCH 223/283] modify hardware control testcase for physical machine

---
 xCAT-test/autotest/testcase/reventlog/cases0 | 4 ++--
 xCAT-test/autotest/testcase/rinv/cases0      | 2 +-
 xCAT-test/autotest/testcase/rpower/cases0    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xCAT-test/autotest/testcase/reventlog/cases0 b/xCAT-test/autotest/testcase/reventlog/cases0
index 7c65a6035..cbb3aceba 100644
--- a/xCAT-test/autotest/testcase/reventlog/cases0
+++ b/xCAT-test/autotest/testcase/reventlog/cases0
@@ -11,12 +11,12 @@ end
 start:reventlog_clear
 cmd:reventlog $$CN clear
 check:rc==0
-check:output=~$$CN\s*:\s*clear |SEL cleared
+check:output=~$$CN\s*:\s*clear|SEL cleared
 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
+check:output=~$$CN\s*:\s*.*\d\d/\d\d/\d\d\s*\S+|$$CN: no SEL entries
 cmd:reventlog $$CN 3 | wc -l
 check:output=~\s*1\s*
 end
diff --git a/xCAT-test/autotest/testcase/rinv/cases0 b/xCAT-test/autotest/testcase/rinv/cases0
index 1958a8d7e..8e9c3f1cf 100644
--- a/xCAT-test/autotest/testcase/rinv/cases0
+++ b/xCAT-test/autotest/testcase/rinv/cases0
@@ -106,7 +106,7 @@ cmd:chdef -p -t node  -o $$CN  groups="test"
 check:rc==0
 cmd:rinv test all
 check:rc==1
-check:output=~$$CN: SYSTEM |$$CN: System
+check:output=~$$CN: SYSTEM|$$CN: System
 cmd:chdef -m -t node -o $$CN groups="test"
 check:rc==0
 cmd:rmdef testnode;if [[ -e /tmp/testnode.stanza ]]; then cat /tmp/testnode.stanza | chdef -z;rm -rf /tmp/testnode.stanza;fi
diff --git a/xCAT-test/autotest/testcase/rpower/cases0 b/xCAT-test/autotest/testcase/rpower/cases0
index fd3890ed5..94fde2054 100644
--- a/xCAT-test/autotest/testcase/rpower/cases0
+++ b/xCAT-test/autotest/testcase/rpower/cases0
@@ -91,7 +91,7 @@ end
 start:rpower_reset
 description:This case is to test reset option could hard reset nodes when nodes are in on state.
 Attribute: $$CN-The operation object of rpower command
-cmd:stat=`rpower $$CN stat`;if ([[ $stat =~ on ]] || [[ $stat =~ Running ]]) ;then rpower $$CN reset;sleep 30;stat1=`rpower $$CN stat`;if ([[ $stat1 =~ on ]] || [[ $stat1 =~ Running ]]);then exit 0;else exit 1;fi;else rpower $$CN reset;sleep 30;stat1=`rpower $$CN stat`;if ([[ $stat1 =~ off ]] || [[ $stat1 =~ "Not Activated" ]]);then exit 0;else exit 1;fi;fi
+cmd:stat=`rpower $$CN stat`;if ([[ $stat =~ on ]] || [[ $stat =~ Running ]]) ;then rpower $$CN reset;sleep 300;stat1=`rpower $$CN stat`;if ([[ $stat1 =~ on ]] || [[ $stat1 =~ Running ]]);then exit 0;else exit 1;fi;else rpower $$CN reset;sleep 300;stat1=`rpower $$CN stat`;if ([[ $stat1 =~ off ]] || [[ $stat1 =~ "Not Activated" ]]);then exit 0;else exit 1;fi;fi
 check:rc==0
 end
 

From 770d947c949d99f8abacd8e9fbdab4b14f9e6250 Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Fri, 28 Jul 2017 16:36:15 +0800
Subject: [PATCH 224/283] Using networks.dhcpserver as one accept whole
 noderange for nodeset.

---
 perl-xCAT/xCAT/Scope.pm                   | 101 ++++++++++++----------
 xCAT-server/lib/xcat/plugins/grub2.pm     |  11 ++-
 xCAT-server/lib/xcat/plugins/petitboot.pm |  11 ++-
 xCAT-server/lib/xcat/plugins/xnba.pm      |  11 ++-
 4 files changed, 85 insertions(+), 49 deletions(-)

diff --git a/perl-xCAT/xCAT/Scope.pm b/perl-xCAT/xCAT/Scope.pm
index 103e1b65b..b35388fe3 100644
--- a/perl-xCAT/xCAT/Scope.pm
+++ b/perl-xCAT/xCAT/Scope.pm
@@ -146,33 +146,35 @@ sub get_broadcast_scope_with_parallel {
     }
     #Exit if the packet has been preprocessed in its history
     if ($req->{_xcatpreprocessed}->[0] == 1) { return [$req]; }
+    $req->{_xcatpreprocessed}->[0] = 1;
 
     my $snlist = shift;
-    my @reqs = ();
-    $req->{_xcatpreprocessed}->[0] = 1;
-    my $isMN = xCAT::Utils->isMN();
-    #Handle the one for current management/service node
-    if ( $isMN ) {
-        $reqs = get_parallel_scope($req);
-    } else {
-        # get site.master and broadcast to it as MN will not be in SN list or defined in noderes.servicenode.
+
+    my $reqs = get_parallel_scope($req);
+
+    my @requests = (); # The request array will be return.
+    push @requests, @$reqs;
+
+    # get site.master from DB and dispatch to it as MN will not be in SN list.
+    if ( xCAT::Utils->isServiceNode() ) {
         my @entries = xCAT::TableUtils->get_site_attribute("master");
         my $master = $entries[0];
-        my $reqcopy = {%$req};
-        $reqcopy->{'_xcatdest'} = $master;
-        $reqs = get_parallel_scope($reqcopy);
+        foreach (@$reqs) {
+            my $reqcopy = {%$_};
+            $reqcopy->{'_xcatdest'} = $master;
+            push @requests, $reqcopy;
+        }
     }
-    my @requests = @$reqs;
 
-    #Broadcast the request to other management/service nodes
+    #Broadcast the request to all service nodes
     foreach (@$snlist) {
         my $xcatdest = $_;
-        my $reqcopy = {%$req};
-        $reqcopy->{'_xcatdest'} = $xcatdest;
+        next unless (xCAT::NetworkUtils->thishostisnot($xcatdest));
 
-        $reqs = get_parallel_scope($reqcopy);
         foreach (@$reqs) {
-            push @requests, {%$_};
+            my $reqcopy = {%$_};
+            $reqcopy->{'_xcatdest'} = $xcatdest;
+            push @requests, $reqcopy;
         }
     }
     return \@requests;
@@ -182,12 +184,13 @@ sub get_broadcast_scope_with_parallel {
 
 =head3 get_broadcast_disjoint_scope_with_parallel
 
-    Convert a request object to an array of multiple requests according to the 
-    splitted node range. (Work under disjoint mode)
+    Convert a request object to an array of multiple request objects according to the 
+    service node management scope. (Work under disjoint mode)
 
     Arguments:
        Reference of request
        SN hash: Hash of target service nodes => Managed CNs
+       Special servers: Array of servers, those servers are required to handle whole noderange.
     Returns: An array of requests
     Error:
         none
@@ -203,48 +206,54 @@ sub get_broadcast_disjoint_scope_with_parallel {
     }
     #Exit if the packet has been preprocessed in its history
     if ($req->{_xcatpreprocessed}->[0] == 1) { return [$req]; }
+    $req->{_xcatpreprocessed}->[0] = 1;
 
     my $sn_hash = shift;
-    my @reqs = ();
-    $req->{_xcatpreprocessed}->[0] = 1;
-    my $isMN = xCAT::Utils->isMN();
-    #Handle the one for current management/service node
-    if ( $isMN ) {
-        $reqs = get_parallel_scope($req);
-    } else {
-        # get site.master and broadcast to it as MN will not be in SN list or defined in noderes.servicenode.
-        my @entries = xCAT::TableUtils->get_site_attribute("master");
-        my $master = $entries[0];
-        my $reqcopy = {%$req};
-        $reqcopy->{'_xcatdest'} = $master;
-        $reqs = get_parallel_scope($reqcopy);
-    }
-    my @requests = @$reqs;
+    my $extras = shift;
 
-    my $handled4me = 0;
-    #Broadcast the request to other management/service nodes
+    my @requests = (); # The request array will be return.
+    my $reqs = get_parallel_scope($req);
+
+    my $handled4me = 0;  # indicate myself is already handled.
+    my %prehandledhash = ();# the servers which is already handled.
+    foreach (@$extras) {
+        my $xcatdest = $_;
+        if (xCAT::NetworkUtils->thishostisnot($xcatdest)) {
+            # TODO, To avoid sending request to a multi-home server many times.
+            foreach (@$reqs) {
+                my $reqcopy = {%$_};
+                $reqcopy->{'_xcatdest'} = $xcatdest;
+                push @requests, $reqcopy;
+            }
+            $prehandledhash{$xcatdest} = 1;
+        } elsif ($handled4me == 0) {
+            push @requests, @$reqs;
+            $handled4me = 1;
+        }
+    }
+
+    #Broadcast the request to all available service nodes
     foreach (keys %$sn_hash) {
         my $xcatdest = $_;
+        # to check if the SN already handled
+        next if (exists($prehandledhash{$xcatdest}));
+
         if (xCAT::NetworkUtils->thishostisnot($xcatdest)) {
             my $reqcopy = {%$req};
             $reqcopy->{'_xcatdest'} = $xcatdest;
             $reqcopy->{'node'} = $sn_hash->{$xcatdest};
 
             $reqs = get_parallel_scope($reqcopy);
-            foreach (@$reqs) {
-                push @requests, {%$_};
-            }
-        } elsif ($isMN == 0) {
-            # avoid handle myself multiple times when different IP address used in `noderes.servicenode`.
-            next if $handled4me;
+            push @requests, @$reqs;
+            #foreach (@$reqs) {
+            #    push @requests, {%$_};
+            #}
+        } elsif ($handled4me == 0) {
             my $reqcopy = {%$req};
-            $reqcopy->{'_xcatdest'} = $xcatdest;
             $reqcopy->{'node'} = $sn_hash->{$xcatdest};
 
             $reqs = get_parallel_scope($reqcopy);
-            foreach (@$reqs) {
-                push @requests, {%$_};
-            }
+            push @requests, @$reqs;
             $handled4me = 1;
         }
     }
diff --git a/xCAT-server/lib/xcat/plugins/grub2.pm b/xCAT-server/lib/xcat/plugins/grub2.pm
index a09612745..563595b72 100644
--- a/xCAT-server/lib/xcat/plugins/grub2.pm
+++ b/xCAT-server/lib/xcat/plugins/grub2.pm
@@ -499,7 +499,16 @@ sub preprocess_request {
             }
 
             my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@CN, "xcat", "MN");
-            return xCAT::Scope->get_broadcast_disjoint_scope_with_parallel($req, $sn_hash);
+            my @dhcpsvrs = ();
+            my $ntab = xCAT::Table->new('networks');
+            if ($ntab) {
+                foreach (@{ $ntab->getAllEntries() }) {
+                    next unless ($_->{dynamicrange});
+                    # if dynamicrange specified but dhcpserver was not - issue error message
+                    push @dhcpsvrs, $_->{dhcpserver} if ($_->{dhcpserver})
+                }
+            }
+            return xCAT::Scope->get_broadcast_disjoint_scope_with_parallel($req, $sn_hash, \@dhcpsvrs);
         }
     }
     # Do not dispatch to service nodes if non-sharedtftp or the node range contains only SNs.
diff --git a/xCAT-server/lib/xcat/plugins/petitboot.pm b/xCAT-server/lib/xcat/plugins/petitboot.pm
index 58d2bd794..46b471f8f 100644
--- a/xCAT-server/lib/xcat/plugins/petitboot.pm
+++ b/xCAT-server/lib/xcat/plugins/petitboot.pm
@@ -385,7 +385,16 @@ sub preprocess_request {
             }
 
             my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@CN, "xcat", "MN");
-            return xCAT::Scope->get_broadcast_disjoint_scope_with_parallel($req, $sn_hash);
+            my @dhcpsvrs = ();
+            my $ntab = xCAT::Table->new('networks');
+            if ($ntab) {
+                foreach (@{ $ntab->getAllEntries() }) {
+                    next unless ($_->{dynamicrange});
+                    # if dynamicrange specified but dhcpserver was not - issue error message
+                    push @dhcpsvrs, $_->{dhcpserver} if ($_->{dhcpserver})
+                }
+            }
+            return xCAT::Scope->get_broadcast_disjoint_scope_with_parallel($req, $sn_hash, \@dhcpsvrs);
         }
     }
     # Do not dispatch to service nodes if non-sharedtftp or the node range contains only SNs.
diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm
index d18b3d004..834434a98 100644
--- a/xCAT-server/lib/xcat/plugins/xnba.pm
+++ b/xCAT-server/lib/xcat/plugins/xnba.pm
@@ -437,7 +437,16 @@ sub preprocess_request {
             }
 
             my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@CN, "xcat", "MN");
-            return xCAT::Scope->get_broadcast_disjoint_scope_with_parallel($req, $sn_hash);
+            my @dhcpsvrs = ();
+            my $ntab = xCAT::Table->new('networks');
+            if ($ntab) {
+                foreach (@{ $ntab->getAllEntries() }) {
+                    next unless ($_->{dynamicrange});
+                    # if dynamicrange specified but dhcpserver was not - issue error message
+                    push @dhcpsvrs, $_->{dhcpserver} if ($_->{dhcpserver})
+                }
+            }
+            return xCAT::Scope->get_broadcast_disjoint_scope_with_parallel($req, $sn_hash, \@dhcpsvrs);
         }
     }
     # Do not dispatch to service nodes if non-sharedtftp or the node range contains only SNs.

From d4a2ef35adc7b90dbb4c40a77da348758853a980 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Fri, 28 Jul 2017 18:09:51 +0800
Subject: [PATCH 225/283] Add scripts rhel-cuda-diskfull-install.sh and
 rhel-cuda-diskless-install.sh

---
 .../cuda/rhel-cuda-diskfull-install.sh        | 86 ++++++++++++++++
 .../cuda/rhel-cuda-diskless-install.sh        | 99 +++++++++++++++++++
 2 files changed, 185 insertions(+)
 create mode 100755 xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
 create mode 100755 xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh

diff --git a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
new file mode 100755
index 000000000..ebc1f7cc1
--- /dev/null
+++ b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+########
+# Set all the variables below
+
+COMPUTE_NODE="c910f03c01p10"
+OSIMAGE_NAME="rhels7.3-ppc64le-install-cudafull"
+OSIMAGE_OTHERPKGDIR="/install/post/otherpkgs/rhels7.3/ppc64le"
+SOURCE_BASEDIR="/media/xcat"
+
+RHEL_ISO="${SOURCE_BASEDIR}/RHEL-7.3-20161019.0-Server-ppc64le-dvd1.iso"
+CUDA_RPMS=(
+	"${SOURCE_BASEDIR}/cuda-repo-rhel7-8-0-local-ga2v2-8.0.61-1.ppc64le.rpm"
+	"${SOURCE_BASEDIR}/cuda-repo-rhel7-8-0-local-cublas-performance-update-8.0.61-1.ppc64le.rpm"
+)
+DKMS_RPM="${SOURCE_BASEDIR}/dkms-2.3-5.20170523git8c3065c.el7.noarch.rpm"
+
+# Set all the variables above
+########
+
+[ -f "${RHEL_ISO}" ]
+[ "$?" -ne "0" ] && echo "File ${RHEL_ISO} not found." >&2 && exit 1
+copycds "${RHEL_ISO}"
+[ "$?" -ne "0" ] && echo "Copy CD failed." >&2 && exit 1
+
+rmdef -t osimage "${OSIMAGE_NAME}"
+mkdef -z <<-EOF
+# <xCAT data object stanza file>
+
+${OSIMAGE_NAME}:
+    objtype=osimage
+    imagetype=linux
+    osarch=ppc64le
+    osdistroname=rhels7.3-ppc64le
+    osname=Linux
+    osvers=rhels7.3
+    otherpkgdir="${OSIMAGE_OTHERPKGDIR}"
+    pkgdir=/install/rhels7.3/ppc64le
+    pkglist=/opt/xcat/share/xcat/install/rh/cudafull.rhels7.ppc64le.pkglist
+    profile=compute
+    provmethod=install
+    template=/opt/xcat/share/xcat/install/rh/compute.rhels7.tmpl
+EOF
+[ "$?" -ne "0" ] && echo "Make node definition failed." >&2 && exit 1
+
+rm -rf "${OSIMAGE_OTHERPKGDIR}"
+mkdir -p "${OSIMAGE_OTHERPKGDIR}"
+for f in "${CUDA_RPMS[@]}"
+do
+	[ -f "${f}" ]
+	[ "$?" -ne "0" ] && echo "File ${f} not found." >&2 && exit 1
+	rpm2cpio "${f}" | ( cd "${OSIMAGE_OTHERPKGDIR}" && cpio -ivd )
+done
+
+mkdir -p "${OSIMAGE_OTHERPKGDIR}"/dkms
+[ -f "${DKMS_RPM}" ]
+[ "$?" -ne "0" ] && echo "File ${DKMS_RPM} not found." >&2 && exit 1
+cp "${DKMS_RPM}" "${OSIMAGE_OTHERPKGDIR}/dkms"
+
+( cd "${OSIMAGE_OTHERPKGDIR}" && createrepo . )
+
+makedhcp -n
+rinstall "${COMPUTE_NODE}" "osimage=${OSIMAGE_NAME}"
+
+NETBOOT_TIMEOUT=600
+declare -i WAIT=0
+
+while sleep 10
+do
+	(( WAIT += 10 ))
+	nodestat "${COMPUTE_NODE}" | grep ': sshd$'
+	[ "$?" -eq "0" ] && break
+	[ "${WAIT}" -le "${NETBOOT_TIMEOUT}" ]
+	[ "$?" -ne "0" ] && echo "Netboot failed" >&2 && exit 1
+done
+
+# For workaround the GitHub issue #3549
+sleep 5
+
+xdsh "${COMPUTE_NODE}" date
+[ "$?" -ne "0" ] && echo "Failed connect to compute node via SSH." >&2 && exit 1
+
+xdsh "${COMPUTE_NODE}" 'rpm -q cuda' | grep ': cuda-'
+[ "$?" -ne "0" ] && echo "CUDA installation checking failed" >&2 && exit 1
+
+exit 0
diff --git a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
new file mode 100755
index 000000000..81a9a799b
--- /dev/null
+++ b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+########
+# Set all the variables below
+
+COMPUTE_NODE="c910f03c01p10"
+OSIMAGE_NAME="rhels7.3-ppc64le-netboot-cudafull"
+OSIMAGE_OTHERPKGDIR="/install/post/otherpkgs/rhels7.3/ppc64le"
+SOURCE_BASEDIR="/media/xcat"
+
+RHEL_ISO="${SOURCE_BASEDIR}/RHEL-7.3-20161019.0-Server-ppc64le-dvd1.iso"
+CUDA_RPMS=(
+	"${SOURCE_BASEDIR}/cuda-repo-rhel7-8-0-local-ga2v2-8.0.61-1.ppc64le.rpm"
+	"${SOURCE_BASEDIR}/cuda-repo-rhel7-8-0-local-cublas-performance-update-8.0.61-1.ppc64le.rpm"
+)
+DKMS_RPM="${SOURCE_BASEDIR}/dkms-2.3-5.20170523git8c3065c.el7.noarch.rpm"
+
+# Set all the variables above
+########
+
+OSIMAGE_ROOTIMGDIR="/install/netboot/rhels7.3/ppc64le/${OSIMAGE_NAME}"
+
+[ -f "${RHEL_ISO}" ]
+[ "$?" -ne "0" ] && echo "File ${RHEL_ISO} not found." >&2 && exit 1
+copycds "${RHEL_ISO}"
+[ "$?" -ne "0" ] && echo "Copy CD failed." >&2 && exit 1
+
+rmdef -t osimage "${OSIMAGE_NAME}"
+mkdef -z <<-EOF
+# <xCAT data object stanza file>
+
+${OSIMAGE_NAME}:
+    objtype=osimage
+    exlist=/opt/xcat/share/xcat/netboot/rh/compute.rhels7.ppc64le.exlist
+    imagetype=linux
+    osarch=ppc64le
+    osdistroname=rhels7.3-ppc64le
+    osname=Linux
+    osvers=rhels7.3
+    otherpkgdir="${OSIMAGE_OTHERPKGDIR}"
+    otherpkglist=/opt/xcat/share/xcat/netboot/rh/cudafull.rhels7.ppc64le.otherpkgs.pkglist
+    permission=755
+    pkgdir=/install/rhels7.3/ppc64le
+    pkglist=/opt/xcat/share/xcat/netboot/rh/compute.rhels7.ppc64le.pkglist
+    postinstall=/opt/xcat/share/xcat/netboot/rh/compute.rhels7.ppc64le.postinstall
+    profile=compute
+    provmethod=netboot
+    rootimgdir=${OSIMAGE_ROOTIMGDIR}
+EOF
+[ "$?" -ne "0" ] && echo "Make node definition failed." >&2 && exit 1
+
+rm -rf "${OSIMAGE_OTHERPKGDIR}"
+mkdir -p "${OSIMAGE_OTHERPKGDIR}"
+for f in "${CUDA_RPMS[@]}"
+do
+	[ -f "${f}" ]
+	[ "$?" -ne "0" ] && echo "File ${f} not found." >&2 && exit 1
+	rpm2cpio "${f}" | ( cd "${OSIMAGE_OTHERPKGDIR}" && cpio -ivd )
+done
+
+mkdir -p "${OSIMAGE_OTHERPKGDIR}"/dkms
+[ -f "${DKMS_RPM}" ]
+[ "$?" -ne "0" ] && echo "File ${DKMS_RPM} not found." >&2 && exit 1
+cp "${DKMS_RPM}" "${OSIMAGE_OTHERPKGDIR}/dkms"
+
+( cd "${OSIMAGE_OTHERPKGDIR}" && createrepo . )
+
+rm -rf "${OSIMAGE_ROOTIMGDIR}"
+
+genimage "${OSIMAGE_NAME}"
+[ "$?" -ne "0" ] && echo "genimage failed" >&2 && exit 1
+packimage "${OSIMAGE_NAME}"
+[ "$?" -ne "0" ] && echo "packimage failed" >&2 && exit 1
+
+makedhcp -n
+rinstall "${COMPUTE_NODE}" "osimage=${OSIMAGE_NAME}"
+
+NETBOOT_TIMEOUT=600
+declare -i WAIT=0
+
+while sleep 10
+do
+	(( WAIT += 10 ))
+	nodestat "${COMPUTE_NODE}" | grep ': sshd$'
+	[ "$?" -eq "0" ] && break
+	[ "${WAIT}" -le "${NETBOOT_TIMEOUT}" ]
+	[ "$?" -ne "0" ] && echo "Netboot failed" >&2 && exit 1
+done
+
+# For workaround the GitHub issue #3549
+sleep 5
+
+xdsh "${COMPUTE_NODE}" date
+[ "$?" -ne "0" ] && echo "Failed connect to compute node via SSH." >&2 && exit 1
+
+xdsh "${COMPUTE_NODE}" 'rpm -q cuda' | grep ': cuda-'
+[ "$?" -ne "0" ] && echo "CUDA installation checking failed" >&2 && exit 1
+
+exit 0

From 2b841c9a308df30c4e1ab682fa1977c0974440e4 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Fri, 28 Jul 2017 18:43:02 +0800
Subject: [PATCH 226/283] Minor tweak of the CUDA installation test case

---
 .../cuda/rhel-cuda-diskless-install.sh        | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
index 81a9a799b..8ee0c7a64 100755
--- a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
+++ b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
@@ -3,12 +3,13 @@
 ########
 # Set all the variables below
 
+LINUX_DISTRO="rhels7.4"
+LINUX_ARCH="ppc64le"
+
 COMPUTE_NODE="c910f03c01p10"
-OSIMAGE_NAME="rhels7.3-ppc64le-netboot-cudafull"
-OSIMAGE_OTHERPKGDIR="/install/post/otherpkgs/rhels7.3/ppc64le"
 SOURCE_BASEDIR="/media/xcat"
 
-RHEL_ISO="${SOURCE_BASEDIR}/RHEL-7.3-20161019.0-Server-ppc64le-dvd1.iso"
+RHEL_ISO="${SOURCE_BASEDIR}/RHEL-7.4-20170711.0-Server-ppc64le-dvd1.iso"
 CUDA_RPMS=(
 	"${SOURCE_BASEDIR}/cuda-repo-rhel7-8-0-local-ga2v2-8.0.61-1.ppc64le.rpm"
 	"${SOURCE_BASEDIR}/cuda-repo-rhel7-8-0-local-cublas-performance-update-8.0.61-1.ppc64le.rpm"
@@ -18,7 +19,9 @@ DKMS_RPM="${SOURCE_BASEDIR}/dkms-2.3-5.20170523git8c3065c.el7.noarch.rpm"
 # Set all the variables above
 ########
 
-OSIMAGE_ROOTIMGDIR="/install/netboot/rhels7.3/ppc64le/${OSIMAGE_NAME}"
+OSIMAGE_NAME="${LINUX_DISTRO}-${LINUX_ARCH}-netboot-cudafull"
+OSIMAGE_OTHERPKGDIR="/install/post/otherpkgs/${LINUX_DISTRO}/${LINUX_ARCH}"
+OSIMAGE_ROOTIMGDIR="/install/netboot/${LINUX_DISTRO}/${LINUX_ARCH}/${OSIMAGE_NAME}"
 
 [ -f "${RHEL_ISO}" ]
 [ "$?" -ne "0" ] && echo "File ${RHEL_ISO} not found." >&2 && exit 1
@@ -31,18 +34,18 @@ mkdef -z <<-EOF
 
 ${OSIMAGE_NAME}:
     objtype=osimage
-    exlist=/opt/xcat/share/xcat/netboot/rh/compute.rhels7.ppc64le.exlist
+    exlist=/opt/xcat/share/xcat/netboot/rh/compute.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.exlist
     imagetype=linux
-    osarch=ppc64le
-    osdistroname=rhels7.3-ppc64le
+    osarch=${LINUX_ARCH}
+    osdistroname=${LINUX_DISTRO}-${LINUX_ARCH}
     osname=Linux
-    osvers=rhels7.3
+    osvers=${LINUX_DISTRO}
     otherpkgdir="${OSIMAGE_OTHERPKGDIR}"
-    otherpkglist=/opt/xcat/share/xcat/netboot/rh/cudafull.rhels7.ppc64le.otherpkgs.pkglist
+    otherpkglist=/opt/xcat/share/xcat/netboot/rh/cudafull.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.otherpkgs.pkglist
     permission=755
-    pkgdir=/install/rhels7.3/ppc64le
-    pkglist=/opt/xcat/share/xcat/netboot/rh/compute.rhels7.ppc64le.pkglist
-    postinstall=/opt/xcat/share/xcat/netboot/rh/compute.rhels7.ppc64le.postinstall
+    pkgdir=/install/${LINUX_DISTRO}/${LINUX_ARCH}
+    pkglist=/opt/xcat/share/xcat/netboot/rh/compute.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.pkglist
+    postinstall=/opt/xcat/share/xcat/netboot/rh/compute.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.postinstall
     profile=compute
     provmethod=netboot
     rootimgdir=${OSIMAGE_ROOTIMGDIR}

From cf9fd117a8be3412a746aaf4967456c35d371365 Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Mon, 31 Jul 2017 13:49:45 +0800
Subject: [PATCH 227/283] Update nodeset manpage for XCATSHOWSVR, with this
 environment variable the output will have server name information.

---
 .../guides/admin-guides/references/man8/nodeset.8.rst  | 10 +++++++++-
 xCAT-client/pods/man8/nodeset.8.pod                    | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man8/nodeset.8.rst b/docs/source/guides/admin-guides/references/man8/nodeset.8.rst
index 35edfcd45..f4674c226 100644
--- a/docs/source/guides/admin-guides/references/man8/nodeset.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/nodeset.8.rst
@@ -40,10 +40,16 @@ changing  the network boot files.  Each xCAT node always boots from the
 network and downloads a boot file with instructions on what  action  to
 take next.
 
-\ **nodeset**\  will manipulate the boot configuration files of yaboot and pxelinux.0.
+\ **nodeset**\  will manipulate the boot configuration files of xnba, grub2, petitboot, yaboot and pxelinux.0.
 
 Assume that /tftpboot is the root for tftpd (set in site(5)|site.5).
 
+\ **nodeset**\  for petitboot makes changes to /tftpboot/petitboot/{node name}
+
+\ **nodeset**\  for xnba makes changes to /tftpboot/xcat/xnba/nodes/{node name}
+
+\ **nodeset**\  for grub2 makes changes to /tftpboot/boot/grub2/{node name}
+
 \ **nodeset**\  for pxe makes changes to /tftpboot/pxelinux.cfg/{node hex ip}
 
 \ **nodeset**\  for yaboot makes changes to /tftpboot/etc/{node hex ip}
@@ -53,6 +59,8 @@ Assume that /tftpboot is the root for tftpd (set in site(5)|site.5).
 \ **nodeset**\   is  called  by \ **rinstall**\  and \ **winstall**\  and is also called by the
 installation process remotely to set the boot state back to "boot".
 
+In a hierarchical cluster which managed by service nodes, the boot stat of the nodes should be kept in consistence on the mn and on the service nodes. Then \ **nodeset**\  command is required to be dispatched to the service nodes for handling the boot configuration files. There are multiple messages for one node from service nodes, it is hard to tell where is the problem from. To make the output more clear, user could run the command with "XCATSHOWSVR=1" environment variable, and then the output message will be appended with the server information.
+
 A user can supply their own scripts to be run on the mn or on the service node (if a hierarchical cluster) for a node when the nodeset command is run. Such scripts are called \ **prescripts**\ . They should be copied to /install/prescripts directory. A table called \ *prescripts*\  is used to specify the scripts and their associated actions. The scripts to be run at the beginning of the nodeset command are stored in the 'begin' column of \ *prescripts*\  table. The scripts to be run at the end of the nodeset command are stored in the 'end' column of \ *prescripts*\  table. You can run 'tabdump -d prescripts' command for details. The following two environment variables will be passed to each script: NODES contains all the names of the nodes that need to run the script for and ACTION contains the current nodeset action. If \ *#xCAT setting:MAX_INSTANCE=number*\  is specified in the script, the script will get invoked for each node in parallel, but no more than \ *number*\  of instances will be invoked at a time. If it is not specified, the script will be invoked once for all the nodes.
 
 
diff --git a/xCAT-client/pods/man8/nodeset.8.pod b/xCAT-client/pods/man8/nodeset.8.pod
index 15618d46d..7934a2d9c 100644
--- a/xCAT-client/pods/man8/nodeset.8.pod
+++ b/xCAT-client/pods/man8/nodeset.8.pod
@@ -21,10 +21,16 @@ changing  the network boot files.  Each xCAT node always boots from the
 network and downloads a boot file with instructions on what  action  to
 take next.
 
-B<nodeset> will manipulate the boot configuration files of yaboot and pxelinux.0.
+B<nodeset> will manipulate the boot configuration files of xnba, grub2, petitboot, yaboot and pxelinux.0.
 
 Assume that /tftpboot is the root for tftpd (set in L<site(5)|site.5>).
 
+B<nodeset> for petitboot makes changes to /tftpboot/petitboot/{node name}
+
+B<nodeset> for xnba makes changes to /tftpboot/xcat/xnba/nodes/{node name}
+
+B<nodeset> for grub2 makes changes to /tftpboot/boot/grub2/{node name}
+
 B<nodeset> for pxe makes changes to /tftpboot/pxelinux.cfg/{node hex ip}
 
 B<nodeset> for yaboot makes changes to /tftpboot/etc/{node hex ip}
@@ -34,6 +40,8 @@ B<nodeset> only sets the next boot state, but does not reboot.
 B<nodeset>  is  called  by B<rinstall> and B<winstall> and is also called by the
 installation process remotely to set the boot state back to "boot".
 
+In a hierarchical cluster which managed by service nodes, the boot stat of the nodes should be kept in consistence on the mn and on the service nodes. Then B<nodeset> command is required to be dispatched to the service nodes for handling the boot configuration files. There are multiple messages for one node from service nodes, it is hard to tell where is the problem from. To make the output more clear, user could run the command with "XCATSHOWSVR=1" environment variable, and then the output message will be appended with the server information.
+
 A user can supply their own scripts to be run on the mn or on the service node (if a hierarchical cluster) for a node when the nodeset command is run. Such scripts are called B<prescripts>. They should be copied to /install/prescripts directory. A table called I<prescripts> is used to specify the scripts and their associated actions. The scripts to be run at the beginning of the nodeset command are stored in the 'begin' column of I<prescripts> table. The scripts to be run at the end of the nodeset command are stored in the 'end' column of I<prescripts> table. You can run 'tabdump -d prescripts' command for details. The following two environment variables will be passed to each script: NODES contains all the names of the nodes that need to run the script for and ACTION contains the current nodeset action. If I<#xCAT setting:MAX_INSTANCE=number> is specified in the script, the script will get invoked for each node in parallel, but no more than I<number> of instances will be invoked at a time. If it is not specified, the script will be invoked once for all the nodes.
 
 

From 03876bb1cd0e792fd92d8b78cdc71414f8eac79e Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Mon, 31 Jul 2017 15:43:53 +0800
Subject: [PATCH 228/283] Make the cuda installation test case to search for
 the binary packages automatically

---
 .../cuda/rhel-cuda-diskfull-install.sh        | 116 +++++++++++++++---
 .../cuda/rhel-cuda-diskless-install.sh        |  94 ++++++++++++--
 2 files changed, 185 insertions(+), 25 deletions(-)

diff --git a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
index ebc1f7cc1..83645da90 100755
--- a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
+++ b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
@@ -3,21 +3,103 @@
 ########
 # Set all the variables below
 
+LINUX_DISTRO="rhels7.4"
+LINUX_ARCH="ppc64le"
+
 COMPUTE_NODE="c910f03c01p10"
-OSIMAGE_NAME="rhels7.3-ppc64le-install-cudafull"
-OSIMAGE_OTHERPKGDIR="/install/post/otherpkgs/rhels7.3/ppc64le"
-SOURCE_BASEDIR="/media/xcat"
+SOURCE_DIR="/media/xcat"
 
-RHEL_ISO="${SOURCE_BASEDIR}/RHEL-7.3-20161019.0-Server-ppc64le-dvd1.iso"
-CUDA_RPMS=(
-	"${SOURCE_BASEDIR}/cuda-repo-rhel7-8-0-local-ga2v2-8.0.61-1.ppc64le.rpm"
-	"${SOURCE_BASEDIR}/cuda-repo-rhel7-8-0-local-cublas-performance-update-8.0.61-1.ppc64le.rpm"
-)
-DKMS_RPM="${SOURCE_BASEDIR}/dkms-2.3-5.20170523git8c3065c.el7.noarch.rpm"
-
-# Set all the variables above
 ########
 
+# $SOURCE_DIR is a directory this test case will be searched for.
+# Files with the name looked like the following will be searched.
+#
+# -rw-r--r-- 1 nobody nobody  124064759 Jun 28 16:58 cuda-repo-rhel7-8-0-local-cublas-performance-update-8.0.61-1.ppc64le.rpm
+# -rw-r--r-- 1 nobody nobody 1331397445 Feb 10 18:17 cuda-repo-rhel7-8-0-local-ga2v2-8.0.61-1.ppc64le.rpm
+# -rw-r--r-- 1 nobody nobody      79404 Jul 27 01:20 dkms-2.3-5.20170523git8c3065c.el7.noarch.rpm
+# -rwxrwxrwx 2 nobody nobody 3283865600 Jul 27 23:21 RHEL-7.4-20170711.0-Server-ppc64le-dvd1.iso
+
+########
+# Auto detect all the source packages from the ${SOURCE_DIR}
+
+[ -d "${SOURCE_DIR}" ]
+[ "$?" -ne "0" ] && echo "Directory ${SOURCE_DIR} not found." >&2 && exit 1
+
+declare RHEL_ISO
+declare -a CUDA_RPMS
+declare DKMS_RPM
+
+for f in "${SOURCE_DIR}"/*
+do
+	r="$(realpath "${f}")"
+	[ -f "${r}" ] || continue
+	case "${r##*/}" in
+	"RHEL-"*"-"*"-Server-${LINUX_ARCH}-dvd1.iso")
+		RHEL_ISO="${r}"
+		;;
+	"cuda-repo-rhel"*"-"*"-local-"*".${LINUX_ARCH}.rpm")
+		if [[ "$(echo "${r##*/}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" \
+			> \
+			"$(echo "${CUDA_RPMS[0]}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" ]]
+		then
+			CUDA_RPMS=("${r}")
+		elif [[ "$(echo "${r##*/}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" \
+			= \
+			"$(echo "${CUDA_RPMS[0]}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" ]]
+		then
+			CUDA_RPMS+=("${r}")
+		fi
+		;;
+	"dkms-"*".el7.noarch.rpm")
+		DKMS_RPM="${r}"
+		;;
+	esac
+done
+
+########
+# Override the auto detect results here.
+
+#RHEL_ISO="${SOURCE_DIR}/RHEL-7.4-20170711.0-Server-ppc64le-dvd1.iso"
+#CUDA_RPMS=(
+#	"${SOURCE_DIR}/cuda-repo-rhel7-8-0-local-ga2v2-8.0.61-1.ppc64le.rpm"
+#	"${SOURCE_DIR}/cuda-repo-rhel7-8-0-local-cublas-performance-update-8.0.61-1.ppc64le.rpm"
+#)
+#DKMS_RPM="${SOURCE_DIR}/dkms-2.3-5.20170523git8c3065c.el7.noarch.rpm"
+
+########
+echo "Red Hat Enterprise Linux Server ISO"
+echo "==================================="
+echo "${RHEL_ISO}"
+echo
+echo "CUDA RPM(s)"
+echo "==========="
+for f in "${CUDA_RPMS[@]}"
+do
+	echo "${f}"
+done
+echo
+echo "DKMS RPM"
+echo "========"
+echo "${DKMS_RPM}"
+echo
+
+echo "The files listed above were found and will be used for this test case"
+echo "Press Ctrl-C to abort!"
+for t in {5..1}
+do
+	echo -n " ... ${t}"
+	sleep 1
+	echo -n -e "\b\b\b\b\b\b"
+done
+########
+
+OSIMAGE_NAME="${LINUX_DISTRO}-${LINUX_ARCH}-install-cudafull"
+OSIMAGE_OTHERPKGDIR="/install/post/otherpkgs/${LINUX_DISTRO}/${LINUX_ARCH}"
+
 [ -f "${RHEL_ISO}" ]
 [ "$?" -ne "0" ] && echo "File ${RHEL_ISO} not found." >&2 && exit 1
 copycds "${RHEL_ISO}"
@@ -30,16 +112,16 @@ mkdef -z <<-EOF
 ${OSIMAGE_NAME}:
     objtype=osimage
     imagetype=linux
-    osarch=ppc64le
-    osdistroname=rhels7.3-ppc64le
+    osarch=${LINUX_ARCH}
+    osdistroname=${LINUX_DISTRO}-${LINUX_ARCH}
     osname=Linux
-    osvers=rhels7.3
+    osvers=${LINUX_DISTRO}
     otherpkgdir="${OSIMAGE_OTHERPKGDIR}"
-    pkgdir=/install/rhels7.3/ppc64le
-    pkglist=/opt/xcat/share/xcat/install/rh/cudafull.rhels7.ppc64le.pkglist
+    pkgdir=/install/${LINUX_DISTRO}/${LINUX_ARCH}
+    pkglist=/opt/xcat/share/xcat/install/rh/cudafull.${LINUX_DISTRO%%.*}.${LINUX_ARCH}.pkglist
     profile=compute
     provmethod=install
-    template=/opt/xcat/share/xcat/install/rh/compute.rhels7.tmpl
+    template=/opt/xcat/share/xcat/install/rh/compute.${LINUX_DISTRO%%.*}.tmpl
 EOF
 [ "$?" -ne "0" ] && echo "Make node definition failed." >&2 && exit 1
 
diff --git a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
index 8ee0c7a64..1e9eeafc5 100755
--- a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
+++ b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
@@ -7,16 +7,94 @@ LINUX_DISTRO="rhels7.4"
 LINUX_ARCH="ppc64le"
 
 COMPUTE_NODE="c910f03c01p10"
-SOURCE_BASEDIR="/media/xcat"
+SOURCE_DIR="/media/xcat"
 
-RHEL_ISO="${SOURCE_BASEDIR}/RHEL-7.4-20170711.0-Server-ppc64le-dvd1.iso"
-CUDA_RPMS=(
-	"${SOURCE_BASEDIR}/cuda-repo-rhel7-8-0-local-ga2v2-8.0.61-1.ppc64le.rpm"
-	"${SOURCE_BASEDIR}/cuda-repo-rhel7-8-0-local-cublas-performance-update-8.0.61-1.ppc64le.rpm"
-)
-DKMS_RPM="${SOURCE_BASEDIR}/dkms-2.3-5.20170523git8c3065c.el7.noarch.rpm"
+########
 
-# Set all the variables above
+# $SOURCE_DIR is a directory this test case will be searched for.
+# Files with the name looked like the following will be searched.
+#
+# -rw-r--r-- 1 nobody nobody  124064759 Jun 28 16:58 cuda-repo-rhel7-8-0-local-cublas-performance-update-8.0.61-1.ppc64le.rpm
+# -rw-r--r-- 1 nobody nobody 1331397445 Feb 10 18:17 cuda-repo-rhel7-8-0-local-ga2v2-8.0.61-1.ppc64le.rpm
+# -rw-r--r-- 1 nobody nobody      79404 Jul 27 01:20 dkms-2.3-5.20170523git8c3065c.el7.noarch.rpm
+# -rwxrwxrwx 2 nobody nobody 3283865600 Jul 27 23:21 RHEL-7.4-20170711.0-Server-ppc64le-dvd1.iso
+
+########
+# Auto detect all the source packages from the ${SOURCE_DIR}
+
+[ -d "${SOURCE_DIR}" ]
+[ "$?" -ne "0" ] && echo "Directory ${SOURCE_DIR} not found." >&2 && exit 1
+
+declare RHEL_ISO
+declare -a CUDA_RPMS
+declare DKMS_RPM
+
+for f in "${SOURCE_DIR}"/*
+do
+	r="$(realpath "${f}")"
+	[ -f "${r}" ] || continue
+	case "${r##*/}" in
+	"RHEL-"*"-"*"-Server-${LINUX_ARCH}-dvd1.iso")
+		RHEL_ISO="${r}"
+		;;
+	"cuda-repo-rhel"*"-"*"-local-"*".${LINUX_ARCH}.rpm")
+		if [[ "$(echo "${r##*/}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" \
+			> \
+			"$(echo "${CUDA_RPMS[0]}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" ]]
+		then
+			CUDA_RPMS=("${r}")
+		elif [[ "$(echo "${r##*/}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" \
+			= \
+			"$(echo "${CUDA_RPMS[0]}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" ]]
+		then
+			CUDA_RPMS+=("${r}")
+		fi
+		;;
+	"dkms-"*".el7.noarch.rpm")
+		DKMS_RPM="${r}"
+		;;
+	esac
+done
+
+########
+# Override the auto detect results here.
+
+#RHEL_ISO="${SOURCE_DIR}/RHEL-7.4-20170711.0-Server-ppc64le-dvd1.iso"
+#CUDA_RPMS=(
+#	"${SOURCE_DIR}/cuda-repo-rhel7-8-0-local-ga2v2-8.0.61-1.ppc64le.rpm"
+#	"${SOURCE_DIR}/cuda-repo-rhel7-8-0-local-cublas-performance-update-8.0.61-1.ppc64le.rpm"
+#)
+#DKMS_RPM="${SOURCE_DIR}/dkms-2.3-5.20170523git8c3065c.el7.noarch.rpm"
+
+########
+echo "Red Hat Enterprise Linux Server ISO"
+echo "==================================="
+echo "${RHEL_ISO}"
+echo
+echo "CUDA RPM(s)"
+echo "==========="
+for f in "${CUDA_RPMS[@]}"
+do
+	echo "${f}"
+done
+echo
+echo "DKMS RPM"
+echo "========"
+echo "${DKMS_RPM}"
+echo
+
+echo "The files listed above were found and will be used for this test case"
+echo "Press Ctrl-C to abort!"
+for t in {5..1}
+do
+	echo -n " ... ${t}"
+	sleep 1
+	echo -n -e "\b\b\b\b\b\b"
+done
 ########
 
 OSIMAGE_NAME="${LINUX_DISTRO}-${LINUX_ARCH}-netboot-cudafull"

From a58e9b4f2eeca91791afe600c7c4ca29459a7d89 Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Mon, 31 Jul 2017 04:21:08 -0400
Subject: [PATCH 229/283] fix issue [FVT] Failed to generate computes.log in
 rhels7.4GA #3561

---
 xCAT/postscripts/syslog | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/xCAT/postscripts/syslog b/xCAT/postscripts/syslog
index 8705aa168..2cb1a7824 100755
--- a/xCAT/postscripts/syslog
+++ b/xCAT/postscripts/syslog
@@ -219,7 +219,6 @@ config_rsyslog_V8()
     # Need to uncomment the lines $ModLoad imudp.so and $UDPServerRun 514,
     # to make the MN be able to receive syslog from remote hosts
     if [ -f "$remoteconf" ]; then
-      
         ##listen on tcp and udp port to enable receiving the xcat debug logs 
         ##forwarded  via tcp/udp protocol
         sed -i 's/#\$ModLoad imudp.so/\$ModLoad imudp.so/; 
@@ -228,9 +227,17 @@ config_rsyslog_V8()
                        s/#\$InputTCPServerRun <port>/\$InputTCPServerRun 514/' $remoteconf
     fi
 
-    #ubuntu16.04 ships rsyslog 8.16.0,which does not ship remote.conf
-    #the configuration for UDP and TCP syslog reception is in rsyslog.conf
+
+    ##listen on tcp and udp port to enable receiving the xcat debug logs 
+    ##forwarded  via tcp/udp protocol
     if [ -f "$conf_file" ]; then
+        #rhels7.4 ships rsyslogd 8.24.0, which does not ship remote.conf
+        #the relevant sections are included in rsyslog.conf
+        sed -i '/#\$ModLoad \+imudp\|imtcp\|imudp.so\|imtcp.so/s/^#//;
+                       /#\$InputTCPServerRun\|UDPServerRun.*/s/^#//' $conf_file
+
+        #ubuntu16.04 ships rsyslog 8.16.0,which does not ship remote.conf
+        #the configuration for UDP and TCP syslog reception is in rsyslog.conf
         sed -i 's/#module(load="imudp")/module(load="imudp")/;
                 s/#input(type="imudp" port="514")/input(type="imudp" port="514")/;
                 s/#module(load="imtcp")/module(load="imtcp")/;
@@ -242,17 +249,18 @@ config_rsyslog_V8()
   else
     # not logging local, forward logging
     # backup the existing remote.conf file from the install
-    if [ ! -f $remoteconf.XCATORIG ]; then
-      cp -f $remoteconf $remoteconf.XCATORIG
+    if [ -f $remoteconf ] && [ ! -f $remoteconf.XCATORIG ]; then
+        cp -f $remoteconf $remoteconf.XCATORIG
     fi
 
     if [ $isSN -eq 1 ];then
-      ##listen on tcp and udp port to enable receiving the xcat debug logs 
-      ##forwarded  via tcp/udp protocol
-      sed -i 's/#\$ModLoad imudp.so/\$ModLoad imudp.so/; 
-                     s/#\$UDPServerRun 514/\$UDPServerRun 514/; 
-                     s/#\$ModLoad imtcp.so/\$ModLoad imtcp.so/; 
-                     s/#\$InputTCPServerRun <port>/\$InputTCPServerRun 514/' $remoteconf
+        ##listen on tcp and udp port to enable receiving the xcat debug logs 
+        ##forwarded  via tcp/udp protocol
+        [ -f "$remoteconf" ] && sed -i '/#\$ModLoad \+imudp\|imtcp\|imudp.so\|imtcp.so/s/^#//;
+                       /#\$InputTCPServerRun\|UDPServerRun.*/s/^#//' $remoteconf 
+
+        [ -f "$conf_file" ] && sed -i '/#\$ModLoad \+imudp\|imtcp\|imudp.so\|imtcp.so/s/^#//;
+                       /#\$InputTCPServerRun\|UDPServerRun.*/s/^#//' $conf_file
     fi
 
 

From 61abd9c6c7e01a0f4e66f193c23fe6304367a9d4 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Mon, 31 Jul 2017 04:37:17 -0400
Subject: [PATCH 230/283] fix 13.1.0.100 is existed in some unknown system

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

diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0
index 55c1f07cc..f0a21ea0e 100644
--- a/xCAT-test/autotest/testcase/confignetwork/cases0
+++ b/xCAT-test/autotest/testcase/confignetwork/cases0
@@ -422,7 +422,7 @@ cmd:mkdef -t network -o 14_1_0_0-255_255_0_0 net=14.1.0.0 mask=255.255.0.0 mgtif
 check:rc==0
 cmd:chdef $$CN nicips.$$SECONDNIC="11.1.0.100|12.1.0.100" nictypes.$$SECONDNIC=Ethernet nicnetworks.$$SECONDNIC="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0" nichostnamesuffixes.$$SECONDNIC="-$$SECONDNIC-1|-$$SECONDNIC-2"
 check:rc==0
-cmd:chdef $$CN nicips.$$THIRDNIC="13.1.0.100|14.1.0.100" nictypes.$$THIRDNIC=Ethernet nicnetworks.$$THIRDNIC="13_1_0_0-255_255_0_0|14_1_0_0-255_255_0_0" nichostnamesuffixes.$$THIRDNIC="-$$THIRDNIC-1|-$$THIRDNIC-2"
+cmd:chdef $$CN nicips.$$THIRDNIC="13.1.0.200|14.1.0.100" nictypes.$$THIRDNIC=Ethernet nicnetworks.$$THIRDNIC="13_1_0_0-255_255_0_0|14_1_0_0-255_255_0_0" nichostnamesuffixes.$$THIRDNIC="-$$THIRDNIC-1|-$$THIRDNIC-2"
 check:rc==0
 cmd:cp /etc/hosts /etc/hosts.bak
 cmd:rc==0
@@ -439,8 +439,8 @@ cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/ne
 check:output=~11.1.0.100
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/sysconfig/network/ifcfg-$$SECONDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 12.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 12.1.0.100 /etc/network/interfaces.d/$$SECONDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~12.1.0.100
-cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 13.1.0.100 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 13.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 13.1.0.100 /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
-check:output=~13.1.0.100
+cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 13.1.0.200 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 13.1.0.200 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 13.1.0.200 /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
+check:output=~13.1.0.200
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/sysconfig/network/ifcfg-$$THIRDNIC"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 14.1.0.100 /etc/sysconfig/network-scripts/ifcfg-$$THIRDNIC:1"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 14.1.0.100 /etc/network/interfaces.d/$$THIRDNIC";else echo "Sorry,this is not supported os"; fi
 check:output=~14.1.0.100
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
@@ -453,7 +453,7 @@ cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifc
 check:rc==0
 cmd:xdsh $$CN "ip addr del 11.1.0.100/16 dev $$SECONDNIC"
 cmd:xdsh $$CN "ip addr del 12.1.0.100/16 dev $$SECONDNIC"
-cmd:xdsh $$CN "ip addr del 13.1.0.100/16 dev $$THIRDNIC"
+cmd:xdsh $$CN "ip addr del 13.1.0.200/16 dev $$THIRDNIC"
 cmd:xdsh $$CN "ip addr del 14.1.0.100/16 dev $$THIRDNIC"
 cmd:if [ -e /tmp/CN.standa ]; then rmdef $$CN; cat /tmp/CN.standa | mkdef -z; rm -rf /tmp/CN.standa; fi
 check:rc==0

From 1586ca799197f8cd41a469698bde8aeaf3e23a85 Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Mon, 31 Jul 2017 04:59:41 -0400
Subject: [PATCH 231/283] fix issue The line 71 of postbootscript
 setbootfromnet is wrong in rhels7.4GA #3562

---
 xCAT/postscripts/setbootfromnet | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT/postscripts/setbootfromnet b/xCAT/postscripts/setbootfromnet
index df5a898e4..a979a03f3 100755
--- a/xCAT/postscripts/setbootfromnet
+++ b/xCAT/postscripts/setbootfromnet
@@ -47,7 +47,7 @@ if [ ! -z $NODE_NAME ]; then
    if [[ $OS = "Linux" ]]; then
       CLIENT_IP=`ping -c 3 $NODE_NAME | sed '/icmp_seq/!d;s/.*(\([0-9.]\+\)).*/\1/' | uniq  2>&1`
       RET=`echo $?`
-      NIC=`ip route | grep "src $CLIENT_IP" | sed -r 's/.*dev (.*)  proto.*/\1/'  2>&1`
+      NIC=`ip route | grep "src $CLIENT_IP" | sed -r 's/.*dev (.*) +proto.*/\1/'  2>&1`
       NRET=`echo $?`
    else ## for AIX
       CLIENT_IP=`ping -c 3 $NODE_NAME | grep "icmp_seq" | sed 's/.*from \([0-9.]*\):.*/\1/' | uniq 2>&1`

From 57be67ad31b4eb7e689f3e81180ab5b0013c86b9 Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Mon, 31 Jul 2017 06:46:40 -0400
Subject: [PATCH 232/283] modify genesis testcase for if xcatmaster=nodename

---
 xCAT-test/autotest/testcase/genesis/genesistest.pl | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/xCAT-test/autotest/testcase/genesis/genesistest.pl b/xCAT-test/autotest/testcase/genesis/genesistest.pl
index f7b376049..47ee8f50d 100755
--- a/xCAT-test/autotest/testcase/genesis/genesistest.pl
+++ b/xCAT-test/autotest/testcase/genesis/genesistest.pl
@@ -18,6 +18,7 @@ my $check_genesis_file;
 my $noderange;
 my $clear_env;
 my $help = 0;
+my $nodestanza;
 $::USAGE = "Usage:
     $program_name -h
     $program_name -n <node_range> -s 
@@ -79,7 +80,11 @@ my $master=`lsdef -t site -i master -c  2>&1 | awk -F'=' '{print \$2}'`;
 if (!$master) { $master=hostname(); }
 chomp($master);
 print "master is $master\n"; 
-
+$nodestanza="/tmp/$noderange.stanza";
+if (!(-e $nodestanza)) {
+    `lsdef $noderange -z > $nodestanza`;
+    `chdef $noderange xcatmaster=$master`;
+} 
 ####################################
 ####nodesetshell test for genesis
 ####################################
@@ -306,6 +311,10 @@ sub clearenv {
         send_msg(0, "rinstall node failed");
         exit 1;
     }
+    if (-e "$nodestanza") {
+    `cat $nodestanza | chdef -z`;
+    unlink("$nodestanza"); 
+    } 
     return 0;
 }
 ####################################

From 2fe55ff4836fca758f0e66ab743bbd5fc42fa87c Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Mon, 31 Jul 2017 07:04:40 -0400
Subject: [PATCH 233/283] modify genesis testcase for if xcatmaster=nodename

---
 xCAT-test/autotest/testcase/genesis/genesistest.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-test/autotest/testcase/genesis/genesistest.pl b/xCAT-test/autotest/testcase/genesis/genesistest.pl
index 47ee8f50d..5d24812a0 100755
--- a/xCAT-test/autotest/testcase/genesis/genesistest.pl
+++ b/xCAT-test/autotest/testcase/genesis/genesistest.pl
@@ -83,7 +83,7 @@ print "master is $master\n";
 $nodestanza="/tmp/$noderange.stanza";
 if (!(-e $nodestanza)) {
     `lsdef $noderange -z > $nodestanza`;
-    `chdef $noderange xcatmaster=$master`;
+    `chdef $noderange xcatmaster= `;
 } 
 ####################################
 ####nodesetshell test for genesis

From 7ffc1bd86d8ffa5d36b99b02153f597f23b6439a Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Wed, 26 Jul 2017 04:11:26 -0400
Subject: [PATCH 234/283] refine xCAT network scripts related document

---
 .../common/deployment/cfg_network.rst         |  10 --
 .../common/deployment/cfg_network_bond.rst    |  58 ----------
 .../common/deployment/cfg_network_vlan.rst    | 109 ------------------
 .../common/deployment/cfg_second_adapter.rst  |   4 +-
 .../network/cfg_network_aliases.rst           |  63 ++++++++++
 .../deployment/network/cfg_network_bond.rst   |  53 +++++++++
 .../network/cfg_network_bond_bridge.rst       |  75 ++++++++++++
 .../network/cfg_network_bond_vlan.rst         |  61 ++++++++++
 .../network/cfg_network_bond_vlan_bridge.rst  |  77 +++++++++++++
 .../deployment/network/cfg_network_bridge.rst |  56 +++++++++
 .../network/cfg_network_custom_scripts.rst    |  30 +++++
 .../network/cfg_network_ethernet_nic.rst      |  76 ++++++++++++
 .../network/cfg_network_extra_param.rst       |  21 ++++
 .../deployment/network/cfg_network_vlan.rst   |  52 +++++++++
 .../network/cfg_network_vlan_bridge.rst       |  63 ++++++++++
 .../diskful/customize_image/cfg_network.rst   |   1 -
 .../customize_image/cfg_network_adapter.rst   |  49 +++++++-
 .../diskless/customize_image/cfg_network.rst  |   1 -
 .../customize_image/cfg_network_adapter.rst   |  49 +++++++-
 19 files changed, 725 insertions(+), 183 deletions(-)
 delete mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst
 delete mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_bond.rst
 delete mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_vlan.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_extra_param.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst
 delete mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network.rst
 delete mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network.rst

diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst
deleted file mode 100644
index e11d21d67..000000000
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Advanced Networking Configuration - confignetwork
-=================================================
-
-**Note:** ``confignetwork`` postscript is only supported on RHEL releases.
-
-.. toctree::
-      :maxdepth: 2
-
-.. include:: ../../../common/deployment/cfg_network_vlan.rst
-.. include:: ../../../common/deployment/cfg_network_bond.rst
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_bond.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_bond.rst
deleted file mode 100644
index b4c31a981..000000000
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_bond.rst
+++ /dev/null
@@ -1,58 +0,0 @@
-Configure Two Bonded Adapters
------------------------------
-
-The following example set the xCAT properties for compute node ``cn1`` to create:
-
-  * Compute node ``cn1`` has two physical NICs: eth2 and eth3  
-  * Bond eth2 and eth3 as ``bond0`` 
-  * Assign ip ``40.0.0.1`` to the bonded interface ``bond0`` 
-
-Define attributes in the ``nics`` table
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-#. Using the ``mkdef`` or ``chdef`` commands  
-
-    a. Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` ::
- 
-        chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet
-   
-    b. Define ``bond0`` and bond ``eth2`` and ``eth3`` as ``bond0`` ::
-
-        chdef cn1 nictypes.bond0=bond nicdevices.bond0="eth2|eth3"
-        chdef cn1 nicips.bond0=40.0.0.1
-
-Add network object into the networks table
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Use the ``chdef`` command to add/modify the networks in the ``networks`` table ::
-
-    chdef -t network net40 net=40.0.0.0 mask=255.0.0.0
-    chdef cn1 nicnetworks.bond0=net40
-
-Add ``confignetwork`` into the node's postscripts list
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Use command below to add ``confignetwork`` into the node's postscripts list ::
-
-    chdef cn1 -p postscripts=confignetwork
-
-
-During OS deployment on compute node, ``confignetwork`` postscript will be executed. 
-If the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript without rebooting the node::
-
-    updatenode cn1 -P confignetwork
-
-
-Verify bonding mode
-~~~~~~~~~~~~~~~~~~~
-
-Login to compute node cn1 and check bonding options in ``/etc/sysconfig/network-scripts/ifcfg-bond0`` file ::
-
-   BONDING_OPTS="mode=802.3ad xmit_hash_policy=layer2+3"
-
-
-* ``mode=802.3ad`` requires additional configuration on the switch. 
-* ``mode=2`` can be used for bonding without additional switch configuration. 
-
-If changes are made to ``/etc/sysconfig/network-scripts/ifcfg-bond0`` file, restart network service.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_vlan.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_vlan.rst
deleted file mode 100644
index 3ddd9606f..000000000
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_network_vlan.rst
+++ /dev/null
@@ -1,109 +0,0 @@
-Configure BOND, VLAN and BRIDGES
---------------------------------
-
-The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support VLAN, BONDs, and BRIDGES. In order for the ``confignetwork`` postscript to run successfully, the following attributes must be configured for the node in the ``nics`` table:
-
-    * ``nicips``
-    * ``nictypes``
-    * ``nicnetworks``
-    * ``nicdevices`` - resolves the relationship among the physical network interface devices
-
-The following example set the xCAT properties for compute node ``cn1`` to achieve the following network configuration using the ``confignetwork`` postscript:
-
-  * Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3``  
-  * Bond ``eth2`` and ``eth3`` as ``bond0`` 
-  * From ``bond0``, create 2 VLANs: ``bond0.1`` and ``bond0.2``
-  * Make bridge ``br1`` using ``bond0.1`` with IP (10.0.0.1)
-  * Make bridge ``br2`` using ``bond0.2`` with IP (20.0.0.1)
-
-Define attributes in the ``nics`` table
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Chose one of two methods described below:
-
-#. Using the ``mkdef`` or ``chdef`` commands  
-
-    a. Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` ::
- 
-        chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet
-   
-    b. Define ``bond0`` and bond ``eth2`` and ``eth3`` as ``bond0`` ::
-
-        chdef cn1 nictypes.bond0=bond \
-                  nicdevices.bond0="eth2|eth3"
-
-    c. From ``bond0``, create 2 VLANs: ``bond0.1`` and ``bond0.2`` ::
-    
-        chdef cn1 nictypes.bond0.1=vlan \
-                  nictypes.bond0.2=vlan \
-                  nicdevices.bond0.1=bond0 \
-                  nicdevices.bond0.2=bond0
-
-    d. Create bridge ``br1`` using ``bond0.1`` with IP (10.0.0.1) ::
-
-        chdef cn1 nictypes.br1=bridge \
-                  nicdevices.br1=bond0.1 \
-                  nicips.br1=10.0.0.1 \
-                  nicnetworks.br1="net10"
-
-    e. Create bridge ``br2`` using ``bond0.2`` with IP (20.0.0.1) ::
-
-        chdef cn1 nictypes.br2=bridge \
-                  nicdevices.br2=bond0.2 \
-                  nicips.br2=20.0.0.1 \
-                  nicnetworks.br2="net20"
-
-#. Using an xCAT stanza file
-
-    - Prepare a stanza file ``<filename>.stanza`` with content similiar to the following: ::
-
-        # <xCAT data object stanza file>
-        cn1:
-          objtype=node
-          arch=x86_64
-          groups=kvm,vm,all
-          nicdevices.br1=bond0.1 
-          nicdevices.br2=bond0.2 
-          nicdevices.bond0.1=bond0 
-          nicdevices.bond0.2=bond0 
-          nicdevices.bond0=eth2|eth3
-          nictypes.eth2=ethernet 
-          nictypes.eth3=ethernet 
-          nictypes.bond0=bond 
-          nictypes.bond0.1=vlan 
-          nictypes.bond0.2=vlan 
-          nictypes.br1=bridge 
-          nictypes.br2=bridge 
-          nicips.br1=10.0.0.1 
-          nicips.br2=20.0.0.1 
-          nicnetworks.br1=net10
-          nicnetworks.br2=net20
-
-    - Using the ``mkdef -z`` option, define the stanza file to xCAT: ::
-
-        cat <filename>.stanza | mkdef -z
-
-Define the additional networks to xCAT
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If this is a new network being created on the compute nodes, an entry needs to be created into the xCAT database.
-
-The ``nicnetworks`` attribute only defines the nic that uses the IP address.
-Other information about the network should be defined in the ``networks`` table.
-
-Use the ``chdef`` command to add/modify the networks in the ``networks`` table ::
-
-    chdef -t network net10 net=10.0.0.0 mask=255.0.0.0
-    chdef -t network net20 net=20.0.0.0 mask=255.0.0.0
-
-Add ``confignetwork`` into the node's postscripts list
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Use the following command to add ``confignetwork`` into postscript list to execute on reboot: ::
-
-    chdef cn1 -p postscripts=confignetwork
-
-If the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript without rebooting the node::
-
-    updatenode cn1 -P confignetwork
-
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_second_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_second_adapter.rst
index ca1da9738..32b8b5a83 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_second_adapter.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_second_adapter.rst
@@ -1,5 +1,5 @@
-Configure Additional Network Interfaces - confignics
-====================================================
+Configure Additional Network Interfaces - confignics - (depleted)
+=================================================================
 
 The **nics** table and the **confignics** postscript can be used to automatically configure additional network interfaces (multiple ethernets adapters, InfiniBand, etc) on the nodes as they are being deployed.
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases.rst
new file mode 100644
index 000000000..384564b55
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases.rst
@@ -0,0 +1,63 @@
+Configure Aliases
+-----------------
+
+The following example set the xCAT properties for compute node ``cn1`` to create:
+
+  * Compute node ``cn1`` has one physical NIC: eth2
+  * User wants to configure aliases ``aliases1-1`` and ``aliases1-2``
+  * Assign ip ``11.1.0.100`` to ``aliases1-1`` and ``12.1.0.100`` to ``aliases1-2``
+
+Add network object into the networks table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Add/modify the networks in the ``networks`` table ::
+
+    chdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0
+    chdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0
+
+Define attributes in the ``nics`` table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+#. Compute node ``cn1`` has one physical NICs: ``eth2`` ::
+
+    chdef cn1 nictypes.eth2=ethernet
+
+#. Define ``nicips``, ``nicaliases``, ``nichostnamesuffixes`` ::
+
+    chdef cn1 nicips.eth2="11.1.0.100|12.1.0.100" nicaliases.eth2="aliases1-1|aliases1-2" nichostnamesuffixes.eth2="-eth2|-eth2-1"
+
+#. Define ``nicnetworks`` ::
+
+    chdef cn1 nicnetworks.eth2="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0"
+
+Update /etc/hosts
+~~~~~~~~~~~~~~~~
+
+#. Update the ``/etc/hosts`` file ::
+
+    makehosts cn1
+
+#. Check the ``/etc/hosts`` file ::
+
+    11.1.0.100 cn1-eth2 cn1-eth2.cluster.com aliases1-1
+    12.1.0.100 cn1-eth2-1 cn1-eth2-1.cluster.com aliases1-2
+
+Enable ``confignetwork`` to configure aliases
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Add ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node ::
+
+    chdef cn1 -p postscripts=confignetwork
+
+#. Or if the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript ::
+
+    updatenode cn1 -P confignetwork
+
+Check the result
+~~~~~~~~~~~~~~~
+
+Check if eth2 is configured correct or not ::
+
+    xdsh cn1 "ip addr show eth2"
+
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst
new file mode 100644
index 000000000..f7b78bc26
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst
@@ -0,0 +1,53 @@
+Configure Bond using two Ethernet Adapters
+------------------------------------------
+
+The following example set the xCAT properties for compute node ``cn1`` to create:
+
+  * Compute node ``cn1`` has two physical NICs: eth2 and eth3  
+  * Bond eth2 and eth3 as ``bond0`` 
+  * Assign ip ``40.0.0.1`` to the bonded interface ``bond0`` 
+
+Add network object into the networks table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Add the network ``net40`` in the ``networks`` table ::
+
+    chdef -t network net40 net=40.0.0.0 mask=255.0.0.0
+
+Define attributes in the ``nics`` table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` ::
+ 
+    chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet
+   
+#. Define ``bond0`` and bond ``eth2`` and ``eth3`` as ``bond0`` ::
+
+    chdef cn1 nictypes.bond0=bond nicdevices.bond0="eth2|eth3"
+    chdef cn1 nicips.bond0=40.0.0.1
+
+#. Define ``nicnetworks`` for ``bond0`` ::
+
+    chdef cn1 nicnetworks.bond0=net40
+
+Enable ``confignetwork`` to configure bond
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. If add ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node ::
+
+    chdef cn1 -p postscripts=confignetwork
+
+#. Or if the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript ::
+
+    updatenode cn1 -P confignetwork
+
+Verify bonding mode
+~~~~~~~~~~~~~~~~~~~
+
+Login to compute node cn1 and check bonding options in ``/etc/sysconfig/network-scripts/ifcfg-bond0`` file ::
+
+   BONDING_OPTS="mode=802.3ad xmit_hash_policy=layer2+3"
+
+
+* ``mode=802.3ad`` requires additional configuration on the switch. 
+
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst
new file mode 100644
index 000000000..2b7f4e896
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst
@@ -0,0 +1,75 @@
+Configure Bridge Based on Bond Adapters
+---------------------------------------
+
+The following example set the xCAT properties for compute node ``cn1`` to create:
+
+  * Compute node ``cn1`` has two physical NICs: eth2 and eth3  
+  * Bond eth2 and eth3 as ``bond0`` 
+  * Create bridge ``br0`` based on ``bond0``
+  * Assign ip ``40.0.0.1`` to the bridge interface ``br0`` 
+
+Add network object into the networks table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Add/modify network data in the ``networks`` table ::
+
+    chdef -t network net40 net=40.0.0.0 mask=255.0.0.0
+
+Define attributes in the ``nics`` table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` ::
+ 
+    chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet
+   
+#. Define ``bond0`` and bond ``eth2`` and ``eth3`` as ``bond0`` ::
+
+    chdef cn1 nictypes.bond0=bond nicdevices.bond0="eth2|eth3"
+
+#. Define ``br0`` based on ``bond0`` ::
+
+    chdef cn1 nicips.br0=40.0.0.1 nictypes.br0=bridge
+
+#. Define ``nicnetworks`` for ``br0`` ::
+
+    chdef cn1 nicnetworks.br0=net40
+
+Enable ``confignetwork`` to configure bridge
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. If add ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node ::
+
+    chdef cn1 -p postscripts=confignetwork
+
+#. Or if the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript ::
+
+    updatenode cn1 -P confignetwork
+
+Verify bridge
+~~~~~~~~~~~~~
+
+Login to compute node cn1 and check bonding options in ``/etc/sysconfig/network-scripts/ifcfg-bond0`` file ::
+
+    DEVICE="bond0"
+    BOOTPROTO="none"
+    NAME="bond0"
+    BONDING_MASTER="yes"
+    ONBOOT="yes"
+    USERCTL="no"
+    TYPE="Bond"
+    BONDING_OPTS="mode=802.3ad miimon=100"
+    DHCLIENTARGS="-timeout 200"
+    BRIDGE=br0
+
+Check ``ifcfg-br0`` under ``/etc/sysconfig/network-scripts/`` ::
+   
+   DEVICE="br0"
+   BOOTPROTO="static"
+   IPADDR="40.0.0.1"
+   NETMASK="255.0.0.0"
+   NAME="br0"
+   ONBOOT="yes"
+   STP="on"
+   TYPE="Bridge"
+
+Use ``ip a`` command to check if ``br0`` and ``bond0`` are correct.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst
new file mode 100644
index 000000000..c58769c8f
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst
@@ -0,0 +1,61 @@
+Configure VLAN Based on Bond Adapters
+-------------------------------------
+
+The following example set the xCAT properties for compute node ``cn1`` to create:
+
+  * Compute node ``cn1`` has two physical NICs: eth2 and eth3  
+  * Bond eth2 and eth3 as ``bond0`` 
+  * Create bridge ``bond0.1`` based on ``bond0``
+  * Assign ip ``40.0.0.1`` to the bridge interface ``bond0.1`` 
+
+Add network object into the networks table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Add/modify the network ``net40`` in the ``networks`` table ::
+
+    chdef -t network net40 net=40.0.0.0 mask=255.0.0.0
+
+Define attributes in the ``nics`` table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` ::
+ 
+    chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet
+   
+#. Define ``bond0`` and bond ``eth2`` and ``eth3`` as ``bond0`` ::
+
+    chdef cn1 nictypes.bond0=bond nicdevices.bond0="eth2|eth3"
+
+#. Define VLAN ``bond0.1`` based on ``bond0`` ::
+
+    chdef cn1 nicips.bond0.1=40.0.0.1 nictypes.bond0.1=vlan
+
+#. Define ``nicnetworks`` for ``bond0.1`` ::
+    chdef cn1 nicnetworks.bond0.1=net40
+
+Enable ``confignetwork`` to configure bridge
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. If add ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node ::
+
+    chdef cn1 -p postscripts=confignetwork
+
+#. Or if the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript ::
+
+    updatenode cn1 -P confignetwork
+
+Verify VLAN
+~~~~~~~~~~~
+
+Login to compute node cn1 and check ``ifcfg-bond0.1`` under ``/etc/sysconfig/network-scripts/`` ::
+   
+   DEVICE="bond0.1"
+   BOOTPROTO="static"
+   IPADDR="40.0.0.1"
+   NETMASK="255.0.0.0"
+   NAME="bond0.1"
+   ONBOOT="yes"
+   USERCTL=no
+   VLAN=yes
+
+Use ``ip a`` command to check if ``br0`` and ``bond0`` are correct.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst
new file mode 100644
index 000000000..b2c3d5737
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst
@@ -0,0 +1,77 @@
+Configure BOND, VLAN and BRIDGES
+--------------------------------
+
+The following example set the xCAT properties for compute node ``cn1`` to achieve the following network configuration using the ``confignetwork`` postscript:
+
+  * Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3``  
+  * Bond ``eth2`` and ``eth3`` as ``bond0`` 
+  * From ``bond0``, create 2 VLANs: ``bond0.1`` and ``bond0.2``
+  * Make bridge ``br1`` using ``bond0.1`` with IP (10.0.0.1)
+  * Make bridge ``br2`` using ``bond0.2`` with IP (20.0.0.1)
+
+Define the additional networks to xCAT
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If this is a new network being created on the compute nodes, an entry needs to be created into the xCAT database.
+
+The ``nicnetworks`` attribute only defines the nic that uses the IP address.
+Other information about the network should be defined in the ``networks`` table.
+
+Add/modify the networks in the ``networks`` table ::
+
+    chdef -t network net10 net=10.0.0.0 mask=255.0.0.0
+    chdef -t network net20 net=20.0.0.0 mask=255.0.0.0
+
+
+Define attributes in the ``nics`` table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Compute node ``cn1`` has two physical NICs: ``eth2`` and ``eth3`` ::
+ 
+    chdef cn1 nictypes.eth2=ethernet nictypes.eth3=ethernet
+   
+#. Define ``bond0`` and bond ``eth2`` and ``eth3`` as ``bond0`` ::
+
+    chdef cn1 nictypes.bond0=bond \
+              nicdevices.bond0="eth2|eth3"
+
+#. From ``bond0``, create 2 VLANs: ``bond0.1`` and ``bond0.2`` ::
+    
+    chdef cn1 nictypes.bond0.1=vlan \
+              nictypes.bond0.2=vlan \
+              nicdevices.bond0.1=bond0 \
+              nicdevices.bond0.2=bond0
+
+#. Create bridge ``br1`` using ``bond0.1`` with IP (10.0.0.1) ::
+
+    chdef cn1 nictypes.br1=bridge \
+              nicdevices.br1=bond0.1 \
+              nicips.br1=10.0.0.1 \
+              nicnetworks.br1="net10"
+
+#. Create bridge ``br2`` using ``bond0.2`` with IP (20.0.0.1) ::
+
+    chdef cn1 nictypes.br2=bridge \
+              nicdevices.br2=bond0.2 \
+              nicips.br2=20.0.0.1 \
+              nicnetworks.br2="net20"
+
+Add ``confignetwork`` into the node's postscripts list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Use the following command to add ``confignetwork`` into postscript list to execute on reboot: ::
+
+    chdef cn1 -p postscripts=confignetwork
+
+#. If the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript without rebooting the node::
+
+    updatenode cn1 -P confignetwork
+
+Check result
+~~~~~~~~~~~~
+
+Use ``ip`` command on ``cn1`` to check all NICs ::
+   
+    xdsh cn1 "ip a"
+
+Check all network configuration files under ``/etc/sysconfig/network-scripts/``.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst
new file mode 100644
index 000000000..f553525dc
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst
@@ -0,0 +1,56 @@
+Configure Bridge Based On Ethernet NIC
+--------------------------------------
+
+The following example set the xCAT properties for compute node ``cn1`` to create:
+
+  * Compute node ``cn1`` has one physical NIC: eth1
+  * User wants to confgure 1 bridge br1 based on eth1
+  * Assign ip ``30.5.106.9`` to br0
+
+Add network object into the networks table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Add/modify the network ``net30`` in the ``networks`` table ::
+
+    chdef -t network net30 net=30.0.0.0 mask=255.0.0.0
+
+Define attributes in the ``nics`` table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Compute node ``cn1`` has one physical NIC: ``eth1`` ::
+
+    chdef cn1 nictypes.eth1=ethernet
+
+#. Define bridge ``br1`` based on ``eth1`` ::
+
+    chdef cn1 nictypes.br1=bridge nicdevices.br1="eth1" 
+    chdef cn1 nicips.br1=30.5.106.9
+
+#. Define ``nicnetworks`` for ``br1`` ::
+
+    chdef cn1 nicnetworks.br1=net30
+
+Enable ``confignetwork`` to configure bridge
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. If add ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node ::
+
+    chdef cn1 -p postscripts=confignetwork
+
+#. Or if the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript ::
+
+    updatenode cn1 -P confignetwork
+
+Verify Bridge
+~~~~~~~~~~~~~
+
+Login to compute node cn1 and check configure files in ``ifcfg-br1`` under ``/etc/sysconfig/network-scripts/`` ::
+
+    TYPE=Bridge
+    STP=on
+
+Check ``ifcfg-eth1`` under ``/etc/sysconfig/network-scripts/`` ::
+   
+    BRIDGE=br1
+
+Use ``ip a`` command to check if ``br1``, ``eth0.6`` and ``eth0.7`` are correct.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst
new file mode 100644
index 000000000..a63ee4608
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst
@@ -0,0 +1,30 @@
+Use Customized Scripts To Configure NIC
+---------------------------------------
+
+If using customized script to configure NIC, ``niccustomscripts`` for the specified nic in ``nics`` table should be configured. In the customized scripts, it can use data from xCAT DB, These data are parsed as global value from ``/xcatpost/mypostscript`` in compute node. Here is a simple example :
+
+  #. Compute node ``cn1`` has one physical NIC: eth1
+  #. Put customized script ``cfgeth1`` under xCAT MN ``/install/postscripts``
+  #. Configure ``niccustomscripts`` in ``nics`` table ::
+      chdef cn1 niccustomscripts.eth1=cfgeth1
+
+  #. The script ``cfgeth1`` uses data from xCAT DB, for example, it uses network ``net50`` from ``networks`` table ::
+
+      chdef -t network net50 net=50.0.0.0 mask=255.0.0.0
+
+     The network ``net50`` is parsed as ``NETWORKS_LINE1`` in ``/xcatpost/mypostscript`` as following, so script ``cfgeth1`` can use global value ``NETWORKS_LINE1`` directly. ::
+
+      NETWORKS_LINE1='netname=net50||net=50.0.0.0||mask=255.0.0.0||mgtifname=||gateway=||dhcpserver=||tftpserver=||nameservers=||ntpservers=||logservers=||dynamicrange=||staticrange=||staticrangeincrement=||nodehostname=||ddnsdomain=||vlanid=||domain=||disable=||comments='
+
+  #. When ``confignetwork`` is running in ``cn1``, ``confignetwork`` will execute ``cfgeth1`` to configure eth1. So add ``confignetwork`` into the node's postscripts list ::
+
+      chdef cn1 -p postscripts=confignetwork
+
+     During OS deployment on compute node, ``confignetwork`` postscript will be executed. If the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript without rebooting the node::
+
+      updatenode cn1 -P confignetwork
+
+  #. Use ``xdsh cn1 "ip addr show eth1"`` to check the NIC
+
+  #. Check ``ifcfg-eth1`` under ``/etc/sysconfig/network-scripts/`` 
+
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst
new file mode 100644
index 000000000..2eba4017a
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst
@@ -0,0 +1,76 @@
+Configure Ethernet Network Interface
+------------------------------------
+
+The following example set the xCAT properties for compute node ``cn1`` to create:
+
+  * Compute node ``cn1`` has two physical NICs: ``eth0`` and ``eth1``
+  * Management network is ``11.1.89.0``, application network is ``13.1.89.0``
+  * The install NIC is eth0, and application NIC is eth1
+  * Assign static ip ``11.1.89.7/24`` to eth0
+  * Assign static ip ``13.1.89.7/24`` to eth1
+
+Add/update networks into the xCAT DB
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Add/update additional networks ``net11`` and ``net13`` into ``networks`` table::    
+
+    chdef -t network net11 net=11.1.89.0 mask=255.255.255.0 
+    chdef -t network net13 net=13.1.89.0 mask=255.255.255.0
+
+**Note:** MTU can be customized as ``mtu`` in ``networks`` table for specified network.
+
+Define Adapters in the nics table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Privision ip is coming from DHCP, it is no need to configure install nic into ``nics`` table. Provision ip can be configured in node definition, but it is not must. ::
+
+    chdef cn1 ip=11.1.89.7
+
+#. Data NIC ``eth1`` is not install NIC, configure ``eth1`` into ``nics`` table  ::
+
+    chdef cn1 nicips.eth1="13.1.89.7" nicnetworks.eth1="net13" nictypes.eth1="Ethernet" nichostnamesuffixes.eth1=-eth2
+
+Update /etc/hosts
+~~~~~~~~~~~~~~~~~
+
+#. Run the ``makehosts`` command to add the new configuration to the ``/etc/hosts`` file.  ::
+
+    makehosts cn1
+
+#. Check ``/etc/hosts`` ::
+
+    cat /etc/hosts
+    11.1.89.7 cn1 cn1.cluster.com
+    13.1.89.7 cn1-eth1 cn1-eth1.cluster.com
+
+Configure adapters with static IPs
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Execute ``confignetwork -s`` to configure both provision ip ``11.1.89.7`` and data ip ``13.1.89.7`` as static
+
+    a. Add ``confignetwork -s`` into postscript list to execute on reboot ::
+
+        chdef cn1 -p postscripts="confignetwork -s"
+
+    b. If the compute node is already running, use ``updatenode`` command to run ``confignetwork -s`` postscript without rebooting the node ::
+
+        updatenode cn1 -P "confignetwork -s"
+
+#. If install NIC is not configured in ``nics`` table, and only configure all other NIC's data defined in ``nics`` table, execute ``confignetwork`` without ``-s``
+
+    a. Add ``confignetwork`` into postscript list to execute on reboot ::
+
+        chdef cn1 -p postscripts="confignetwork"
+
+    b. If the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript without rebooting the node ::
+
+        updatenode cn1 -P "confignetwork"
+
+**Notes:** Option "-s" writes the install NIC's information into configuration file for persistence. All other NIC's data defined in ``nics`` table will be written also. Without option "-s", ``confignetwork`` only configure all NIC's data defined in ``nics`` table.
+
+Check result
+~~~~~~~~~~~~
+
+#. Use ``xdsh cn1 "ip a"`` to check ``eth0`` and ``eth1``
+
+#. Check ``ifcfg-eth0`` and ``ifcfg-eth1`` under ``/etc/sysconfig/network-scripts/``
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_extra_param.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_extra_param.rst
new file mode 100644
index 000000000..25769c31f
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_extra_param.rst
@@ -0,0 +1,21 @@
+Use Extra Parameters In NIC Configuration File
+----------------------------------------------
+
+Use ``nicextraparams`` to customize attribute in NIC configuration file. For example :
+
+  #. Compute node ``cn1`` has one physical NIC: eth1
+  #. Configure network into ``networks`` table, configure ``nicips``, ``nictypes`` and ``nicnetworks`` in ``nics`` table, like :doc:`Configure Ethernet Network Interface<cfg_network_ethernet_nic>`
+  #. In order to customize "MTU=1456 onboot=no" for eth1. configure ``nicips``, ``nictypes`` and ``nicnetworks`` in ``nics`` table , also need to configure ``nicextraparams`` as following::
+
+      chdef cn1 nicextraparams.eth1="MTU=1456 onboot=no"
+
+  #. After ``confignetwork`` is executed in ``cn1``, ``nicexraparams`` will overwrite the original value in ``/etc/sysconfig/network-scripts/ifcfg-eth1`` as ::
+
+      DEVICE=eth1
+      IPADDR=13.1.89.7
+      NETMASK=255.255.255.0
+      BOOTPROTO=static
+      ONBOOT=no
+      HWADDR=42:f5:0a:05:6a:09
+      MTU=1456
+
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan.rst
new file mode 100644
index 000000000..94c63be56
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan.rst
@@ -0,0 +1,52 @@
+Configure VLAN Based on Ethernet Adapter
+----------------------------------------
+
+The following example set the xCAT properties for compute node ``cn1`` to create:
+
+  * Compute node ``cn1`` has one physical NIC: eth0
+  * Confgure 2 vlans: eth0.6 and eth0.7 based on eth0
+  * Assign ip ``60.5.106.9`` to eth0.6 and ``70.5.106.9`` to eth0.7
+
+Define the additional networks to xCAT
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Add/modify the networks ``net60`` and ``net70`` in the ``networks`` table ::
+
+    chdef -t network net60 net=60.0.0.0 mask=255.0.0.0
+    chdef -t network net70 net=70.0.0.0 mask=255.0.0.0
+
+Define attributes in the ``nics`` table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Compute node ``cn1`` has one physical NIC: ``eth0`` ::
+
+    chdef cn1 nictypes.eth0=ethernet
+
+#. Define vlan ``eth0.6`` and ``eth0.7`` based on ``eth0`` ::
+
+    chdef cn1 nictypes.eth0.6=vlan nicdevices.eth0.6="eth0" nictypes.eth0.7=vlan nicdevices.eth0.7="eth0"
+    chdef cn1 nicips.eth0.6=60.5.106.9 nicips.eth0.7=70.5.106.9
+
+#. Define ``nicnetworks`` for ``eth0.6`` and ``eth0.7`` ::
+
+    chdef cn1 nicnetworks.eth0.6=net60 nicnetworks.eth0.7=net70
+
+Enable ``confignetwork`` to configure VLAN
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Add ``confignetwork`` into postscript list to execute on reboot ::
+
+    chdef cn1 -p postscripts=confignetwork
+
+#. If the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript without rebooting the node ::
+
+    updatenode cn1 -P confignetwork
+
+Verify VLAN
+~~~~~~~~~~~
+
+Login to compute node cn1 and check VLAN options in ``ifcfg-eth0.6`` and ``ifcfg-eth0.7`` under ``/etc/sysconfig/network-scripts/`` ::
+
+    VLAN=yes
+
+Use ``ip a`` command to check if ``eth0.6`` and ``eth0.7`` are there.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst
new file mode 100644
index 000000000..031df2b51
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst
@@ -0,0 +1,63 @@
+Configure Bridge Based on VLAN
+------------------------------
+
+The following example set the xCAT properties for compute node ``cn1`` to create:
+
+  * Compute node ``cn1`` has one physical NIC: eth0
+  * Define 2 vlans: eth0.6 and eth0.7 based on eth0
+  * Define 2 bridge br1 and br2
+  * Assign ip ``60.5.106.9`` to br1 and ``70.5.106.9`` to br2
+
+Define attributes in the ``nics`` table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+#. Using the ``mkdef`` or ``chdef`` commands
+
+    a. Compute node ``cn1`` has one physical NIC: ``eth0`` ::
+
+        chdef cn1 nictypes.eth0=ethernet
+
+    b. Define vlan ``eth0.6`` and ``eth0.7`` based on ``eth0`` ::
+
+        chdef cn1 nictypes.eth0.6=vlan nicdevices.eth0.6="eth0" nictypes.eth0.7=vlan nicdevices.eth0.7="eth0"
+
+    c. Define bridge ``br1`` and ``br2`` ::
+
+        chdef cn1 nicips.br1=60.5.106.9 nicips.br2=70.5.106.9 nictypes.br1=bridge nictypes.br2=bridge
+
+Add network object into the networks table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Use the ``chdef`` command to add/modify the networks in the ``networks`` table ::
+
+    chdef -t network net60 net=60.0.0.0 mask=255.0.0.0 
+    chdef -t network net70 net=70.0.0.0 mask=255.0.0.0
+    chdef cn1 nicnetworks.br1=net60 nicnetworks.br2=net70
+
+Add ``confignetwork`` into the node's postscripts list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Use command below to add ``confignetwork`` into the node's postscripts list ::
+
+    chdef cn1 -p postscripts=confignetwork
+
+
+During OS deployment on compute node, ``confignetwork`` postscript will be executed.
+If the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript without rebooting the node::
+
+    updatenode cn1 -P confignetwork
+
+Verify Bridge
+~~~~~~~~~~~~~
+
+Login to compute node cn1 and check ``ifcfg-br1`` and ``ifcfg-br2`` under ``/etc/sysconfig/network-scripts/`` like ::
+
+    BOOTPROTO="static"
+    IPADDR="60.5.106.9"
+    NETMASK="255.0.0.0"
+    NAME="br1"
+    ONBOOT="yes"
+    STP="on"
+    TYPE="Bridge"
+
+Use ``ip a`` command to check if ``br1``, ``br2``, ``eth0.6`` and ``eth0.7``.
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network.rst
deleted file mode 100644
index 27d35cf7d..000000000
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../../common/deployment/cfg_network.rst
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst
index e68b5756f..da079510d 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst
@@ -1,8 +1,55 @@
 Customize network adapter
 =========================
 
+This section introduces how to configure network adapters with persistent configuration using xCAT. 
+
+Networking Adapters Configuration - confignetwork
+-------------------------------------------------
+
+The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. ``confignetwork`` can be used in postscripts during OS privision, it can also be executed in ``updatenode``. The way the confignetwork postscript decides what IP address to give the secondary adapter is by checking the nics table, in which the nic configuration information is stored. In order for the ``confignetwork`` postscript to run successfully, the following attributes must be configured for the node in the ``nics`` table:
+
+    * ``nicips``
+    * ``nictypes``
+    * ``nicnetworks``
+
+If configuring VLAN, BONDs, or BRIDGES, ``nicdevices`` in ``nics`` table must be configured.
+
+    * ``nicdevices`` - resolves the relationship among the physical network interface devices
+
+The following scenarios are standalone typical examples to configure Ethernet adapters/BOND/VLAN/Bridge.
+
+    #. Configure Ethernet adapters: 
+   
+        * Scenario 1: :doc:`Configure Ethernet Network Interface <../../../common/deployment/network/cfg_network_ethernet_nic>`
+          To configure Ethernet install NIC or other Ethernet network adapters as static
+
+    #. Configure BOND **[RHEL]**:
+
+        * Scenario 2: :doc:`Configure Bond using two Ethernet Adapters <../../../common/deployment/network/cfg_network_bond>`
+
+    #. Configure VLAN **[RHEL]**:
+
+        * Scenario 3: :doc:`Configure VLAN Based on Ethernet Adapter <../../../common/deployment/network/cfg_network_vlan>`
+        * Scenario 4: :doc:`Configure VLAN Based on Bond Adapters <../../../common/deployment/network/cfg_network_bond_vlan>`
+
+    #. Configure Bridge **[RHEL]**:
+ 
+        * Scenario 5: :doc:`Configure Bridge Based On Ethernet NIC <../../../common/deployment/network/cfg_network_bridge>`
+        * Scenario 6: :doc:`Configure Bridge Based on Bond Adapters <../../../common/deployment/network/cfg_network_bond_bridge>`
+        * Scenario 7: :doc:`Configure Bridge Based on VLAN <../../../common/deployment/network/cfg_network_vlan_bridge>`
+
+        * Scenario 8: :doc:`Configure Bridge Based on VLAN,VLAN use BOND adapter <../../../common/deployment/network/cfg_network_bond_vlan_bridge>`
+
+    #. Advanced topics:
+    
+        * :doc:`Use Customized Scripts To Configure NIC <../../../common/deployment/network/cfg_network_custom_scripts>`
+        * :doc:`Use Extra Parameters In NIC Configuration File <../../../common/deployment/network/cfg_network_extra_param>`
+        * :doc:`Configure Aliases <../../../common/deployment/network/cfg_network_aliases>`
+ 
+Configure Additional Network Interfaces - confignics - (depleted)
+-----------------------------------------------------------------
+
 .. toctree::
    :maxdepth: 2
 
    cfg_second_adapter.rst
-   cfg_network.rst
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network.rst
deleted file mode 100644
index 27d35cf7d..000000000
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../../common/deployment/cfg_network.rst
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst
index e68b5756f..da079510d 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst
@@ -1,8 +1,55 @@
 Customize network adapter
 =========================
 
+This section introduces how to configure network adapters with persistent configuration using xCAT. 
+
+Networking Adapters Configuration - confignetwork
+-------------------------------------------------
+
+The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. ``confignetwork`` can be used in postscripts during OS privision, it can also be executed in ``updatenode``. The way the confignetwork postscript decides what IP address to give the secondary adapter is by checking the nics table, in which the nic configuration information is stored. In order for the ``confignetwork`` postscript to run successfully, the following attributes must be configured for the node in the ``nics`` table:
+
+    * ``nicips``
+    * ``nictypes``
+    * ``nicnetworks``
+
+If configuring VLAN, BONDs, or BRIDGES, ``nicdevices`` in ``nics`` table must be configured.
+
+    * ``nicdevices`` - resolves the relationship among the physical network interface devices
+
+The following scenarios are standalone typical examples to configure Ethernet adapters/BOND/VLAN/Bridge.
+
+    #. Configure Ethernet adapters: 
+   
+        * Scenario 1: :doc:`Configure Ethernet Network Interface <../../../common/deployment/network/cfg_network_ethernet_nic>`
+          To configure Ethernet install NIC or other Ethernet network adapters as static
+
+    #. Configure BOND **[RHEL]**:
+
+        * Scenario 2: :doc:`Configure Bond using two Ethernet Adapters <../../../common/deployment/network/cfg_network_bond>`
+
+    #. Configure VLAN **[RHEL]**:
+
+        * Scenario 3: :doc:`Configure VLAN Based on Ethernet Adapter <../../../common/deployment/network/cfg_network_vlan>`
+        * Scenario 4: :doc:`Configure VLAN Based on Bond Adapters <../../../common/deployment/network/cfg_network_bond_vlan>`
+
+    #. Configure Bridge **[RHEL]**:
+ 
+        * Scenario 5: :doc:`Configure Bridge Based On Ethernet NIC <../../../common/deployment/network/cfg_network_bridge>`
+        * Scenario 6: :doc:`Configure Bridge Based on Bond Adapters <../../../common/deployment/network/cfg_network_bond_bridge>`
+        * Scenario 7: :doc:`Configure Bridge Based on VLAN <../../../common/deployment/network/cfg_network_vlan_bridge>`
+
+        * Scenario 8: :doc:`Configure Bridge Based on VLAN,VLAN use BOND adapter <../../../common/deployment/network/cfg_network_bond_vlan_bridge>`
+
+    #. Advanced topics:
+    
+        * :doc:`Use Customized Scripts To Configure NIC <../../../common/deployment/network/cfg_network_custom_scripts>`
+        * :doc:`Use Extra Parameters In NIC Configuration File <../../../common/deployment/network/cfg_network_extra_param>`
+        * :doc:`Configure Aliases <../../../common/deployment/network/cfg_network_aliases>`
+ 
+Configure Additional Network Interfaces - confignics - (depleted)
+-----------------------------------------------------------------
+
 .. toctree::
    :maxdepth: 2
 
    cfg_second_adapter.rst
-   cfg_network.rst

From bf9c57f325b913ade079773eb5914a8c04f677ca Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Mon, 31 Jul 2017 21:15:08 -0400
Subject: [PATCH 235/283] Add 'Error' label when unable to get information

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 08c9abc5d..5d76bd340 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -877,7 +877,7 @@ sub parse_node_info {
             if ($openbmc_hash->{$node}->[0]->{'bmc'}) {
                 $node_info{$node}{bmc} = $openbmc_hash->{$node}->[0]->{'bmc'};
             } else {
-                xCAT::SvrUtils::sendmsg("Unable to get attribute bmc", $callback, $node);
+                xCAT::SvrUtils::sendmsg("Error: Unable to get attribute bmc", $callback, $node);
                 $rst = 1;
                 next;
             }
@@ -887,7 +887,7 @@ sub parse_node_info {
             } elsif ($passwd_hash and $passwd_hash->{username}) {
                 $node_info{$node}{username} = $passwd_hash->{username};
             } else {
-                xCAT::SvrUtils::sendmsg("Unable to get attribute username", $callback, $node);
+                xCAT::SvrUtils::sendmsg("Error: Unable to get attribute username", $callback, $node);
                 delete $node_info{$node};
                 $rst = 1;
                 next;
@@ -898,7 +898,7 @@ sub parse_node_info {
             } elsif ($passwd_hash and $passwd_hash->{password}) {
                 $node_info{$node}{password} = $passwd_hash->{password};
             } else {
-                xCAT::SvrUtils::sendmsg("Unable to get attribute password", $callback, $node);
+                xCAT::SvrUtils::sendmsg("Error: Unable to get attribute password", $callback, $node);
                 delete $node_info{$node};
                 $rst = 1;
                 next;
@@ -906,7 +906,7 @@ sub parse_node_info {
 
             $node_info{$node}{cur_status} = "LOGIN_REQUEST";
         } else {
-            xCAT::SvrUtils::sendmsg("Unable to get information from openbmc table", $callback, $node);
+            xCAT::SvrUtils::sendmsg("Error: Unable to get information from openbmc table", $callback, $node);
             $rst = 1;
             next;
         }

From 9226f1f1f44d5eaab0e22df2ea5fe591dae6c1f0 Mon Sep 17 00:00:00 2001
From: Victor Hu <whowutwut@gmail.com>
Date: Mon, 31 Jul 2017 21:35:31 -0400
Subject: [PATCH 236/283] Remove the openbmc version information when running
 xCAT commands

---
 xCAT-server/lib/xcat/plugins/openbmc.pm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 08c9abc5d..d3503e4ea 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -467,9 +467,6 @@ sub parse_args {
     my $extrargs = shift;
     my $noderange = shift;
     my $check = undef;
-
-    xCAT::SvrUtils::sendmsg("[OpenBMC development support] Using this version of xCAT, ensure firmware level is at v1.99.6-0-r1, or higher.", $callback);
-
     my $subcommand = undef;
     my $verbose    = undef;
     unless (GetOptions(

From 38d0f9ba25622646a9b9ef020e704ead8ccf7403 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Tue, 1 Aug 2017 13:01:34 +0800
Subject: [PATCH 237/283] Add symbolic for ubuntu 16.04.2 support (#3576)

---
 .../share/xcat/netboot/ubuntu/compute.ubuntu16.04.2.pkglist      | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu16.04.2.pkglist

diff --git a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu16.04.2.pkglist b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu16.04.2.pkglist
new file mode 120000
index 000000000..e08894338
--- /dev/null
+++ b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu16.04.2.pkglist
@@ -0,0 +1 @@
+compute.ubuntu16.04.1.pkglist
\ No newline at end of file

From c008a1686e4c1fb08412ff38e4cebde10c0fd69a Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Tue, 1 Aug 2017 13:43:13 +0800
Subject: [PATCH 238/283] Adopted review comments and made changes as below:  
 - use -V/--verbose to enable the XCATSHOWSVR, it is more straitforward to
 user.   - refine the manpage based on Mark's comments.

---
 .../guides/admin-guides/references/man8/nodeset.8.rst  | 10 ++++++++--
 xCAT-client/bin/rinstall                               |  9 +++++++++
 xCAT-client/bin/updatenode                             |  9 +++++++++
 xCAT-client/bin/xcatclient                             |  9 +++++++++
 xCAT-client/bin/xcatclientnnr                          |  9 +++++++++
 xCAT-client/pods/man8/nodeset.8.pod                    |  8 ++++++--
 6 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man8/nodeset.8.rst b/docs/source/guides/admin-guides/references/man8/nodeset.8.rst
index f4674c226..1186b8b91 100644
--- a/docs/source/guides/admin-guides/references/man8/nodeset.8.rst
+++ b/docs/source/guides/admin-guides/references/man8/nodeset.8.rst
@@ -19,7 +19,7 @@ Name
 ****************
 
 
-\ **nodeset**\  \ *noderange*\  [\ **boot**\  | \ **stat**\  | \ **offline**\  | \ **runcmd=bmcsetup**\  | \ **osimage**\ [=\ *imagename*\ ] | \ **shell**\  | \ **shutdown**\ ]
+\ **nodeset**\  \ *noderange*\  [\ **boot**\  | \ **stat**\  | \ **offline**\  | \ **runcmd=bmcsetup**\  | \ **osimage**\ [=\ *imagename*\ ] | \ **shell**\  | \ **shutdown**\ ] [\ **-V | -**\ **-verbose**\ ]
 
 \ **nodeset**\  \ *noderange*\  \ **osimage**\ [=\ *imagename*\ ] [\ **-**\ **-noupdateinitrd**\ ] [\ **-**\ **-ignorekernelchk**\ ]
 
@@ -59,7 +59,7 @@ Assume that /tftpboot is the root for tftpd (set in site(5)|site.5).
 \ **nodeset**\   is  called  by \ **rinstall**\  and \ **winstall**\  and is also called by the
 installation process remotely to set the boot state back to "boot".
 
-In a hierarchical cluster which managed by service nodes, the boot stat of the nodes should be kept in consistence on the mn and on the service nodes. Then \ **nodeset**\  command is required to be dispatched to the service nodes for handling the boot configuration files. There are multiple messages for one node from service nodes, it is hard to tell where is the problem from. To make the output more clear, user could run the command with "XCATSHOWSVR=1" environment variable, and then the output message will be appended with the server information.
+In a hierarchical cluster managed by service nodes, \ **nodeset**\  command is used to make sure compute node states are consistent on service and management nodes. When errors are reported, run the command with verbose mode. And the command will display additional service node information, which might be useful in identifying the problem.
 
 A user can supply their own scripts to be run on the mn or on the service node (if a hierarchical cluster) for a node when the nodeset command is run. Such scripts are called \ **prescripts**\ . They should be copied to /install/prescripts directory. A table called \ *prescripts*\  is used to specify the scripts and their associated actions. The scripts to be run at the beginning of the nodeset command are stored in the 'begin' column of \ *prescripts*\  table. The scripts to be run at the end of the nodeset command are stored in the 'end' column of \ *prescripts*\  table. You can run 'tabdump -d prescripts' command for details. The following two environment variables will be passed to each script: NODES contains all the names of the nodes that need to run the script for and ACTION contains the current nodeset action. If \ *#xCAT setting:MAX_INSTANCE=number*\  is specified in the script, the script will get invoked for each node in parallel, but no more than \ *number*\  of instances will be invoked at a time. If it is not specified, the script will be invoked once for all the nodes.
 
@@ -133,6 +133,12 @@ A user can supply their own scripts to be run on the mn or on the service node (
  
 
 
+\ **-V | -**\ **-verbose**\ 
+ 
+ Verbose mode.
+ 
+
+
 \ **-h | -**\ **-help**\ 
  
  Print help.
diff --git a/xCAT-client/bin/rinstall b/xCAT-client/bin/rinstall
index 9d989a2e7..0a69b158f 100755
--- a/xCAT-client/bin/rinstall
+++ b/xCAT-client/bin/rinstall
@@ -67,6 +67,15 @@ push(@{ $cmdref->{arg} }, @ARGV);
 
 my $noderange = $cmdref->{noderange}->[0];    # save the noderange
 
+# Allow to print server information when -V/--verbose
+foreach (reverse(@ARGV)) {
+    print $_;
+    if ($_ eq '-V' || $_ eq '--verbose') {
+        $ENV{'XCATSHOWSVR'} = 1;
+        last;
+    }
+}
+
 # ok call Client to run the plugin rinstall.pm
 xCAT::Client::submit_request($cmdref, \&xCAT::Client::handle_response);
 
diff --git a/xCAT-client/bin/updatenode b/xCAT-client/bin/updatenode
index 17e52db8e..bb7ddd80a 100755
--- a/xCAT-client/bin/updatenode
+++ b/xCAT-client/bin/updatenode
@@ -200,5 +200,14 @@ foreach (keys %ENV) {
     }
 }
 
+# Allow to print server information when -V/--verbose
+foreach (reverse(@ARGV)) {
+    print $_;
+    if ($_ eq '-V' || $_ eq '--verbose') {
+        $ENV{'XCATSHOWSVR'} = 1;
+        last;
+    }
+}
+
 xCAT::Client::submit_request($cmdref, \&xCAT::Client::handle_response);
 exit $xCAT::Client::EXITCODE;
diff --git a/xCAT-client/bin/xcatclient b/xCAT-client/bin/xcatclient
index 83a918941..c59f59685 100755
--- a/xCAT-client/bin/xcatclient
+++ b/xCAT-client/bin/xcatclient
@@ -102,5 +102,14 @@ foreach (keys %ENV) {
     }
 }
 
+# Allow to print server information when -V
+foreach (reverse(@ARGV)) {
+    print $_;
+    if ($_ eq '-V') {
+        $ENV{'XCATSHOWSVR'} = 1;
+        last;
+    }
+}
+
 xCAT::Client::submit_request($cmdref, \&xCAT::Client::handle_response);
 exit $xCAT::Client::EXITCODE;
diff --git a/xCAT-client/bin/xcatclientnnr b/xCAT-client/bin/xcatclientnnr
index e33b80408..bb980801b 100755
--- a/xCAT-client/bin/xcatclientnnr
+++ b/xCAT-client/bin/xcatclientnnr
@@ -51,6 +51,15 @@ foreach (keys %ENV) {
     }
 }
 
+# Allow to print server information when -V/--verbose
+foreach (reverse(@ARGV)) {
+    print $_;
+    if ($_ eq '-V' || $_ eq '--verbose') {
+        $ENV{'XCATSHOWSVR'} = 1;
+        last;
+    }
+}
+
 xCAT::Client::submit_request($cmdref, \&xCAT::Client::handle_response);
 exit $xCAT::Client::EXITCODE;
 
diff --git a/xCAT-client/pods/man8/nodeset.8.pod b/xCAT-client/pods/man8/nodeset.8.pod
index 7934a2d9c..bd53594fd 100644
--- a/xCAT-client/pods/man8/nodeset.8.pod
+++ b/xCAT-client/pods/man8/nodeset.8.pod
@@ -4,7 +4,7 @@ B<nodeset> - set the boot state for a noderange
 
 =head1 B<Synopsis>
 
-B<nodeset> I<noderange> [B<boot> | B<stat> | B<offline> | B<runcmd=bmcsetup> | B<osimage>[=I<imagename>] | B<shell> | B<shutdown>]
+B<nodeset> I<noderange> [B<boot> | B<stat> | B<offline> | B<runcmd=bmcsetup> | B<osimage>[=I<imagename>] | B<shell> | B<shutdown>] [B<-V>|B<--verbose>]
 
 B<nodeset> I<noderange> B<osimage>[=I<imagename>] [B<--noupdateinitrd>] [B<--ignorekernelchk>]
 
@@ -40,7 +40,7 @@ B<nodeset> only sets the next boot state, but does not reboot.
 B<nodeset>  is  called  by B<rinstall> and B<winstall> and is also called by the
 installation process remotely to set the boot state back to "boot".
 
-In a hierarchical cluster which managed by service nodes, the boot stat of the nodes should be kept in consistence on the mn and on the service nodes. Then B<nodeset> command is required to be dispatched to the service nodes for handling the boot configuration files. There are multiple messages for one node from service nodes, it is hard to tell where is the problem from. To make the output more clear, user could run the command with "XCATSHOWSVR=1" environment variable, and then the output message will be appended with the server information.
+In a hierarchical cluster managed by service nodes, B<nodeset> command is used to make sure compute node states are consistent on service and management nodes. When errors are reported, run the command with verbose mode. And the command will display additional service node information, which might be useful in identifying the problem.
 
 A user can supply their own scripts to be run on the mn or on the service node (if a hierarchical cluster) for a node when the nodeset command is run. Such scripts are called B<prescripts>. They should be copied to /install/prescripts directory. A table called I<prescripts> is used to specify the scripts and their associated actions. The scripts to be run at the beginning of the nodeset command are stored in the 'begin' column of I<prescripts> table. The scripts to be run at the end of the nodeset command are stored in the 'end' column of I<prescripts> table. You can run 'tabdump -d prescripts' command for details. The following two environment variables will be passed to each script: NODES contains all the names of the nodes that need to run the script for and ACTION contains the current nodeset action. If I<#xCAT setting:MAX_INSTANCE=number> is specified in the script, the script will get invoked for each node in parallel, but no more than I<number> of instances will be invoked at a time. If it is not specified, the script will be invoked once for all the nodes.
 
@@ -92,6 +92,10 @@ The node will also be able to be sshed into and have utilities such as wget, tft
 
 To make the node to get into power off status. This status only can be used after B<runcmd> and B<runimage> to power off the node after the performing of operations.
 
+=item B<-V>|B<--verbose>
+
+Verbose mode.
+
 =item B<-h>|B<--help>
 
 Print help.

From 91ad73ec29b75cb2ad0a63184e1ea461caf4ec14 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Tue, 1 Aug 2017 13:48:29 +0800
Subject: [PATCH 239/283] Add script ubuntu-cuda-diskless-install.sh

---
 .../cuda/ubuntu-cuda-diskless-install.sh      | 182 ++++++++++++++++++
 1 file changed, 182 insertions(+)
 create mode 100755 xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskless-install.sh

diff --git a/xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskless-install.sh b/xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskless-install.sh
new file mode 100755
index 000000000..bc52aed55
--- /dev/null
+++ b/xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskless-install.sh
@@ -0,0 +1,182 @@
+#!/bin/bash
+
+########
+# Set all the variables below
+
+LINUX_DISTRO="ubuntu16.04.2"
+LINUX_ARCH="ppc64el"
+
+COMPUTE_NODE="c910f03c11k06"
+SOURCE_DIR="/media/xcat"
+
+########
+
+# $SOURCE_DIR is a directory this test case will be searched for.
+# Files with the name looked like the following will be searched.
+#
+# -rw-r--r-- 1 nobody nobody  124037944 Jun 28 17:00 cuda-repo-ubuntu1604-8-0-local-cublas-performance-update_8.0.61-1_ppc64el.deb
+# -rw-r--r-- 1 nobody nobody 1321330418 Feb 10 18:18 cuda-repo-ubuntu1604-8-0-local-ga2v2_8.0.61-1_ppc64el.deb
+# -rw-r--r-- 1 nobody nobody   69365760 Jul 27 20:35 mini.iso
+# -rw-r--r-- 1 nobody nobody  927946752 Feb 15 15:57 ubuntu-16.04.2-server-ppc64el.iso
+
+########
+# Auto detect all the source packages from the ${SOURCE_DIR}
+
+[ -d "${SOURCE_DIR}" ]
+[ "$?" -ne "0" ] && echo "Directory ${SOURCE_DIR} not found." >&2 && exit 1
+
+declare UBUNTU_ISO
+declare UBUNTU_MINI_ISO
+declare -a CUDA_DEBS
+
+for f in "${SOURCE_DIR}"/*
+do
+	r="$(realpath "${f}")"
+	[ -f "${r}" ] || continue
+	case "${r##*/}" in
+	"ubuntu-"*"-server-${LINUX_ARCH}.iso")
+		UBUNTU_ISO="${r}"
+		;;
+	*"mini.iso")
+		UBUNTU_MINI_ISO="${r}"
+		;;
+	"cuda-repo-ubuntu"*"-"*"-local-"*"_${LINUX_ARCH}.deb")
+		if [[ "$(echo "${r##*/}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" \
+			> \
+			"$(echo "${CUDA_DEBS[0]}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" ]]
+		then
+			CUDA_DEBS=("${r}")
+		elif [[ "$(echo "${r##*/}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" \
+			= \
+			"$(echo "${CUDA_DEBS[0]}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" ]]
+		then
+			CUDA_DEBS+=("${r}")
+		fi
+		;;
+	esac
+done
+
+########
+# Override the auto detect results here.
+
+#UBUNTU_ISO="${SOURCE_DIR}/ubuntu-16.04.2-server-ppc64el.iso"
+#UBUNTU_MINI_ISO="${SOURCE_DIR}/mini.iso"
+#CUDA_DEBS=(
+#	"${SOURCE_DIR}/cuda-repo-ubuntu1604-8-0-local-ga2v2_8.0.61-1_ppc64el.deb"
+#	"${SOURCE_DIR}/cuda-repo-ubuntu1604-8-0-local-cublas-performance-update_8.0.61-1_ppc64el.deb"
+#)
+
+########
+echo "Ubuntu ISO"
+echo "==================================="
+echo "${UBUNTU_ISO}"
+echo
+echo "Ubuntu mini ISO"
+echo "==================================="
+echo "${UBUNTU_MINI_ISO}"
+echo
+echo "CUDA DEB(s)"
+echo "==========="
+for f in "${CUDA_DEBS[@]}"
+do
+	echo "${f}"
+done
+echo
+
+echo "The files listed above were found and will be used for this test case"
+echo "Press Ctrl-C to abort!"
+for t in {5..1}
+do
+	echo -n " ... ${t}"
+	sleep 1
+	echo -n -e "\b\b\b\b\b\b"
+done
+########
+
+OSIMAGE_NAME="${LINUX_DISTRO}-${LINUX_ARCH}-netboot-cudafull"
+OSIMAGE_OTHERPKGDIR="/install/post/otherpkgs/${LINUX_DISTRO}/${LINUX_ARCH}"
+OSIMAGE_ROOTIMGDIR="/install/netboot/${LINUX_DISTRO}/${LINUX_ARCH}/${OSIMAGE_NAME}"
+
+[ -f "${UBUNTU_ISO}" ]
+[ "$?" -ne "0" ] && echo "File ${UBUNTU_ISO} not found." >&2 && exit 1
+copycds "${UBUNTU_ISO}"
+[ "$?" -ne "0" ] && echo "Copy CD failed." >&2 && exit 1
+
+[ -f "${UBUNTU_MINI_ISO}" ]
+[ "$?" -ne "0" ] && echo "File ${UBUNTU_MINI_ISO} not found." >&2 && exit 1
+MOUNT_POINT="/tmp/ubuntu-mini-iso-$$"
+mkdir -p "${MOUNT_POINT}"
+mount -o loop "${UBUNTU_MINI_ISO}" "${MOUNT_POINT}"
+mkdir -p "/install/${LINUX_DISTRO}/${LINUX_ARCH}/install/netboot"
+cp "${MOUNT_POINT}/install/"* "/install/${LINUX_DISTRO}/${LINUX_ARCH}/install/netboot"
+umount "${MOUNT_POINT}"
+rmdir "${MOUNT_POINT}"
+
+rmdef -t osimage "${OSIMAGE_NAME}"
+mkdef -z <<-EOF
+# <xCAT data object stanza file>
+
+${OSIMAGE_NAME}:
+    objtype=osimage
+    exlist=/opt/xcat/share/xcat/netboot/ubuntu/compute.exlist
+    imagetype=linux
+    osarch=${LINUX_ARCH}
+    osname=Linux
+    osvers=${LINUX_DISTRO}
+    otherpkgdir=${OSIMAGE_OTHERPKGDIR}/var/cuda/repo-8-0-local-ga2v2,http://ports.ubuntu.com/ubuntu-ports/ xenial
+    otherpkglist=/opt/xcat/share/xcat/netboot/ubuntu/cudafull.otherpkgs.pkglist
+    permission=755
+    pkgdir=/install/${LINUX_DISTRO}/${LINUX_ARCH}
+    pkglist=/opt/xcat/share/xcat/netboot/ubuntu/compute.${LINUX_DISTRO}.pkglist
+    postinstall=/opt/xcat/share/xcat/netboot/ubuntu/compute.postinstall
+    profile=compute
+    provmethod=netboot
+    rootimgdir=${OSIMAGE_ROOTIMGDIR}
+EOF
+[ "$?" -ne "0" ] && echo "Make node definition failed." >&2 && exit 1
+
+rm -rf "${OSIMAGE_OTHERPKGDIR}"
+mkdir -p "${OSIMAGE_OTHERPKGDIR}"
+for f in "${CUDA_DEBS[@]}"
+do
+	[ -f "${f}" ]
+	[ "$?" -ne "0" ] && echo "File ${f} not found." >&2 && exit 1
+	dpkg -x "${f}" "${OSIMAGE_OTHERPKGDIR}"
+done
+
+rm -rf "${OSIMAGE_ROOTIMGDIR}"
+
+genimage "${OSIMAGE_NAME}"
+[ "$?" -ne "0" ] && echo "genimage failed" >&2 && exit 1
+packimage "${OSIMAGE_NAME}"
+[ "$?" -ne "0" ] && echo "packimage failed" >&2 && exit 1
+
+makedhcp -n
+rinstall "${COMPUTE_NODE}" "osimage=${OSIMAGE_NAME}"
+
+NETBOOT_TIMEOUT=600
+declare -i WAIT=0
+
+while sleep 10
+do
+	(( WAIT += 10 ))
+	nodestat "${COMPUTE_NODE}" | grep ': sshd$'
+	[ "$?" -eq "0" ] && break
+	[ "${WAIT}" -le "${NETBOOT_TIMEOUT}" ]
+	[ "$?" -ne "0" ] && echo "Netboot failed" >&2 && exit 1
+done
+
+# For workaround the GitHub issue #3549
+sleep 5
+
+xdsh "${COMPUTE_NODE}" date
+[ "$?" -ne "0" ] && echo "Failed connect to compute node via SSH." >&2 && exit 1
+
+xdsh "${COMPUTE_NODE}" 'rpm -q cuda' | grep ': cuda-'
+[ "$?" -ne "0" ] && echo "CUDA installation checking failed" >&2 && exit 1
+
+exit 0

From cb00d0e154cb42022364590bf69f745e936993a4 Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Tue, 1 Aug 2017 02:31:24 -0400
Subject: [PATCH 240/283] [fvt] 'pgsqlsetup -i ' does not work well in rhels7.3
 and rhels7.4 #3579

---
 xCAT-client/bin/pgsqlsetup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-client/bin/pgsqlsetup b/xCAT-client/bin/pgsqlsetup
index 7446f7aeb..5e9152c3c 100755
--- a/xCAT-client/bin/pgsqlsetup
+++ b/xCAT-client/bin/pgsqlsetup
@@ -760,7 +760,7 @@ sub initpgdb
         {
             $insertstr .= "host    all          all        ";
             $insertstr .= $hbaaccess;
-            $insertstr .= "\/32      md5\n "; # add entry line to string
+            $insertstr .= "\/32      md5\\n "; # add entry line to string
         }
       }
     $cmd = "awk '{gsub(\"\IPv4 local connections:\",\"\IPv4 local connections:\\n$insertstr \"); print}'   $hbafile > $hbafile.xcat";

From 29d045ae15db53d5aba2740f7e6e4319abb2c19f Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Tue, 1 Aug 2017 15:03:26 +0800
Subject: [PATCH 241/283] Add script ubuntu-cuda-diskfull-install.sh

---
 .../cuda/ubuntu-cuda-diskfull-install.sh      | 170 ++++++++++++++++++
 1 file changed, 170 insertions(+)
 create mode 100755 xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskfull-install.sh

diff --git a/xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskfull-install.sh b/xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskfull-install.sh
new file mode 100755
index 000000000..8790427c6
--- /dev/null
+++ b/xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskfull-install.sh
@@ -0,0 +1,170 @@
+#!/bin/bash
+
+########
+# Set all the variables below
+
+LINUX_DISTRO="ubuntu16.04.2"
+LINUX_ARCH="ppc64el"
+
+COMPUTE_NODE="c910f03c11k06"
+SOURCE_DIR="/media/xcat"
+
+########
+
+# $SOURCE_DIR is a directory this test case will be searched for.
+# Files with the name looked like the following will be searched.
+#
+# -rw-r--r-- 1 nobody nobody  124037944 Jun 28 17:00 cuda-repo-ubuntu1604-8-0-local-cublas-performance-update_8.0.61-1_ppc64el.deb
+# -rw-r--r-- 1 nobody nobody 1321330418 Feb 10 18:18 cuda-repo-ubuntu1604-8-0-local-ga2v2_8.0.61-1_ppc64el.deb
+# -rw-r--r-- 1 nobody nobody   69365760 Jul 27 20:35 mini.iso
+# -rw-r--r-- 1 nobody nobody  927946752 Feb 15 15:57 ubuntu-16.04.2-server-ppc64el.iso
+
+########
+# Auto detect all the source packages from the ${SOURCE_DIR}
+
+[ -d "${SOURCE_DIR}" ]
+[ "$?" -ne "0" ] && echo "Directory ${SOURCE_DIR} not found." >&2 && exit 1
+
+declare UBUNTU_ISO
+declare UBUNTU_MINI_ISO
+declare -a CUDA_DEBS
+
+for f in "${SOURCE_DIR}"/*
+do
+	r="$(realpath "${f}")"
+	[ -f "${r}" ] || continue
+	case "${r##*/}" in
+	"ubuntu-"*"-server-${LINUX_ARCH}.iso")
+		UBUNTU_ISO="${r}"
+		;;
+	*"mini.iso")
+		UBUNTU_MINI_ISO="${r}"
+		;;
+	"cuda-repo-ubuntu"*"-"*"-local-"*"_${LINUX_ARCH}.deb")
+		if [[ "$(echo "${r##*/}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" \
+			> \
+			"$(echo "${CUDA_DEBS[0]}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" ]]
+		then
+			CUDA_DEBS=("${r}")
+		elif [[ "$(echo "${r##*/}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" \
+			= \
+			"$(echo "${CUDA_DEBS[0]}" |
+			sed -e 's#.*\([0-9]\+.[0-9]\+.[0-9]\+-[0-9]\+\).*#\1#')" ]]
+		then
+			CUDA_DEBS+=("${r}")
+		fi
+		;;
+	esac
+done
+
+########
+# Override the auto detect results here.
+
+#UBUNTU_ISO="${SOURCE_DIR}/ubuntu-16.04.2-server-ppc64el.iso"
+#UBUNTU_MINI_ISO="${SOURCE_DIR}/mini.iso"
+#CUDA_DEBS=(
+#	"${SOURCE_DIR}/cuda-repo-ubuntu1604-8-0-local-ga2v2_8.0.61-1_ppc64el.deb"
+#	"${SOURCE_DIR}/cuda-repo-ubuntu1604-8-0-local-cublas-performance-update_8.0.61-1_ppc64el.deb"
+#)
+
+########
+echo "Ubuntu ISO"
+echo "==================================="
+echo "${UBUNTU_ISO}"
+echo
+echo "Ubuntu mini ISO"
+echo "==================================="
+echo "${UBUNTU_MINI_ISO}"
+echo
+echo "CUDA DEB(s)"
+echo "==========="
+for f in "${CUDA_DEBS[@]}"
+do
+	echo "${f}"
+done
+echo
+
+echo "The files listed above were found and will be used for this test case"
+echo "Press Ctrl-C to abort!"
+for t in {5..1}
+do
+	echo -n " ... ${t}"
+	sleep 1
+	echo -n -e "\b\b\b\b\b\b"
+done
+########
+
+OSIMAGE_NAME="${LINUX_DISTRO}-${LINUX_ARCH}-install-cudafull"
+OSIMAGE_OTHERPKGDIR="/install/post/otherpkgs/${LINUX_DISTRO}/${LINUX_ARCH}"
+
+[ -f "${UBUNTU_ISO}" ]
+[ "$?" -ne "0" ] && echo "File ${UBUNTU_ISO} not found." >&2 && exit 1
+copycds "${UBUNTU_ISO}"
+[ "$?" -ne "0" ] && echo "Copy CD failed." >&2 && exit 1
+
+[ -f "${UBUNTU_MINI_ISO}" ]
+[ "$?" -ne "0" ] && echo "File ${UBUNTU_MINI_ISO} not found." >&2 && exit 1
+MOUNT_POINT="/tmp/ubuntu-mini-iso-$$"
+mkdir -p "${MOUNT_POINT}"
+mount -o loop "${UBUNTU_MINI_ISO}" "${MOUNT_POINT}"
+mkdir -p "/install/${LINUX_DISTRO}/${LINUX_ARCH}/install/netboot"
+cp "${MOUNT_POINT}/install/"* "/install/${LINUX_DISTRO}/${LINUX_ARCH}/install/netboot"
+umount "${MOUNT_POINT}"
+rmdir "${MOUNT_POINT}"
+
+rmdef -t osimage "${OSIMAGE_NAME}"
+mkdef -z <<-EOF
+# <xCAT data object stanza file>
+
+${OSIMAGE_NAME}:
+    objtype=osimage
+    imagetype=linux
+    osarch=${LINUX_ARCH}
+    osname=Linux
+    osvers=${LINUX_DISTRO}
+    otherpkgdir=${OSIMAGE_OTHERPKGDIR}/var/cuda/repo-8-0-local-ga2v2,http://ports.ubuntu.com/ubuntu-ports/ xenial
+    pkgdir=/install/${LINUX_DISTRO}/${LINUX_ARCH}
+    pkglist=/opt/xcat/share/xcat/install/ubuntu/compute.${LINUX_DISTRO}.${LINUX_ARCH}.pkglist
+    profile=compute
+    provmethod=install
+    template=/opt/xcat/share/xcat/install/ubuntu/compute.tmpl
+EOF
+[ "$?" -ne "0" ] && echo "Make node definition failed." >&2 && exit 1
+
+rm -rf "${OSIMAGE_OTHERPKGDIR}"
+mkdir -p "${OSIMAGE_OTHERPKGDIR}"
+for f in "${CUDA_DEBS[@]}"
+do
+	[ -f "${f}" ]
+	[ "$?" -ne "0" ] && echo "File ${f} not found." >&2 && exit 1
+	dpkg -x "${f}" "${OSIMAGE_OTHERPKGDIR}"
+done
+
+makedhcp -n
+rinstall "${COMPUTE_NODE}" "osimage=${OSIMAGE_NAME}"
+
+NETBOOT_TIMEOUT=600
+declare -i WAIT=0
+
+while sleep 10
+do
+	(( WAIT += 10 ))
+	nodestat "${COMPUTE_NODE}" | grep ': sshd$'
+	[ "$?" -eq "0" ] && break
+	[ "${WAIT}" -le "${NETBOOT_TIMEOUT}" ]
+	[ "$?" -ne "0" ] && echo "Netboot failed" >&2 && exit 1
+done
+
+# For workaround the GitHub issue #3549
+sleep 5
+
+xdsh "${COMPUTE_NODE}" date
+[ "$?" -ne "0" ] && echo "Failed connect to compute node via SSH." >&2 && exit 1
+
+xdsh "${COMPUTE_NODE}" 'rpm -q cuda' | grep ': cuda-'
+[ "$?" -ne "0" ] && echo "CUDA installation checking failed" >&2 && exit 1
+
+exit 0

From 7b69cf4520de1814c828c7e1abf9e1b95a125ed6 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Tue, 1 Aug 2017 03:06:10 -0400
Subject: [PATCH 242/283] enhanced doc based on comments

---
 .../network/cfg_network_aliases.rst           | 16 +++---
 .../deployment/network/cfg_network_bond.rst   |  8 +--
 .../network/cfg_network_bond_bridge.rst       |  6 +-
 .../network/cfg_network_bond_vlan.rst         |  8 +--
 .../network/cfg_network_bond_vlan_bridge.rst  |  2 +-
 .../deployment/network/cfg_network_bridge.rst |  2 +-
 .../network/cfg_network_custom_scripts.rst    |  8 +--
 .../network/cfg_network_ethernet_nic.rst      |  8 +--
 .../network/cfg_network_extra_param.rst       |  8 +--
 .../{ => network}/cfg_second_adapter.rst      |  4 +-
 .../customize_image/cfg_network_adapter.rst   | 55 -------------------
 .../customize_image/cfg_second_adapter.rst    |  2 -
 .../ppc64le/diskful/customize_image/index.rst |  2 +-
 .../network/cfg_network_adapter.rst           | 42 ++++++++++++++
 .../network/cfg_second_adapter.rst            |  2 +
 .../diskful/customize_image/network/index.rst | 10 ++++
 .../customize_image/cfg_network_adapter.rst   | 55 -------------------
 .../customize_image/cfg_second_adapter.rst    |  2 -
 .../diskless/customize_image/index.rst        |  2 +-
 .../network/cfg_network_adapter.rst           | 42 ++++++++++++++
 .../network/cfg_second_adapter.rst            |  2 +
 .../customize_image/network/index.rst         | 10 ++++
 22 files changed, 145 insertions(+), 151 deletions(-)
 rename docs/source/guides/admin-guides/manage_clusters/common/deployment/{ => network}/cfg_second_adapter.rst (98%)
 delete mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst
 delete mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_second_adapter.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_second_adapter.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst
 delete mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst
 delete mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_second_adapter.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_second_adapter.rst
 create mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst

diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases.rst
index 384564b55..92d98cb0d 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_aliases.rst
@@ -1,14 +1,14 @@
 Configure Aliases
 -----------------
 
-The following example set the xCAT properties for compute node ``cn1`` to create:
+The following example sets the xCAT properties for compute node ``cn1`` to create:
 
-  * Compute node ``cn1`` has one physical NIC: eth2
+  * Compute node ``cn1`` with one physical NIC: ``eth2``
   * User wants to configure aliases ``aliases1-1`` and ``aliases1-2``
   * Assign ip ``11.1.0.100`` to ``aliases1-1`` and ``12.1.0.100`` to ``aliases1-2``
 
 Add network object into the networks table
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Add/modify the networks in the ``networks`` table ::
 
@@ -16,7 +16,7 @@ Add/modify the networks in the ``networks`` table ::
     chdef -t network -o 12_1_0_0-255_255_0_0 net=12.1.0.0 mask=255.255.0.0
 
 Define attributes in the ``nics`` table
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
 #. Compute node ``cn1`` has one physical NICs: ``eth2`` ::
@@ -32,7 +32,7 @@ Define attributes in the ``nics`` table
     chdef cn1 nicnetworks.eth2="11_1_0_0-255_255_0_0|12_1_0_0-255_255_0_0"
 
 Update /etc/hosts
-~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~
 
 #. Update the ``/etc/hosts`` file ::
 
@@ -44,7 +44,7 @@ Update /etc/hosts
     12.1.0.100 cn1-eth2-1 cn1-eth2-1.cluster.com aliases1-2
 
 Enable ``confignetwork`` to configure aliases
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 #. Add ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node ::
 
@@ -55,9 +55,9 @@ Enable ``confignetwork`` to configure aliases
     updatenode cn1 -P confignetwork
 
 Check the result
-~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~
 
-Check if eth2 is configured correct or not ::
+Check if eth2 is configured correctly ::
 
     xdsh cn1 "ip addr show eth2"
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst
index f7b78bc26..0ed1084d4 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond.rst
@@ -1,9 +1,9 @@
 Configure Bond using two Ethernet Adapters
 ------------------------------------------
 
-The following example set the xCAT properties for compute node ``cn1`` to create:
+The following example sets the xCAT properties for compute node ``cn1`` to create:
 
-  * Compute node ``cn1`` has two physical NICs: eth2 and eth3  
+  * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3``  
   * Bond eth2 and eth3 as ``bond0`` 
   * Assign ip ``40.0.0.1`` to the bonded interface ``bond0`` 
 
@@ -33,7 +33,7 @@ Define attributes in the ``nics`` table
 Enable ``confignetwork`` to configure bond
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-#. If add ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node ::
+#. If adding ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node ::
 
     chdef cn1 -p postscripts=confignetwork
 
@@ -50,4 +50,4 @@ Login to compute node cn1 and check bonding options in ``/etc/sysconfig/network-
 
 
 * ``mode=802.3ad`` requires additional configuration on the switch. 
-
+* ``mode=2`` can be used for bonding without additional switch configuration.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst
index 2b7f4e896..ffe1006f2 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst
@@ -1,9 +1,9 @@
 Configure Bridge Based on Bond Adapters
 ---------------------------------------
 
-The following example set the xCAT properties for compute node ``cn1`` to create:
+The following example sets the xCAT properties for compute node ``cn1`` to create:
 
-  * Compute node ``cn1`` has two physical NICs: eth2 and eth3  
+  * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3``  
   * Bond eth2 and eth3 as ``bond0`` 
   * Create bridge ``br0`` based on ``bond0``
   * Assign ip ``40.0.0.1`` to the bridge interface ``br0`` 
@@ -37,7 +37,7 @@ Define attributes in the ``nics`` table
 Enable ``confignetwork`` to configure bridge
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-#. If add ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node ::
+#. If adding ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node ::
 
     chdef cn1 -p postscripts=confignetwork
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst
index c58769c8f..b56020045 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst
@@ -1,9 +1,9 @@
 Configure VLAN Based on Bond Adapters
 -------------------------------------
 
-The following example set the xCAT properties for compute node ``cn1`` to create:
+The following example sets the xCAT properties for compute node ``cn1`` to create:
 
-  * Compute node ``cn1`` has two physical NICs: eth2 and eth3  
+  * Compute node ``cn1`` with two physical NICs: ``eth2`` and ``eth3`` 
   * Bond eth2 and eth3 as ``bond0`` 
   * Create bridge ``bond0.1`` based on ``bond0``
   * Assign ip ``40.0.0.1`` to the bridge interface ``bond0.1`` 
@@ -34,9 +34,9 @@ Define attributes in the ``nics`` table
     chdef cn1 nicnetworks.bond0.1=net40
 
 Enable ``confignetwork`` to configure bridge
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-#. If add ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node ::
+#. If adding ``confignetwork`` into the node's postscripts list, ``confignetwork`` will be executed during OS deployment on compute node ::
 
     chdef cn1 -p postscripts=confignetwork
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst
index b2c3d5737..64001f546 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst
@@ -10,7 +10,7 @@ The following example set the xCAT properties for compute node ``cn1`` to achiev
   * Make bridge ``br2`` using ``bond0.2`` with IP (20.0.0.1)
 
 Define the additional networks to xCAT
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If this is a new network being created on the compute nodes, an entry needs to be created into the xCAT database.
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst
index f553525dc..78d650431 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst
@@ -8,7 +8,7 @@ The following example set the xCAT properties for compute node ``cn1`` to create
   * Assign ip ``30.5.106.9`` to br0
 
 Add network object into the networks table
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Add/modify the network ``net30`` in the ``networks`` table ::
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst
index a63ee4608..8b352f3f3 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_custom_scripts.rst
@@ -3,7 +3,7 @@ Use Customized Scripts To Configure NIC
 
 If using customized script to configure NIC, ``niccustomscripts`` for the specified nic in ``nics`` table should be configured. In the customized scripts, it can use data from xCAT DB, These data are parsed as global value from ``/xcatpost/mypostscript`` in compute node. Here is a simple example :
 
-  #. Compute node ``cn1`` has one physical NIC: eth1
+  #. Compute node ``cn1`` with one physical NIC: ``eth1``
   #. Put customized script ``cfgeth1`` under xCAT MN ``/install/postscripts``
   #. Configure ``niccustomscripts`` in ``nics`` table ::
       chdef cn1 niccustomscripts.eth1=cfgeth1
@@ -12,15 +12,15 @@ If using customized script to configure NIC, ``niccustomscripts`` for the specif
 
       chdef -t network net50 net=50.0.0.0 mask=255.0.0.0
 
-     The network ``net50`` is parsed as ``NETWORKS_LINE1`` in ``/xcatpost/mypostscript`` as following, so script ``cfgeth1`` can use global value ``NETWORKS_LINE1`` directly. ::
+     **Notes:** The network ``net50`` is parsed as ``NETWORKS_LINE1`` in ``/xcatpost/mypostscript`` as following, so script ``cfgeth1`` can use global value ``NETWORKS_LINE1`` directly ::
 
       NETWORKS_LINE1='netname=net50||net=50.0.0.0||mask=255.0.0.0||mgtifname=||gateway=||dhcpserver=||tftpserver=||nameservers=||ntpservers=||logservers=||dynamicrange=||staticrange=||staticrangeincrement=||nodehostname=||ddnsdomain=||vlanid=||domain=||disable=||comments='
 
-  #. When ``confignetwork`` is running in ``cn1``, ``confignetwork`` will execute ``cfgeth1`` to configure eth1. So add ``confignetwork`` into the node's postscripts list ::
+  #. When ``confignetwork`` is running in ``cn1``, ``confignetwork`` will execute ``cfgeth1`` to configure eth1, so adding ``confignetwork`` into the node's postscripts list. During OS deployment on compute node, ``confignetwork`` postscript will be executed. ::
 
       chdef cn1 -p postscripts=confignetwork
 
-     During OS deployment on compute node, ``confignetwork`` postscript will be executed. If the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript without rebooting the node::
+  #. Or if the compute node is already running, use ``updatenode`` command to run ``confignetwork`` postscript without rebooting the node::
 
       updatenode cn1 -P confignetwork
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst
index 2eba4017a..215178679 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst
@@ -1,9 +1,9 @@
 Configure Ethernet Network Interface
 ------------------------------------
 
-The following example set the xCAT properties for compute node ``cn1`` to create:
+The following example sets the xCAT properties for compute node ``cn1`` to create:
 
-  * Compute node ``cn1`` has two physical NICs: ``eth0`` and ``eth1``
+  * Compute node ``cn1`` with two physical NICs: ``eth0`` and ``eth1``
   * Management network is ``11.1.89.0``, application network is ``13.1.89.0``
   * The install NIC is eth0, and application NIC is eth1
   * Assign static ip ``11.1.89.7/24`` to eth0
@@ -22,7 +22,7 @@ Add/update additional networks ``net11`` and ``net13`` into ``networks`` table::
 Define Adapters in the nics table
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-#. Privision ip is coming from DHCP, it is no need to configure install nic into ``nics`` table. Provision ip can be configured in node definition, but it is not must. ::
+#. Provision ip is coming from DHCP, there is no need to configure install nic into ``nics`` table. Provision ip can be configured in node definition, but it is not required. ::
 
     chdef cn1 ip=11.1.89.7
 
@@ -66,7 +66,7 @@ Configure adapters with static IPs
 
         updatenode cn1 -P "confignetwork"
 
-**Notes:** Option "-s" writes the install NIC's information into configuration file for persistence. All other NIC's data defined in ``nics`` table will be written also. Without option "-s", ``confignetwork`` only configure all NIC's data defined in ``nics`` table.
+**Notes:** Option "-s" writes the install NIC's information into configuration file for persistence. All other NIC's data defined in ``nics`` table will be written also. Without option "-s", ``confignetwork`` only configures all NIC's data defined in ``nics`` table.
 
 Check result
 ~~~~~~~~~~~~
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_extra_param.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_extra_param.rst
index 25769c31f..74e33d59e 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_extra_param.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_extra_param.rst
@@ -1,13 +1,13 @@
 Use Extra Parameters In NIC Configuration File
 ----------------------------------------------
 
-Use ``nicextraparams`` to customize attribute in NIC configuration file. For example :
+Use ``nicextraparams`` to customize attributes in NIC configuration file. For example :
 
-  #. Compute node ``cn1`` has one physical NIC: eth1
+  #. Compute node ``cn1`` with one physical NIC: ``eth1``
   #. Configure network into ``networks`` table, configure ``nicips``, ``nictypes`` and ``nicnetworks`` in ``nics`` table, like :doc:`Configure Ethernet Network Interface<cfg_network_ethernet_nic>`
-  #. In order to customize "MTU=1456 onboot=no" for eth1. configure ``nicips``, ``nictypes`` and ``nicnetworks`` in ``nics`` table , also need to configure ``nicextraparams`` as following::
+  #. In order to customize "MTU=1456 ONBOOT=no" for eth1. configure ``nicips``, ``nictypes`` and ``nicnetworks`` in ``nics`` table , also need to configure ``nicextraparams`` as following::
 
-      chdef cn1 nicextraparams.eth1="MTU=1456 onboot=no"
+      chdef cn1 nicextraparams.eth1="MTU=1456 ONBOOT=no"
 
   #. After ``confignetwork`` is executed in ``cn1``, ``nicexraparams`` will overwrite the original value in ``/etc/sysconfig/network-scripts/ifcfg-eth1`` as ::
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_second_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst
similarity index 98%
rename from docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_second_adapter.rst
rename to docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst
index 32b8b5a83..45db73984 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/cfg_second_adapter.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst
@@ -1,5 +1,5 @@
-Configure Additional Network Interfaces - confignics - (depleted)
-=================================================================
+Configure Additional Network Interfaces - confignics - (deprecated)
+===================================================================
 
 The **nics** table and the **confignics** postscript can be used to automatically configure additional network interfaces (multiple ethernets adapters, InfiniBand, etc) on the nodes as they are being deployed.
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst
deleted file mode 100644
index da079510d..000000000
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_network_adapter.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-Customize network adapter
-=========================
-
-This section introduces how to configure network adapters with persistent configuration using xCAT. 
-
-Networking Adapters Configuration - confignetwork
--------------------------------------------------
-
-The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. ``confignetwork`` can be used in postscripts during OS privision, it can also be executed in ``updatenode``. The way the confignetwork postscript decides what IP address to give the secondary adapter is by checking the nics table, in which the nic configuration information is stored. In order for the ``confignetwork`` postscript to run successfully, the following attributes must be configured for the node in the ``nics`` table:
-
-    * ``nicips``
-    * ``nictypes``
-    * ``nicnetworks``
-
-If configuring VLAN, BONDs, or BRIDGES, ``nicdevices`` in ``nics`` table must be configured.
-
-    * ``nicdevices`` - resolves the relationship among the physical network interface devices
-
-The following scenarios are standalone typical examples to configure Ethernet adapters/BOND/VLAN/Bridge.
-
-    #. Configure Ethernet adapters: 
-   
-        * Scenario 1: :doc:`Configure Ethernet Network Interface <../../../common/deployment/network/cfg_network_ethernet_nic>`
-          To configure Ethernet install NIC or other Ethernet network adapters as static
-
-    #. Configure BOND **[RHEL]**:
-
-        * Scenario 2: :doc:`Configure Bond using two Ethernet Adapters <../../../common/deployment/network/cfg_network_bond>`
-
-    #. Configure VLAN **[RHEL]**:
-
-        * Scenario 3: :doc:`Configure VLAN Based on Ethernet Adapter <../../../common/deployment/network/cfg_network_vlan>`
-        * Scenario 4: :doc:`Configure VLAN Based on Bond Adapters <../../../common/deployment/network/cfg_network_bond_vlan>`
-
-    #. Configure Bridge **[RHEL]**:
- 
-        * Scenario 5: :doc:`Configure Bridge Based On Ethernet NIC <../../../common/deployment/network/cfg_network_bridge>`
-        * Scenario 6: :doc:`Configure Bridge Based on Bond Adapters <../../../common/deployment/network/cfg_network_bond_bridge>`
-        * Scenario 7: :doc:`Configure Bridge Based on VLAN <../../../common/deployment/network/cfg_network_vlan_bridge>`
-
-        * Scenario 8: :doc:`Configure Bridge Based on VLAN,VLAN use BOND adapter <../../../common/deployment/network/cfg_network_bond_vlan_bridge>`
-
-    #. Advanced topics:
-    
-        * :doc:`Use Customized Scripts To Configure NIC <../../../common/deployment/network/cfg_network_custom_scripts>`
-        * :doc:`Use Extra Parameters In NIC Configuration File <../../../common/deployment/network/cfg_network_extra_param>`
-        * :doc:`Configure Aliases <../../../common/deployment/network/cfg_network_aliases>`
- 
-Configure Additional Network Interfaces - confignics - (depleted)
------------------------------------------------------------------
-
-.. toctree::
-   :maxdepth: 2
-
-   cfg_second_adapter.rst
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_second_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_second_adapter.rst
deleted file mode 100644
index 097b8010d..000000000
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/cfg_second_adapter.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../common/deployment/cfg_second_adapter.rst
-
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst
index 6a99eb8ac..059b0ef6c 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/index.rst
@@ -12,6 +12,6 @@ Optional means all the subitems in this page are not necessary to finish an OS d
    syncfile.rst
    additional_pkg.rst
    use_kernel_patch.rst
-   cfg_network_adapter.rst
+   network/index.rst
    
    
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst
new file mode 100644
index 000000000..0e78a7c61
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst
@@ -0,0 +1,42 @@
+Networking Adapters Configuration - confignetwork
+-------------------------------------------------
+
+The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. ``confignetwork`` can be used in postscripts during OS privision, it can also be executed in ``updatenode``. The way the ``confignetwork`` postscript decides what IP address to give the secondary adapter is by checking the ``nics`` table, in which the nic configuration information is stored. In order for the ``confignetwork`` postscript to run successfully, the following attributes must be configured for the node in the ``nics`` table:
+
+    * ``nicips``
+    * ``nictypes``
+    * ``nicnetworks``
+
+If configuring VLAN, BOND, or BRIDGES, ``nicdevices`` in ``nics`` table must be configured. VLAN, BOND or BRIDGES is only supported on RHEL.
+
+    * ``nicdevices`` - resolves the relationship among the physical network interface devices
+
+The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Bridge.
+
+    #. Configure Ethernet adapters: 
+   
+        * Scenario 1: :doc:`Configure Ethernet Network Interface <../../../../common/deployment/network/cfg_network_ethernet_nic>`
+          To configure Ethernet install NIC or other Ethernet network adapters as static
+
+    #. Configure BOND **[RHEL]**:
+
+        * Scenario 2: :doc:`Configure Bond using two Ethernet Adapters <../../../../common/deployment/network/cfg_network_bond>`
+
+    #. Configure VLAN **[RHEL]**:
+
+        * Scenario 3: :doc:`Configure VLAN Based on Ethernet Adapter <../../../../common/deployment/network/cfg_network_vlan>`
+        * Scenario 4: :doc:`Configure VLAN Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_vlan>`
+
+    #. Configure Bridge **[RHEL]**:
+ 
+        * Scenario 5: :doc:`Configure Bridge Based On Ethernet NIC <../../../../common/deployment/network/cfg_network_bridge>`
+        * Scenario 6: :doc:`Configure Bridge Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_bridge>`
+        * Scenario 7: :doc:`Configure Bridge Based on VLAN <../../../../common/deployment/network/cfg_network_vlan_bridge>`
+
+        * Scenario 8: :doc:`Configure Bridge Based on VLAN,VLAN use BOND adapter <../../../../common/deployment/network/cfg_network_bond_vlan_bridge>`
+
+    #. Advanced topics:
+    
+        * :doc:`Use Customized Scripts To Configure NIC <../../../../common/deployment/network/cfg_network_custom_scripts>`
+        * :doc:`Use Extra Parameters In NIC Configuration File <../../../../common/deployment/network/cfg_network_extra_param>`
+        * :doc:`Configure Aliases <../../../../common/deployment/network/cfg_network_aliases>`
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_second_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_second_adapter.rst
new file mode 100644
index 000000000..f5cfbee00
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_second_adapter.rst
@@ -0,0 +1,2 @@
+.. include:: ../../../../common/deployment/network/cfg_second_adapter.rst
+
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst
new file mode 100644
index 000000000..43286943d
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/index.rst
@@ -0,0 +1,10 @@
+Customize network adapter
+=========================
+
+This section describes how to configure network adapters with persistent configuration using xCAT. The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES.  
+
+.. toctree::
+   :maxdepth: 1
+
+   cfg_network_adapter.rst
+   cfg_second_adapter.rst
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst
deleted file mode 100644
index da079510d..000000000
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_network_adapter.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-Customize network adapter
-=========================
-
-This section introduces how to configure network adapters with persistent configuration using xCAT. 
-
-Networking Adapters Configuration - confignetwork
--------------------------------------------------
-
-The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. ``confignetwork`` can be used in postscripts during OS privision, it can also be executed in ``updatenode``. The way the confignetwork postscript decides what IP address to give the secondary adapter is by checking the nics table, in which the nic configuration information is stored. In order for the ``confignetwork`` postscript to run successfully, the following attributes must be configured for the node in the ``nics`` table:
-
-    * ``nicips``
-    * ``nictypes``
-    * ``nicnetworks``
-
-If configuring VLAN, BONDs, or BRIDGES, ``nicdevices`` in ``nics`` table must be configured.
-
-    * ``nicdevices`` - resolves the relationship among the physical network interface devices
-
-The following scenarios are standalone typical examples to configure Ethernet adapters/BOND/VLAN/Bridge.
-
-    #. Configure Ethernet adapters: 
-   
-        * Scenario 1: :doc:`Configure Ethernet Network Interface <../../../common/deployment/network/cfg_network_ethernet_nic>`
-          To configure Ethernet install NIC or other Ethernet network adapters as static
-
-    #. Configure BOND **[RHEL]**:
-
-        * Scenario 2: :doc:`Configure Bond using two Ethernet Adapters <../../../common/deployment/network/cfg_network_bond>`
-
-    #. Configure VLAN **[RHEL]**:
-
-        * Scenario 3: :doc:`Configure VLAN Based on Ethernet Adapter <../../../common/deployment/network/cfg_network_vlan>`
-        * Scenario 4: :doc:`Configure VLAN Based on Bond Adapters <../../../common/deployment/network/cfg_network_bond_vlan>`
-
-    #. Configure Bridge **[RHEL]**:
- 
-        * Scenario 5: :doc:`Configure Bridge Based On Ethernet NIC <../../../common/deployment/network/cfg_network_bridge>`
-        * Scenario 6: :doc:`Configure Bridge Based on Bond Adapters <../../../common/deployment/network/cfg_network_bond_bridge>`
-        * Scenario 7: :doc:`Configure Bridge Based on VLAN <../../../common/deployment/network/cfg_network_vlan_bridge>`
-
-        * Scenario 8: :doc:`Configure Bridge Based on VLAN,VLAN use BOND adapter <../../../common/deployment/network/cfg_network_bond_vlan_bridge>`
-
-    #. Advanced topics:
-    
-        * :doc:`Use Customized Scripts To Configure NIC <../../../common/deployment/network/cfg_network_custom_scripts>`
-        * :doc:`Use Extra Parameters In NIC Configuration File <../../../common/deployment/network/cfg_network_extra_param>`
-        * :doc:`Configure Aliases <../../../common/deployment/network/cfg_network_aliases>`
- 
-Configure Additional Network Interfaces - confignics - (depleted)
------------------------------------------------------------------
-
-.. toctree::
-   :maxdepth: 2
-
-   cfg_second_adapter.rst
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_second_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_second_adapter.rst
deleted file mode 100644
index 097b8010d..000000000
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/cfg_second_adapter.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. include:: ../../../common/deployment/cfg_second_adapter.rst
-
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst
index c790d1dd3..5d71d4223 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/index.rst
@@ -10,7 +10,7 @@ Optional means all the subitems in this page are not necessary to finish an OS d
    pre_post_script.rst
    syncfile.rst
    additional_pkg.rst
-   cfg_network_adapter.rst
+   network/index.rst
    enable_kdump.rst
    install_new_kernel.rst  
    acc_initrd_rootimg_gen_ppc64le.rst 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst
new file mode 100644
index 000000000..0e78a7c61
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst
@@ -0,0 +1,42 @@
+Networking Adapters Configuration - confignetwork
+-------------------------------------------------
+
+The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. ``confignetwork`` can be used in postscripts during OS privision, it can also be executed in ``updatenode``. The way the ``confignetwork`` postscript decides what IP address to give the secondary adapter is by checking the ``nics`` table, in which the nic configuration information is stored. In order for the ``confignetwork`` postscript to run successfully, the following attributes must be configured for the node in the ``nics`` table:
+
+    * ``nicips``
+    * ``nictypes``
+    * ``nicnetworks``
+
+If configuring VLAN, BOND, or BRIDGES, ``nicdevices`` in ``nics`` table must be configured. VLAN, BOND or BRIDGES is only supported on RHEL.
+
+    * ``nicdevices`` - resolves the relationship among the physical network interface devices
+
+The following scenarios are examples to configure Ethernet adapters/BOND/VLAN/Bridge.
+
+    #. Configure Ethernet adapters: 
+   
+        * Scenario 1: :doc:`Configure Ethernet Network Interface <../../../../common/deployment/network/cfg_network_ethernet_nic>`
+          To configure Ethernet install NIC or other Ethernet network adapters as static
+
+    #. Configure BOND **[RHEL]**:
+
+        * Scenario 2: :doc:`Configure Bond using two Ethernet Adapters <../../../../common/deployment/network/cfg_network_bond>`
+
+    #. Configure VLAN **[RHEL]**:
+
+        * Scenario 3: :doc:`Configure VLAN Based on Ethernet Adapter <../../../../common/deployment/network/cfg_network_vlan>`
+        * Scenario 4: :doc:`Configure VLAN Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_vlan>`
+
+    #. Configure Bridge **[RHEL]**:
+ 
+        * Scenario 5: :doc:`Configure Bridge Based On Ethernet NIC <../../../../common/deployment/network/cfg_network_bridge>`
+        * Scenario 6: :doc:`Configure Bridge Based on Bond Adapters <../../../../common/deployment/network/cfg_network_bond_bridge>`
+        * Scenario 7: :doc:`Configure Bridge Based on VLAN <../../../../common/deployment/network/cfg_network_vlan_bridge>`
+
+        * Scenario 8: :doc:`Configure Bridge Based on VLAN,VLAN use BOND adapter <../../../../common/deployment/network/cfg_network_bond_vlan_bridge>`
+
+    #. Advanced topics:
+    
+        * :doc:`Use Customized Scripts To Configure NIC <../../../../common/deployment/network/cfg_network_custom_scripts>`
+        * :doc:`Use Extra Parameters In NIC Configuration File <../../../../common/deployment/network/cfg_network_extra_param>`
+        * :doc:`Configure Aliases <../../../../common/deployment/network/cfg_network_aliases>`
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_second_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_second_adapter.rst
new file mode 100644
index 000000000..f5cfbee00
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_second_adapter.rst
@@ -0,0 +1,2 @@
+.. include:: ../../../../common/deployment/network/cfg_second_adapter.rst
+
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst
new file mode 100644
index 000000000..43286943d
--- /dev/null
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/index.rst
@@ -0,0 +1,10 @@
+Customize network adapter
+=========================
+
+This section describes how to configure network adapters with persistent configuration using xCAT. The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES.  
+
+.. toctree::
+   :maxdepth: 1
+
+   cfg_network_adapter.rst
+   cfg_second_adapter.rst

From 71444ec61351178a45ff979d5447a2b653604d6a Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Tue, 1 Aug 2017 03:41:56 -0400
Subject: [PATCH 243/283] Install Capture::Tiny for Z in CI test environment

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index a04874d6c..25ab2393e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ sudo: required
 before_install: 
 - sudo apt-get install -y git reprepro devscripts debhelper libsoap-lite-perl libdbi-perl quilt openssh-server dpkg looptools genometools software-properties-common
 - perl -v
+- echo "yes" | sudo cpan -f -i Capture::Tiny
 
 script: 
 - echo $TRAVIS_BUILD_ID

From c173fd3f0e257ca99110e448c3175980232a3b70 Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Tue, 1 Aug 2017 06:40:34 -0400
Subject: [PATCH 244/283] modify rsetboot test dure to failed cases

---
 xCAT-test/autotest/testcase/rsetboot/cases0 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xCAT-test/autotest/testcase/rsetboot/cases0 b/xCAT-test/autotest/testcase/rsetboot/cases0
index 63b280588..bcec836d4 100644
--- a/xCAT-test/autotest/testcase/rsetboot/cases0
+++ b/xCAT-test/autotest/testcase/rsetboot/cases0
@@ -56,10 +56,10 @@ cmd:if [[ -f /tmp/rsetboot.stat ]];then mv -f /tmp/rsetboot.stat /tmp/rsetboot.s
 check:rc==0
 cmd:rsetboot $$CN default
 check:rc==0
-check:output=~boot override inactive
+check:output=~boot override inactive|Default
 cmd:rsetboot $$CN stat
 check:rc==0
-check:output=~$$CN: boot override inactive
+check:output=~boot override inactive|$$CN: Default
 cmd:if [[ `grep CD /tmp/rsetboot.stat` ]];then rsetboot $$CN cd;elif [[ `grep  Network /tmp/rsetboot.stat` ]];then rsetboot $$CN  net;else  rsetboot $$CN hd;fi
 check:rc==0
 cmd:if [[ -f /tmp/rsetboot.stat.bak ]];then mv -f /tmp/rsetboot.stat.bak /tmp/rsetboot.stat;else rm -rf /tmp/rsetboot.stat;fi
@@ -120,7 +120,7 @@ description:rsetboot node using invalidaction
 Attribute: $$CN-The operation object of rsetboot command.
 cmd:rsetboot $$CN dsdf
 check:rc!=0
-check:output=~Error: unsupported command
+check:output=~Error: unsupported command|Unsupported command
 end
 
 start:rsetboot_group_net

From 52b43e29f3222467e10adcbaae96111d7c57cd2d Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Tue, 1 Aug 2017 17:20:23 +0800
Subject: [PATCH 245/283] Remove the debug print

---
 xCAT-client/bin/rinstall      | 1 -
 xCAT-client/bin/updatenode    | 1 -
 xCAT-client/bin/xcatclient    | 1 -
 xCAT-client/bin/xcatclientnnr | 1 -
 4 files changed, 4 deletions(-)

diff --git a/xCAT-client/bin/rinstall b/xCAT-client/bin/rinstall
index 0a69b158f..8ca3357ec 100755
--- a/xCAT-client/bin/rinstall
+++ b/xCAT-client/bin/rinstall
@@ -69,7 +69,6 @@ my $noderange = $cmdref->{noderange}->[0];    # save the noderange
 
 # Allow to print server information when -V/--verbose
 foreach (reverse(@ARGV)) {
-    print $_;
     if ($_ eq '-V' || $_ eq '--verbose') {
         $ENV{'XCATSHOWSVR'} = 1;
         last;
diff --git a/xCAT-client/bin/updatenode b/xCAT-client/bin/updatenode
index bb7ddd80a..ebfe392e2 100755
--- a/xCAT-client/bin/updatenode
+++ b/xCAT-client/bin/updatenode
@@ -202,7 +202,6 @@ foreach (keys %ENV) {
 
 # Allow to print server information when -V/--verbose
 foreach (reverse(@ARGV)) {
-    print $_;
     if ($_ eq '-V' || $_ eq '--verbose') {
         $ENV{'XCATSHOWSVR'} = 1;
         last;
diff --git a/xCAT-client/bin/xcatclient b/xCAT-client/bin/xcatclient
index c59f59685..7f68579c9 100755
--- a/xCAT-client/bin/xcatclient
+++ b/xCAT-client/bin/xcatclient
@@ -104,7 +104,6 @@ foreach (keys %ENV) {
 
 # Allow to print server information when -V
 foreach (reverse(@ARGV)) {
-    print $_;
     if ($_ eq '-V') {
         $ENV{'XCATSHOWSVR'} = 1;
         last;
diff --git a/xCAT-client/bin/xcatclientnnr b/xCAT-client/bin/xcatclientnnr
index bb980801b..566dec3b2 100755
--- a/xCAT-client/bin/xcatclientnnr
+++ b/xCAT-client/bin/xcatclientnnr
@@ -53,7 +53,6 @@ foreach (keys %ENV) {
 
 # Allow to print server information when -V/--verbose
 foreach (reverse(@ARGV)) {
-    print $_;
     if ($_ eq '-V' || $_ eq '--verbose') {
         $ENV{'XCATSHOWSVR'} = 1;
         last;

From b167c2932b8f7cfd7b31d7fb6b26a84e5898a7dc Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Tue, 1 Aug 2017 01:00:18 -0400
Subject: [PATCH 246/283] fix issue rinstall/winstall -c doesn't open console
 #3535

---
 xCAT-client/bin/rinstall                 | 17 ++++++---
 xCAT-server/lib/xcat/plugins/rinstall.pm | 45 +++++-------------------
 2 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/xCAT-client/bin/rinstall b/xCAT-client/bin/rinstall
index 9d989a2e7..789222ba3 100755
--- a/xCAT-client/bin/rinstall
+++ b/xCAT-client/bin/rinstall
@@ -21,6 +21,7 @@ use Getopt::Long;
 use xCAT::MsgUtils;
 use xCAT::Utils;
 use xCAT::Client;
+use xCAT::NodeRange;
 use Cwd;
 use strict;
 
@@ -65,15 +66,23 @@ while ($arg =~ /^-/) {
 $cmdref->{noderange}->[0] = $arg;
 push(@{ $cmdref->{arg} }, @ARGV);
 
+my $startconsole=0;
+if(grep m/^-c|--console$/,@ARGV){
+   $startconsole=1;
+}
+
 my $noderange = $cmdref->{noderange}->[0];    # save the noderange
+my @noderange=xCAT::NodeRange::noderange($noderange);
+
+if($bname eq "rinstall" and $startconsole==1 and scalar @noderange!=1 ){
+    xCAT::MsgUtils->message("E", "Error: rinstall can only be run against one node! Please use winstall for multiple nodes.");
+    exit 1;    
+}
 
 # ok call Client to run the plugin rinstall.pm
 xCAT::Client::submit_request($cmdref, \&xCAT::Client::handle_response);
-
 if ($xCAT::Client::EXITCODE == 0)             # no errors
 {
-    my $startconsole = $cmdref->{startconsole}->[0];
-
     # if startconsole requested ( -c flag) for rinstall always for winstall
     # This is set in the rinstall plugin
     if ($startconsole == 1) {
@@ -82,9 +91,7 @@ if ($xCAT::Client::EXITCODE == 0)             # no errors
             exec("rcons $noderange");
         }
         elsif (basename($0) =~ /winstall/) {
-
             # winstall can commence a wcons command to the noderange for monitoring the provision cycle
-
             exec("wcons $noderange");
         }
     }
diff --git a/xCAT-server/lib/xcat/plugins/rinstall.pm b/xCAT-server/lib/xcat/plugins/rinstall.pm
index ea2f0003a..787fbc63d 100644
--- a/xCAT-server/lib/xcat/plugins/rinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/rinstall.pm
@@ -335,6 +335,7 @@ sub rinstall {
         $rsp->{data}->[0] = "Provision node(s): @nodes";
         xCAT::MsgUtils->message("I", $rsp, $callback);
     }
+
     %nodes = map { $_, 1 } @nodes;
 
     # Run nodeset $noderange $parameter
@@ -355,8 +356,8 @@ sub rinstall {
         push @{ $rsp->{data} }, @$res;
         xCAT::MsgUtils->message("D", $rsp, $callback);
     }
-    unless ($rc == 0) {
 
+    unless ($rc == 0) {
         # We got an error with the nodeset
         my @successnodes;
         my @failurenodes;
@@ -364,12 +365,8 @@ sub rinstall {
         my @lines = @$res;
         foreach my $line (@lines) {
             $rsp->{data}->[0] = $line;
-            if (($line =~ /: install/) or ($line =~ /: netboot/)) {
-                my $successnode;
-                my $restline;
-                ($successnode, $restline) = split(/:/, $line, 2);
-                $nodes{$successnode} = 0;
-                push @successnodes, $successnode;
+            if($line =~ /The (\S+) can not be resolved/){
+                push @failurenodes,$1;
             }
             if ($line =~ /dhcp server is not running/) {
                 my $rsp = {};
@@ -380,18 +377,18 @@ sub rinstall {
             }
             xCAT::MsgUtils->message("I", $rsp, $callback);
         }
-        foreach my $node (@nodes) {
-            if ($nodes{$node} == 1) {
-                push @failurenodes, $node;
-            }
+
+        foreach my $node (@failurenodes) {
+            delete $nodes{$node};
         }
+
         my $rsp = {};
         if (0+@failurenodes > 0) { 
             $rsp->{error}->[0] = "Failed to run 'nodeset' against the following nodes: @failurenodes";
             $rsp->{errorcode}->[0] = 1;
             xCAT::MsgUtils->message("E", $rsp, $callback);
         }
-        @nodes = @successnodes;
+        @nodes = keys %nodes;
     }
 
     # Group the nodes according to the nodehm.mgt
@@ -591,30 +588,6 @@ sub rinstall {
         }
     }
 
-    # Check if they asked to bring up a console (-c) from rinstall always for winstall
-    $req->{startconsole}->[0] = 0;
-    if ($command =~ /rinstall/) {
-
-        # For rinstall, the -c|--console option can provide the remote console for only 1 node
-        if ($CONSOLE) {
-            if (scalar @nodes != 1) {
-                my $rsp = {};
-                $rsp->{error}->[0] = "rinstall -c only accepts one node in the noderange. See winstall for support of consoles on multiple nodes.";
-                $rsp->{errorcode}->[0] = 1;
-                xCAT::MsgUtils->message("E", $rsp, $callback);
-                return 1;
-            }
-            else {
-                # Tell rinstall client ok to start rcons
-                $req->{startconsole}->[0] = 1;
-            }
-        }
-    }
-    elsif ($command =~ /winstall/) {
-
-        # Command winstall can start a wcons command to multiple nodes for monitoring the provision cycle
-        $req->{startconsole}->[0] = 1;
-    }
     return 0;
 }
 

From 0174dc353febfead72810fba121a0b95d7edc661 Mon Sep 17 00:00:00 2001
From: Samveen Gulati <samveen@yahoo.com>
Date: Tue, 1 Aug 2017 12:15:00 +0000
Subject: [PATCH 247/283] Fix bug introduced into `bmcsetup` by commit
 `bb460dc`

Commit bb460dc introduced a minor bug, where the value of LOCKEDUSERS
was no longer considered while handling existing entries in the user
list. This fixes that by adding back the check.
---
 xCAT-genesis-scripts/bin/bmcsetup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-genesis-scripts/bin/bmcsetup b/xCAT-genesis-scripts/bin/bmcsetup
index d2c7668c8..fd88f331f 100755
--- a/xCAT-genesis-scripts/bin/bmcsetup
+++ b/xCAT-genesis-scripts/bin/bmcsetup
@@ -429,7 +429,7 @@ for user in $BMCUS; do
     if [ -z "$USERSLOT" ]; then
         USERSLOT=$((`ipmitool raw 6 0x44 1 1|awk '{print $3}'` + 1))
     fi
-    if [ "$USERSLOT" == 0 ]; then USERSLOT=2; fi
+    if [ "$USERSLOT" == 0 -o -z "$LOCKEDUSERS" ]; then USERSLOT=2; fi
     if [ "$ISITE" = 1 ]; then
         allowcred.awk &
         CREDPID=$!

From f18044a8c2e6708ebce6da685096e7db78b78afd Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Wed, 21 Jun 2017 11:35:42 -0400
Subject: [PATCH 248/283] Initial implementation of rflash --activate

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index d3503e4ea..cf8563a16 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -156,6 +156,14 @@ my %status_info = (
     RFLASH_FILE_UPLOAD_RESPONSE => {
         process        => \&rflash_response,
     },
+    RFLASH_UPDATE_ACTIVATE_REQUEST  => {
+        method         => "PUT",
+        init_url       => "$openbmc_project_url/software",
+        data           => "xyz.openbmc_project.Software.Activation.RequestedActivations.Active",
+    },
+    RFLASH_UPDATE_ACTIVATE_RESPONSE => {
+        process        => \&rflash_response,
+    },
 
     RINV_REQUEST => {
         method         => "GET",
@@ -564,10 +572,19 @@ sub parse_args {
         #
         $check = unsupported($callback); if (ref($check) eq "ARRAY") { return $check; }
         my $filename_passed = 0;
+        my $updateid_passed = 0;
         foreach my $opt (@$extrargs) {
+            print "Examening $opt \n";
             # Only files ending on .tar are allowed
             if ($opt =~ /.*\.tar$/i) {
                 $filename_passed = 1;
+                print "Opt matches filename ending on .tar \n";
+                next;
+            }
+            # Check if hex number for the updateid is passed
+            if ($opt =~ /^[[:xdigit:]]+$/i) {
+                $updateid_passed = 1;
+                print "Opt matches hex fileid \n";
                 next;
             }
             if ($filename_passed) {
@@ -577,9 +594,17 @@ sub parse_args {
                 }
             }
             else {
-                # Filename was not passed, check flags allowed without file
-                if ($opt !~ /^-c$|^--check$|^-l$|^--list/) {
-                    return ([ 1, "Invalid option specified: $opt" ]);
+                if ($updateid_passed) {
+                    # Updateid was passed, check flags allowed with update id
+                    if ($opt !~ /^^-d$|^--delete$|^-a$|^--activate$/) {
+                        return ([ 1, "Invalid option specified when an update id is provided: $opt" ]);
+                    }
+                }
+                else {
+                   # Neither Filename nor updateid was not passed, check flags allowed without file or updateid
+                   if ($opt !~ /^-c$|^--check$|^-l$|^--list/) {
+                       return ([ 1, "Invalid option specified: $opt" ]);
+                   }
                 }
             }
         }
@@ -772,9 +797,11 @@ sub parse_command_status {
 
     if ($command eq "rflash") {
         my $check_version = 0;
+<<<<<<< HEAD
         my $list = 0;
         my $delete = 0;
         my $upload = 0;
+        my $activate = 0;
 
         if ($$subcommands[-1] =~ /c|check/) {
             $check_version = 1;
@@ -788,6 +815,9 @@ sub parse_command_status {
         } elsif ($$subcommands[-1] =~ /u|upload/) {
             $upload = 1;
             pop(@$subcommands);
+        } elsif ($$subcommands[-1] =~ /a|activate/) {
+            $activate = 1;
+            pop(@$subcommands);
         }
 
         my $update_file = $$subcommands[0]; 
@@ -822,7 +852,11 @@ sub parse_command_status {
                 }
             }
             else {
-                # TODO Process file id passed in
+                # Check if hex number for the updateid is passed
+                if ($update_file =~ /^[[:xdigit:]]+$/i) {
+                    # Update init_url to include the id of the update to activate
+                    $status_info{RFLASH_UPDATE_ACTIVATE_REQUEST}{init_url} .= "/$update_file/attr/RequestedActivation";
+                }
             }
         }
         if ($check_version) {
@@ -844,6 +878,14 @@ sub parse_command_status {
             $next_status{LOGIN_RESPONSE} = "RFLASH_FILE_UPLOAD_REQUEST";
             $next_status{"RFLASH_FILE_UPLOAD_REQUEST"} = "RFLASH_FILE_UPLOAD_RESPONSE";
         }
+        if ($activate) {
+            # MG
+            print "Current value of activate request $status_info{RFLASH_UPDATE_ACTIVATE_REQUEST}{init_url} \n";
+            $next_status{LOGIN_RESPONSE} = "RFLASH_UPDATE_ACTIVATE_REQUEST";
+            $next_status{"RFLASH_UPDATE_ACTIVATE_REQUEST"} = "RFLASH_UPDATE_ACTIVATE_RESPONSE";
+            #xCAT::SvrUtils::sendmsg("Activate option is not yet supported.", $callback);
+            #return 1;
+        }
     }
 
     print Dumper(\%next_status) . "\n";
@@ -1797,6 +1839,9 @@ sub rflash_response {
             }
         }
     }
+    if ($node_info{$node}{cur_status} eq "RFLASH_UPDATE_ACTIVATE_RESPONSE") {
+        print "Update activatiion response\n";
+    }
 
     if ($next_status{ $node_info{$node}{cur_status} }) {
         $node_info{$node}{cur_status} = $next_status{ $node_info{$node}{cur_status} };

From a5856dc0cf7987a84ea8c5eff7797eaf2fa2d747 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Mon, 26 Jun 2017 14:15:26 -0400
Subject: [PATCH 249/283] rflash activate initial pass

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index cf8563a16..1aee7d803 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 ## IBM(c) 2017 EPL license http://www.eclipse.org/legal/epl-v10.html
+#MG June 26
 
 package xCAT_plugin::openbmc;
 
@@ -164,6 +165,14 @@ my %status_info = (
     RFLASH_UPDATE_ACTIVATE_RESPONSE => {
         process        => \&rflash_response,
     },
+    RFLASH_UPDATE_PRIORITY_REQUEST  => {
+        method         => "PUT",
+        init_url       => "$openbmc_project_url/software",
+        data           => "xyz.openbmc_project.Software.Activation.RequestedPriority.0",
+    },
+    RFLASH_UPDATE_PRIORITY_RESPONSE => {
+        process        => \&rflash_response,
+    },
 
     RINV_REQUEST => {
         method         => "GET",
@@ -856,6 +865,7 @@ sub parse_command_status {
                 if ($update_file =~ /^[[:xdigit:]]+$/i) {
                     # Update init_url to include the id of the update to activate
                     $status_info{RFLASH_UPDATE_ACTIVATE_REQUEST}{init_url} .= "/$update_file/attr/RequestedActivation";
+                    $status_info{RFLASH_UPDATE_ACTIVATE_REQUEST}{init_url} .= "/$update_file/attr/RequestedActivation";
                 }
             }
         }
@@ -883,6 +893,8 @@ sub parse_command_status {
             print "Current value of activate request $status_info{RFLASH_UPDATE_ACTIVATE_REQUEST}{init_url} \n";
             $next_status{LOGIN_RESPONSE} = "RFLASH_UPDATE_ACTIVATE_REQUEST";
             $next_status{"RFLASH_UPDATE_ACTIVATE_REQUEST"} = "RFLASH_UPDATE_ACTIVATE_RESPONSE";
+            $next_status{"RFLASH_UPDATE_ACTIVATE_RESPOSNE"} = "RFLASH_UPDATE_PRIORITY_REQUEST";
+            $next_status{"RFLASH_UPDATE_PRIORITY_REQUEST"} = "RFLASH_UPDATE_PRIORITY_RESPONSE";
             #xCAT::SvrUtils::sendmsg("Activate option is not yet supported.", $callback);
             #return 1;
         }
@@ -1840,7 +1852,10 @@ sub rflash_response {
         }
     }
     if ($node_info{$node}{cur_status} eq "RFLASH_UPDATE_ACTIVATE_RESPONSE") {
-        print "Update activatiion response\n";
+        print "Update activation response\n";
+    }
+    if ($node_info{$node}{cur_status} eq "RFLASH_UPDATE_PRIORITY_RESPONSE") {
+        print "Update priority response\n";
     }
 
     if ($next_status{ $node_info{$node}{cur_status} }) {

From 0fdeb8279aeed5e9dafe15ff5cf6078dc6103296 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Tue, 25 Jul 2017 15:27:23 -0400
Subject: [PATCH 250/283] Activate firmware update and track progress

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 1aee7d803..be59875fd 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -165,6 +165,13 @@ my %status_info = (
     RFLASH_UPDATE_ACTIVATE_RESPONSE => {
         process        => \&rflash_response,
     },
+    RFLASH_UPDATE_CHECK_STATE_REQUEST  => {
+        method         => "GET",
+        init_url       => "$openbmc_project_url/software",
+    },
+    RFLASH_UPDATE_CHECK_STATE_RESPONSE => {
+        process        => \&rflash_response,
+    },
     RFLASH_UPDATE_PRIORITY_REQUEST  => {
         method         => "PUT",
         init_url       => "$openbmc_project_url/software",
@@ -864,8 +871,10 @@ sub parse_command_status {
                 # Check if hex number for the updateid is passed
                 if ($update_file =~ /^[[:xdigit:]]+$/i) {
                     # Update init_url to include the id of the update to activate
+                    # MG
                     $status_info{RFLASH_UPDATE_ACTIVATE_REQUEST}{init_url} .= "/$update_file/attr/RequestedActivation";
-                    $status_info{RFLASH_UPDATE_ACTIVATE_REQUEST}{init_url} .= "/$update_file/attr/RequestedActivation";
+                    # Update init_url to include the id of the update to check state
+                    $status_info{RFLASH_UPDATE_CHECK_STATE_REQUEST}{init_url} .= "/$update_file";
                 }
             }
         }
@@ -893,8 +902,8 @@ sub parse_command_status {
             print "Current value of activate request $status_info{RFLASH_UPDATE_ACTIVATE_REQUEST}{init_url} \n";
             $next_status{LOGIN_RESPONSE} = "RFLASH_UPDATE_ACTIVATE_REQUEST";
             $next_status{"RFLASH_UPDATE_ACTIVATE_REQUEST"} = "RFLASH_UPDATE_ACTIVATE_RESPONSE";
-            $next_status{"RFLASH_UPDATE_ACTIVATE_RESPOSNE"} = "RFLASH_UPDATE_PRIORITY_REQUEST";
-            $next_status{"RFLASH_UPDATE_PRIORITY_REQUEST"} = "RFLASH_UPDATE_PRIORITY_RESPONSE";
+            $next_status{"RFLASH_UPDATE_ACTIVATE_RESPONSE"} = "RFLASH_UPDATE_CHECK_STATE_REQUEST";
+            $next_status{"RFLASH_UPDATE_CHECK_STATE_REQUEST"} = "RFLASH_UPDATE_CHECK_STATE_RESPONSE";
             #xCAT::SvrUtils::sendmsg("Activate option is not yet supported.", $callback);
             #return 1;
         }
@@ -1852,10 +1861,41 @@ sub rflash_response {
         }
     }
     if ($node_info{$node}{cur_status} eq "RFLASH_UPDATE_ACTIVATE_RESPONSE") {
-        print "Update activation response\n";
+        # We get here after the activation of the image file. No processing. Just a landing spot 
     }
-    if ($node_info{$node}{cur_status} eq "RFLASH_UPDATE_PRIORITY_RESPONSE") {
-        print "Update priority response\n";
+    if ($node_info{$node}{cur_status} eq "RFLASH_UPDATE_CHECK_STATE_RESPONSE") {
+        my $activation_state;
+        my $progress_state;
+        my $priority_state;
+        foreach my $key_url (keys %{$response_info->{data}}) {
+            my $content = ${ $response_info->{data} }{$key_url};
+            # Get values of some attributes to determine activation status 
+            if ($key_url eq "Activation") {
+                $activation_state = ${ $response_info->{data} }{$key_url};
+            }
+            if ($key_url eq "Progress") {
+                $progress_state = ${ $response_info->{data} }{$key_url};
+            }
+            if ($key_url eq "Priority") {
+                $priority_state = ${ $response_info->{data} }{$key_url};
+            }
+        }
+
+        if ($activation_state eq "xyz.openbmc_project.Software.Activation.Activations.Active" && $priority_state eq "0") {
+            # Activation state of active and priority of 0 indicates the avtivation has been completed
+            xCAT::SvrUtils::sendmsg("Firmware update successfully activated", $callback, $node);
+            $wait_node_num--;
+            return;
+        }
+
+        if ($activation_state eq "xyz.openbmc_project.Software.Activation.Activations.Activating") {
+            # Activation still going, sleep for a bit, then print the progress value
+            sleep(15);
+            xCAT::SvrUtils::sendmsg("Activating firmware update. $progress_state\%", $callback, $node);
+
+            # Set next state to come back here to chect the activation status again.
+            $next_status{ $node_info{$node}{cur_status} } = "RFLASH_UPDATE_CHECK_STATE_REQUEST";
+        }
     }
 
     if ($next_status{ $node_info{$node}{cur_status} }) {

From 58e4523258236bdc41713b9413bf1c4d71699806 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Thu, 27 Jul 2017 15:17:05 -0400
Subject: [PATCH 251/283] openbmc Host firmware update activation

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index be59875fd..ab171aac2 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 ## IBM(c) 2017 EPL license http://www.eclipse.org/legal/epl-v10.html
-#MG June 26
 
 package xCAT_plugin::openbmc;
 
@@ -172,12 +171,12 @@ my %status_info = (
     RFLASH_UPDATE_CHECK_STATE_RESPONSE => {
         process        => \&rflash_response,
     },
-    RFLASH_UPDATE_PRIORITY_REQUEST  => {
+    RFLASH_SET_PRIORITY_REQUEST  => {
         method         => "PUT",
         init_url       => "$openbmc_project_url/software",
-        data           => "xyz.openbmc_project.Software.Activation.RequestedPriority.0",
+        data           => "false", # Priority state of 0 sets image to active
     },
-    RFLASH_UPDATE_PRIORITY_RESPONSE => {
+    RFLASH_SET_PRIORITY_RESPONSE => {
         process        => \&rflash_response,
     },
 
@@ -583,10 +582,6 @@ sub parse_args {
             return ([ 1, "Unsupported command: $command $subcommand" ]);
         }
     } elsif ($command eq "rflash") {
-        #
-        # disable function until fully tested
-        #
-        $check = unsupported($callback); if (ref($check) eq "ARRAY") { return $check; }
         my $filename_passed = 0;
         my $updateid_passed = 0;
         foreach my $opt (@$extrargs) {
@@ -870,10 +865,9 @@ sub parse_command_status {
             else {
                 # Check if hex number for the updateid is passed
                 if ($update_file =~ /^[[:xdigit:]]+$/i) {
-                    # Update init_url to include the id of the update to activate
-                    # MG
-                    $status_info{RFLASH_UPDATE_ACTIVATE_REQUEST}{init_url} .= "/$update_file/attr/RequestedActivation";
-                    # Update init_url to include the id of the update to check state
+                    # Update init_url to include the id of the update
+                    $status_info{RFLASH_UPDATE_ACTIVATE_REQUEST}{init_url}    .= "/$update_file/attr/RequestedActivation";
+                    $status_info{RFLASH_SET_PRIORITY_REQUEST}{init_url}       .= "/$update_file/attr/Priority";
                     $status_info{RFLASH_UPDATE_CHECK_STATE_REQUEST}{init_url} .= "/$update_file";
                 }
             }
@@ -898,14 +892,17 @@ sub parse_command_status {
             $next_status{"RFLASH_FILE_UPLOAD_REQUEST"} = "RFLASH_FILE_UPLOAD_RESPONSE";
         }
         if ($activate) {
-            # MG
-            print "Current value of activate request $status_info{RFLASH_UPDATE_ACTIVATE_REQUEST}{init_url} \n";
+            # Activation of an update was requested.
+            # First we query the update image for its Activation state. If image is in "Ready" we
+            # need to set "RequestedActivation" attribute to "Active". If image is in "Active" we
+            # need to set "Priority" to 0.
             $next_status{LOGIN_RESPONSE} = "RFLASH_UPDATE_ACTIVATE_REQUEST";
             $next_status{"RFLASH_UPDATE_ACTIVATE_REQUEST"} = "RFLASH_UPDATE_ACTIVATE_RESPONSE";
             $next_status{"RFLASH_UPDATE_ACTIVATE_RESPONSE"} = "RFLASH_UPDATE_CHECK_STATE_REQUEST";
             $next_status{"RFLASH_UPDATE_CHECK_STATE_REQUEST"} = "RFLASH_UPDATE_CHECK_STATE_RESPONSE";
-            #xCAT::SvrUtils::sendmsg("Activate option is not yet supported.", $callback);
-            #return 1;
+
+            $next_status{"RFLASH_SET_PRIORITY_REQUEST"} = "RFLASH_SET_PRIORITY_RESPONSE";
+            $next_status{"RFLASH_SET_PRIORITY_RESPONSE"} = "RFLASH_UPDATE_CHECK_STATE_REQUEST";
         }
     }
 
@@ -1800,10 +1797,11 @@ sub rflash_response {
     my $update_activation;
     my $update_purpose;
     my $update_version;
+    my $update_priority = -1;
 
     if ($node_info{$node}{cur_status} eq "RFLASH_LIST_RESPONSE") {
         # Display "list" option header and data
-        xCAT::SvrUtils::sendmsg("ID       Purpose State    Version", $callback, $node);
+        xCAT::SvrUtils::sendmsg("ID       Purpose State      Version", $callback, $node);
         xCAT::SvrUtils::sendmsg("-" x 55, $callback, $node);
 
         foreach my $key_url (keys %{$response_info->{data}}) {
@@ -1819,7 +1817,15 @@ sub rflash_response {
             if (defined($content{Purpose}) and $content{Purpose}) {
                 $update_purpose = (split(/\./, $content{Purpose}))[ -1 ];
             }
-            xCAT::SvrUtils::sendmsg(sprintf("%-8s %-7s %-8s %s", $update_id, $update_purpose, $update_activation, $update_version), $callback, $node);
+            if (defined($content{Priority}))  {
+                $update_priority = (split(/\./, $content{Priority}))[ -1 ];
+            }
+            # Priority attribute of 0 indicates the "really" active update image
+            if ($update_priority == 0) {
+                $update_activation = $update_activation . "(*)";
+                $update_priority = -1; # Reset update priority for next loop iteration
+            }
+            xCAT::SvrUtils::sendmsg(sprintf("%-8s %-7s %-10s %s", $update_id, $update_purpose, $update_activation, $update_version), $callback, $node);
         }
         xCAT::SvrUtils::sendmsg("", $callback, $node); #Separate output in case more than 1 endpoint
     }
@@ -1861,7 +1867,10 @@ sub rflash_response {
         }
     }
     if ($node_info{$node}{cur_status} eq "RFLASH_UPDATE_ACTIVATE_RESPONSE") {
-        # We get here after the activation of the image file. No processing. Just a landing spot 
+        xCAT::SvrUtils::sendmsg("rflash started, please wait...", $callback, $node);
+    }
+    if ($node_info{$node}{cur_status} eq "RFLASH_SET_PRIORITY_RESPONSE") {
+        print "Update priority has been set";
     }
     if ($node_info{$node}{cur_status} eq "RFLASH_UPDATE_CHECK_STATE_RESPONSE") {
         my $activation_state;
@@ -1881,14 +1890,22 @@ sub rflash_response {
             }
         }
 
-        if ($activation_state eq "xyz.openbmc_project.Software.Activation.Activations.Active" && $priority_state eq "0") {
-            # Activation state of active and priority of 0 indicates the avtivation has been completed
-            xCAT::SvrUtils::sendmsg("Firmware update successfully activated", $callback, $node);
-            $wait_node_num--;
-            return;
+        if ($activation_state =~ /Software.Activation.Activations.Active/) { 
+            if (scalar($priority_state) == 0) {
+                # Activation state of active and priority of 0 indicates the activation has been completed
+                xCAT::SvrUtils::sendmsg("Firmware update successfully activated", $callback, $node);
+                $wait_node_num--;
+                return;
+            }
+            else {
+                # Activation state of active and priority of non 0 - need to just set priority to 0 to activate
+                print "Update is already active, just need to set priority to 0";
+                $next_status{ $node_info{$node}{cur_status} } = "RFLASH_SET_PRIORITY_REQUEST";
+            }
         }
 
-        if ($activation_state eq "xyz.openbmc_project.Software.Activation.Activations.Activating") {
+        #if ($activation_state eq "xyz.openbmc_project.Software.Activation.Activations.Activating") {
+        if ($activation_state =~ /Software.Activation.Activations.Activating/) {
             # Activation still going, sleep for a bit, then print the progress value
             sleep(15);
             xCAT::SvrUtils::sendmsg("Activating firmware update. $progress_state\%", $callback, $node);

From 711f1549db08e318df02abf8885e9e7c155ab328 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Thu, 27 Jul 2017 15:27:36 -0400
Subject: [PATCH 252/283] OpenBMC host firmware activation 2

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index ab171aac2..153792d88 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -808,7 +808,6 @@ sub parse_command_status {
 
     if ($command eq "rflash") {
         my $check_version = 0;
-<<<<<<< HEAD
         my $list = 0;
         my $delete = 0;
         my $upload = 0;

From 1d9909e074e936acd6f8b378d2a3165f3d5d4800 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Tue, 1 Aug 2017 12:01:21 -0400
Subject: [PATCH 253/283] Updates from review

---
 .../admin-guides/references/man1/rflash.1.rst | 43 +++++++++--
 perl-xCAT/xCAT/Usage.pm                       |  6 +-
 xCAT-client/pods/man1/rflash.1.pod            | 27 ++++++-
 xCAT-server/lib/xcat/plugins/openbmc.pm       | 74 +++++++++----------
 4 files changed, 103 insertions(+), 47 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 4c69921d0..5f688c7ac 100644
--- a/docs/source/guides/admin-guides/references/man1/rflash.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rflash.1.rst
@@ -46,13 +46,20 @@ NeXtScale FPC specific:
 \ **rflash**\  \ *noderange*\  \ *http_directory*\ 
 
 
-OpenPOWER BMC specific:
-=======================
+OpenPOWER BMC specific (using IPMI):
+====================================
 
 
 \ **rflash**\  \ *noderange*\  [\ *hpm_file_path*\  | \ **-d=**\ \ *data_directory*\ ] [\ **-c | -**\ **-check**\ ] [\ **-**\ **-retry=**\ \ *count*\ ] [\ **-V**\ ]
 
 
+OpenPOWER OpenBMC specific :
+============================
+
+
+\ **rflash**\  \ *noderange*\  [\ *tar_file_path*\  | \ *image_id*\ ] [\ **-c | -**\ **-check**\ ] [\ **-a | -**\ **-activate**\ ] [\ **-l | -**\ **-list**\ ] [\ **-u | -**\ **-upload**\ ]
+
+
 
 *******************
 \ **Description**\ 
@@ -118,14 +125,22 @@ NeXtScale FPC specific:
 The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware. The http information required includes both the MN IP address as well as the directory containing the firmware. It is recommended that the firmware be downloaded and placed in the /install directory structure as the xCAT MN /install directory is configured with the correct permissions for http.  Refer to the doc to get more details: XCAT_NeXtScale_Clusters
 
 
-OpenPOWER specific:
-===================
+OpenPOWER specific (using IPMI):
+================================
 
 
 The command will update firmware for OpenPOWER BMC when given an OpenPOWER node and either the hpm formatted file path or path to a data directory.
 \ **Note:**\  When using \ **rflash**\  in hierarchical environment, the hpm file or data directory must be accessible from Service Nodes.
 
 
+OpenPOWER OpenBMC specific:
+===========================
+
+
+The command will update firmware for OpenPOWER OpenBMC when given an OpenPOWER node and either an update .tar file or an uploaded image id.
+\ **Note:**\  When using \ **rflash**\  in hierarchical environment, the .tar file must be accessible from Service Nodes.
+
+
 
 ***************
 \ **Options**\ 
@@ -141,7 +156,7 @@ The command will update firmware for OpenPOWER BMC when given an OpenPOWER node
 
 \ **-c|-**\ **-check**\ 
  
- Check the firmware version of BMC and HPM file.
+ Check the firmware version of BMC and an update file.
  
 
 
@@ -187,6 +202,24 @@ The command will update firmware for OpenPOWER BMC when given an OpenPOWER node
  
 
 
+\ **-a|-**\ **-activate**\ 
+ 
+ Activate update image. Image id must be specified.
+ 
+
+
+\ **-l|-**\ **-list**\ 
+ 
+ List currently uploaded update images. "(\*)" indicates currently active image.
+ 
+
+
+\ **-u|-**\ **-upload**\ 
+ 
+ Upload update image. Specified file must be in .tar format.
+ 
+
+
 \ **-v|-**\ **-version**\ 
  
  Displays the command's version.
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 82ac2eff8..6df950099 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -342,8 +342,10 @@ my %usage = (
 	rflash <noderange> -p <rpm_directory> [--activate {disruptive|deferred}] [-d <data_directory>]
 	rflash <noderange> [--commit | --recover] [-V|--verbose]
         rflash <noderange> [--bpa_acdl]
-    PPC64LE (using BMC Management) specific:
-        rflash <noderange> [-c | --check] [--retry=<count>] [-V] [<hpm_file>|-d=<data_directory>]",
+    PPC64LE (using IPMI Management) specific:
+        rflash <noderange> [-c|--check] [--retry=<count>] [-V] [<hpm_file>|-d=<data_directory>]
+    PPC64LE (using OpenBMC Management) specific:
+        rflash <noderange> [-c|--check] [-l|--list] [-a|--activate] [-u|--upload] [<tar_file>|<image_id>]",
     "mkhwconn" =>
       "Usage:
     mkhwconn [-h|--help]
diff --git a/xCAT-client/pods/man1/rflash.1.pod b/xCAT-client/pods/man1/rflash.1.pod
index 9f0cf29f4..283b35381 100644
--- a/xCAT-client/pods/man1/rflash.1.pod
+++ b/xCAT-client/pods/man1/rflash.1.pod
@@ -22,10 +22,14 @@ B<rflash> I<noderange> {B<--commit>|B<--recover>}
 
 B<rflash> I<noderange> I<http_directory>
 
-=head2 OpenPOWER BMC specific:
+=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>]
 
+=head2 OpenPOWER OpenBMC specific :
+
+B<rflash> I<noderange> [I<tar_file_path> | I<image_id>] [B<-c>|B<--check>] [B<-a>|B<--activate>] [B<-l>|B<--list>] [B<-u>|B<--upload>]
+
 =head1 B<Description>
 
 The B<rflash> command initiates Firmware updates on supported xCAT nodes.  Licensed Internal Code (also known as microcode) updates are performed on supported HMC-attached  POWER5 and POWER6 pSeries nodes, and POWER7 systems using Direct FSP management.
@@ -79,11 +83,16 @@ For more details about the Firmware Update using Direct FSP/BPA Management, refe
 
 The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware. The http information required includes both the MN IP address as well as the directory containing the firmware. It is recommended that the firmware be downloaded and placed in the /install directory structure as the xCAT MN /install directory is configured with the correct permissions for http.  Refer to the doc to get more details: XCAT_NeXtScale_Clusters 
 
-=head2 OpenPOWER specific:
+=head2 OpenPOWER specific (using IPMI):
 
 The command will update firmware for OpenPOWER BMC when given an OpenPOWER node and either the hpm formatted file path or path to a data directory.
 B<Note:> When using B<rflash> in hierarchical environment, the hpm file or data directory must be accessible from Service Nodes.
 
+=head2 OpenPOWER OpenBMC specific:
+
+The command will update firmware for OpenPOWER OpenBMC when given an OpenPOWER node and either an update .tar file or an uploaded image id.
+B<Note:> When using B<rflash> in hierarchical environment, the .tar file must be accessible from Service Nodes.
+
 =head1 B<Options>
 
 =over 7
@@ -94,7 +103,7 @@ Writes the command's usage statement to standard output.
 
 =item B<-c|--check>
 
-Check the firmware version of BMC and HPM file.
+Check the firmware version of BMC and an update file.
 
 =item B<-p> I<directory>
 
@@ -124,6 +133,18 @@ Used to recover the flash image in the permanent side of the chip to the tempora
 
 Specify number of times to retry the update if failure is detected. Default value is 2. Value of 0 can be used to indicate no retries.
 
+=item B<-a|--activate>
+
+Activate update image. Image id must be specified.
+
+=item B<-l|--list>
+
+List currently uploaded update images. "(*)" indicates currently active image.
+
+=item B<-u|--upload>
+
+Upload update image. Specified file must be in .tar format.
+
 =item B<-v|--version>
 
 Displays the command's version.
diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 153792d88..f818b678a 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -584,40 +584,42 @@ sub parse_args {
     } elsif ($command eq "rflash") {
         my $filename_passed = 0;
         my $updateid_passed = 0;
+        my $option_flag;
         foreach my $opt (@$extrargs) {
-            print "Examening $opt \n";
             # Only files ending on .tar are allowed
             if ($opt =~ /.*\.tar$/i) {
                 $filename_passed = 1;
-                print "Opt matches filename ending on .tar \n";
                 next;
             }
             # Check if hex number for the updateid is passed
             if ($opt =~ /^[[:xdigit:]]+$/i) {
                 $updateid_passed = 1;
-                print "Opt matches hex fileid \n";
                 next;
             }
-            if ($filename_passed) {
-                # Filename was passed, check flags allowed with file
-                if ($opt !~ /^-c$|^--check$|^-d$|^--delete$|^-u$|^--upload$/) {
-                    return ([ 1, "Invalid option specified when a file is provided: $opt" ]);
+            # check if option starting with - was passed
+            if ($opt =~ /^-/) {
+                $option_flag = $opt;
+            }
+        }
+        if ($filename_passed) {
+            # Filename was passed, check flags allowed with file
+            if ($option_flag !~ /^-c$|^--check$|^-d$|^--delete$|^-u$|^--upload$/) {
+                return ([ 1, "Invalid option specified when a file is provided: $option_flag" ]);
+            }
+        }
+        else {
+            if ($updateid_passed) {
+                # Updateid was passed, check flags allowed with update id
+                if ($option_flag !~ /^^-d$|^--delete$|^-a$|^--activate$/) {
+                    return ([ 1, "Invalid option specified when an update id is provided: $option_flag" ]);
                 }
             }
             else {
-                if ($updateid_passed) {
-                    # Updateid was passed, check flags allowed with update id
-                    if ($opt !~ /^^-d$|^--delete$|^-a$|^--activate$/) {
-                        return ([ 1, "Invalid option specified when an update id is provided: $opt" ]);
-                    }
-                }
-                else {
-                   # Neither Filename nor updateid was not passed, check flags allowed without file or updateid
-                   if ($opt !~ /^-c$|^--check$|^-l$|^--list/) {
-                       return ([ 1, "Invalid option specified: $opt" ]);
-                   }
-                }
-            }
+                # Neither Filename nor updateid was not passed, check flags allowed without file or updateid
+                if ($option_flag !~ /^-c$|^--check$|^-l$|^--list/) {
+                    return ([ 1, "Invalid option specified: $option_flag" ]);
+               }
+            }  
         }
     } else {
         return ([ 1, "Command is not supported." ]);
@@ -812,25 +814,24 @@ sub parse_command_status {
         my $delete = 0;
         my $upload = 0;
         my $activate = 0;
+        my $update_file;
 
-        if ($$subcommands[-1] =~ /c|check/) {
-            $check_version = 1;
-            pop(@$subcommands);
-        } elsif ($$subcommands[-1] =~ /l|list/) {
-            $list = 1;
-            pop(@$subcommands);
-        } elsif ($$subcommands[-1] =~ /d|delete/) {
-            $delete = 1;
-            pop(@$subcommands);
-        } elsif ($$subcommands[-1] =~ /u|upload/) {
-            $upload = 1;
-            pop(@$subcommands);
-        } elsif ($$subcommands[-1] =~ /a|activate/) {
-            $activate = 1;
-            pop(@$subcommands);
+        foreach $subcommand (@$subcommands) {
+            if ($subcommand =~ /-c|--check/) {
+                $check_version = 1;
+            } elsif ($subcommand =~ /-l|--list/) {
+                $list = 1;
+            } elsif ($subcommand =~ /-d|--delete/) {
+                $delete = 1;
+            } elsif ($subcommand =~ /-u|--upload/) {
+                $upload = 1;
+            } elsif ($subcommand =~ /-a|--activate/) {
+                $activate = 1;
+            } else {
+                $update_file = $subcommand;
+            }
         }
 
-        my $update_file = $$subcommands[0]; 
         my $filename = undef;
         my $file_id = undef;
         my $grep_cmd = "/usr/bin/grep -a";
@@ -1903,7 +1904,6 @@ sub rflash_response {
             }
         }
 
-        #if ($activation_state eq "xyz.openbmc_project.Software.Activation.Activations.Activating") {
         if ($activation_state =~ /Software.Activation.Activations.Activating/) {
             # Activation still going, sleep for a bit, then print the progress value
             sleep(15);

From 0d85cd441be3d7f42a8266ecd0b4e6cb210a9519 Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Wed, 2 Aug 2017 14:39:28 +0800
Subject: [PATCH 254/283] 1, Make the function header and comments more clear

---
 perl-xCAT/xCAT/Scope.pm                   | 15 ++++++++-------
 xCAT-server/lib/xcat/plugins/grub2.pm     | 16 +++++-----------
 xCAT-server/lib/xcat/plugins/petitboot.pm | 16 +++++-----------
 xCAT-server/lib/xcat/plugins/xnba.pm      | 16 +++++-----------
 4 files changed, 23 insertions(+), 40 deletions(-)

diff --git a/perl-xCAT/xCAT/Scope.pm b/perl-xCAT/xCAT/Scope.pm
index b35388fe3..39bb3da44 100644
--- a/perl-xCAT/xCAT/Scope.pm
+++ b/perl-xCAT/xCAT/Scope.pm
@@ -126,7 +126,8 @@ sub get_parallel_scope {
 =head3 get_broadcast_scope_with_parallel
 
     Convert a request object to an array of multiple requests according to the 
-    splitted node range.
+    splitted node range. Also it replicates the requests to all required service
+    nodes or management node.
 
     Arguments:
        Reference of request
@@ -155,7 +156,8 @@ sub get_broadcast_scope_with_parallel {
     my @requests = (); # The request array will be return.
     push @requests, @$reqs;
 
-    # get site.master from DB and dispatch to it as MN will not be in SN list.
+    # when this method is called on service node, it is required to broadcast to MN too.
+    # get site.master from DB in order to dispatch to MN ( MN will not be added in servicenode table)
     if ( xCAT::Utils->isServiceNode() ) {
         my @entries = xCAT::TableUtils->get_site_attribute("master");
         my $master = $entries[0];
@@ -184,8 +186,10 @@ sub get_broadcast_scope_with_parallel {
 
 =head3 get_broadcast_disjoint_scope_with_parallel
 
-    Convert a request object to an array of multiple request objects according to the 
-    service node management scope. (Work under disjoint mode)
+    Convert a request object to an array of multiple requests according to the 
+    splitted node range. Also it replicates the requests to all required service
+    nodes or management node, but the request to a service node will only contains 
+    the node range it manages.
 
     Arguments:
        Reference of request
@@ -245,9 +249,6 @@ sub get_broadcast_disjoint_scope_with_parallel {
 
             $reqs = get_parallel_scope($reqcopy);
             push @requests, @$reqs;
-            #foreach (@$reqs) {
-            #    push @requests, {%$_};
-            #}
         } elsif ($handled4me == 0) {
             my $reqcopy = {%$req};
             $reqcopy->{'node'} = $sn_hash->{$xcatdest};
diff --git a/xCAT-server/lib/xcat/plugins/grub2.pm b/xCAT-server/lib/xcat/plugins/grub2.pm
index 563595b72..03482eeb4 100644
--- a/xCAT-server/lib/xcat/plugins/grub2.pm
+++ b/xCAT-server/lib/xcat/plugins/grub2.pm
@@ -1,6 +1,6 @@
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 package xCAT_plugin::grub2;
-#use Data::Dumper;
+
 use Sys::Syslog;
 use xCAT::Scope;
 use xCAT::Utils;
@@ -611,17 +611,13 @@ sub process_request {
     my $str_node = join(" ", @nodes);
     xCAT::MsgUtils->trace($verbose_on_off, "d", "grub2: nodes are $str_node") if ($str_node);
 
-    # return directly if no nodes in the same network
+    # Return directly if no nodes in the same network, need to report error on console if its managed nodes are not handled.
     unless (@nodes) {
         xCAT::MsgUtils->message("S", "xCAT: grub2 netboot: no valid nodes. Stop the operation on this server.");
 
-        # We need special hanlding to see if the plugin needs report error.
-        # - For MN, it is designed to handle all nodes, any error is required to be reqport. (All nodes are handled on MN if sharedtftp=1)
-        # - For SN, if disjointdhcps=1 AND sharedtftp=0, all nodes in the request are the nodes managed by this SN, so we need report error
-        #           if disjointdhcps=1 AND sharedtftp=0, report error only if there are nodes are managed by me.
-        if (xCAT::Utils->isMN() != 1 && $request->{'_disparatetftp'}->[0] && $request->{'_disjointmode'}->[0] != 1) {
+        # If non-shared tftproot and non disjoint mode, need to figure out if no nodes here is a normal case.
+        if ($request->{'_disparatetftp'}->[0] && $request->{'_disjointmode'}->[0] != 1) {
             # Find out which nodes are really mine only when not sharedtftp and not disjoint mode.
-            # For other case, all passing node range are required to be handled.
             my %iphash   = ();
             # flag the IPs or names in iphash
             foreach (@hostinfo) { $iphash{$_} = 1; }
@@ -629,16 +625,14 @@ sub process_request {
             # Get managed node list under current server
             # The node will be under under 'site.master' if no 'noderes.servicenode' is defined
             my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@rnodes, "xcat", "MN");
-            #my %managed = ();
             my $req2manage = 0;
             foreach (keys %$sn_hash) {
                 if (exists($iphash{$_})) {
-                    #my $cur_xmaster = $_;
-                    #foreach (@{ $sn_hash->{$cur_xmaster} }) { $managed{$_} = 1; }
                     $req2manage = 1;
                     last;
                 }
             }
+            # Okay, now report error as no nodes are handled.
             if ($req2manage == 0) {
                 xCAT::MsgUtils->trace(0, "d", "grub2: No nodes are required to be managed on this server");
                 return;
diff --git a/xCAT-server/lib/xcat/plugins/petitboot.pm b/xCAT-server/lib/xcat/plugins/petitboot.pm
index 46b471f8f..af3320ae2 100644
--- a/xCAT-server/lib/xcat/plugins/petitboot.pm
+++ b/xCAT-server/lib/xcat/plugins/petitboot.pm
@@ -501,17 +501,13 @@ sub process_request {
     my $str_node = join(" ", @nodes);
     xCAT::MsgUtils->trace($verbose_on_off, "d", "petitboot: nodes are $str_node") if ($str_node);
 
-    # Return directly if no nodes in the same network
+    # Return directly if no nodes in the same network, need to report error on console if its managed nodes are not handled.
     unless (@nodes) {
         xCAT::MsgUtils->message("S", "xCAT: petitboot netboot: no valid nodes. Stop the operation on this server.");
 
-        # We need special hanlding to see if the plugin needs report error.
-        # - For MN, it is designed to handle all nodes, any error is required to be reqport. (All nodes are handled on MN if sharedtftp=1)
-        # - For SN, if disjointdhcps=1 AND sharedtftp=0, all nodes in the request are the nodes managed by this SN, so we need report error
-        #           if disjointdhcps=1 AND sharedtftp=0, report error only if there are nodes are managed by me.
-        if (xCAT::Utils->isMN() != 1 && $request->{'_disparatetftp'}->[0] && $request->{'_disjointmode'}->[0] != 1) {
+        # If non-shared tftproot and non disjoint mode, need to figure out if no nodes here is a normal case.
+        if ($request->{'_disparatetftp'}->[0] && $request->{'_disjointmode'}->[0] != 1) {
             # Find out which nodes are really mine only when not sharedtftp and not disjoint mode.
-            # For other case, all passing node range are required to be handled.
             my %iphash   = ();
             # flag the IPs or names in iphash
             foreach (@hostinfo) { $iphash{$_} = 1; }
@@ -519,21 +515,19 @@ sub process_request {
             # Get managed node list under current server
             # The node will be under under 'site.master' if no 'noderes.servicenode' is defined
             my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@rnodes, "xcat", "MN");
-            #my %managed = ();
             my $req2manage = 0;
             foreach (keys %$sn_hash) {
                 if (exists($iphash{$_})) {
-                    #my $cur_xmaster = $_;
-                    #foreach (@{ $sn_hash->{$cur_xmaster} }) { $managed{$_} = 1; }
                     $req2manage = 1;
                     last;
                 }
             }
             if ($req2manage == 0) {
-                xCAT::MsgUtils->trace(0, "d", "petitboot: No nodes are required to be managed on this server");
+                #No nodes are required to be handled, quit without error.
                 return;
             }
         }
+        # Okay, now report error as no nodes are handled.
         my $rsp;
         $rsp->{errorcode}->[0] = 1;
         $rsp->{error}->[0]     = "Failed to generate petitboot configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.";
diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm
index 834434a98..7250f1b6c 100644
--- a/xCAT-server/lib/xcat/plugins/xnba.pm
+++ b/xCAT-server/lib/xcat/plugins/xnba.pm
@@ -547,17 +547,13 @@ sub process_request {
     my $str_node = join(" ", @nodes);
     xCAT::MsgUtils->trace(0, "d", "xnba: nodes are $str_node") if ($str_node);
 
-    # return directly if no nodes in the same network
+    # Return directly if no nodes in the same network, need to report error on console if its managed nodes are not handled.
     unless (@nodes) {
         xCAT::MsgUtils->message("S", "xCAT: xnba netboot: no valid nodes. Stop the operation on this server.");
 
-        # We need special hanlding to see if the plugin needs report error.
-        # - For MN, it is designed to handle all nodes, any error is required to be reqport. (All nodes are handled on MN if sharedtftp=1)
-        # - For SN, if disjointdhcps=1 AND sharedtftp=0, all nodes in the request are the nodes managed by this SN, so we need report error
-        #           if disjointdhcps=1 AND sharedtftp=0, report error only if there are nodes are managed by me.
-        if (xCAT::Utils->isMN() != 1 && $::XNBA_request->{'_disparatetftp'}->[0] && $::XNBA_request->{'_disjointmode'}->[0] != 1) {
+        # If non-shared tftproot and non disjoint mode, need to figure out if no nodes here is a normal case.
+        if ($::XNBA_request->{'_disparatetftp'}->[0] && $::XNBA_request->{'_disjointmode'}->[0] != 1) {
             # Find out which nodes are really mine only when not sharedtftp and not disjoint mode.
-            # For other case, all passing node range are required to be handled.
             my %iphash   = ();
             # flag the IPs or names in iphash
             foreach (@hostinfo) { $iphash{$_} = 1; }
@@ -565,21 +561,19 @@ sub process_request {
             # Get managed node list under current server
             # The node will be under under 'site.master' if no 'noderes.servicenode' is defined
             my $sn_hash = xCAT::ServiceNodeUtils->getSNformattedhash(\@rnodes, "xcat", "MN");
-            #my %managed = ();
             my $req2manage = 0;
             foreach (keys %$sn_hash) {
                 if (exists($iphash{$_})) {
-                    #my $cur_xmaster = $_;
-                    #foreach (@{ $sn_hash->{$cur_xmaster} }) { $managed{$_} = 1; }
                     $req2manage = 1;
                     last;
                 }
             }
             if ($req2manage == 0) {
-                xCAT::MsgUtils->trace(0, "d", "xnba: No nodes are required to be managed on this server");
+                #No nodes are required to be handled, quit without error.
                 return;
             }
         }
+        # Okay, now report error as no nodes are handled.
         my $rsp;
         $rsp->{errorcode}->[0] = 1;
         $rsp->{error}->[0]     = "Failed to generate xnba configurations for some node(s) on $::myxcatname. Check xCAT log file for more details.";

From 405ed14a20f15b670e143d904dd76f8f7d2fbed2 Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Wed, 2 Aug 2017 15:33:42 +0800
Subject: [PATCH 255/283] Leverage syscall to resolve the hang in CI
 environment

---
 xCAT-server/sbin/xcatd | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index e462ce99a..dd34ccbed 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -940,8 +940,8 @@ unless ($foreground) {
     daemonize;
 }
 
-my @hostinfo = xCAT::NetworkUtils->determinehostname();
-my $XCATSERVER = $hostinfo[-1];
+# Cache the hostname, restart xcatd if hostname is changed after xcatd running
+my $MYXCATSERVER = Sys::Hostname::hostname;
 
 $dbmaster = xCAT::Table::init_dbworker;
 if ($enable_perf) {
@@ -2588,19 +2588,19 @@ sub send_response {
     if ($encode eq "xml") {
         my $xml;
         if ($response->{xcatresponse}) {    # it's an aggregate, keeproot
-            if ($XCATSERVER) {
+            if ($MYXCATSERVER) {
                 my $rsp = $response->{xcatresponse};
                 if ( (ref($rsp) eq 'ARRAY') && scalar(@$rsp) > 0 ) {
                     foreach (@$rsp) {
-                        $_->{xcatdsource}->[0] = $XCATSERVER unless ($_->{xcatdsource});
+                        $_->{xcatdsource}->[0] = $MYXCATSERVER unless ($_->{xcatdsource});
                     }
                 }
             }
             $xml = XMLout($response, KeyAttr => [], NoAttr => 1, KeepRoot => 1);
         } else {
-            if ($XCATSERVER) {
+            if ($MYXCATSERVER) {
                 unless (exists($response->{serverdone})) {
-                    $response->{xcatdsource}->[0] = $XCATSERVER;
+                    $response->{xcatdsource}->[0] = $MYXCATSERVER;
                 }
             }
             $xml = XMLout($response, RootName => 'xcatresponse', NoAttr => 1);

From 5dcbe0fc78d8b8c46abcc47108a5815152af87ff Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Wed, 2 Aug 2017 02:26:45 -0400
Subject: [PATCH 256/283] Task 3554, enhance xcatprobe discovery precheck

---
 xCAT-probe/subcmds/discovery | 127 ++++++++++++++++++++++++++++++++---
 1 file changed, 118 insertions(+), 9 deletions(-)

diff --git a/xCAT-probe/subcmds/discovery b/xCAT-probe/subcmds/discovery
index c47a1add1..d2089b06b 100755
--- a/xCAT-probe/subcmds/discovery
+++ b/xCAT-probe/subcmds/discovery
@@ -41,6 +41,7 @@ my $valid_discovery_type_str = join(",", @valid_discovery_type);
 my $program_name = basename("$0");
 $::USAGE = "Usage:
     $program_name -h
+    $program_name -n <node_range> -m <discovery_type> -c
     $program_name -n <node_range> -m <discovery_type> [-t <max_waiting_time>] [-V] [--noprecheck] 
     $program_name -n <node_range> -m <discovery_type> -r <roll_back_duration> [-V] [--noprecheck]
 
@@ -55,6 +56,7 @@ Options:
     -V           : Output more information for debug.
     -m           : The method of discovery, the valid values are $valid_discovery_type_str.
     -n           : The range of predefined nodes, must be used with option -m.
+    -c           : Only do pre-check including predefined nodes' definition, genesis version and files, dynamic range.
     -t           : The maximum time to wait when doing monitor, unit is minutes. default is 60.
     -r           : Trigger 'Replay history' mode. Follow the duration of rolling back. Units are 'h' (hour) or 'm' (minute)
                    Supported format examples: 3h30m (3 hours and 30 minutes ago), 2h (2 hours ago), 40m (40 minutes ago) and 3 (3 hours ago).
@@ -73,6 +75,7 @@ my $maxwaittime = 60;    #unit is minute, the max wait time of monitor
 my $rollforward_time_of_replay;    #used by feature replay discovery log
 my $noderange;
 my $discovery_type;
+my $pre_check    = 0;
 my $no_pre_check = 0;
 my $nics;
 if (
@@ -80,6 +83,7 @@ if (
         "T"            => \$test,
         "V"            => \$verbose,
         "--noprecheck" => \$no_pre_check,
+        "c"            => \$pre_check,
         "m=s"          => \$discovery_type,
         "n=s"          => \$noderange,
         "t=s"          => \$maxwaittime,
@@ -121,6 +125,16 @@ if (defined($discovery_type)) {
     }
 }
 
+if ($pre_check) {
+    if ($no_pre_check or $rollforward_time_of_replay) {
+        probe_utils->send_msg("stdout", "f", "Option '-c' could not used with '--noprecheck', '-r'");
+        probe_utils->send_msg("stdout", "", "$::USAGE");
+        exit 1;
+    }
+    $rst = do_pre_check();
+    exit $rst;
+}
+
 if ($rollforward_time_of_replay) {
     if (($rollforward_time_of_replay !~ /(\d+)h(\d+)m/i) && ($rollforward_time_of_replay !~ /^(\d+)h*$/i) && ($rollforward_time_of_replay !~ /^(\d+)m$/i)) {
         probe_utils->send_msg("stdout", "f", "Unsupported time format for option '-r'");
@@ -194,10 +208,14 @@ sub check_pre_defined_node {
 
     # check whether there is bmc node in noderange
     my @bmcnodes = ();
+    my @nochain  = ();
     foreach my $node (keys %nodecheckrst) {
         if (($nodecheckrst{$node}{"nodetype"} eq "mp") and ($nodecheckrst{$node}{"hwtype"} eq "bmc")) {
             push @bmcnodes, $node;
         }
+        unless ($nodecheckrst{$node}{"chain"}) {
+            push @nochain, $node;
+        }
     }
     if (@bmcnodes) {
         my $bmcnode = join(",", @bmcnodes);
@@ -205,6 +223,12 @@ sub check_pre_defined_node {
         $rst = 1; 
     }
 
+    if (@nochain) {
+        my $nochainnode = join(",", @nochain);
+        probe_utils->send_msg("stdout", "f", "[$nochainnode] : Invalid value for attribute 'chain'");
+        $rst = 1;
+    }
+
     # if discover type is mtms, check whether mtms is only for per-define node and bmc node 
     @errornodes = ();
     if ($discovery_type eq "mtms") {
@@ -310,6 +334,10 @@ sub check_pre_defined_node {
             }
         }
 
+        my $all_switch = ` xcatprobe switch_macmap`;
+        my $error_switch = `echo -e "$all_switch" | grep "FAIL" | cut -d ' ' -f1`;
+        my $valid_nodes = `echo -e "$all_switch" | sed s'/\-//g' |  grep -v "FAIL" | grep -v "MAC address" | awk '{print \$4}' | grep -E -v "^\$"`;
+        my %error_switch_hash = ();
         my @error_switchport;
         my %errorhash = ();
         my $keystring;
@@ -322,8 +350,13 @@ sub check_pre_defined_node {
 
                 if (!(exists($nodecheckrst{$node}{"switch"})) or $nodecheckrst{$node}{"switch"} !~ /^\w/) {
                     push @error_attribute, "switch";
+                } elsif ($error_switch =~ $nodecheckrst{$node}{"switch"}) {
+                    my $error_switch_string = "No switch " . $nodecheckrst{$node}{"switch"} . " information obtained."; 
+                    push @{$error_switch_hash{$error_switch_string}}, $node;
+                    next;
                 }
-                if (!(exists($nodecheckrst{$node}{"switchport"})) or $nodecheckrst{$node}{"switchport"} !~ /^\w/) {
+
+                if (!(exists($nodecheckrst{$node}{"switchport"})) or $nodecheckrst{$node}{"switchport"} !~ /^\w/ or $valid_nodes !~ $node) {
                     push @error_attribute, "switchport";
                 }
 
@@ -377,6 +410,11 @@ sub check_pre_defined_node {
             probe_utils->send_msg("stdout", "f", "[$switchnode] : Duplicate node definition found for the same switch and switchport $switch_port.");
             $rst = 1;
         }
+        foreach my $key (keys %error_switch_hash) {
+            my $nodes = join(",", @{$error_switch_hash{$key}});
+            probe_utils->send_msg("stdout", "f", "[$nodes] : $key");
+            $rst = 1;
+        }
     }
                   
     return $rst;
@@ -492,7 +530,9 @@ sub do_pre_check {
 sub check_genesis_file {
     my $msg = "Genesis files are avaliable";
     my $rst = 0;
+    my @warn_msg;
 
+    my $genesis_v;
     my $os = probe_utils->get_os();
     if ($os =~ "unknown") {
         probe_utils->send_msg("stdout", "f", $msg);
@@ -508,6 +548,7 @@ sub check_genesis_file {
             probe_utils->send_msg("stdout", "d", "xCAT-genesis is not installed.");
             return 1;
         }
+        $genesis_v = `dpkg -s xcat-genesis-base-ppc64`;
     } else {
         my $genesis_output = `rpm -qa | grep -i "xcat-genesis"`;
         unless (($genesis_output =~ /base/ and $genesis_output =~ /ppc64/) and
@@ -518,6 +559,40 @@ sub check_genesis_file {
             probe_utils->send_msg("stdout", "d", "xCAT-genesis is not installed.");
             return 1;
         }
+        $genesis_v = `rpm -qi xCAT-genesis-base-ppc64`;
+    }
+
+    if ($genesis_v =~ /Built in environment .+fc26.* on (.+)\./) {
+        push @warn_msg, "xcat-genesis-base-ppc64 is built in environment fc26 on $1.";
+    }
+
+    my $genesis_update_flag_p;
+    my $genesis_update_flag_x;
+    my $genesis_time;
+    my $genesis_base_time;
+    my $genesis_script_time;
+    $genesis_base_time  = `stat /etc/xcat/genesis-base-updated | grep Modify | cut -d ' ' -f 2-3` if (-e '/etc/xcat/genesis-base-updated');
+    $genesis_script_time = `stat /etc/xcat/genesis-scripts-updated | grep Modify | cut -d ' ' -f 2-3` if (-e '/etc/xcat/genesis-scripts-updated');
+    if ($genesis_base_time > $genesis_script_time) {
+        $genesis_time = $genesis_base_time;
+    } else {
+        $genesis_time = $genesis_script_time;
+    }
+
+    my $dhcpinterface = `tabdump site | sed s/'"'//g | grep '^dhcpinterfaces'`;
+    my $noboot_file;
+    my @tmp_info = split(",", $dhcpinterface);
+    foreach (@tmp_info) {
+        if ($_ =~ /(.+):noboot/) {
+            my $noboot_nic = $1; 
+            my $ip_string = `ip -4 -o a | grep $noboot_nic | awk -F ' ' '{print \$4}'`;
+            if ($ip_string) {
+                my ($noboot_ip, $noboot_netmask) = split('\/', $ip_string);
+                my @noboot_ips = split('\.', $noboot_ip);
+                $noboot_file = $noboot_ips[0] . ".0.0.0_$noboot_netmask";
+                chomp($noboot_file);
+            }
+        }
     }
 
     my $tftpdir = `tabdump site | awk -F',' '/^"tftpdir",/ { gsub(/"/, "", \$2) ; print \$2 }'`;
@@ -539,9 +614,14 @@ sub check_genesis_file {
 
         @genesis_files = glob("$genesis_folder/*");
 
-        foreach (@genesis_files) {
-            unless (open(FILE, $_)) {
-                push @errors, "Cannot open file $_.";
+        foreach my $file (@genesis_files) {
+            if ($noboot_file and $file =~ $noboot_file) {
+                push @warn_msg, "File $file should not exist, please delete it.";
+                next;
+            }
+
+            unless (open(FILE, $file)) {
+                push @errors, "Cannot open file $file.";
                 $rst = 1;
                 next;
             }
@@ -558,6 +638,15 @@ sub check_genesis_file {
                         push @errors, "'initrd' cannot be downloaded from $initrd_path.";
                         $rst = 1;
                     }
+
+                    if ($initrd_path =~ /http.+($tftpdir\/.+)/) {
+                        my $initrd_file = $1;
+                        my $initrd_time = `stat $initrd_file | grep Modify | cut -d ' ' -f 2-3`;
+                        if ($initrd_time < $genesis_time) {
+                            $genesis_update_flag_p = 1;
+                        }
+                    }
+
                 }
 
                 if ($genesis_line =~ /^kernel/) {
@@ -593,9 +682,14 @@ sub check_genesis_file {
 
         @genesis_files = glob("$genesis_folder/*");
 
-        foreach (@genesis_files) {
-            if ($_ =~ /uefi$/) {
-                my $file_name = basename($_);
+        foreach my $file (@genesis_files) {
+            if ($noboot_file and $file =~ $noboot_file) {
+                push @warn_msg, "File $file should not exist, please delete it.";
+                next;
+            }
+
+            if ($file =~ /uefi$/) {
+                my $file_name = basename($file);
                 my @tmp_ip    = split('_', $file_name);
                 my $ip_range  = shift(@tmp_ip);
                 my $host_ip;
@@ -614,8 +708,8 @@ sub check_genesis_file {
                     next;
                 }
 
-                unless (open(FILE, $_)) {
-                    push @errors, "Cannot open file $_.";
+                unless (open(FILE, $file)) {
+                    push @errors, "Cannot open file $file.";
                     $rst = 1;
                     next;
                 }
@@ -671,7 +765,13 @@ sub check_genesis_file {
                                     if ($wget_rst) {
                                         push @errors, "'initrd' cannot be downloaded from $initrd_http.";
                                         $rst = 1;
+                                    } else {
+                                        my $initrd_time = `stat $initrd_path | grep Modify | cut -d ' ' -f 2-3`;
+                                        if ($initrd_time < $genesis_time) {
+                                            $genesis_update_flag_x = 1;
+                                        }
                                     }
+ 
                                 }
                             }
                         }
@@ -681,11 +781,16 @@ sub check_genesis_file {
         }
     }
 
+    push @warn_msg, "Genesis packages have been updated, please run 'mknb <arch>'" if ($genesis_update_flag_p and $genesis_update_flag_x);
+
     if ($rst) {
         probe_utils->send_msg("stdout", "f", $msg);
         probe_utils->send_msg("stdout", "d", $_) foreach (@errors);
     } else {
         probe_utils->send_msg("stdout", "o", $msg);
+        if (@warn_msg) {
+            probe_utils->send_msg("stdout", "w", $_) foreach (@warn_msg);
+        }
     }
 
     return $rst;
@@ -756,6 +861,8 @@ sub dhcp_dynamic_range_check {
             } else {
                 push @dynamic_range, "$2-$1";
             }
+        } elsif ($config_line =~ /^range dynamic-bootp (\d+.\d+.\d+.\d+)/) {
+            push @dynamic_range, "$1-$1";
         }
     }
 
@@ -859,6 +966,8 @@ sub get_node_ip {
             $nodeipcheck{$node}{"ip"} = $ip_net;
         } elsif (!$nodeipcheck{$node}{"ip"} and $ip_net) {
             $nodeipcheck{$node}{"ip"} = $ip_net;
+        } elsif ($nodeipcheck{$node}{"ip"} and !$ip_net) {
+            $nodeipcheck{$node}{"error"} = "Unknown host $node, please run 'makehosts' and 'makedns'";
         } 
         if ($ip_net and !$isonmynet) {
             $nodeipcheck{$node}{"error"} = "IP for $node is not on any network this server attached.";

From e27b5ec5987002557b2bc4b5237b027f8cd64857 Mon Sep 17 00:00:00 2001
From: Yuan Bai <bybai@cn.ibm.com>
Date: Wed, 2 Aug 2017 17:36:48 +0800
Subject: [PATCH 257/283] fix configeth get netmask in postscript (#3597)

---
 xCAT/postscripts/configeth | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth
index f57e84305..fa147ef06 100755
--- a/xCAT/postscripts/configeth
+++ b/xCAT/postscripts/configeth
@@ -487,9 +487,9 @@ elif [ "$1" = "-s" ];then
                 if [ ! -z "${inst_nic}" ];then
                     str_inst_ip=`ip -4 -o addr|grep -i ${inst_nic} |awk '{print $4}'|awk -F/ '{print $1}'`
                     if [ ! -z "$str_inst_ip" ];then
-                        inst_ip_pre=`ip ro ls|grep -i ${str_inst_ip}|awk '{print $1}'|awk -F/ '{print $1}'`
-                        if [ ! -z "$inst_ip_pre" ];then
-                            str_inst_mask=`route |grep ^${inst_ip_pre}|awk '{print $3}'|head -1`
+                        inst_prefix=`ip ro ls|grep -i ${str_inst_ip}|awk '{print $1}'|awk -F/ '{print $2}'`
+                        if [ ! -z "$inst_prefix" ];then
+                            str_inst_mask=`v4prefix2mask $inst_prefix`
                         fi
                     fi
                 fi

From cdd1441006889d6f5ca9b609222354294315e6fa Mon Sep 17 00:00:00 2001
From: Yuan Bai <bybai@cn.ibm.com>
Date: Wed, 2 Aug 2017 18:09:34 +0800
Subject: [PATCH 258/283] fix setroute failed during updatenode (#3598)

---
 xCAT/postscripts/routeop | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/xCAT/postscripts/routeop b/xCAT/postscripts/routeop
index 4e5501592..9ee356107 100755
--- a/xCAT/postscripts/routeop
+++ b/xCAT/postscripts/routeop
@@ -25,9 +25,13 @@
 
 if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
    str_dir_name=`dirname $0`
-   ([ -f $str_dir_name/xcatlib.sh ] && . $str_dir_name/xcatlib.sh) || \
-   ([ -f /install/postscripts/xcatlib.sh ] && . /install/postscripts/xcatlib.sh) || \
-   ([ -f /xcatpost/xcatlib.sh ] && . /xcatpost/xcatlib.sh)
+   if [ -f $str_dir_name/xcatlib.sh ]; then
+       . $str_dir_name/xcatlib.sh
+   elif [ -f /install/postscripts/xcatlib.sh ]; then
+       . /install/postscripts/xcatlib.sh
+   elif [ -f /xcatpost/xcatlib.sh ]; then
+       . /xcatpost/xcatlib.sh
+   fi
 fi
 
 op=$1

From 6914d28e8482bac932bda4b50f37a2575606f841 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Wed, 2 Aug 2017 07:23:54 -0400
Subject: [PATCH 259/283] enhance new doc based on comments

---
 .../common/deployment/network/cfg_network_bond_bridge.rst     | 2 +-
 .../common/deployment/network/cfg_network_bond_vlan.rst       | 2 +-
 .../deployment/network/cfg_network_bond_vlan_bridge.rst       | 2 +-
 .../common/deployment/network/cfg_network_bridge.rst          | 2 +-
 .../common/deployment/network/cfg_network_ethernet_nic.rst    | 4 ++--
 .../common/deployment/network/cfg_network_vlan.rst            | 2 +-
 .../common/deployment/network/cfg_network_vlan_bridge.rst     | 2 +-
 .../common/deployment/network/cfg_second_adapter.rst          | 4 ++--
 .../diskful/customize_image/network/cfg_network_adapter.rst   | 4 ++--
 .../diskless/customize_image/network/cfg_network_adapter.rst  | 4 ++--
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst
index ffe1006f2..fec33c383 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_bridge.rst
@@ -72,4 +72,4 @@ Check ``ifcfg-br0`` under ``/etc/sysconfig/network-scripts/`` ::
    STP="on"
    TYPE="Bridge"
 
-Use ``ip a`` command to check if ``br0`` and ``bond0`` are correct.
+Use ``ip addr`` command to check if ``br0`` and ``bond0`` are correct.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst
index b56020045..84130a096 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan.rst
@@ -58,4 +58,4 @@ Login to compute node cn1 and check ``ifcfg-bond0.1`` under ``/etc/sysconfig/net
    USERCTL=no
    VLAN=yes
 
-Use ``ip a`` command to check if ``br0`` and ``bond0`` are correct.
+Use ``ip addr`` command to check if ``br0`` and ``bond0`` are correct.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst
index 64001f546..317946682 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bond_vlan_bridge.rst
@@ -72,6 +72,6 @@ Check result
 
 Use ``ip`` command on ``cn1`` to check all NICs ::
    
-    xdsh cn1 "ip a"
+    xdsh cn1 "ip addr"
 
 Check all network configuration files under ``/etc/sysconfig/network-scripts/``.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst
index 78d650431..02c0a1075 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_bridge.rst
@@ -53,4 +53,4 @@ Check ``ifcfg-eth1`` under ``/etc/sysconfig/network-scripts/`` ::
    
     BRIDGE=br1
 
-Use ``ip a`` command to check if ``br1``, ``eth0.6`` and ``eth0.7`` are correct.
+Use ``ip addr`` command to check if ``br1``, ``eth0.6`` and ``eth0.7`` are correct.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst
index 215178679..5e5755deb 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_ethernet_nic.rst
@@ -46,7 +46,7 @@ Update /etc/hosts
 Configure adapters with static IPs
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-#. Execute ``confignetwork -s`` to configure both provision ip ``11.1.89.7`` and data ip ``13.1.89.7`` as static
+#. Execute ``confignetwork -s`` to configure both provision ip ``11.1.89.7`` and application data ip ``13.1.89.7`` as static
 
     a. Add ``confignetwork -s`` into postscript list to execute on reboot ::
 
@@ -71,6 +71,6 @@ Configure adapters with static IPs
 Check result
 ~~~~~~~~~~~~
 
-#. Use ``xdsh cn1 "ip a"`` to check ``eth0`` and ``eth1``
+#. Use ``xdsh cn1 "ip addr"`` to check ``eth0`` and ``eth1``
 
 #. Check ``ifcfg-eth0`` and ``ifcfg-eth1`` under ``/etc/sysconfig/network-scripts/``
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan.rst
index 94c63be56..41ed6a0a9 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan.rst
@@ -49,4 +49,4 @@ Login to compute node cn1 and check VLAN options in ``ifcfg-eth0.6`` and ``ifcfg
 
     VLAN=yes
 
-Use ``ip a`` command to check if ``eth0.6`` and ``eth0.7`` are there.
+Use ``ip addr`` command to check if ``eth0.6`` and ``eth0.7`` are there.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst
index 031df2b51..ebbf9fa12 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_network_vlan_bridge.rst
@@ -60,4 +60,4 @@ Login to compute node cn1 and check ``ifcfg-br1`` and ``ifcfg-br2`` under ``/etc
     STP="on"
     TYPE="Bridge"
 
-Use ``ip a`` command to check if ``br1``, ``br2``, ``eth0.6`` and ``eth0.7``.
+Use ``ip addr`` command to check if ``br1``, ``br2``, ``eth0.6`` and ``eth0.7``.
diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst
index 45db73984..8e4fda2c1 100644
--- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/network/cfg_second_adapter.rst
@@ -1,5 +1,5 @@
-Configure Additional Network Interfaces - confignics - (deprecated)
-===================================================================
+Configure Additional Network Interfaces old version - confignics - (deprecated)
+===============================================================================
 
 The **nics** table and the **confignics** postscript can be used to automatically configure additional network interfaces (multiple ethernets adapters, InfiniBand, etc) on the nodes as they are being deployed.
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst
index 0e78a7c61..72631fe6b 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskful/customize_image/network/cfg_network_adapter.rst
@@ -1,5 +1,5 @@
-Networking Adapters Configuration - confignetwork
--------------------------------------------------
+Configure Additional Network Interfaces - confignetwork
+-------------------------------------------------------
 
 The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. ``confignetwork`` can be used in postscripts during OS privision, it can also be executed in ``updatenode``. The way the ``confignetwork`` postscript decides what IP address to give the secondary adapter is by checking the ``nics`` table, in which the nic configuration information is stored. In order for the ``confignetwork`` postscript to run successfully, the following attributes must be configured for the node in the ``nics`` table:
 
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst
index 0e78a7c61..72631fe6b 100644
--- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst
+++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/network/cfg_network_adapter.rst
@@ -1,5 +1,5 @@
-Networking Adapters Configuration - confignetwork
--------------------------------------------------
+Configure Additional Network Interfaces - confignetwork
+-------------------------------------------------------
 
 The ``confignetwork`` postscript can be used to configure the network interfaces on the compute nodes to support Ethernet adapters, VLAN, BONDs, and BRIDGES. ``confignetwork`` can be used in postscripts during OS privision, it can also be executed in ``updatenode``. The way the ``confignetwork`` postscript decides what IP address to give the secondary adapter is by checking the ``nics`` table, in which the nic configuration information is stored. In order for the ``confignetwork`` postscript to run successfully, the following attributes must be configured for the node in the ``nics`` table:
 

From 92a927e214287ce61cfd244afe85f7150cc29f75 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Wed, 2 Aug 2017 15:00:10 -0400
Subject: [PATCH 260/283] disable rflash command for normal user and check
 error state

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index f818b678a..c97cfc7b8 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -582,6 +582,11 @@ sub parse_args {
             return ([ 1, "Unsupported command: $command $subcommand" ]);
         }
     } elsif ($command eq "rflash") {
+        #
+        # disable function until fully supported by openbmc 
+        # Currently waiting for issue https://github.com/openbmc/openbmc/issues/2074 to be fixed
+        #
+        $check = unsupported($callback); if (ref($check) eq "ARRAY") { return $check; }
         my $filename_passed = 0;
         my $updateid_passed = 0;
         my $option_flag;
@@ -1890,6 +1895,11 @@ sub rflash_response {
             }
         }
 
+        if ($activation_state =~ /Software.Activation.Activations.Failed/) {
+            # Activation failed. Report error and exit
+            xCAT::SvrUtils::sendmsg([1,"Activation of firmware failed"], $callback, $node);
+        }
+
         if ($activation_state =~ /Software.Activation.Activations.Active/) { 
             if (scalar($priority_state) == 0) {
                 # Activation state of active and priority of 0 indicates the activation has been completed

From 8373b5de6be62f2ffe502aae2e45319f96139afc Mon Sep 17 00:00:00 2001
From: chenglch <chenglch@cn.ibm.com>
Date: Thu, 3 Aug 2017 10:17:53 +0800
Subject: [PATCH 261/283] Optimize the performance for `getNodesAttribs` and
 `getAllNodeAttribs` (#3593)

As `get_site_attribute` subroutine could not cache the value for
hierarchicalattrs configuration, this commit move the check logic of
`hierarchicalattrs` from `getNodeAttribs_nosub_returnany` to `getNodesAttribs`
and `getAllNodeAttribs` to optimize the the performance of bulk query.

After testing, this change will bring 50% performance improvement for
`getNodesAttribs` subroutine.
---
 perl-xCAT/xCAT/Table.pm | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/perl-xCAT/xCAT/Table.pm b/perl-xCAT/xCAT/Table.pm
index 576598ef9..82cad05e4 100644
--- a/perl-xCAT/xCAT/Table.pm
+++ b/perl-xCAT/xCAT/Table.pm
@@ -2186,6 +2186,12 @@ sub getNodesAttribs {
         $self->{nodelist}->{_use_cache} = 1;
     }
     my $rethash;
+    my @hierarchy_attrs = ();
+    my $hierarchy_field = xCAT::TableUtils->get_site_attribute("hierarchicalattrs");
+    if ($hierarchy_field) {
+        @hierarchy_attrs = split(/,/, $hierarchy_field);
+    }
+    $options{hierarchy_attrs} = \@hierarchy_attrs;
     foreach (@$nodelist) {
         my @nodeentries = $self->getNodeAttribs($_, \@realattribs, %options);
         $rethash->{$_} = \@nodeentries;    #$self->getNodeAttribs($_,\@attribs);
@@ -2435,6 +2441,16 @@ sub getNodeAttribs
     } else {
         @attribs = @_;
     }
+
+    if (!exists($options{hierarchy_attrs})) {
+        my @hierarchy_attrs = ();
+        my $hierarchy_field = xCAT::TableUtils->get_site_attribute("hierarchicalattrs");
+        if ($hierarchy_field) {
+            @hierarchy_attrs = split(/,/, $hierarchy_field);
+        }
+        $options{hierarchy_attrs} = \@hierarchy_attrs;
+    }
+
     my $datum;
     my $oldusecache;
     my $nloldusecache;
@@ -2665,12 +2681,7 @@ sub getNodeAttribs_nosub_returnany
 
     my $attrib;
     my $result;
-    my @hierarchy_attrs;
-    my $hierarchy_field = xCAT::TableUtils->get_site_attribute("hierarchicalattrs");
-    if ($hierarchy_field) {
-        @hierarchy_attrs = split(/,/, $hierarchy_field);
-    }
-
+    my @hierarchy_attrs = @{ $options{hierarchy_attrs} };
     my $data = $results[0];
     if (defined {$data}) { #if there was some data for the node, loop through and check it
         foreach $result (@results) {
@@ -3103,7 +3114,13 @@ sub getAllNodeAttribs
             #}  end SF 3580
 
             #my $localhash = $self->getNodesAttribs(\@nodes,$attribq); #NOTE:  This is stupid, rebuilds the cache for every entry, FIXME
-
+            my %options;
+            my @hierarchy_attrs = ();
+            my $hierarchy_field = xCAT::TableUtils->get_site_attribute("hierarchicalattrs");
+            if ($hierarchy_field) {
+                @hierarchy_attrs = split(/,/, $hierarchy_field);
+            }
+            $options{hierarchy_attrs} = \@hierarchy_attrs;
             foreach (@nodes)
             {
                 if ($donenodes{$_}) { next; }
@@ -3117,7 +3134,7 @@ sub getAllNodeAttribs
                 #  }
                 #} else {
                 my @attrs =
-                  $self->getNodeAttribs($_, $attribq); #@{$localhash->{$_}} #$self->getNodeAttribs($_, $attribq)
+                  $self->getNodeAttribs($_, $attribq, %options); #@{$localhash->{$_}} #$self->getNodeAttribs($_, $attribq)
                 ;    #Logic moves to getNodeAttribs
                      #}
                  #populate node attribute by default, this sort of expansion essentially requires it.

From 95fb71953288f0fb9a141ef12643499502f4a7d2 Mon Sep 17 00:00:00 2001
From: Bin Xu <robin.hsu@163.com>
Date: Thu, 3 Aug 2017 10:18:44 +0800
Subject: [PATCH 262/283] makedhcp dispatch the requesting to all available
 xcatd when the request is from service node (#3565)

- for non-disjoin mode, forward the request to MN also if preprocess is handled on SN
 - for disjoint mode, forward the request to dhcpservers which is serving dynamic range
---
 xCAT-server/lib/xcat/plugins/dhcp.pm | 121 ++++++++++++++++++---------
 1 file changed, 80 insertions(+), 41 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index c30eceffd..6494e555e 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -1112,6 +1112,28 @@ sub preprocess_request
     xCAT::MsgUtils->trace($verbose_on_off, "d", "dhcp: disjointdhcps=$t_entry");
     my @requests     = ();
     my $hasHierarchy = 0;
+    my @snlist = xCAT::ServiceNodeUtils->getSNList('dhcpserver');
+    if (@snlist > 0) { $hasHierarchy = 1; }
+    xCAT::MsgUtils->trace($verbose_on_off, "d", "dhcp: hasHierarchy=$hasHierarchy");
+
+    my @dhcpsvrs = ();
+    if ($hasHierarchy) {
+        #hierarchy detected, enforce more rigorous sanity
+        my $ntab = xCAT::Table->new('networks');
+        if ($ntab) {
+            foreach (@{ $ntab->getAllEntries() }) {
+                next unless ($_->{dynamicrange});
+                # if dynamicrange specified but dhcpserver was not - issue error message
+                unless ($_->{dhcpserver}) {
+                    $callback->({ error => [ "Hierarchy requested, therefore networks.dhcpserver must be set for net=" . $_->{net} . "" ], errorcode => [1] });
+                    return [];
+                }
+                push @dhcpsvrs, $_->{dhcpserver};
+                xCAT::MsgUtils->trace($verbose_on_off, "d", "dhcp: dhcp server on $_->{net}: $_->{dhcpserver}");
+            }
+        }
+    }
+
 
     my @nodes = ();
 
@@ -1191,6 +1213,14 @@ sub preprocess_request
     my $str_node = join(" ", @nodes);
     xCAT::MsgUtils->trace($verbose_on_off, "d", "dhcp: nodes are $str_node");
 
+    my $issn = xCAT::Utils->isServiceNode();
+    #check if this node is the service node for any input node
+    my @hostinfo = xCAT::NetworkUtils->determinehostname();
+    my %iphash   = ();
+
+    # flag the hostnames in iphash
+    foreach (@hostinfo) { $iphash{$_} = 1; }
+
     # If service node and not -n option
     if (($snonly == 1) && (!$opt{n})) {
 
@@ -1203,13 +1233,6 @@ sub preprocess_request
             # if processing only on the local host
             if ($localonly) {
 
-                #check if this node is the service node for any input node
-                my @hostinfo = xCAT::NetworkUtils->determinehostname();
-                my %iphash   = ();
-
-                # flag the hostnames in iphash
-                foreach (@hostinfo) { $iphash{$_} = 1; }
-
                 # compare the service node hash with the iphash - a match adds this service node
                 foreach (keys %$sn_hash) {
                     if (exists($iphash{$_})) {
@@ -1218,21 +1241,47 @@ sub preprocess_request
                         $reqcopy->{'_xcatdest'}            = $_;
                         $reqcopy->{_xcatpreprocessed}->[0] = 1;
                         push @requests, $reqcopy;
+                        last;
                     }
                 }
             } else {
-
-                # check to see if dhcp is running on service nodes
-                my @sn = xCAT::ServiceNodeUtils->getSNList('dhcpserver');
-                if (@sn > 0) { $hasHierarchy = 1; }
+                my $handled4me = 0;     # indicate myself is already handled.
+                my %prehandledhash = ();# the servers which is already handled.
+                foreach (@dhcpsvrs) {
+                    # It is required to handle the whole noderange for the dhcp server which serving dynamic range
+                    if (! exists($iphash{$_})) {
+                        my $reqcopy = {%$req};
+                        $reqcopy->{'node'}                 = \@nodes;
+                        $reqcopy->{'_xcatdest'}            = $_;
+                        $reqcopy->{_xcatpreprocessed}->[0] = 1;
+                        push @requests, $reqcopy;
+                        $prehandledhash{$_} = 1;
+                    } elsif ($handled4me == 0) {
+                        my $reqcopy = {%$req};
+                        $reqcopy->{'node'}                 = \@nodes;
+                        $reqcopy->{_xcatpreprocessed}->[0] = 1;
+                        push @requests, $reqcopy;
+                        $handled4me = 1;
+                    }
+                }
 
                 # create a request for each service node
                 foreach (keys %$sn_hash) {
-                    my $reqcopy = {%$req};
-                    $reqcopy->{'node'}                 = $sn_hash->{$_};
-                    $reqcopy->{'_xcatdest'}            = $_;
-                    $reqcopy->{_xcatpreprocessed}->[0] = 1;
-                    push @requests, $reqcopy;
+                    # to check if the SN already handled
+                    next if (exists($prehandledhash{$_}));
+                    if (! exists($iphash{$_})) {
+                        my $reqcopy = {%$req};
+                        $reqcopy->{'node'}                 = $sn_hash->{$_};
+                        $reqcopy->{'_xcatdest'}            = $_;
+                        $reqcopy->{_xcatpreprocessed}->[0] = 1;
+                        push @requests, $reqcopy;
+                    } elsif ($handled4me == 0) {
+                        my $reqcopy = {%$req};
+                        $reqcopy->{'node'} = $sn_hash->{$_};
+                        $reqcopy->{_xcatpreprocessed}->[0] = 1;
+                        push @requests, $reqcopy;
+                        $handled4me = 1;
+                    }
                 }
             }
         }    # list of nodes specified
@@ -1241,42 +1290,32 @@ sub preprocess_request
          # if -n option or nodes were specified
     elsif (@nodes > 0 or $opt{n}) {    #send the request to every dhservers
         $req->{'node'} = \@nodes;
+        $req->{_xcatpreprocessed}->[0] = 1;
         @requests = ({%$req}); #Start with a straight copy to reflect local instance
-             # if not localonly - get list of service nodes and create requests
-        unless ($localonly) {
-            my @sn = xCAT::ServiceNodeUtils->getSNList('dhcpserver');
-            if (@sn > 0) { $hasHierarchy = 1; }
+        
+        # if not localonly - get list of service nodes and create requests
+        unless ($localonly || $hasHierarchy == 0) {
 
-            foreach my $s (@sn)
+            # If running on SN, get site.master from DB and dispatch to it as MN will not be in SN list.
+            if ( $issn ) {
+                my @entries = xCAT::TableUtils->get_site_attribute("master");
+                my $reqcopy = {%$req};
+                $reqcopy->{'_xcatdest'} = $entries[0];
+                push @requests, $reqcopy;
+            }
+
+            foreach my $s (@snlist)
             {
                 if (scalar @nodes == 1 and $nodes[0] eq $s) { next; }
+                next if ($issn && exists($iphash{$s}));
+
                 my $reqcopy = {%$req};
                 $reqcopy->{'_xcatdest'} = $s;
-                $reqcopy->{_xcatpreprocessed}->[0] = 1;
                 push @requests, $reqcopy;
             }
         }
     }
 
-    xCAT::MsgUtils->trace($verbose_on_off, "d", "dhcp: hasHierarchy=$hasHierarchy");
-
-    if ($hasHierarchy)
-    {
-        #hierarchy detected, enforce more rigorous sanity
-        my $ntab = xCAT::Table->new('networks');
-        if ($ntab)
-        {
-            foreach (@{ $ntab->getAllEntries() })
-            {
-                # if dynamicrange specified but dhcpserver was not - issue error message
-                if ($_->{dynamicrange} and not $_->{dhcpserver})
-                {
-                    $callback->({ error => [ "Hierarchy requested, therefore networks.dhcpserver must be set for net=" . $_->{net} . "" ], errorcode => [1] });
-                    return [];
-                }
-            }
-        }
-    }
 
     #print Dumper(@requests);
     return \@requests;

From b62ede6774ff779f1e487eaa5e0b4d6a293b39cb Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Thu, 3 Aug 2017 02:43:13 -0400
Subject: [PATCH 263/283] modify rinv testcase for different arch has different
 output

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

diff --git a/xCAT-test/autotest/testcase/rinv/cases0 b/xCAT-test/autotest/testcase/rinv/cases0
index 8e9c3f1cf..e1a41eecd 100644
--- a/xCAT-test/autotest/testcase/rinv/cases0
+++ b/xCAT-test/autotest/testcase/rinv/cases0
@@ -121,7 +121,7 @@ cmd:chdef $$CN bmcpassword=test
 check:rc==0
 cmd:rinv $$CN all
 check:rc==1
-check:output=~$$CN: Error: Invalid username or password
+check:output=~$$CN: Error: Invalid username or password|Error: ERROR: Incorrect password provided
 cmd:cat /tmp/testnode.stanza | chdef -z;rm -rf /tmp/testnode.stanza 
 check:rc==0
 end

From c3de2ea734dd007e35226b5e9c77d73eb83478df Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Thu, 3 Aug 2017 03:35:47 -0400
Subject: [PATCH 264/283] modified depending on comments

---
 xCAT-probe/subcmds/discovery | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/xCAT-probe/subcmds/discovery b/xCAT-probe/subcmds/discovery
index d2089b06b..e2ea8ca1f 100755
--- a/xCAT-probe/subcmds/discovery
+++ b/xCAT-probe/subcmds/discovery
@@ -351,7 +351,7 @@ sub check_pre_defined_node {
                 if (!(exists($nodecheckrst{$node}{"switch"})) or $nodecheckrst{$node}{"switch"} !~ /^\w/) {
                     push @error_attribute, "switch";
                 } elsif ($error_switch =~ $nodecheckrst{$node}{"switch"}) {
-                    my $error_switch_string = "No switch " . $nodecheckrst{$node}{"switch"} . " information obtained."; 
+                    my $error_switch_string = "Switch " . $nodecheckrst{$node}{"switch"} . " can not be accessible."; 
                     push @{$error_switch_hash{$error_switch_string}}, $node;
                     next;
                 }
@@ -585,11 +585,16 @@ sub check_genesis_file {
     foreach (@tmp_info) {
         if ($_ =~ /(.+):noboot/) {
             my $noboot_nic = $1; 
-            my $ip_string = `ip -4 -o a | grep $noboot_nic | awk -F ' ' '{print \$4}'`;
+            my $ip_string = `ip -4 -o a |awk -F' ' '/$noboot_nic/ {print \$4}'`;
             if ($ip_string) {
                 my ($noboot_ip, $noboot_netmask) = split('\/', $ip_string);
-                my @noboot_ips = split('\.', $noboot_ip);
-                $noboot_file = $noboot_ips[0] . ".0.0.0_$noboot_netmask";
+                my $local_nets = xCAT::NetworkUtils::my_nets();
+                foreach my $key (%{$local_nets}) {
+                    if (${$local_nets}{$key} eq $noboot_ip) {
+                        $noboot_file = $key;
+                        $noboot_file =~ s/\//\_/g;
+                    }
+                }
                 chomp($noboot_file);
             }
         }
@@ -642,7 +647,7 @@ sub check_genesis_file {
                     if ($initrd_path =~ /http.+($tftpdir\/.+)/) {
                         my $initrd_file = $1;
                         my $initrd_time = `stat $initrd_file | grep Modify | cut -d ' ' -f 2-3`;
-                        if ($initrd_time < $genesis_time) {
+                        if ($genesis_time and $initrd_time < $genesis_time) {
                             $genesis_update_flag_p = 1;
                         }
                     }
@@ -709,7 +714,7 @@ sub check_genesis_file {
                 }
 
                 unless (open(FILE, $file)) {
-                    push @errors, "Cannot open file $file.";
+                    push @errors, "Cannot open file $file : $!..";
                     $rst = 1;
                     next;
                 }
@@ -737,7 +742,7 @@ sub check_genesis_file {
                             $rst = 1;
                         } else {
                             unless (open(FILE_ELILO, $elilo_path)) {
-                                push @errors, "Cannot open file $_.";
+                                push @errors, "Cannot open file $_ : $!..";
                                 $rst = 1;
                                 next;
                             }
@@ -767,7 +772,7 @@ sub check_genesis_file {
                                         $rst = 1;
                                     } else {
                                         my $initrd_time = `stat $initrd_path | grep Modify | cut -d ' ' -f 2-3`;
-                                        if ($initrd_time < $genesis_time) {
+                                        if ($genesis_time and $initrd_time < $genesis_time) {
                                             $genesis_update_flag_x = 1;
                                         }
                                     }

From 7917678e39cd81ba16cd7bf9bbc254a27451310a Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Thu, 3 Aug 2017 15:52:25 +0800
Subject: [PATCH 265/283] Fix 3603, if using ppc64le/ppc64el for mknb, just use
 'ppc64' as a substitude.

---
 xCAT-server/lib/xcat/plugins/mknb.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/mknb.pm b/xCAT-server/lib/xcat/plugins/mknb.pm
index e920fb1e4..5219e3b51 100644
--- a/xCAT-server/lib/xcat/plugins/mknb.pm
+++ b/xCAT-server/lib/xcat/plugins/mknb.pm
@@ -98,9 +98,11 @@ sub process_request {
         $callback->({ error => "Need to specify architecture (x86, x86_64 or ppc64)" }, { errorcode => [1] });
         return;
     } elsif ($arch eq "ppc64le" or $arch eq "ppc64el") {
-        $callback->({ data => "The arch:$arch is not supported at present, pls use \"ppc64\" instead" });
-        return;
+        $callback->({ data => "The arch:$arch is not supported at present, use \"ppc64\" instead" });
+        $arch = 'ppc64';
+        $request->{arg}->[0] = $arch;
     }
+
     unless (-d "$::XCATROOT/share/xcat/netboot/$arch" or -d "$::XCATROOT/share/xcat/netboot/genesis/$arch") {
         $callback->({ error => "Unable to find directory $::XCATROOT/share/xcat/netboot/$arch or $::XCATROOT/share/xcat/netboot/genesis/$arch", errorcode => [1] });
         return;

From 6e9825f0d1b78422a21d434b964813c313b31af4 Mon Sep 17 00:00:00 2001
From: Bin Xu <bxuxa@cn.ibm.com>
Date: Thu, 3 Aug 2017 16:41:37 +0800
Subject: [PATCH 266/283] 1, test case for nodeset -V to show server info 2,
 allow xcattest get 'var' type config from environment variable when no config
 file specified. For example, when given 'XCATTEST_CN=fake1', xcattest will
 set $$CN=fake1

---
 xCAT-test/autotest/testcase/nodeset/cases0 | 4 ++++
 xCAT-test/xcattest                         | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/xCAT-test/autotest/testcase/nodeset/cases0 b/xCAT-test/autotest/testcase/nodeset/cases0
index 84546a788..4d549447b 100644
--- a/xCAT-test/autotest/testcase/nodeset/cases0
+++ b/xCAT-test/autotest/testcase/nodeset/cases0
@@ -3,7 +3,11 @@ os:Linux
 cmd:nodeset $$CN stat
 check:rc==0
 check:output=~$$CN:\s+[discover|boot|reboot|install|netboot|shell|standby]
+cmd:nodeset $$CN stat -V
+check:rc==0
+check:output=~$$CN:\s+\[\w+\]:\s+[discover|boot|reboot|install|netboot|shell|standby]
 end
+
 start:nodeset_noderange
 os:Linux
 cmd:nodeset $$CN test
diff --git a/xCAT-test/xcattest b/xCAT-test/xcattest
index be197d0d9..f7e1f7450 100755
--- a/xCAT-test/xcattest
+++ b/xCAT-test/xcattest
@@ -220,6 +220,13 @@ if (defined($configfile)) {
     }
 } else {
     $setup_env_by_config_file = 0;
+    # Leverage environment variable to used in test case
+    foreach (keys %ENV) {
+        if (/^XCATTEST_/) {
+            my @envname=split("_",$_,2);
+            $config{var}{$envname[-1]} = $ENV{$_};
+        }
+    }
 }
 
 if ($restore) {

From 447b00af5b3b6373ad2904bc30917c1360342f06 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Thu, 3 Aug 2017 04:52:11 -0400
Subject: [PATCH 267/283] enhance nicips regular expression in mypostscript

---
 xCAT-server/lib/perl/xCAT/Postage.pm | 65 +++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/Postage.pm b/xCAT-server/lib/perl/xCAT/Postage.pm
index d1f56e36b..d636f103f 100644
--- a/xCAT-server/lib/perl/xCAT/Postage.pm
+++ b/xCAT-server/lib/perl/xCAT/Postage.pm
@@ -1436,6 +1436,63 @@ sub getDisklessNet()
     return $result;
 
 }
+#---------------------------------------------------
+=head3 get_nics_nicips
+
+    Description: If nicips contain regular expression, 
+                 transform the regular expression attribute to the target ip,
+                 then generate new nicips with target ip.
+    Arguments:
+            Node
+            nicips Attribute value (may have regular expression)
+    Returns:
+            new nicips Attribute value
+    Globals:
+    Error:
+    Example:
+            $nicips = transRegexAttrs($node, $nicips_with_regex)
+    Comments:
+        none
+=cut
+#---------------------------------------------------
+sub get_nics_nicips
+{
+    my $node = shift;
+    my $old_nicips = shift;
+    my $new_nicips;
+    my $nicname;
+    my $nicip;
+    if (defined($old_nicips)) {
+        my @nicandiplist = split(',', $old_nicips);
+        foreach (@nicandiplist)
+        {
+            #if it contains a "!" then split on "!"
+            if ($_ =~ /!/) {
+                ($nicname, $nicip) = split('!', $_);
+            } else {
+                ($nicname, $nicip) = split(':', $_);
+            }                                                                 
+            if (!$nicip) {
+                next;
+            }
+            #If there is one nicip in  nicips, and it is regular expression
+            #for example: eth0!|\D+(\d+)\D+|10.80.1.($1*2+103)|
+            #Does not support: there is regular expression in multple nicips
+            if ($nicip =~ /^\|\S*\|$/) {
+                #transform the regular expression attribute to the target ip 
+                $nicip = xCAT::Table::transRegexAttrs($node, $nicip);
+            }
+            #generate new nicips
+            if (defined($new_nicips)) {
+                $new_nicips.=",".$nicname."!".$nicip;
+            } else {
+                $new_nicips=$nicname."!".$nicip;
+            }
+       }
+      
+    }
+    return $new_nicips;
+}
 
 sub collect_all_attribs_for_tables_in_template
 {
@@ -1473,7 +1530,12 @@ sub collect_all_attribs_for_tables_in_template
                     if ($ent->{$node}->[0]) {
                         foreach my $attrib (@attribs) {
                             $::GLOBAL_TAB_HASH{$tabname}{$node}{$attrib} = $ent->{$node}->[0]->{$attrib};
-
+                            #If nicips contains regular expression 
+                            if ($tabname =~ /^nics$/ && $attrib =~ /^nicips$/ &&  
+                                $::GLOBAL_TAB_HASH{nics}{$node}{nicips} =~ /\S*\!\|\S*/)
+                            {
+                                $::GLOBAL_TAB_HASH{nics}{$node}{nicips}=get_nics_nicips($node,$::GLOBAL_TAB_HASH{nics}{$node}{nicips});
+                            }
                             #for noderes.xcatmaster
                             if ($tabname =~ /^noderes$/ && $attrib =~ /^xcatmaster$/ &&
                                 (!exists($::GLOBAL_TAB_HASH{noderes}{$node}{xcatmaster}) ||
@@ -1517,7 +1579,6 @@ sub collect_all_attribs_for_tables_in_template
                     if (!defined($::GLOBAL_TAB_HASH{noderes}{$node}{tftpserver})) {
                         $::GLOBAL_TAB_HASH{noderes}{$node}{tftpserver} = $::GLOBAL_TAB_HASH{noderes}{$node}{xcatmaster};
                     }
-
                     #if the values are not got, we will set them to '';
                     foreach my $attrib (@attribs) {
                         if (!defined($::GLOBAL_TAB_HASH{$tabname}) || !defined($::GLOBAL_TAB_HASH{$tabname}{$node}) || !defined($::GLOBAL_TAB_HASH{$tabname}{$node}{$attrib})) {

From bb02b38583313965eddc7f6a7e1674669bbd0d76 Mon Sep 17 00:00:00 2001
From: zet809 <ertaozh@cn.ibm.com>
Date: Thu, 3 Aug 2017 19:20:18 +0800
Subject: [PATCH 268/283] add option --sn <sn_name> for bmcdiscover to discover
 bmc on sn (#3607)

---
 xCAT-server/lib/xcat/plugins/bmcdiscover.pm | 84 +++++++++++++++++++--
 1 file changed, 79 insertions(+), 5 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
index b0406a037..5f61b6726 100644
--- a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
@@ -67,6 +67,48 @@ sub handled_commands
 }
 
 #-------------------------------------------------------
+#
+sub preprocess_request {
+    my $request = shift;
+    if (defined $request->{_xcatpreprocessed}->[0] and $request->{_xcatpreprocessed}->[0] == 1) { return [$request]; }
+
+    my $callback = shift;
+    my $extargs = $request->{arg};
+    my @exargs = ($request->{arg});
+    if (ref($extargs)) {
+        @exargs = @$extargs;
+    }
+    @ARGV = @exargs;
+    $Getopt::Long::ignorecase=0;
+    Getopt::Long::Configure("bundling");
+    my $sns = undef;
+    if ((grep /--sn/, @ARGV) and (Getopt::Long::GetOptions('sn=s' => \$sns))) {
+        unless ($sns) {
+            $callback->({ error => ["The value for --sn is invalid"], errorcode => [1] });
+            $request = ();
+            return;
+        }
+        my $nettab = xCAT::Table->new("networks");
+        my @entries   = $nettab->getAllAttribs('dhcpserver', 'dynamicrange');
+        my @dhcpservers = ();
+        foreach (@entries) {
+            if (!defined($_->{dynamicrange})) {next;}
+            push @dhcpservers, $_->{dhcpserver};
+        }
+        my @requests = ();
+        foreach (split (/,/, $sns)) {
+            my $reqcopy = {%$request};
+            $reqcopy->{'_xcatdest'} = $_;   
+            $reqcopy->{'sn'} = $_;
+            $reqcopy->{'dhcpservers'} = \@dhcpservers;
+            $reqcopy->{_xcatpreprocessed}->[0] = 1;
+            push @requests, $reqcopy;
+        }
+        return \@requests;
+    } else {
+        return [$request];
+    }
+}
 
 =head3  process_request
 
@@ -91,7 +133,26 @@ sub process_request
     } else {
         $::XCAT_DEV_WITHERSPOON = $request->{environment}->{XCAT_DEV_WITHERSPOON};
     }
-
+    if ($request->{sn}) {
+        my $dhcpservers = $request->{dhcpservers};
+        if (!defined($dhcpservers) or ref($dhcpservers) ne 'ARRAY') {
+            $callback->({ error => ["the ". $request->{command}->[0]. " doesn't work when no dynamic range set."], errorcode => [1] });
+            return 1;
+        }
+        else {
+            my $have_dynamicrange_set = 0;
+            foreach (@$dhcpservers) {
+                unless (xCAT::NetworkUtils->thishostisnot($_)) {
+                    $have_dynamicrange_set = 1;
+                    last;
+                }
+            }
+            unless ($have_dynamicrange_set) {
+                $callback->({ error => ["the ". $request->{command}->[0]. " won't work since no dynamic range set on $request->{sn}->[0]"], errorcode => [1] });
+                return 1;
+            }
+        }
+    }
     unless (defined($request->{arg})) {
         bmcdiscovery_usage();
         return 2;
@@ -184,6 +245,7 @@ sub bmcdiscovery_processargs {
         'ipsource'      => \$::opt_S,
         'version|v'     => \$::opt_v,
         't'             => \$::opt_T,
+        'sn=s'          => \$::opt_SN,
     );
 
     if (!$getopt_success) {
@@ -239,6 +301,11 @@ sub bmcdiscovery_processargs {
         $bmc_pass = $::opt_P;
         $openbmc_pass = $::opt_P;
     }
+    if ($request->{sn}) {
+        $::opt_SN = $request->{sn}->[0];
+    } else {
+        $::opt_SN = '';
+    }
 
     #########################################
     # Option -s -r should be together
@@ -664,7 +731,7 @@ sub format_stanza {
     my $node = shift;
     my $data = shift;
     my $mgt_type = shift;
-    my ($bmcip, $bmcmtm, $bmcserial, $bmcuser, $bmcpass, $nodetype, $hwtype) = split(/,/, $data);
+    my ($bmcip, $bmcmtm, $bmcserial, $bmcuser, $bmcpass, $nodetype, $hwtype, $sn, $conserver) = split(/,/, $data);
     my $result;
     if (defined($bmcip)) {
         $result .= "$node:\n\tobjtype=node\n";
@@ -684,6 +751,12 @@ sub format_stanza {
         if ($bmcpass) {
             $result .= "\tbmcpassword=$bmcpass\n";
         }
+        if ($sn) {
+            $result .="\tservicenode=$sn\n";
+        }
+        if ($conserver) {
+            $result .= "\tconserver=$conserver\n";
+        }
         my $rsp = {};
         push @{ $rsp->{data} }, "$result";
         xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
@@ -705,7 +778,7 @@ sub write_to_xcatdb {
     my $node = shift;
     my $data = shift;
     my $mgt_type = shift;
-    my ($bmcip, $bmcmtm, $bmcserial, $bmcuser, $bmcpass, $nodetype, $hwtype) = split(/,/, $data);
+    my ($bmcip, $bmcmtm, $bmcserial, $bmcuser, $bmcpass, $nodetype, $hwtype, $sn, $conserver) = split(/,/, $data);
     my $request_command = shift;
     my $ret;
 
@@ -713,6 +786,7 @@ sub write_to_xcatdb {
                                   arg => [ '-t', 'node', '-o', $node, "bmc=$bmcip", "cons=$mgt_type", 
                                            "mgt=$mgt_type", "mtm=$bmcmtm", "serial=$bmcserial", 
                                            "bmcusername=$bmcuser", "bmcpassword=$bmcpass", "nodetype=$nodetype", 
+                                           "servicenode=$sn", "conserver=$conserver",
                                            "hwtype=$hwtype", "groups=all" ] },
                                   $request_command, 0, 1);
     if ($::RUNCMD_RC != 0) {
@@ -1018,7 +1092,7 @@ sub bmcdiscovery_ipmi {
             } else {
                 $node_data .= ",,";
             }
-            $node_data .= ",mp,bmc";
+            $node_data .= ",mp,bmc,$::opt_SN,$::opt_SN";
             if ($mtm and $serial) {
                 $node = "node-$mtm-$serial";
                 $node =~ s/(.*)/\L$1/g;
@@ -1144,7 +1218,7 @@ sub bmcdiscovery_openbmc{
         } else {
             $node_data .= ",,";
         }
-        $node_data .= ",mp,bmc";
+        $node_data .= ",mp,bmc,$::opt_SN,$::opt_SN";
         if ($mtm and $serial) {
             $node = "node-$mtm-$serial";
             $node =~ s/(.*)/\L$1/g;

From 1be7b6c2d539d731bef5f95ba7b3254042550030 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Thu, 3 Aug 2017 14:40:18 -0400
Subject: [PATCH 269/283] Implement openbmc image delete function

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

diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index c7450095b..c9c2bfdb3 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -179,6 +179,14 @@ my %status_info = (
     RFLASH_SET_PRIORITY_RESPONSE => {
         process        => \&rflash_response,
     },
+    RFLASH_DELETE_IMAGE_REQUEST  => {
+        method         => "POST",
+        init_url       => "$openbmc_project_url/software",
+        data           => "[]",
+    },
+    RFLASH_DELETE_IMAGE_RESPONSE => {
+        process        => \&rflash_response,
+    },
 
     RINV_REQUEST => {
         method         => "GET",
@@ -874,6 +882,7 @@ sub parse_command_status {
                     $status_info{RFLASH_UPDATE_ACTIVATE_REQUEST}{init_url}    .= "/$update_file/attr/RequestedActivation";
                     $status_info{RFLASH_SET_PRIORITY_REQUEST}{init_url}       .= "/$update_file/attr/Priority";
                     $status_info{RFLASH_UPDATE_CHECK_STATE_REQUEST}{init_url} .= "/$update_file";
+                    $status_info{RFLASH_DELETE_IMAGE_REQUEST}{init_url}       .= "/$update_file/action/Delete";
                 }
             }
         }
@@ -888,11 +897,12 @@ sub parse_command_status {
             $next_status{RFLASH_LIST_REQUEST} = "RFLASH_LIST_RESPONSE";
         }
         if ($delete) {
-            xCAT::SvrUtils::sendmsg("Delete option is not yet supported.", $callback);
-            return 1;
+            # Delete uploaded image from BMC
+            $next_status{LOGIN_RESPONSE} = "RFLASH_DELETE_IMAGE_REQUEST";
+            $next_status{RFLASH_DELETE_IMAGE_REQUEST} = "RFLASH_DELETE_IMAGE_RESPONSE";
         }
         if ($upload) {
-            # Upload specified update file to  BMC
+            # Upload specified update file to BMC
             $next_status{LOGIN_RESPONSE} = "RFLASH_FILE_UPLOAD_REQUEST";
             $next_status{"RFLASH_FILE_UPLOAD_REQUEST"} = "RFLASH_FILE_UPLOAD_RESPONSE";
         }
@@ -1013,6 +1023,9 @@ sub gen_send_request {
         # Handle boolean values by create the json objects without wrapping with quotes
         if ($status_info{ $node_info{$node}{cur_status} }{data} =~ /^1$|^true$|^True$|^0$|^false$|^False$/) {
             $content = '{"data":' . $status_info{ $node_info{$node}{cur_status} }{data} . '}';
+        } elsif ($status_info{ $node_info{$node}{cur_status} }{data} =~ /^\[\]$/) {
+            # Special handling of empty data list
+            $content = '{"data":[]}';
         } else {
             $content = '{"data":"' . $status_info{ $node_info{$node}{cur_status} }{data} . '"}';
         }
@@ -1799,7 +1812,7 @@ sub rflash_response {
     print Dumper(%{$response_info->{data}});
 
     my $update_id;
-    my $update_activation;
+    my $update_activation = "Unknown";
     my $update_purpose;
     my $update_version;
     my $update_priority = -1;
@@ -1898,9 +1911,8 @@ sub rflash_response {
         if ($activation_state =~ /Software.Activation.Activations.Failed/) {
             # Activation failed. Report error and exit
             xCAT::SvrUtils::sendmsg([1,"Activation of firmware failed"], $callback, $node);
-        }
-
-        if ($activation_state =~ /Software.Activation.Activations.Active/) { 
+        } 
+        elsif ($activation_state =~ /Software.Activation.Activations.Active/) { 
             if (scalar($priority_state) == 0) {
                 # Activation state of active and priority of 0 indicates the activation has been completed
                 xCAT::SvrUtils::sendmsg("Firmware update successfully activated", $callback, $node);
@@ -1913,8 +1925,7 @@ sub rflash_response {
                 $next_status{ $node_info{$node}{cur_status} } = "RFLASH_SET_PRIORITY_REQUEST";
             }
         }
-
-        if ($activation_state =~ /Software.Activation.Activations.Activating/) {
+        elsif ($activation_state =~ /Software.Activation.Activations.Activating/) {
             # Activation still going, sleep for a bit, then print the progress value
             sleep(15);
             xCAT::SvrUtils::sendmsg("Activating firmware update. $progress_state\%", $callback, $node);
@@ -1922,6 +1933,11 @@ sub rflash_response {
             # Set next state to come back here to chect the activation status again.
             $next_status{ $node_info{$node}{cur_status} } = "RFLASH_UPDATE_CHECK_STATE_REQUEST";
         }
+       
+    }
+
+    if ($node_info{$node}{cur_status} eq "RFLASH_DELETE_IMAGE_RESPONSE") {
+            xCAT::SvrUtils::sendmsg("Firmware update successfully removed", $callback, $node);
     }
 
     if ($next_status{ $node_info{$node}{cur_status} }) {

From 0ca911b9f3cbf33fdb04a23d6ce0e203dd542c02 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Thu, 3 Aug 2017 14:50:46 -0400
Subject: [PATCH 270/283] Usage and man page update

---
 .../guides/admin-guides/references/man1/rflash.1.rst      | 8 +++++++-
 perl-xCAT/xCAT/Usage.pm                                   | 2 +-
 xCAT-client/pods/man1/rflash.1.pod                        | 6 +++++-
 3 files changed, 13 insertions(+), 3 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 5f688c7ac..84d176e49 100644
--- a/docs/source/guides/admin-guides/references/man1/rflash.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rflash.1.rst
@@ -57,7 +57,7 @@ OpenPOWER OpenBMC specific :
 ============================
 
 
-\ **rflash**\  \ *noderange*\  [\ *tar_file_path*\  | \ *image_id*\ ] [\ **-c | -**\ **-check**\ ] [\ **-a | -**\ **-activate**\ ] [\ **-l | -**\ **-list**\ ] [\ **-u | -**\ **-upload**\ ]
+\ **rflash**\  \ *noderange*\  [\ *tar_file_path*\  | \ *image_id*\ ] [\ **-c | -**\ **-check**\ ] [\ **-a | -**\ **-activate**\ ] [\ **-l | -**\ **-list**\ ] [\ **-u | -**\ **-upload**\ ] [\ **-d | -**\ **-delete**\ ]
 
 
 
@@ -220,6 +220,12 @@ The command will update firmware for OpenPOWER OpenBMC when given an OpenPOWER n
  
 
 
+\ **-d|-**\ **-delete**\ 
+ 
+ Delete update image from BMC
+ 
+
+
 \ **-v|-**\ **-version**\ 
  
  Displays the command's version.
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 871d3802b..dd40450e3 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -345,7 +345,7 @@ my %usage = (
     PPC64LE (using IPMI Management) specific:
         rflash <noderange> [-c|--check] [--retry=<count>] [-V] [<hpm_file>|-d=<data_directory>]
     PPC64LE (using OpenBMC Management) specific:
-        rflash <noderange> [-c|--check] [-l|--list] [-a|--activate] [-u|--upload] [<tar_file>|<image_id>]",
+        rflash <noderange> [-c|--check] [-l|--list] [-a|--activate] [-u|--upload] [-d|--delete] [<tar_file>|<image_id>]",
     "mkhwconn" =>
       "Usage:
     mkhwconn [-h|--help]
diff --git a/xCAT-client/pods/man1/rflash.1.pod b/xCAT-client/pods/man1/rflash.1.pod
index 283b35381..70c964d15 100644
--- a/xCAT-client/pods/man1/rflash.1.pod
+++ b/xCAT-client/pods/man1/rflash.1.pod
@@ -28,7 +28,7 @@ B<rflash> I<noderange> [I<hpm_file_path> | B<-d=>I<data_directory>] [B<-c>|B<--c
 
 =head2 OpenPOWER OpenBMC specific :
 
-B<rflash> I<noderange> [I<tar_file_path> | I<image_id>] [B<-c>|B<--check>] [B<-a>|B<--activate>] [B<-l>|B<--list>] [B<-u>|B<--upload>]
+B<rflash> I<noderange> [I<tar_file_path> | I<image_id>] [B<-c>|B<--check>] [B<-a>|B<--activate>] [B<-l>|B<--list>] [B<-u>|B<--upload>] [B<-d>|B<--delete>]
 
 =head1 B<Description>
 
@@ -145,6 +145,10 @@ List currently uploaded update images. "(*)" indicates currently active image.
 
 Upload update image. Specified file must be in .tar format.
 
+=item B<-d|--delete>
+
+Delete update image from BMC
+
 =item B<-v|--version>
 
 Displays the command's version.

From c87dd2c763e24956616391286751d2f4591dc5c4 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Fri, 4 Aug 2017 00:33:54 -0400
Subject: [PATCH 271/283] polished

---
 xCAT-server/lib/perl/xCAT/Postage.pm | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/Postage.pm b/xCAT-server/lib/perl/xCAT/Postage.pm
index d636f103f..3e7743aa2 100644
--- a/xCAT-server/lib/perl/xCAT/Postage.pm
+++ b/xCAT-server/lib/perl/xCAT/Postage.pm
@@ -18,7 +18,7 @@ use xCAT::Template;
 use xCAT::SvrUtils;
 use xCAT::Zone;
 
-#use Data::Dumper;
+use Data::Dumper;
 use File::Basename;
 use Socket;
 use strict;
@@ -1530,12 +1530,6 @@ sub collect_all_attribs_for_tables_in_template
                     if ($ent->{$node}->[0]) {
                         foreach my $attrib (@attribs) {
                             $::GLOBAL_TAB_HASH{$tabname}{$node}{$attrib} = $ent->{$node}->[0]->{$attrib};
-                            #If nicips contains regular expression 
-                            if ($tabname =~ /^nics$/ && $attrib =~ /^nicips$/ &&  
-                                $::GLOBAL_TAB_HASH{nics}{$node}{nicips} =~ /\S*\!\|\S*/)
-                            {
-                                $::GLOBAL_TAB_HASH{nics}{$node}{nicips}=get_nics_nicips($node,$::GLOBAL_TAB_HASH{nics}{$node}{nicips});
-                            }
                             #for noderes.xcatmaster
                             if ($tabname =~ /^noderes$/ && $attrib =~ /^xcatmaster$/ &&
                                 (!exists($::GLOBAL_TAB_HASH{noderes}{$node}{xcatmaster}) ||
@@ -1572,7 +1566,11 @@ sub collect_all_attribs_for_tables_in_template
                         !defined($::GLOBAL_TAB_HASH{noderes}{$node}{xcatmaster})) {
                         $::GLOBAL_TAB_HASH{noderes}{$node}{xcatmaster} = $::XCATSITEVALS{master};
                     }
-
+                    #If nicips contains regular expression
+                    if (exists($::GLOBAL_TAB_HASH{nics}{$node}{nicips}) && $::GLOBAL_TAB_HASH{nics}{$node}{nicips} =~ /\S*\!\|\S*/)
+                    {
+                        $::GLOBAL_TAB_HASH{nics}{$node}{nicips}=get_nics_nicips($node,$ent->{$node}->[0]->{nicips});
+                    }
                     if (!defined($::GLOBAL_TAB_HASH{noderes}{$node}{nfsserver})) {
                         $::GLOBAL_TAB_HASH{noderes}{$node}{nfsserver} = $::GLOBAL_TAB_HASH{noderes}{$node}{xcatmaster};
                     }

From 12923fdd74b43ae8e3c22ecd9401a17f36e55fa5 Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Fri, 4 Aug 2017 01:07:41 -0400
Subject: [PATCH 272/283] polished

---
 xCAT-server/lib/perl/xCAT/Postage.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xCAT-server/lib/perl/xCAT/Postage.pm b/xCAT-server/lib/perl/xCAT/Postage.pm
index 3e7743aa2..ffcc0ba8d 100644
--- a/xCAT-server/lib/perl/xCAT/Postage.pm
+++ b/xCAT-server/lib/perl/xCAT/Postage.pm
@@ -18,7 +18,6 @@ use xCAT::Template;
 use xCAT::SvrUtils;
 use xCAT::Zone;
 
-use Data::Dumper;
 use File::Basename;
 use Socket;
 use strict;

From 02fa80fba31c0059cd52d09c6715674cecde8000 Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Thu, 3 Aug 2017 00:32:07 -0400
Subject: [PATCH 273/283] fix issue dodiscovery sending findme packet 4 times
 for each node #3408

---
 xCAT-genesis-scripts/bin/dodiscovery         | 27 ++++++++++++++++
 xCAT-genesis-scripts/bin/minixcatd.awk       | 34 ++++++++++++--------
 xCAT-server/lib/xcat/plugins/aaadiscovery.pm | 16 +++++++++
 xCAT-server/lib/xcat/plugins/nodediscover.pm |  2 +-
 xCAT-server/lib/xcat/plugins/zzzdiscovery.pm | 22 +++++++++++--
 5 files changed, 84 insertions(+), 17 deletions(-)

diff --git a/xCAT-genesis-scripts/bin/dodiscovery b/xCAT-genesis-scripts/bin/dodiscovery
index e870783fb..7a6345ea0 100755
--- a/xCAT-genesis-scripts/bin/dodiscovery
+++ b/xCAT-genesis-scripts/bin/dodiscovery
@@ -1,6 +1,13 @@
 #!/bin/bash
 log_label="xcat.genesis.dodiscovery"
 
+#the time when the latest findme request is sent to master
+reqtime=0
+#the timeout value on the waiting for the "processed" response from master
+#when the xcatd on master finished the processing of my findme request, 
+#a "processed" response will be replied
+maxresptime=180
+
 minixcatd.awk &
 PUBKEY=`openssl rsa -in /etc/xcat/privkey.pem -pubout 2> /dev/null|grep -v "PUBLIC KEY"`
 PUBKEY=`echo $PUBKEY|sed -e 's/ //g'`
@@ -56,6 +63,23 @@ done
 	
 #time to make our packet...
 while [ ! -r /restart ]; do
+
+    #record the current time
+    curtime=$(date +%s)       
+
+    #the existence of "/processing" indicates that my  findme request is under processing
+    if [ -f "/processing"  ]; then
+        if [ $curtime -gt $[ $reqtime + $maxresptime ] ]; then
+           #I think my findme request processing is timeout, I will resend the findme request
+           logger -s -t $log_label -p local4.info  "seems the processing of my findme request cost more than $maxresptime, send new findme request"
+           rm -rf /processing
+        else
+           logger -s -t $log_label -p local4.info  "My findme request is still under processing, do not send new request"
+           sleep 5
+        fi
+        continue
+    fi
+
 MTM=unknown
 SERIAL=unknown
 ARCH=unknown
@@ -287,6 +311,9 @@ gzip -9 /tmp/discopacket
 		logger -s -t $log_label -p local4.info "Sending the discovery packet to xCAT ($dhcps:$XCATPORT)..."
 		(cat /tmp/discopacket.gz | udpcat.awk $dhcps $XCATPORT ) &
 	done
+      
+        #record the time when the "findme request is sent to master"
+        reqtime=$(date +%s) 
 	#cat /tmp/discopacket
 	logger -s -t $log_label -p local4.info "Sleeping 5 seconds..."
 	sleep 5
diff --git a/xCAT-genesis-scripts/bin/minixcatd.awk b/xCAT-genesis-scripts/bin/minixcatd.awk
index 5f71623a2..c0231a579 100755
--- a/xCAT-genesis-scripts/bin/minixcatd.awk
+++ b/xCAT-genesis-scripts/bin/minixcatd.awk
@@ -1,18 +1,24 @@
 #!/usr/bin/awk -f
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 BEGIN {
-	port = 3001
-	listener = "/inet/tcp/" port "/0/0"
-    quit = "no"
-	while (match(quit,"no")) {
-		while (match(quit,"no") && (listener |& getline) > 0) {
-			if (match($0,"restart")) {
-				print "restarting bootstrap process" |& listener
-                quit="yes"
-				system("echo \"" $0 "\" > /restart")
-		        close(listener)
-			}
-		}
-		close(listener)
-	}
+        port = 3001
+        listener = "/inet/tcp/" port "/0/0"
+        quit = "no"
+        while (match(quit,"no")) {
+            while (match(quit,"no") && (listener |& getline) > 0) {
+                if (match($0,"restart")) {
+                    print "restarting bootstrap process" |& listener
+                    quit="yes"
+                    system("echo \"" $0 "\" > /restart")
+                    close(listener)
+                }else if(match($0,"processing")){
+                    print "processing request" |& listener
+                    system("echo \"" $0 "\" > /processing")
+                }else if(match($0,"processed")){
+                    print "finished request process" |& listener
+                    system("rm -rf /processing")
+                }
+           }
+           close(listener)
+        }
 }
diff --git a/xCAT-server/lib/xcat/plugins/aaadiscovery.pm b/xCAT-server/lib/xcat/plugins/aaadiscovery.pm
index e6d374e32..a03518dcc 100644
--- a/xCAT-server/lib/xcat/plugins/aaadiscovery.pm
+++ b/xCAT-server/lib/xcat/plugins/aaadiscovery.pm
@@ -27,6 +27,22 @@ sub process_request {
             return;
         }
         my $client_ip = $req->{'_xcat_clientip'};
+
+        #now, notify the node that its findme request is under processing
+        xCAT::MsgUtils->message("S", "Notify $client_ip that its findme request is processing\n");
+        my $sock = new IO::Socket::INET(
+            PeerAddr => $client_ip,
+            PeerPort => '3001',
+            Timeout  => '1',
+            Proto    => 'tcp'
+        );
+        if ($sock) { 
+            print $sock "processing";
+            close($sock);
+        }else{ 
+            xCAT::MsgUtils->message("S", "Failed to notify $client_ip that its findme request is processing."); 
+        }
+
         my $arptable;
         if (-x "/usr/sbin/arp") {
             $arptable = `/usr/sbin/arp -n`;
diff --git a/xCAT-server/lib/xcat/plugins/nodediscover.pm b/xCAT-server/lib/xcat/plugins/nodediscover.pm
index 7188d8cc2..21596f611 100644
--- a/xCAT-server/lib/xcat/plugins/nodediscover.pm
+++ b/xCAT-server/lib/xcat/plugins/nodediscover.pm
@@ -470,7 +470,7 @@ sub process_request {
         Timeout  => '1',
         Proto    => 'tcp'
     );
-    unless ($sock) { xCAT::MsgUtils->message("S", "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."); return; }
     print $sock $restartstring;
     close($sock);
 
diff --git a/xCAT-server/lib/xcat/plugins/zzzdiscovery.pm b/xCAT-server/lib/xcat/plugins/zzzdiscovery.pm
index bcf423fa1..8665d62fb 100644
--- a/xCAT-server/lib/xcat/plugins/zzzdiscovery.pm
+++ b/xCAT-server/lib/xcat/plugins/zzzdiscovery.pm
@@ -19,14 +19,32 @@ sub process_request {
     my $cb    = shift;
     my $doreq = shift;
     if ($req->{command}->[0] eq 'findme') {
+
         if (!defined($req->{discoverymethod}) or !defined($req->{discoverymethod}->[0]) or ($req->{discoverymethod}->[0] eq 'undef')) {
             my $rsp = {};
             $rsp->{error}->[0] = "The discovery request can not be processed";
             $cb->($rsp);
             xCAT::MsgUtils->message("S", "xcat.discovery.zzzdiscovery: ($req->{_xcat_clientmac}->[0]) Failed to discover the node.");
-            return;
+
+            #now, notify the node that its findme request has been processed
+            my $client_ip = $req->{'_xcat_clientip'};
+            xCAT::MsgUtils->message("S","Notify $client_ip that its findme request has been processed");
+            my $sock = new IO::Socket::INET(
+                PeerAddr => $client_ip,
+                PeerPort => '3001',
+                Timeout  => '1',
+                Proto    => 'tcp'
+            );
+            if ($sock) { 
+                print $sock "processed";
+                close($sock);
+            }else{
+                xCAT::MsgUtils->message("S", "Failed to notify $client_ip that its findme request has been processed"); 
+            }
+        }else{
+            xCAT::MsgUtils->message("S", "xcat.discovery.zzzdiscovery: ($req->{_xcat_clientmac}->[0]) Successfully discovered the node using $req->{discoverymethod}->[0] discovery method.");
         }
-        xCAT::MsgUtils->message("S", "xcat.discovery.zzzdiscovery: ($req->{_xcat_clientmac}->[0]) Successfully discovered the node using $req->{discoverymethod}->[0] discovery method.");
+
         return;
     }
 }

From a9c45279e12a75c3436208087cfb09bf245eb248 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Fri, 4 Aug 2017 04:01:54 -0400
Subject: [PATCH 274/283] modified depending on comments

---
 xCAT-probe/subcmds/discovery | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/xCAT-probe/subcmds/discovery b/xCAT-probe/subcmds/discovery
index e2ea8ca1f..622fc81f2 100755
--- a/xCAT-probe/subcmds/discovery
+++ b/xCAT-probe/subcmds/discovery
@@ -225,7 +225,7 @@ sub check_pre_defined_node {
 
     if (@nochain) {
         my $nochainnode = join(",", @nochain);
-        probe_utils->send_msg("stdout", "f", "[$nochainnode] : Invalid value for attribute 'chain'");
+        probe_utils->send_msg("stdout", "f", "[$nochainnode] : No value for attribute 'chain'");
         $rst = 1;
     }
 
@@ -351,8 +351,8 @@ sub check_pre_defined_node {
                 if (!(exists($nodecheckrst{$node}{"switch"})) or $nodecheckrst{$node}{"switch"} !~ /^\w/) {
                     push @error_attribute, "switch";
                 } elsif ($error_switch =~ $nodecheckrst{$node}{"switch"}) {
-                    my $error_switch_string = "Switch " . $nodecheckrst{$node}{"switch"} . " can not be accessible."; 
-                    push @{$error_switch_hash{$error_switch_string}}, $node;
+                    my $error_switch = $nodecheckrst{$node}{"switch"}; 
+                    push @{$error_switch_hash{$error_switch}}, $node;
                     next;
                 }
 
@@ -412,7 +412,8 @@ sub check_pre_defined_node {
         }
         foreach my $key (keys %error_switch_hash) {
             my $nodes = join(",", @{$error_switch_hash{$key}});
-            probe_utils->send_msg("stdout", "f", "[$nodes] : $key");
+            my $error_string = "Switch " . $key . " can not be accessible.";
+            probe_utils->send_msg("stdout", "f", "[$nodes] : $error_string");
             $rst = 1;
         }
     }
@@ -562,8 +563,8 @@ sub check_genesis_file {
         $genesis_v = `rpm -qi xCAT-genesis-base-ppc64`;
     }
 
-    if ($genesis_v =~ /Built in environment .+fc26.* on (.+)\./) {
-        push @warn_msg, "xcat-genesis-base-ppc64 is built in environment fc26 on $1.";
+    if ($genesis_v !~ /Built in environment .+fc.* on (.+)\./) {
+        push @warn_msg, "xcat-genesis-base-ppc64 is built in environment fedora on $1.";
     }
 
     my $genesis_update_flag_p;

From 44061e54c6031a13471eeb0830003b3fe05f08b4 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Fri, 4 Aug 2017 16:39:42 +0800
Subject: [PATCH 275/283] Fix minor problems

---
 .../autotest/testcase/cuda/rhel-cuda-diskfull-install.sh    | 2 +-
 .../autotest/testcase/cuda/rhel-cuda-diskless-install.sh    | 2 +-
 .../autotest/testcase/cuda/ubuntu-cuda-diskfull-install.sh  | 6 +++---
 .../autotest/testcase/cuda/ubuntu-cuda-diskless-install.sh  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
index 83645da90..b5da8d579 100755
--- a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
+++ b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskfull-install.sh
@@ -123,7 +123,7 @@ ${OSIMAGE_NAME}:
     provmethod=install
     template=/opt/xcat/share/xcat/install/rh/compute.${LINUX_DISTRO%%.*}.tmpl
 EOF
-[ "$?" -ne "0" ] && echo "Make node definition failed." >&2 && exit 1
+[ "$?" -ne "0" ] && echo "Make osimage definition failed." >&2 && exit 1
 
 rm -rf "${OSIMAGE_OTHERPKGDIR}"
 mkdir -p "${OSIMAGE_OTHERPKGDIR}"
diff --git a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
index 1e9eeafc5..731f324fc 100755
--- a/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
+++ b/xCAT-test/autotest/testcase/cuda/rhel-cuda-diskless-install.sh
@@ -128,7 +128,7 @@ ${OSIMAGE_NAME}:
     provmethod=netboot
     rootimgdir=${OSIMAGE_ROOTIMGDIR}
 EOF
-[ "$?" -ne "0" ] && echo "Make node definition failed." >&2 && exit 1
+[ "$?" -ne "0" ] && echo "Make osimage definition failed." >&2 && exit 1
 
 rm -rf "${OSIMAGE_OTHERPKGDIR}"
 mkdir -p "${OSIMAGE_OTHERPKGDIR}"
diff --git a/xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskfull-install.sh b/xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskfull-install.sh
index 8790427c6..ad3682a6d 100755
--- a/xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskfull-install.sh
+++ b/xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskfull-install.sh
@@ -127,12 +127,12 @@ ${OSIMAGE_NAME}:
     osvers=${LINUX_DISTRO}
     otherpkgdir=${OSIMAGE_OTHERPKGDIR}/var/cuda/repo-8-0-local-ga2v2,http://ports.ubuntu.com/ubuntu-ports/ xenial
     pkgdir=/install/${LINUX_DISTRO}/${LINUX_ARCH}
-    pkglist=/opt/xcat/share/xcat/install/ubuntu/compute.${LINUX_DISTRO}.${LINUX_ARCH}.pkglist
+    pkglist=/opt/xcat/share/xcat/install/ubuntu/cudafull.${LINUX_DISTRO}.${LINUX_ARCH}.pkglist
     profile=compute
     provmethod=install
     template=/opt/xcat/share/xcat/install/ubuntu/compute.tmpl
 EOF
-[ "$?" -ne "0" ] && echo "Make node definition failed." >&2 && exit 1
+[ "$?" -ne "0" ] && echo "Make osimage definition failed." >&2 && exit 1
 
 rm -rf "${OSIMAGE_OTHERPKGDIR}"
 mkdir -p "${OSIMAGE_OTHERPKGDIR}"
@@ -164,7 +164,7 @@ sleep 5
 xdsh "${COMPUTE_NODE}" date
 [ "$?" -ne "0" ] && echo "Failed connect to compute node via SSH." >&2 && exit 1
 
-xdsh "${COMPUTE_NODE}" 'rpm -q cuda' | grep ': cuda-'
+xdsh "${COMPUTE_NODE}" 'dpkg -l' | grep 'cuda-'
 [ "$?" -ne "0" ] && echo "CUDA installation checking failed" >&2 && exit 1
 
 exit 0
diff --git a/xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskless-install.sh b/xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskless-install.sh
index bc52aed55..770d591f2 100755
--- a/xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskless-install.sh
+++ b/xCAT-test/autotest/testcase/cuda/ubuntu-cuda-diskless-install.sh
@@ -137,7 +137,7 @@ ${OSIMAGE_NAME}:
     provmethod=netboot
     rootimgdir=${OSIMAGE_ROOTIMGDIR}
 EOF
-[ "$?" -ne "0" ] && echo "Make node definition failed." >&2 && exit 1
+[ "$?" -ne "0" ] && echo "Make osimage definition failed." >&2 && exit 1
 
 rm -rf "${OSIMAGE_OTHERPKGDIR}"
 mkdir -p "${OSIMAGE_OTHERPKGDIR}"
@@ -176,7 +176,7 @@ sleep 5
 xdsh "${COMPUTE_NODE}" date
 [ "$?" -ne "0" ] && echo "Failed connect to compute node via SSH." >&2 && exit 1
 
-xdsh "${COMPUTE_NODE}" 'rpm -q cuda' | grep ': cuda-'
+xdsh "${COMPUTE_NODE}" 'dpkg -l' | grep 'cuda-'
 [ "$?" -ne "0" ] && echo "CUDA installation checking failed" >&2 && exit 1
 
 exit 0

From 7d57ef36bc72d6ce791f5e161bce8b80ea30a7ed Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Fri, 4 Aug 2017 04:53:34 -0400
Subject: [PATCH 276/283] add modify site table testcase for issue:3289 (#3609)

* add modify site table testcase for issue:3289

* add modify site table testcase for issue:3289
---
 xCAT-test/autotest/testcase/chdef/cases0 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/xCAT-test/autotest/testcase/chdef/cases0 b/xCAT-test/autotest/testcase/chdef/cases0
index 26db07053..8b4e6d4ee 100644
--- a/xCAT-test/autotest/testcase/chdef/cases0
+++ b/xCAT-test/autotest/testcase/chdef/cases0
@@ -239,3 +239,13 @@ check:rc==0
 cmd:noderm switch-template
 check:rc==0
 end
+start:chdef_site_check
+description:This case is use to check site table could be changed successfully
+cmd:var=`lsdef -t site clustersite -i dhcplease|grep 'dhcplease=' |awk -F= '{print $2}'`;echo $var>/tmp/sitevalue;chdef -t site clustersite dhcplease=300
+check:rc==0
+check:output=~1 object definitions have been created or modified.
+cmd:lsdef -t site clustersite -i dhcplease|grep 'dhcplease=' |awk -F= '{print $2}'
+check:output=~300
+cmd:if [ -f  /tmp/sitevalue ];then var=`cat /tmp/sitevalue`;chdef -t site clustersite dhcplease=$var;rm -rf /tmp/sitevalue;fi
+check:rc==0
+end

From 69da84f5dbfea289fee050b6dbb0abfdb015d7bc Mon Sep 17 00:00:00 2001
From: yangsong <immarvin@users.noreply.github.com>
Date: Fri, 4 Aug 2017 05:00:02 -0500
Subject: [PATCH 277/283] fix a typo in rinstall -c/--console error message
 (#3613)

* fix a typo

* fix a typo
---
 xCAT-client/bin/rinstall | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-client/bin/rinstall b/xCAT-client/bin/rinstall
index d23b65f94..90cc60e12 100755
--- a/xCAT-client/bin/rinstall
+++ b/xCAT-client/bin/rinstall
@@ -75,7 +75,7 @@ my $noderange = $cmdref->{noderange}->[0];    # save the noderange
 my @noderange=xCAT::NodeRange::noderange($noderange);
 
 if($bname eq "rinstall" and $startconsole==1 and scalar @noderange!=1 ){
-    xCAT::MsgUtils->message("E", "Error: rinstall can only be run against one node! Please use winstall for multiple nodes.");
+    xCAT::MsgUtils->message("E", "Error: rinstall -c/--console can only be run against one node! Please use winstall -c/--console for multiple nodes.");
     exit 1;    
 }
 

From 5afdb68a26db48319971fe7efc0a2feec09ae4ac Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Sun, 6 Aug 2017 21:41:38 -0400
Subject: [PATCH 278/283] Fix typo error in xcatprobe discovery precheck

---
 xCAT-probe/subcmds/discovery | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/xCAT-probe/subcmds/discovery b/xCAT-probe/subcmds/discovery
index 622fc81f2..56ed145c3 100755
--- a/xCAT-probe/subcmds/discovery
+++ b/xCAT-probe/subcmds/discovery
@@ -563,8 +563,12 @@ sub check_genesis_file {
         $genesis_v = `rpm -qi xCAT-genesis-base-ppc64`;
     }
 
-    if ($genesis_v !~ /Built in environment .+fc.* on (.+)\./) {
-        push @warn_msg, "xcat-genesis-base-ppc64 is built in environment fedora on $1.";
+    if ($genesis_v =~ /Built in environment .+fc(\d*).+ on (.+)\./) {
+        my $ver  = $1;
+        my $arch = $2;
+        push @warn_msg, "xcat-genesis-base-ppc64 is not built in environment fedora 26 or higher version on $arch." if ($ver < 26);
+    } else {
+        push @warn_msg, "xcat-genesis-base-ppc64 is not built in environment fedora.";
     }
 
     my $genesis_update_flag_p;

From 818fd8d5a380758d4eede0dafdec9f8bd03992ab Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Mon, 7 Aug 2017 02:23:39 -0400
Subject: [PATCH 279/283] fix issue 3617

---
 xCAT-server/sbin/xcatd | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index dd34ccbed..25c9aaa3e 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -941,7 +941,9 @@ unless ($foreground) {
 }
 
 # Cache the hostname, restart xcatd if hostname is changed after xcatd running
-my $MYXCATSERVER = Sys::Hostname::hostname;
+my $myhostname = Sys::Hostname::hostname;
+my @mynamearray = split(/\./, $myhostname);
+my $MYXCATSERVER = $mynamearray[0];
 
 $dbmaster = xCAT::Table::init_dbworker;
 if ($enable_perf) {

From b189c42cb875ce3df567c74b8430a41cc493b095 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Mon, 7 Aug 2017 02:58:14 -0400
Subject: [PATCH 280/283] Add dep rsync for xCAT package in ubuntu

---
 xCAT/debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT/debian/control b/xCAT/debian/control
index fae5030f6..e0cb0b97b 100644
--- a/xCAT/debian/control
+++ b/xCAT/debian/control
@@ -9,7 +9,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, tftpd-hpa, conserver-xcat, libnet-telnet-perl, xcat-genesis-scripts-ppc64 (>= 2.13-snap000000000000), xcat-genesis-scripts-amd64 (>= 2.13-snap000000000000)
+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)
 Suggests: yaboot-xcat
 Description: Metapackage for a common, default xCAT setup

From f16e3230d1e989d26c1f779f491e0b88edb0e809 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 9 Aug 2017 03:17:54 -0400
Subject: [PATCH 281/283] add new case rpower_wrongpasswd into
 hdctrl_openpower_ipmi.bundle hdctrl_openpower_openbmc.bundle

---
 xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle    | 1 +
 xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
index ac555451a..5690af353 100644
--- a/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle
@@ -11,3 +11,4 @@ rpower_errorcommand_OpenpowerBmc
 rpower_softoff_OpenpowerBmc
 rpower_suspend_OpenpowerBmc
 rpower_wake_OpenpowerBmc
+rpower_wrongpasswd
diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
index cf6c48acc..2e02351df 100644
--- a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
@@ -27,4 +27,5 @@ rspconfig_netmask
 rspconfig_netmask_invalid
 rspconfig_gateway
 rspconfig_gateway_invalid
-rspconfig_node_invalid
+pspconfig_node_invalid
+rpower_wrongpasswd

From f2a1f8873aae8051f832081a1d20d01e69ee1ff1 Mon Sep 17 00:00:00 2001
From: hu-weihua <huweihua@cn.ibm.com>
Date: Wed, 9 Aug 2017 04:17:35 -0400
Subject: [PATCH 282/283] modify a typo

---
 xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
index 2e02351df..961bdb336 100644
--- a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
+++ b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle
@@ -27,5 +27,5 @@ rspconfig_netmask
 rspconfig_netmask_invalid
 rspconfig_gateway
 rspconfig_gateway_invalid
-pspconfig_node_invalid
+rspconfig_node_invalid
 rpower_wrongpasswd

From 98f1e5c0a3f4af618c2d4cce47e1d92604445dae 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: Wed, 9 Aug 2017 17:09:49 +0800
Subject: [PATCH 283/283] Revise the man page of noderange. Describe the
 special characters need to be escaped more clear (#3651)

---
 .../admin-guides/references/man3/noderange.3.rst   | 14 +++++++++++++-
 xCAT-client/pods/man3/noderange.3.pod              | 11 ++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man3/noderange.3.rst b/docs/source/guides/admin-guides/references/man3/noderange.3.rst
index 2505ae4ae..c172e5218 100644
--- a/docs/source/guides/admin-guides/references/man3/noderange.3.rst
+++ b/docs/source/guides/admin-guides/references/man3/noderange.3.rst
@@ -59,7 +59,11 @@ Name
 conveniently specify a list of nodes.  The result is that the  command  will
 be applied to a range of nodes, often in parallel.
 
-To avoid shell expansion, \ **noderange**\  should better be quoted with single quotes('') or double quotes("").
+If you invoke xCAT \ **noderange**\  from a shell you may need to quote the
+\ **noderange**\  if the shell would otherwise treat the punctuation marks in
+the \ **noderange**\  as control operators. The affected punctuation marks may
+include Asterisk (\`*'), Left Square Bracket (\`[') , Right Square Bracket
+(\`]'), Circumflex Accent (\`^'), and Overline (\`~').
 
 \ **noderange**\  is a comma-separated list.  Each token (text between commas)
 in the list can be any of the forms listed below:
@@ -359,6 +363,14 @@ Example of \ **xCAT Node Name Format**\  node/group names:
 
 
 
+************
+\ **Bugs**\ 
+************
+
+The special characters used by xCAT \ **noderange**\  are also special characters
+to many shell programs.  In particular, the characters \`*', \`[', \`]', \`^',
+and \`~' may have to be escaped from the shell.
+
 ****************
 \ **SEE ALSO**\ 
 ****************
diff --git a/xCAT-client/pods/man3/noderange.3.pod b/xCAT-client/pods/man3/noderange.3.pod
index ea2d4bf47..fad826bca 100644
--- a/xCAT-client/pods/man3/noderange.3.pod
+++ b/xCAT-client/pods/man3/noderange.3.pod
@@ -36,7 +36,11 @@ B<noderange> is a syntax that can be used in most xCAT commands to
 conveniently specify a list of nodes.  The result is that the  command  will
 be applied to a range of nodes, often in parallel.
 
-To avoid shell expansion, B<noderange> should better be quoted with single quotes('') or double quotes(""). 
+If you invoke xCAT B<noderange> from a shell you may need to quote the
+B<noderange> if the shell would otherwise treat the punctuation marks in
+the B<noderange> as control operators. The affected punctuation marks may
+include Asterisk (`*'), Left Square Bracket (`[') , Right Square Bracket
+(`]'), Circumflex Accent (`^'), and Overline (`~').
 
 B<noderange> is a comma-separated list.  Each token (text between commas)
 in the list can be any of the forms listed below:
@@ -233,6 +237,11 @@ Generate a list of nodes in the 1st two frames:
 
 =back
 
+=head1 B<Bugs>
+
+The special characters used by xCAT B<noderange> are also special characters
+to many shell programs.  In particular, the characters `*', `[', `]', `^',
+and `~' may have to be escaped from the shell.
 
 =head1 B<SEE ALSO>