update Template.pm, so that the partitionfile is grabbed from the master using wget

more zone support
2014-02-19 00:26:23 +00:00 · 2014-02-18 09:06:11 -05:00 · 2014-02-18 08:49:47 -05:00 · 2014-02-18 06:20:28 -05:00 · 2014-02-17 12:23:32 +00:00 · 2014-02-13 14:27:41 -05:00
1979 changed files with 99501 additions and 65004 deletions
@@ -1,14 +0,0 @@
-xCAT - eXtreme Cloud Administration Toolkit
-
-xCAT is a toolkit for the deployment and administration of clusters.
-
-xCAT documentation is available at: http://xcat.sourceforge.net/
-
-xCAT is made available as open source software under the EPL license:
-http://www.opensource.org/licenses/eclipse-1.0.php
-
-
-
-
-
-
@@ -1 +1 @@
-2.10
+2.8.4
@@ -68,7 +68,7 @@ function makedeb {
 }

 # build all debian packages
-packages="xCAT-client xCAT-nbroot xCAT-nbroot2 perl-xCAT xCAT-server xCAT-UI xCAT xCATsn xCAT-test xCAT-IBMhpc xCAT-rmc xCAT-vlan xCAT-confluent"
+packages="xCAT-client xCAT-nbroot xCAT-nbroot2 perl-xCAT xCAT-server xCAT-UI xCAT xCATsn xCAT-test xCAT-IBMhpc xCAT-rmc"

 for file in `echo $packages`
 do
@@ -27,7 +27,6 @@
 #                                       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.
 #               UP=0 or UP=1 - override the default upload behavior
-#               LOG=<filename> - provide an LOG file option to redirect some output into log file
 #
 # For the dependency packages 1. please run the build-debs-all in xcat-dep svn first( there is usage detail in that script)
 #                             2. run ./build-ubunturepo -d
@@ -54,7 +53,7 @@ for i in $*; do
 done

 # Supported distributions
-dists="saucy trusty utopic"
+dists="maverick natty oneiric precise saucy"

 c_flag=            # xcat-core (trunk-delvel) path
 d_flag=            # xcat-dep (trunk) path
@@ -87,7 +86,7 @@ if [ "$c_flag" -a "$d_flag" ];then
    exit 2
 fi

-uploader="ligc"
+uploader="bp-sawyers"
 # Find where this script is located to set some build variables
 old_pwd=`pwd`
 cd `dirname $0`
@@ -95,7 +94,8 @@ curdir=`pwd`

 #define the dep source code path, core build target path and dep build target path
 local_core_repo_path="$curdir/../../xcat-core"
-local_dep_repo_path="$curdir/../../xcat-dep/xcat-dep"
+xcat_dep_path="$curdir/../../../xcat-dep/src/xcat-dep"
+local_dep_repo_path="$curdir/../../../xcat-dep/xcat-dep"

 #define the url used for creating the source list file
 #define the upload dir used for uploading packages
@@ -112,18 +112,13 @@ fi

 export HOME=/root

-WGET_CMD="wget"
-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
+        wget -P $HOME/.gnupg $gsa_url/keys/$key_name
        chmod 600 $HOME/.gnupg/$key_name
    fi
 done
@@ -199,40 +194,27 @@ then
        if [ ! -d ../../$package_dir_name ];then
            mkdir -p "../../$package_dir_name"
        fi
-        packages="xCAT-client xCAT-genesis-scripts perl-xCAT xCAT-server xCAT xCATsn xCAT-test xCAT-buildkit xCAT-vlan xCAT-confluent"
-        target_archs=(amd64 ppc64el)
+        packages="xCAT-client xCAT-genesis-scripts perl-xCAT xCAT-server xCAT-UI xCAT xCATsn xCAT-test xCAT-OpenStack"
+
        for file in `echo $packages`
        do
            file_low=`echo $file | tr '[A-Z]' '[a-z]'`
-            if [ "$file" = "xCAT" -o "$file" = "xCAT-genesis-scripts" ]; then
-                target_archs="amd64 ppc64el"
-            else
-                target_archs="all"
-            fi
-            for target_arch in `echo $target_archs`
-            do
-                if grep -q $file $update_log || [ "$BUILDALL" == 1 -o "$file" = "perl-xCAT" ]; then
-                    rm -f ../../$package_dir_name/${file_low}_*.$target_arch.deb
-                    #genesis scripts package, don't remove genesis amd64 files
-                    #rm -f ../../$package_dir_name/${file_low}-amd64_*.deb
-                    cd $file
-                    dch -v $pkg_version -b -c debian/changelog $build_string
-                    if [ "$target_arch" = "all" ]; then
-                        dpkg-buildpackage -uc -us
-                    else
-                        dpkg-buildpackage -uc -us -a$target_arch
-                    fi
-                    rc=$?
-                    if [ $rc -gt 0 ]; then
-                        echo "Error: $file build package failed exit code $rc"
-                        exit $rc
-                    fi
-                    cd -
-                    find $file -maxdepth 3 -type d -name "${file_low}*" | grep debian | xargs rm -rf
-                    find $file -maxdepth 3 -type f -name "files" | grep debian | xargs rm -rf
-                    mv ${file_low}* ../../$package_dir_name/
+            if grep -q $file $update_log || [ "$BUILDALL" == 1 -o "$file" = "perl-xCAT" ]; then
+                rm -f ../../$package_dir_name/${file_low}_*.deb
+                #only for genesis package
+                rm -f ../../$package_dir_name/${file_low}-amd64_*.deb
+                cd $file
+                dch -v $pkg_version -b -c debian/changelog $build_string
+                dpkg-buildpackage -uc -us
+                rc=$?
+                if [ $rc -gt 0 ]; then
+                    echo "Error: $file build package failed exit code $rc"
                fi
-            done
+                cd -
+                find $file -maxdepth 3 -type d -name "${file_low}*" | grep debian | xargs rm -rf
+                find $file -maxdepth 3 -type f -name "files" | grep debian | xargs rm -rf
+                mv ${file_low}* ../../$package_dir_name/
+            fi
        done

        find ../../$package_dir_name/* ! -name *.deb | xargs rm -f
@@ -268,16 +250,11 @@ then
    mkdir conf

    for dist in $dists; do
-       if [ "$dist" = "trusty" ] || [ "$dist" = "utopic" ]; then
-           tmp_out_arch="amd64 ppc64el"
-       else
-           tmp_out_arch="amd64"
-       fi
       cat << __EOF__ >> conf/distributions
 Origin: xCAT internal repository
 Label: xcat-core bazaar repository
 Codename: $dist
-Architectures: $tmp_out_arch
+Architectures: amd64 
 Components: main
 Description: Repository automatically genereted conf 
 SignWith: yes
@@ -292,29 +269,17 @@ basedir .
 __EOF__

    #import the deb packages into the repo
-    amd_files=`ls ../$package_dir_name/*.deb | grep -v "ppc64el"`
-    all_files=`ls ../$package_dir_name/*.deb`
    for dist in $dists; do
-      if [ "$dist" = "trusty" ] || [ "$dist" = "utopic" ]; then
-          deb_files=$all_files
-      else
-          deb_files=$amd_files
-      fi
-      for file in $deb_files; do
+      for file in `ls ../$package_dir_name/*.deb`; do
 	reprepro -b ./ includedeb $dist $file;
      done
    done
+
    #create the mklocalrepo script
    cat << '__EOF__' > mklocalrepo.sh
 . /etc/lsb-release
 cd `dirname $0`
-host_arch=`uname -m`
-if [ "$host_arch" != "ppc64le" ];then
-    host_arch="amd64"
-else
-    host_arch="ppc64el"
-fi
-echo deb [arch=$host_arch] file://"`pwd`" $DISTRIB_CODENAME main > /etc/apt/sources.list.d/xcat-core.list
+echo deb file://"`pwd`" $DISTRIB_CODENAME main > /etc/apt/sources.list.d/xcat-core.list
 __EOF__

    chmod 775 mklocalrepo.sh
@@ -388,16 +353,11 @@ then

    #create the conf/distributions file
    for dist in $dists; do
-       if [ "$dist" = "trusty" ] || [ "$dist" = "utopic" ]; then
-           tmp_out_arch="amd64 ppc64el"
-       else 
-           tmp_out_arch="amd64"
-       fi
        cat << __EOF__ >> conf/distributions
 Origin: xCAT internal repository
 Label: xcat-dep bazaar repository
 Codename: $dist
-Architectures: $tmp_out_arch
+Architectures: amd64 
 Components: main
 Description: Repository automatically genereted conf 
 SignWith: yes
@@ -411,16 +371,8 @@ ask-passphrase
 basedir .
 __EOF__

-    #import the deb packages into the repo
-    amd_files=`ls ../debs/*.deb | grep -v "ppc64el"`
-    all_files=`ls ../debs/*.deb`
    for dist in $dists; do
-      if [ "$dist" = "trusty" ] || [ "$dist" = "utopic" ]; then
-          deb_files=$all_files
-      else
-          deb_files=$amd_files
-      fi
-      for file in $deb_files; do
+      for file in `ls ../debs/*.deb`; do
 	reprepro -b ./ includedeb $dist $file;
      done
    done
@@ -428,13 +380,7 @@ __EOF__
    cat << '__EOF__' > mklocalrepo.sh
 . /etc/lsb-release
 cd `dirname $0`
-host_arch=`uname -m`
-if [ "$host_arch" != "ppc64le" ];then
-    host_arch="amd64"
-else
-    host_arch="ppc64el"
-fi
-echo deb [arch=$host_arch] file://"`pwd`" $DISTRIB_CODENAME main > /etc/apt/sources.list.d/xcat-dep.list
+echo deb file://"`pwd`" $DISTRIB_CODENAME main > /etc/apt/sources.list.d/xcat-dep.list
 __EOF__

    chmod 775 mklocalrepo.sh
@@ -450,7 +396,7 @@ __EOF__
    chmod -R g+w xcat-dep

    #create the tar ball
-    dep_tar_name=xcat-dep-ubuntu-snap`date +%Y%m%d`.tar.bz
+    dep_tar_name=xcat-dep-ubuntu.tar.bz
    tar -hjcf $dep_tar_name xcat-dep
    chgrp root $dep_tar_name
    chmod g+w $dep_tar_name
@@ -12,45 +12,40 @@
 #    at https://sourceforge.net/account/ssh
 #  - On Linux:  make sure createrepo is installed on the build machine
 #  - On AIX:  Install openssl and openssh installp pkgs and run updtvpkg.  Install from http://www.perzl.org/aix/ :
-#        apr, apr-util, bash, bzip2, db4, expat, gdbm, gettext, glib2, gmp, info, libidn, neon, openssl (won't
-#        conflict with the installp version - but i don't think you need this), pcre, perl-DBD-SQLite, perl-DBI,
-#        popt, python, readline, rsynce, sqlite, subversion, unixODBC, zlib.  
-#        Install wget from http://www-03.ibm.com/systems/power/software/aix/linux/toolbox/alpha.html
+#			apr, apr-util, bash, bzip2, db4, expat, gdbm, gettext, glib2, gmp, info, libidn, neon, openssl (won't
+#			conflict with the installp version - but i don't think you need this), pcre, perl-DBD-SQLite, perl-DBI,
+#           popt, python, readline, rsynce, sqlite, subversion, unixODBC, zlib.  Install wget from http://www-03.ibm.com/systems/power/software/aix/linux/toolbox/alpha.html
 #  - Run this script from the local svn repository you just created.  It will create the other
 #    directories that are needed.

 # Usage:  buildcore.sh [attr=value attr=value ...]
-#    Before running buildcore.sh, you must change the local git repo to the branch you want built, using: git checkout <branch>
-#        PROMOTE=1 - if the attribute "PROMOTE" is specified, means an official dot release.  This does not actually build
-#                    xcat, just uploads the most recent snap build to https://sourceforge.net/projects/xcat/files/xcat/ .
-#                    If not specified, a snap build is assumed, which uploads to https://sourceforge.net/projects/xcat/files/yum/
-#                    or https://sourceforge.net/projects/xcat/files/aix/.
-#        PREGA=1 - use this option with PROMOTE=1 on a branch that already has a released dot release, but this build is
-#                  a GA candidate build, not to be released yet.  This will result in the tarball being uploaded to
-#                  https://sourceforge.net/projects/xcat/files/yum/ or https://sourceforge.net/projects/xcat/files/aix/
-#                  (but the tarball file name will be like a released tarball, not a snap build).  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.
-#        UP=0 or UP=1 - override the default upload behavior 
-#        SVNUP=<filename> - control which rpms get built by specifying a coresvnup file
-#        GITUP=<filename> - control which rpms get built by specifying a coregitup file
-#        EMBED=<embedded-environment> - the environment for which a minimal version of xcat should be built, e.g. zvm or flex
-#        VERBOSE=1 - to see lots of verbose output
-#        LOG=<filename> - provide an LOG file option to redirect some output into log file
+#       Before running buildcore.sh, you must change the local git repo to the branch you want built, using: git checkout <branch>
+#		PROMOTE=1 - if the attribute "PROMOTE" is specified, means an official dot release.  This does not
+#					actually build xcat, just uploads the most recent snap build to https://sourceforge.net/projects/xcat/files/xcat/ .
+#					If not specified, a snap build is assumed, which uploads to https://sourceforge.net/projects/xcat/files/yum/
+#					or https://sourceforge.net/projects/xcat/files/aix/.
+#		PREGA=1 - use this option with PROMOTE=1 on a branch that already has a released dot release, but this build is
+#					a GA candidate build, not to be released yet.  This will result in the tarball being uploaded to
+#					https://sourceforge.net/projects/xcat/files/yum/ or https://sourceforge.net/projects/xcat/files/aix/
+#					(but the tarball file name will be like a released tarball, not a snap build).  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.
+# 		UP=0 or UP=1 - override the default upload behavior 
+# 		SVNUP=<filename> - control which rpms get built by specifying a coresvnup file
+# 		GITUP=<filename> - control which rpms get built by specifying a coregitup file
+#		EMBED=<embedded-environment> - the environment for which a minimal version of xcat should be built, e.g. zvm or flex
+#		VERBOSE=1 - to see lots of verbose output

 # you can change this if you need to
-UPLOADUSER=litingt
+UPLOADUSER=bp-sawyers
 FRS=/home/frs/project/x/xc/xcat

 # These are the rpms that should be built for each kind of xcat build
-ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts xCAT-SoftLayer xCAT-vlan xCAT-confluent"
+ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts xCAT-OpenStack"
 ZVMBUILD="perl-xCAT xCAT-server xCAT-UI"
 ZVMLINK="xCAT-client xCAT xCATsn"
-# xCAT and xCATsn have PCM specific configuration - conserver-xcat, syslinux-xcat
-# xCAT-server has PCM specific configuration - RESTAPI(perl-JSON) 
-# xCAT-client has PCM specific configuration - getxcatdocs(perl-JSON) 
-PCMBUILD="xCAT xCAT-server xCAT-client xCATsn"
-PCMLINK="perl-xCAT xCAT-buildkit xCAT-genesis-scripts-x86_64 xCAT-genesis-scripts-ppc64 xCAT-vlan"
+PCMBUILD="xCAT"
+PCMLINK="perl-xCAT xCAT-client xCAT-server xCAT-buildkit xCAT-genesis-scripts-x86_64"
 # Note: for FSM, the FlexCAT rpm is built separately from gsa/git
 FSMBUILD="perl-xCAT xCAT-client xCAT-server"
 FSMLINK=""
@@ -86,19 +81,21 @@ if [ "$OSNAME" != "AIX" ]; then
 		echo "Can't get lock /var/lock/xcatbld-$REL.lock.  Someone else must be doing a build right now.  Exiting...."
 		exit 1
 	fi
-	# This is so rpm and gpg will know home, even in sudo
-	export HOME=/root
+	
+	export HOME=/root		# This is so rpm and gpg will know home, even in sudo
 fi

 # for the git case, query the current branch and set REL (changing master to devel if necessary)
 function setbranch {
+	#git checkout $BRANCH
+	#REL=`git rev-parse --abbrev-ref HEAD`
 	REL=`git name-rev --name-only HEAD`
 	if [ "$REL" = "master" ]; then
 		REL="devel"
 	fi
 }

-if [ "$REL" = "xcat-core" ]; then	# using git
+if [ "$REL" = "xcat-core" ]; then			# using git
 	GIT=1
 	setbranch			# this changes the REL variable
 fi
@@ -130,7 +127,7 @@ fi

 XCATCORE="xcat-core"		# core-snap is a sym link to xcat-core

-if [ "$GIT" = "1" ]; then	# using git - need to include REL in the path where we put the built rpms
+if [ "$GIT" = "1" ]; then			# using git - need to include REL in the path where we put the built rpms
 	DESTDIR=../../$REL$EMBEDDIR/$XCATCORE
 else
 	DESTDIR=../..$EMBEDDIR/$XCATCORE
@@ -183,8 +180,7 @@ fi

 # If they have not given us a premade update file, do an svn update or git pull and capture the results
 SOMETHINGCHANGED=0
-if [ "$GIT" = "1" ]; then
-	# using git
+if [ "$GIT" = "1" ]; then			# using git
 	if [ -z "$GITUP" ]; then
 		GITUP=../coregitup
 		echo "git pull > $GITUP"
@@ -198,8 +194,7 @@ if [ "$GIT" = "1" ]; then
 	if ! $GREP 'Already up-to-date' $GITUP; then
 		SOMETHINGCHANGED=1
 	fi
-else
-	# using svn
+else		# using svn
 	GIT=0
 	if [ -z "$SVNUP" ]; then
 		SVNUP=../coresvnup
@@ -242,19 +237,16 @@ if [ "$OSNAME" = "AIX" ]; then
 fi

 # Build the rest of the noarch rpms
-for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT-SoftLayer xCAT-vlan xCAT-confluent; do
+for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit; do
+	#if [ "$EMBED" = "zvm" -a "$rpmname" != "xCAT-server" -a "$rpmname" != "xCAT-UI" ]; then continue; fi		# for zvm embedded env only need to build server and UI
 	if [[ " $EMBEDBUILD " != *\ $rpmname\ * ]]; then continue; fi
-	if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-buildkit" ]; then continue; fi  # do not build xCAT-buildkit on aix
-	if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-SoftLayer" ]; then continue; fi # do not build xCAT-softlayer on aix
-	if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-vlan" ]; then continue; fi      # do not build xCAT-vlan on aix
-	if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-confluent" ]; then continue; fi # do not build xCAT-confluent on aix
+	if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-buildkit" ]; then continue; fi		# do not build xCAT-buildkit on aix
 	if $GREP $rpmname $GITUP || [ "$BUILDALL" == 1 ]; then
 		UPLOAD=1
 		maker $rpmname
 	fi
 	if [ "$OSNAME" = "AIX" ]; then
-		if [ "$rpmname" = "xCAT-client" -o "$rpmname" = "xCAT-server" ]; then
-			# we do not automatically install the rest of the rpms on AIX
+		if [ "$rpmname" = "xCAT-client" -o "$rpmname" = "xCAT-server" ]; then		# we do not automatically install the rest of the rpms on AIX
 			echo "rpm -Uvh $rpmname-$SHORTSHORTVER*rpm" >> $DESTDIR/instxcat
 		fi
 	fi
@@ -269,8 +261,6 @@ if [ "$OSNAME" != "AIX" ]; then
 			ORIGFAILEDRPMS="$FAILEDRPMS"
 			./makerpm xCAT-genesis-scripts x86_64 "$EMBED"
 			if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS xCAT-genesis-scripts-x86_64"; fi
-			./makerpm xCAT-genesis-scripts ppc64 "$EMBED"
-			if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS xCAT-genesis-scripts-ppc64"; fi
 			if [ "$FAILEDRPMS" = "$ORIGFAILEDRPMS" ]; then	# all succeeded
 				rm -f $DESTDIR/xCAT-genesis-scripts*rpm
 				rm -f $SRCDIR/xCAT-genesis-scripts*rpm
@@ -282,18 +272,19 @@ if [ "$OSNAME" != "AIX" ]; then
 fi

 # Build the xCAT and xCATsn rpms for all platforms
-for rpmname in xCAT xCATsn; do 
+for rpmname in xCAT xCATsn xCAT-OpenStack; do
+	#if [ "$EMBED" = "zvm" ]; then break; fi
 	if [[ " $EMBEDBUILD " != *\ $rpmname\ * ]]; then continue; fi
 	if [ $SOMETHINGCHANGED == 1 -o "$BUILDALL" == 1 ]; then		# used to be:  if $GREP -E "^[UAD] +$rpmname/" $GITUP; then
 		UPLOAD=1
 		ORIGFAILEDRPMS="$FAILEDRPMS"
 		if [ "$OSNAME" = "AIX" ]; then
-			if [ "$rpmname" = "xCAT-OpenStack" ] || [ "$rpmname" = "xCAT-OpenStack-baremetal" ]; then continue; fi 		# do not bld openstack on aix
+			if [ "$rpmname" = "xCAT-OpenStack" ]; then continue; fi 		# do not bld openstack on aix
 			./makerpm $rpmname "$EMBED"
 			if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname"; fi
 		else
-			for arch in x86_64 ppc64 ppc64le s390x; do
-				if [ "$rpmname" = "xCAT-OpenStack" -a "$arch" != "x86_64" ] || [ "$rpmname" = "xCAT-OpenStack-baremetal" -a "$arch" != "x86_64" ] ; then continue; fi 		# only bld openstack for x86_64 for now
+			for arch in x86_64 ppc64 s390x; do
+				if [ "$rpmname" = "xCAT-OpenStack" -a "$arch" != "x86_64" ]; then continue; fi 		# only bld openstack for x86_64 for now
 				./makerpm $rpmname $arch "$EMBED"
 				if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname-$arch"; fi
 			done
@@ -344,10 +335,6 @@ fi
 #else we will continue

 # Prepare the RPMs for pkging and upload
-WGET_CMD="wget"
-if [ ! -z ${LOG} ]; then 
-    WGET_CMD="wget -o ${LOG}"
-fi

 # get gpg keys in place
 if [ "$OSNAME" != "AIX" ]; then
@@ -355,7 +342,7 @@ if [ "$OSNAME" != "AIX" ]; then
 	for i in pubring.gpg secring.gpg trustdb.gpg; do
 		if [ ! -f $HOME/.gnupg/$i ] || [ `wc -c $HOME/.gnupg/$i|cut -f 1 -d' '` == 0 ]; then
 			rm -f $HOME/.gnupg/$i
-			${WGET_CMD} -P $HOME/.gnupg $GSA/keys/$i
+			wget -P $HOME/.gnupg $GSA/keys/$i
 			chmod 600 $HOME/.gnupg/$i
 		fi
 	done
@@ -365,7 +352,7 @@ if [ "$OSNAME" != "AIX" ]; then
 		echo '%_signature gpg' >> $MACROS
 	fi
 	if ! $GREP '%_gpg_name' $MACROS 2>/dev/null; then
-		echo '%_gpg_name xCAT Security Key' >> $MACROS
+		echo '%_gpg_name Jarrod Johnson' >> $MACROS
 	fi
 	echo "Signing RPMs..."
 	build-utils/rpmsign.exp `find $DESTDIR -type f -name '*.rpm'` | grep -v -E '(already contains identical signature|was already signed|rpm --quiet --resign|WARNING: standard input reopened)'
@@ -377,10 +364,10 @@ if [ "$OSNAME" != "AIX" ]; then
 	gpg -a --detach-sign $DESTDIR/repodata/repomd.xml
 	gpg -a --detach-sign $SRCDIR/repodata/repomd.xml
 	if [ ! -f $DESTDIR/repodata/repomd.xml.key ]; then
-		${WGET_CMD} -q -P $DESTDIR/repodata $GSA/keys/repomd.xml.key
+		wget -P $DESTDIR/repodata $GSA/keys/repomd.xml.key
 	fi
 	if [ ! -f $SRCDIR/repodata/repomd.xml.key ]; then
-		${WGET_CMD} -P $SRCDIR/repodata $GSA/keys/repomd.xml.key
+		wget -P $SRCDIR/repodata $GSA/keys/repomd.xml.key
 	fi
 fi

@@ -428,18 +415,7 @@ EOF
 #!/bin/sh
 cd `dirname $0`
 REPOFILE=`basename xCAT-*.repo`
-if [[ $REPOFILE == "xCAT-*.repo" ]]; then 
-    echo "ERROR: For xcat-dep, please execute $0 in the correct <os>/<arch> subdirectory"
-    exit 1
-fi
-#
-# default to RHEL yum, if doesn't exist try Zypper
-#
-DIRECTORY="/etc/yum.repos.d"
-if [[ ! -d ${DIRECTORY} ]]; then                                                                            
-    DIRECTORY="/etc/zypp/repos.d"                                                                           
-fi
-sed -e 's|baseurl=.*|baseurl=file://'"`pwd`"'|' $REPOFILE | sed -e 's|gpgkey=.*|gpgkey=file://'"`pwd`"'/repodata/repomd.xml.key|' > ${DIRECTORY}/$REPOFILE
+sed -e 's|baseurl=.*|baseurl=file://'"`pwd`"'|' $REPOFILE | sed -e 's|gpgkey=.*|gpgkey=file://'"`pwd`"'/repodata/repomd.xml.key|' > /etc/yum.repos.d/$REPOFILE
 cd -
 EOF2
 chmod 775 mklocalrepo.sh
@@ -519,9 +495,7 @@ if [ "$OSNAME" != "AIX" -a "$REL" = "devel" -a "$PROMOTE" != 1 -a -z "$EMBED" ];
 	rpm2cpio ../$XCATCORE/perl-xCAT-*.$NOARCH.rpm | cpio -id '*.html'
 	rpm2cpio ../$XCATCORE/xCAT-test-*.$NOARCH.rpm | cpio -id '*.html'
 	rpm2cpio ../$XCATCORE/xCAT-buildkit-*.$NOARCH.rpm | cpio -id '*.html'
-	#rpm2cpio ../$XCATCORE/xCAT-OpenStack-*.x86_64.rpm | cpio -id '*.html'
-	rpm2cpio ../$XCATCORE/xCAT-SoftLayer-*.$NOARCH.rpm | cpio -id '*.html'
-	rpm2cpio ../$XCATCORE/xCAT-vlan-*.$NOARCH.rpm | cpio -id '*.html'
+	rpm2cpio ../$XCATCORE/xCAT-OpenStack-*.x86_64.rpm | cpio -id '*.html'
 	i=0
 	while [ $((i+=1)) -le 5 ] && ! rsync $verboseflag -r opt/xcat/share/doc/man1 opt/xcat/share/doc/man3 opt/xcat/share/doc/man5 opt/xcat/share/doc/man7 opt/xcat/share/doc/man8 $UPLOADUSER,xcat@web.sourceforge.net:htdocs/
 	do : ; done
@@ -19,7 +19,7 @@
 #		VERBOSE=1 - to see lots of verbose output

 # you can change this if you need to
-UPLOADUSER=litingt
+UPLOADUSER=bp-sawyers

 FRS=/home/frs/project/x/xc/xcat
 OSNAME=$(uname)
@@ -92,7 +92,7 @@ if [ "$OSNAME" != "AIX" ]; then
 		echo '%_signature gpg' >> $MACROS
 	fi
 	if ! $GREP -q '%_gpg_name' $MACROS 2>/dev/null; then
-		echo '%_gpg_name xCAT Security Key' >> $MACROS
+		echo '%_gpg_name Jarrod Johnson' >> $MACROS
 	fi

 	# Sign the rpms that are not already signed.  The "standard input reopened" warnings are normal.
@@ -138,21 +138,8 @@ if [ "$PERLVER" == "v5.8.2" ]; then
        OSVER='5.3'
 elif [ "$PERLVER" == "v5.8.8" ]; then
        OSVER='6.1'
-        aixver=`lslpp -lc|grep 'bos.rte:'|head -1|cut -d: -f3`
-                if [[ $aixver < '6.1.9.0' ]]; then
-                        AIX61Y=0
-                else
-                        AIX61Y=1
-                fi
 elif [ "$PERLVER" == "v5.10.1" ]; then
        OSVER='7.1'
-        aixver=`lslpp -lc|grep 'bos.rte:'|head -1|cut -d: -f3`
-		if [[ $aixver < '7.1.3.0' ]]; then
-			AIX71L=0
-		else
-			AIX71L=1
-		fi
-
 else
        echo "Error: the perl version of '$PERLVER' is not one that instoss understands.  Exiting..."
        exit 2
@@ -169,30 +156,33 @@ echo "Running updtvpkg. This could take a few minutes."
 /usr/sbin/updtvpkg
 echo "updtvpkg has completed."

-# unixODBC is required by pyodbc, so install it first
 rpm -Uvh unixODBC*
-# Now install the bulk of the rpms, one at a time, in case some are already installed
-for i in `ls *.rpm|grep -v -E '^tcl-|^tk-|^expect-|^unixODBC-|^xCAT-UI-deps|^perl-DBD-DB2Lite|^net-snmp'`; do
+for i in `ls *.rpm|grep -v -E '^tcl-|^tk-|^expect-|^unixODBC-|^xCAT-UI-deps|^perl-DBD-DB2Lite'`; do
 	if [ "$i" == "perl-Net-DNS-0.66-1.aix5.3.ppc.rpm" ]; then
 		opts="--nodeps"
 	else
 		opts=""
 	fi
-
-	# On 7.1L and 6.1Y we need a newer version of perl-Net_SSLeay.pm
-	if [[ $AIX71L -eq 1 || $AIX61Y -eq 1 ]]; then
-		if [[ $i == perl-Net_SSLeay.pm-1.30-* ]]; then continue; fi 	# skip the old rpm
-	else
-		if [[ $i == perl-Net_SSLeay.pm-1.55-* ]]; then continue; fi 	# skip the new rpm
-	fi
+	
+	# just in case we need it sometime, this next if stmt would mean: if it does not start with perl-DBD-DB2
+	#if [ "${i#perl-DBD-DB2}" == "$i" ]; then
 	
 	echo rpm -Uvh $opts $i
 	rpm -Uvh $opts $i
 done
-# Have to upgrade all of the net-snmp rpms together because they depend on each other.
-# Also, they require bash, so do it after the loop, rather than before
-rpm -Uvh net-snmp*
-
+# don't try to install tcl, tk, or expect if they are already installed!
+# this section about expect/tcl/tk can be removed once 2.8 releases, because 2.8 no longer requires expect
+lslpp -l | grep expect.base > /dev/null 2>&1
+if [ $? -gt 0 ]; then
+	if [ "$OSVER" == "5.3" ]; then
+		for i in tcl-*.rpm tk-*.rpm expect-*.rpm; do
+			echo rpm -Uvh $i
+			rpm -Uvh $i
+		done
+	else
+		echo "The expect.base, tcl.base, and tk.base filesets must also be installed before installing the xCAT RPMs from xcat-core."
+	fi
+fi
 EOF
 # end of instoss file content ---------------------------------------------

@@ -206,7 +196,7 @@ if [ "$OSNAME" == "AIX" ]; then
 else
 	SYSGRP=root
 fi
-chgrp -R -h $SYSGRP *
+chgrp -R $SYSGRP *
 chmod -R g+w *

 # Build the tarball
@@ -1,163 +0,0 @@
-#######################################################################
-#build script for local usage
-#used for Linux/AIX/Ubuntu
-#
-###########################################################################
-
-
-OSNAME=$(uname)
-NAMEALL=$(uname -a)
-
-for i in $*; do
-        # upper case the variable name
-        varstring=`echo "$i"|cut -d '=' -f 1|tr '[a-z]' '[A-Z]'`=`echo "$i"|cut -d '=' -f 2`
-        export $varstring
-done
-
-if [ -z "$CURDIR" ]; then
-   echo "get current directory!"
-   CURDIR=$(pwd)
-fi
-
-echo "CURDIR is $CURDIR"
-echo "OSNAME is $OSNAME!"
-echo "NAMEALL is $NAMEALL"
-
-grep -i 'SUSE' /etc/issue
-if [ $? -eq 0 ]; then
-   echo "This is a SUSE system!"
-   OS="SUSE";
-fi
-
-
-ls $CURDIR/makerpm
-
-if [ $? -gt 0 ]; then
-                echo "Error:no repo exist, exit 1."
-                exit 1 
-fi
-
-# Get a lock, so can not do 2 builds at once
-exec 8>/var/lock/xcatbld.lock
-if ! flock -n 8; then
-    echo "Can't get lock /var/lock/xcatbld.lock.  Someone else must be doing a build right now.  Exiting...."
-    exit 1
-fi
-
-#delete old package if there is
-rm -rf $CURDIR/build/
-cd $CURDIR
-
-echo "==============================================="
-echo $NAMEALL |  egrep "Ubuntu"
-
-#Check if it is an Ubuntu system
-if [ $? -eq 0 ]; then
-
-echo "This is an Ubuntu system"
-     pkg_type="snap"
-     build_string="Snap_Build"
-     cur_date=`date +%Y%m%d`
-     short_ver=`cat Version|cut -d. -f 1,2`
-     pkg_version="${short_ver}-${pkg_type}${cur_date}"
-
-     mkdir -p $CURDIR/build
-
- for rpmname in xCAT-client xCAT-genesis-scripts perl-xCAT xCAT-server xCAT xCATsn xCAT-test xCAT-vlan; do
-     rpmname_low=`echo $rpmname | tr '[A-Z]' '[a-z]'`
-     echo "============================================"
-     echo "$rpmname_low"
-     cd $rpmname
-     dch -v $pkg_version -b -c debian/changelog $build_string
-     dpkg-buildpackage -uc -us
-     rc=$?
-     if [ $rc -gt 0 ]; then
-                  echo "Error: $rpmname build package failed exit code $rc"
-     fi
-     cd -
-     mv ${rpmname_low}* $CURDIR/build
- 
- done 
-     #delete all files except  .deb file
-     find $CURDIR/build/* ! -name *.deb | xargs rm -f
-
-else
-#This is not an Ubuntu system
-echo "This is an $OSNAME system"
-
-     if [ "$OS" = "SUSE" ]; then
-         rm -rf /usr/src/packages/RPMS/noarch/*
-         rm -rf /usr/src/packages/RPMS/x86_64/*
-         rm -rf /usr/src/packages/RPMS/ppc64/*
-     else
-         rm -rf /root/rpmbuild/RPMS/noarch/*
-         rm -rf /root/rpmbuild/RPMS/x86_64/*
-         rm -rf /root/rpmbuild/RPMS/ppc64/*
-     fi
-
-     mkdir -p $CURDIR/build/
-  
-   #always build perl-xCAT
-   $CURDIR/makerpm  perl-xCAT  
- 
-
-   # Build the rest of the noarch rpms
-   for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-test xCAT-buildkit xCAT-vlan; do
-        if [ "$OSNAME" = "AIX" -a "$rpmname" = "xCAT-buildkit" ]; then continue; fi     
-        $CURDIR/makerpm $rpmname
-   done
-  
-  #build xCAT-genesis-scripts if it is x86_64 platform
-  ARCH=$(uname -p)
-  if [ "$ARCH" = "x86_64" ]; then 
-       $CURDIR/makerpm xCAT-genesis-scripts x86_64  
-  else
-       $CURDIR/makerpm xCAT-genesis-scripts ppc64
-  fi
-
-  
-  # Build the xCAT and xCATsn rpms for all platforms
-  for rpmname in xCAT xCATsn; do
-                if [ "$OSNAME" = "AIX" ]; then
-                        $CURDIR/makerpm $rpmname
-                        if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname"; fi 
-                else
-                        for arch in x86_64 ppc64 s390x; do
-                                $CURDIR/makerpm $rpmname $arch
-                                if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname-$arch"; fi
-                        done
-                fi
-  done
-
-  if [ "$OS" = "SUSE" ]; then
-      cp /usr/src/packages/RPMS/noarch/* $CURDIR/build/
-      cp /usr/src/packages/RPMS/x86_64/* $CURDIR/build/
-      cp /usr/src/packages/RPMS/ppc64/* $CURDIR/build/ 
-  else
-      cp /root/rpmbuild/RPMS/noarch/* $CURDIR/build/
-      cp /root/rpmbuild/RPMS/x86_64/* $CURDIR/build/
-      cp /root/rpmbuild/RPMS/ppc64/* $CURDIR/build/
-  fi
-
-  #begin to create repo for redhat platform
-
-   grep -i 'Red' /etc/*release*;
-   if [ "$OSNAME" != "AIX" -a $? -eq 0 ]; then
-        cat >$CURDIR/build/xCAT-core.repo << EOF
-[xcat-2-core]
-name=xCAT 2 Core packages
-baseurl=file://$CURDIR/build
-enabled=1
-gpgcheck=0
-EOF
-
-  cp $CURDIR/build/xCAT-core.repo /etc/yum.repos.d/
-  createrepo $CURDIR/build
-  else
-     rm -f /etc/zypp/repos.d/xCAT-core.repo
-     zypper ar file://$CURDIR/build xCAT-core
-  fi
-   
-fi
-
-
@@ -23,18 +23,6 @@ function makenoarch {
 		RC=$?
 	else	# linux
 		echo "Building $RPMROOT/RPMS/noarch/$RPMNAME-$VER-snap*.noarch.rpm $EMBEDTXT..."
-		# TODO: should fix this up, this is a hack for the new build machine
-		if [ $RPMNAME = "xCAT-UI" ]; then 
-			# Only if the old compiler.jar file does not exist.....
-			if [ ! -e /xcat2/build/tools/compiler.jar ]; then 
-				# look for the dynamic location of the compiler.jar file
-				DIRNAME=`dirname $(readlink -f $0)`
-				COMPILER_JAR=`echo "${DIRNAME%%linux_rpm/*}tools/compiler.jar"`
-				if [ -f $COMPILER_JAR ]; then 
-					sed -i "s#/xcat2/build/tools/compiler.jar#${COMPILER_JAR}#g" xCAT-UI/xCAT-UI.spec
-				fi
-			fi 
-		fi
 		tar --exclude .svn -czf $RPMROOT/SOURCES/$RPMNAME-$VER.tar.gz $RPMNAME
 		rm -f $RPMROOT/SRPMS/$RPMNAME-$VER*rpm $RPMROOT/RPMS/noarch/$RPMNAME-$VER*rpm
 		rpmbuild $QUIET -ta $RPMROOT/SOURCES/$RPMNAME-$VER.tar.gz
@@ -65,7 +53,6 @@ function makexcat {
 			tar -X /tmp/xcat-excludes -cf $RPMROOT/SOURCES/templates.tar templates
 			gzip -f $RPMROOT/SOURCES/templates.tar
 			cp xcat.conf $RPMROOT/SOURCES
-			cp xcat.conf.apach24 $RPMROOT/SOURCES
 			cp xCATMN $RPMROOT/SOURCES
 		else	# xCATsn
 			tar -X /tmp/xcat-excludes -cf $RPMROOT/SOURCES/license.tar LICENSE.html
@@ -90,14 +77,12 @@ function makexcat {
 			tar --exclude .svn -czf $RPMROOT/SOURCES/templates.tar.gz templates
 			tar --exclude .svn -czf $RPMROOT/SOURCES/winpostscripts.tar.gz winpostscripts
 			cp xcat.conf $RPMROOT/SOURCES
-			cp xcat.conf.apach24 $RPMROOT/SOURCES
 			cp xCATMN $RPMROOT/SOURCES
 			cd - >/dev/null
 		elif [ "$RPMNAME" = "xCATsn" ]; then
 			cd `dirname $0`/$RPMNAME
 			tar --exclude .svn -czf $RPMROOT/SOURCES/license.tar.gz LICENSE.html
 			cp xcat.conf $RPMROOT/SOURCES
-			cp xcat.conf.apach24 $RPMROOT/SOURCES
 			cp xCATSN $RPMROOT/SOURCES
 			cd - >/dev/null
 		elif [ "$RPMNAME" = "xCAT-buildkit" ]; then
@@ -118,23 +103,7 @@ function makexcat {
 	fi
 }

-# make ironic rpm for ironic baremetal driver
-function makeironic {
-	RPMNAME="$1"
-	ARCH="$2"
-	cd `dirname $0`/$RPMNAME    
-	cp -rf ironic_baremetal /tmp/
-	cd /tmp/ironic_baremetal
-	git init
-	git add *
-	git commit -a -m "generate rpm"
-	python setup.py bdist_rpm
-	rm -rf $RPMROOT/RPMS/$ARCH/
-	mkdir -p $RPMROOT/RPMS/$ARCH/
-	cp -rf dist/*.rpm $RPMROOT/RPMS/$ARCH/
-	rm -rf /tmp/ironic_baremetal
-}	
-	
+

 # Make the xCAT-nbroot-core rpm
 function makenbroot {
@@ -234,6 +203,7 @@ else	# linux
 	fi
 fi

+
 if [ "$1" = "xCAT" -o "$1" = "xCATsn" -o "$1" = "xCAT-buildkit" -o "$1" = "xCAT-OpenStack" ]; then
 	exportEmbed $3
 	makexcat $1 $2
@@ -246,8 +216,6 @@ elif [ "$1" = "xCAT-genesis-builder" ]; then
 elif [ "$1" = "xCAT-genesis-scripts" ]; then
 	exportEmbed $3
 	makegenesisscripts $1 $2
-elif [ "$1" = "xCAT-OpenStack-ironic" ]; then
-	makeironic $1 $2    
 else	# must be one of the noarch rpms
 	exportEmbed $2
 	makenoarch $1
@@ -262,12 +262,6 @@ expression B<($1-1)%14+1> will evaluate to B<6>.

 See http://www.perl.com/doc/manual/html/pod/perlre.html for information on perl regular expressions.

-=head2 Easy Regular Expressions 
-
-As of xCAT 2.8.1, you can use a modified version of the regular expression support described in the previous section. You do not need to enter the node information (1st part of the expression), it will be derived from the input nodename. You only need to supply the 2nd part of the expression to determine the value to give the attribute. For examples, see 
-
-https://sourceforge.net/p/xcat/wiki/Listing_and_Modifying_the_Database/#easy-regular-expressions
-
 =head1 OBJECT DEFINITIONS

 Because it can get confusing what attributes need to go in what tables, the xCAT database can also
@@ -48,7 +48,7 @@ binary-arch: build install
 	chmod 644 `pwd`/debian/perl-xcat/opt/xcat/share/doc/man5/*
 	chmod 644 `pwd`/debian/perl-xcat/opt/xcat/share/man/man7/*
 	chmod 644 `pwd`/debian/perl-xcat/opt/xcat/share/doc/man7/*
-	./modifyUtils `cat ../Version` `git log -n 1 | head -n 1 | cut -f 2 -d ' '`
+	./modifyUtils `cat ../Version` `svn info | grep Revision | cut -d" " -f 2`
 #	dh_installmenu
 #	dh_installdebconf	
 #	dh_installlogrotate
@@ -1,21 +1,20 @@
 #!/bin/sh
 # Put the version, svn revision #, and build date into the Version function in Version.pm

-if [ -z "$2" ]
+if [ -z "$1" ]
 	then
 	echo "modifyUtils:  Error:  must specify the xCAT version as an argument" >&2
 	exit
 fi

 VER=$1
-GITREF="git commit $2, "

 BUILDDATE=`date`
 #echo ". '(built $BUILDDATE)'"

 if [ "$(uname)" = "AIX" ]
 then
-	sed -e s/"#XCATVERSIONSUBHERE"/". '$VER'"/ -e s/"#XCATSVNBUILDSUBHERE"/". ' (${GITREF}built $BUILDDATE)'"/ xCAT/Version.pm >xCAT/Version.pm.new
+	sed -e s/"#XCATVERSIONSUBHERE"/". '$VER'"/ -e s/"#XCATSVNBUILDSUBHERE"/". ' (built $BUILDDATE)'"/ xCAT/Version.pm >xCAT/Version.pm.new
 	mv xCAT/Version.pm.new xCAT/Version.pm
 else
        if [ -f "/etc/debian_version" ];then
@@ -23,5 +22,5 @@ else
        else
            FILENAME="xCAT/Version.pm"
        fi
-	sed -i -e s/"#XCATVERSIONSUBHERE"/". '$VER'"/ -e s/"#XCATSVNBUILDSUBHERE"/". ' (${GITREF}built $BUILDDATE)'"/ $FILENAME
+	sed -i -e s/"#XCATVERSIONSUBHERE"/". '$VER'"/ -e s/"#XCATSVNBUILDSUBHERE"/". ' (built $BUILDDATE)'"/ $FILENAME
 fi
@@ -23,8 +23,6 @@ Provides: perl-xCAT = %{epoch}:%{version}
 Provides perl xCAT libraries for core functionality.  Required for all xCAT installations.
 Includes xCAT::Table, xCAT::NodeRange, among others.

-%define gitinfo %(git log -n 1 | head -n 1 | cut -f 2 -d ' ')
-
 %define zvm %(if [ "$zvm" = "1" ];then echo 1; else echo 0; fi)
 %define fsm %(if [ "$fsm" = "1" ];then echo 1; else echo 0; fi)

@@ -38,7 +36,7 @@ Includes xCAT::Table, xCAT::NodeRange, among others.
 %if %fsm
 %else
 # Modify the Version() function in xCAT/Utils.pm to automatically have the correct version
-./modifyUtils %{version} %{gitinfo}
+./modifyUtils %{version}

 # Build the pod version of the man pages for each DB table.  It puts them in the man5 and man7 subdirs.
 # Then convert the pods to man pages and html pages.
@@ -500,7 +500,6 @@ sub setCFMPkglistFile {
    Arguments:
      $imagename - the specified linuximage name
      @curospkgs - the currently selected OS packages list
-      $mode      - using Fuzzy Matching or Exact Matching to check packages
    Returns:
      0 - update successfully
      1 - update failed
@@ -510,22 +509,13 @@ sub setCFMPkglistFile {
      none
    Example:
      my $ret = CAT::CFMUtils->updateCFMPkglistFile($imagename, @cur_selected_pkgs);
-      my $ret = CAT::CFMUtils->updateCFMPkglistFile($imagename, @cur_selected_pkgs, 1);

 =cut

 #-----------------------------------------------------------------------------
 sub updateCFMPkglistFile {
-    my ($class, $img, $ospkgs, $mode) = @_;
-    
-    if(defined($mode)){
-        # Exact Matching
-        $mode = 1;
-    }else {
-        # Fuzzy Matching
-        $mode = 0;
-    }
-    
+    my ($class, $img, $ospkgs) = @_;
+     
    my @cur_selected = @$ospkgs;
    my $cfmpkglist = "/install/osimages/$img/pkglist.cfm";

@@ -559,14 +549,6 @@ sub updateCFMPkglistFile {
        my @selected = @$selected_ref;
        @basepkgs = xCAT::CFMUtils->arrayops("U", \@basepkgs, \@selected);
    }
-    
-    # Fuzzy Matching
-    if (not $mode){
-        my ($ref1, $ref2, $ref3) = xCAT::CFMUtils->updateSelectedPkgs(\@pre_selected, \@pre_removed, \@cur_selected);
-        @pre_selected = @$ref1;
-        @pre_removed = @$ref2;
-        @cur_selected = @$ref3;
-    }

    # get diff between previous and current selected OS packages lists    
    my @diff = xCAT::CFMUtils->getPkgsDiff(\@pre_selected, \@cur_selected);
@@ -679,48 +661,6 @@ sub getPreOSpkgsList {
    return (\@selected, \@removed);
 }

-#-----------------------------------------------------------------------------
-
-=head3 getPreBaseOSpkgsList
-    Get previously selected and removed base OS packages lists from pkglist file. Packages named with "example.xxx" should be the base name "example"
-
-    Arguments:
-      $ospkglist - the path for ospkglist file
-    Returns:
-      refs for selected and removed OS packages arrays
-    Globals:
-      none
-    Error:
-      none
-    Example:
-      my $pre_selected_ref = xCAT::CFMUtils->getPreOSpkgsList($ospkglist);
-
-=cut
-
-#-----------------------------------------------------------------------------
-sub getPreBaseOSpkgsList {
-    my ($class, $pkglist) = @_;
-    
-    my ($pre_selected_ref, $pre_removed_ref) = xCAT::CFMUtils->getPreOSpkgsList($pkglist); 
-    
-    my %pre_selected_hash = ();
-    foreach (@$pre_selected_ref) {
-        my @names = split(/\./, $_);
-        my $basename = $names[0];
-        
-        if ($_ =~ /^$basename\.([^\.]+)$/) {
-            $pre_selected_hash{$basename} = 1;
-        }else {
-            $pre_selected_hash{$_} = 1;
-        }
-    }
-    
-    my @pre_selected = keys %pre_selected_hash;
-
-    return \@pre_selected;
-}
-
-
 #-----------------------------------------------------------------------------

 =head3 getPkgsDiff
@@ -879,66 +819,3 @@ sub arrayops {

    #return (\@union, \@intersection, \@difference);
 }
-
-
-#-----------------------------------------------------------------------------
-
-=head3 updateSelectedPkgs
-    Update previous selected, previous removed and current selected packages based on fuzzy matching rules. Packages named with "example.i686" should be same with package "example"
-
-    Arguments:
-      \@pre_selected - reference to previous selected packages
-      \@pre_removed - reference to previous removed packages
-      \@cur_selected - reference to current selected packages
-    Returns:
-      new previous selected, previous removed, current selected packages
-    Globals:
-      none
-    Error:
-      none
-    Example:
-      my ($ref1, $ref2, $ref3) = xCAT::CFMUtils->arrayops(\@pre_selected, \@pre_removed, \@cur_selected);
-
-=cut
-
-#-----------------------------------------------------------------------------
-sub updateSelectedPkgs() {
-    my ($class, $pre_selected_ref, $pre_removed_ref, $cur_selected_ref) = @_; 
-    
-    my %pre_selected_hash = map{$_ => 1} @$pre_selected_ref;
-    my %pre_removed_hash = map{$_ => 1} @$pre_removed_ref;
-    my %cur_selected_hash = map{$_ => 1} @$cur_selected_ref;
-    
-    my %new_pre_selected_hash = %pre_selected_hash;
-    my %new_pre_removed_hash = %pre_removed_hash;
-    my %new_cur_selected_hash = %cur_selected_hash;
-    
-    foreach (keys %cur_selected_hash) {
-        my $father = $_;
-        my $flag = 0;
-        foreach (keys %pre_selected_hash) {
-            my $child = $_;
-            if ($child =~ /^$father\.([^\.]+)$/) {
-                $new_cur_selected_hash{$child} = 1;
-                $flag = 1;
-            }
-        }
-        if ($flag and not exists $pre_selected_hash{$father}){
-            delete $new_cur_selected_hash{$father} if exists $new_cur_selected_hash{$father};
-        }
-        
-        foreach (keys %pre_removed_hash) {
-            my $child = $_;
-            if ($child =~ /^$father\.([^\.]+)$/) {
-                delete $new_pre_removed_hash{$child} if exists $new_pre_removed_hash{$child};
-            }
-        }
-    }
-    
-    my @new_cur_selected = keys %new_cur_selected_hash;
-    my @new_pre_selected = keys %new_pre_selected_hash;
-    my @new_pre_removed = keys %new_pre_removed_hash;
-    
-    
-    return (\@new_pre_selected, \@new_pre_removed, \@new_cur_selected);  
-}
@@ -1,462 +0,0 @@
-#! /usr/bin/env perl
-# IBM(c) 2014 EPL license http://www.eclipse.org/legal/epl-v10.html
-
-# This package offers subroutines to access CIM server
-
-package xCAT::CIMUtils;
-
-use strict;
-use warnings;
-
-use HTTP::Headers;
-use HTTP::Request;
-use LWP::UserAgent;
-
-use XML::LibXML;
-use Data::Dumper;
-
-=head1 HTTP_PARAMS
-
-    A hash which includes all the parameters for accessing HTTP server. The valid parameter:
-        ip:        The IP address of the HTTP server
-        user:      The user to access HTTP server. 
-        password:  The password for the user. 
-        method:    The http method. (GET, PUT, POST, DELETE). Default is GET
-        protocol:  The protocol which will be used to access HTTP server.  (http/https). Default is https
-        format:    The format of payload. Default is xml
-        payload:   The payload of http
-        
-    Example:
-        my %http_params = ( ip       => '192.168.1.1',
-                            port     => '5989',
-                            user     => 'HMC',
-                            password => 'admin',
-                            method   => 'POST',
-                            protocol => 'https');
-        
-=cut
-
-=head1 enum_instance ()
-    Description:
-        Enumerate CIM instances.
-
-    Arguments:
-        http_params: A reference to HTTP_PARAMS
-        cim_params:  The CIM parameters
-            classname - a mandatory param to specify the class that enumerate will target to.
-
-    Return:
-        1 - A hash reference. The valid key includes:
-            rc     - The return code. 0 - success. > 0 - fail.
-            cim_rc - The return code from CIM server.
-            msg    - Output message.
-            
-        2 - Array of instances, each instance is a hash contains lots of properties.
-
-        3 - The name path of instance
-=cut
-
-
-sub enum_instance
-{
-    my $http_params = shift;
-    unless (ref($http_params)) {
-        $http_params = shift;
-    }
-    
-    my $cim_params = shift;
-
-   # This is a mandatory parameter 
-    unless ($cim_params->{classname}) {
-        return ({rc => 1, msg => "Missed the classname"});
-    }
-
-    unless ($cim_params->{namespace}) {
-        $cim_params->{namespace} = "ibmsd";
-    }
-    
-    # prepare the CIM payload
-    my $tmpnode;
-
-    # create a new doc
-    my $doc = XML::LibXML->createDocument('1.0','UTF-8');
-    
-    # create and add the root element
-    my $root = $doc->createElement("CIM");
-    $root->setAttribute("CIMVERSION", "2.0");
-    $root->setAttribute("DTDVERSION", "2.0");
-    
-    $doc->setDocumentElement($root);
-    
-    # create and add the MESSAGE element
-    my $message = $doc->createElement("MESSAGE");
-    $message->setAttribute("ID", "1000");
-    $message->setAttribute("PROTOCOLVERSION", "1.0");
-    
-    $root->addChild($message);
-    
-    # add a SIMPLE REQUEST
-    my $simple_request = $doc->createElement("SIMPLEREQ");
-    $message->addChild($simple_request);
-    
-    # add an IMETHOD CALL
-    my $imethod_call = $doc->createElement("IMETHODCALL");
-    $imethod_call->setAttribute("NAME", "EnumerateInstances");
-    
-    $simple_request->addChild($imethod_call);
-    
-    # add the local name space path
-    my $localnamespacepath = $doc->createElement("LOCALNAMESPACEPATH");
-    $tmpnode = $doc->createElement("NAMESPACE");
-    $tmpnode->setAttribute("NAME", "root");
-    $localnamespacepath->addChild($tmpnode);
-    
-    $tmpnode = $doc->createElement("NAMESPACE");
-    $tmpnode->setAttribute("NAME", $cim_params->{namespace});
-    $localnamespacepath->addChild($tmpnode);
-    
-    $imethod_call->addChild($localnamespacepath);
-    
-    # add the target class name
-    my $param_classname = $doc->createElement("IPARAMVALUE");
-    $param_classname->setAttribute("NAME", "ClassName");
-    $imethod_call->addChild($param_classname);
-    
-    my $classname = $doc->createElement("CLASSNAME");
-    $classname->setAttribute("NAME", $cim_params->{classname});
-    $param_classname->addChild($classname);
-    
-    # add several common parameters
-    $imethod_call->appendWellBalancedChunk('<IPARAMVALUE NAME="DeepInheritance"><VALUE>TRUE</VALUE></IPARAMVALUE><IPARAMVALUE NAME="LocalOnly"><VALUE>FALSE</VALUE></IPARAMVALUE><IPARAMVALUE NAME="IncludeQualifiers"><VALUE>FALSE</VALUE></IPARAMVALUE><IPARAMVALUE NAME="IncludeClassOrigin"><VALUE>TRUE</VALUE></IPARAMVALUE>');
-    
-    my $payload = $doc->toString();
-    
-    # generate http request
-    my $ret = gen_http_request($http_params, $payload);
-
-    if ($ret->{rc}) {
-        return $ret;
-    }
-
-    # send request to http server
-    $ret = send_http_request($http_params, $ret->{request});
-    if ($ret->{rc}) {
-        return $ret;
-    }
-
-    # parse the http response
-    my $ret_value;
-    my $parser = XML::LibXML->new();
-    my $resp_doc = $parser->parse_string($ret->{payload});
-
-    # check the error message from CIM
-    my $error_node = $resp_doc->getElementsByTagName("ERROR");
-    if ($error_node) {
-        my $msg = $error_node->[0]->getAttribute("DESCRIPTION");
-        my $errorcode = $error_node->[0]->getAttribute("CODE");
-        return ({rc => 1, cim_rc => $errorcode, msg => $error_node->[0]->getAttribute("DESCRIPTION")." [cim return code: $errorcode]"});
-    }
-
-    # get the name path of the instance, which is used to set property
-    my @namepath = $resp_doc->getElementsByTagName("INSTANCENAME");
-    my $namepath_string;
-    if (@namepath) {
-        $namepath_string = $namepath[0]->toString();
-    }
-
-    # get all the instance elements
-    my @instances = $resp_doc->getElementsByTagName("VALUE.NAMEDINSTANCE");
-    foreach my $instance (@instances) {
-        # get all the property element for each instance
-        my @properties = $instance->getElementsByTagName("PROPERTY");
-        if (my @property_arrays = $instance->getElementsByTagName("PROPERTY.ARRAY")) {
-            push @properties, @property_arrays;
-        }
-        my $ins_value;
-        foreach my $property (@properties) {
-            # get name, vlaue and type for each property. (only the one which has value)
-            if (my $pname = $property->getAttribute("NAME")) {
-                if (my $pvalue = $property->getAttribute("TYPE")) {
-                    $ins_value->{property}->{$pname}->{type} = $pvalue;
-                }
-                if ($property->getElementsByTagName("VALUE.ARRAY")) {
-                    my @nodelist = $property->getElementsByTagName("VALUE");
-                    my @value_array = ();
-                    foreach my $n (@nodelist) {
-                        push @value_array, $n->textContent;
-                    }
-                    $ins_value->{property}->{$pname}->{value} = join(',',@value_array);
-                } elsif (my $node = $property->getElementsByTagName("VALUE")) {
-                    $ins_value->{property}->{$pname}->{value} = $node->[0]->textContent;
-                }
-            }
-        }
-        push @{$ret_value}, $ins_value;
-    }
-    
-    return ({rc =>0}, $ret_value, $namepath_string);
-}
-
-=head1 set_property ()
-    Description:
-        Set the property for an instance.
-
-    Arguments:
-        http_params: A reference to HTTP_PARAMS
-        cim_params:  The CIM parameters
-            namepath - a mandatory param to specify the path of the instance.
-                It should be returned from 'enum_instance' subroutine.
-
-    Return:
-        1 - A hash reference. The valid key includes:
-            rc     - The return code. 0 - success. > 0 - fail.
-            cim_rc - The return code from CIM server.
-            msg    - Output message.
-=cut
-sub set_property
-{
-    my $http_params = shift;
-    unless (ref($http_params)) {
-        $http_params = shift;
-    }
-    
-    my $cim_params = shift;
-
-    # This is a mandatory parameter
-    unless ($cim_params->{namepath}) {
-        return ({rc => 1, msg => "Missed the name path for the instance"});
-    }
-
-    unless ($cim_params->{namespace}) {
-        $cim_params->{namespace} = "ibmsd";
-    }
-    
-    # prepare the CIM payload
-    my $tmpnode;
-
-    # create a new doc
-    my $doc = XML::LibXML->createDocument('1.0','UTF-8');
-    
-    # create and add the root element
-    my $root = $doc->createElement("CIM");
-    $root->setAttribute("CIMVERSION", "2.0");
-    $root->setAttribute("DTDVERSION", "2.0");
-    
-    $doc->setDocumentElement($root);
-    
-    # create and add the MESSAGE element
-    my $message = $doc->createElement("MESSAGE");
-    $message->setAttribute("ID", "1000");
-    $message->setAttribute("PROTOCOLVERSION", "1.0");
-    
-    $root->addChild($message);
-    
-    # add a SIMPLE REQUEST
-    my $simple_request = $doc->createElement("SIMPLEREQ");
-    $message->addChild($simple_request);
-    
-    # add an IMETHOD CALL
-    my $imethod_call = $doc->createElement("IMETHODCALL");
-    $imethod_call->setAttribute("NAME", "SetProperty");
-    
-    $simple_request->addChild($imethod_call);
-    
-    # add the local name space path
-    my $localnamespacepath = $doc->createElement("LOCALNAMESPACEPATH");
-    $tmpnode = $doc->createElement("NAMESPACE");
-    $tmpnode->setAttribute("NAME", "root");
-    $localnamespacepath->addChild($tmpnode);
-    
-    $tmpnode = $doc->createElement("NAMESPACE");
-    $tmpnode->setAttribute("NAME", $cim_params->{namespace});
-    $localnamespacepath->addChild($tmpnode);
-    
-    $imethod_call->addChild($localnamespacepath);
-    
-    # add the target property name
-    my $param_propertyname = $doc->createElement("IPARAMVALUE");
-    $param_propertyname->setAttribute("NAME", "PropertyName");
-    $imethod_call->addChild($param_propertyname);
-    
-    $tmpnode = $doc->createElement("VALUE");
-    $tmpnode->appendTextNode($cim_params->{propertyname});
-    $param_propertyname->addChild($tmpnode);
-
-    # add the target property value
-    my $param_newvaluename = $doc->createElement("IPARAMVALUE");
-    $param_newvaluename->setAttribute("NAME", "NewValue");
-    $imethod_call->addChild($param_newvaluename);
-    
-    $tmpnode = $doc->createElement("VALUE");
-    $tmpnode->appendTextNode($cim_params->{propertyvalue});
-    $param_newvaluename->addChild($tmpnode);
-    
-    # add parameters of instance name path
-    my $param_namepath = $doc->createElement("IPARAMVALUE");
-    $param_namepath->setAttribute("NAME", "InstanceName");
-    $param_namepath->appendWellBalancedChunk($cim_params->{namepath});
-    $imethod_call->addChild($param_namepath);
-    
-    my $payload = $doc->toString();
-    
-    # generate http request
-    my $ret = gen_http_request($http_params, $payload);
-
-    if ($ret->{rc}) {
-        return $ret;
-    }
-
-    # send request to http server
-    $ret = send_http_request($http_params, $ret->{request});
-    if ($ret->{rc}) {
-        return $ret;
-    }
-
-    # parse the http response
-    my $ret_value;
-    my $parser = XML::LibXML->new();
-    my $resp_doc = $parser->parse_string($ret->{payload});
-
-    # check the error message from CIM
-    my $error_node = $resp_doc->getElementsByTagName("ERROR");
-    if ($error_node) {
-        my $msg = $error_node->[0]->getAttribute("DESCRIPTION");
-        my $errorcode = $error_node->[0]->getAttribute("CODE");
-        return ({rc => 1, cim_rc => $errorcode, msg => $error_node->[0]->getAttribute("DESCRIPTION")." [cim return code: $errorcode]"});
-    }
-
-
-    # if no http and cim error, the setting was succeeded
-    return ($ret);
-}
-
-=head1 gen_http_request ()
-    Description:
-        Generate a http request.
-
-    Arguments: 
-        http_params: A reference to HTTP_PARAMS
-        payload:     The payload for the http request. It can be null if the payload has been set in http_params.
-
-    Return:
-        A hash reference. The valid key includes:
-            rc      - The return code. 0 - success. > 0 - fail.
-            msg     - Output message 
-            request - The generated HTTP::Request object
-=cut
-
-sub gen_http_request
-{
-    my $http_params = shift;
-    my $http_payload = shift;
-    
-    # check the mandatory parameters
-    unless (defined ($http_params->{ip}) && defined ($http_params->{port}) && defined($http_params->{user}) && defined($http_params->{password})) {
-        return ({rc => 1, msg => "Missed the mandatory parameters: ip, port, user or password"});
-    }
-
-    # set the default value for parameters
-    unless (defined ($http_params->{protocol})) {
-        $http_params->{protocol} = 'https';
-    }
-    unless (defined ($http_params->{format})) {
-        $http_params->{format} = 'xml';
-    }
-    unless (defined ($http_params->{method})) {
-        $http_params->{method} = 'GET';
-    }
-
-    my $payload = '';
-    if (defined ($http_params->{payload})) {
-        $payload = $http_params->{payload};
-    }
-    if (defined ($http_payload)) {
-        unless (ref($http_payload)) { #Todo: support payloasd to be a hash
-            $payload = $http_payload;
-        }
-    }
-
-    # create the http head
-    my $header = HTTP::Headers->new('content-type' => "application/$http_params->{format}",
-                                    'Accept' => "application/$http_params->{format}",
-                                    'User-Agent' => "xCAT/2",
-                                    'Host' => "$http_params->{ip}:$http_params->{port}");
-
-    # set the user & password
-    $header->authorization_basic($http_params->{user}, $http_params->{password});
-
-    # set the length of payload
-    my $plen = length($payload);
-    $header->push_header('Content-Length' => $plen);
-
-    # create the URL
-    my $url = "$http_params->{protocol}://$http_params->{ip}:$http_params->{port}";
-    my $request = HTTP::Request->new($http_params->{method}, $url, $header, $payload);
-
-    # set the http version
-    $request->protocol('HTTP/1.1');
-
-    return ({rc => 0, request => $request});
-}
-
-
-=head1 send_http_request ()
-    Description:
-        Send http request to http server and waiting for the response.
-
-    Arguments:
-        http_params:  A reference to HTTP_PARAMS
-        http_request: A HTTP::Request object
-
-    Return:
-        A hash reference. The valid key includes:
-            rc      - The return code. 0 - success. > 0 - fail.
-            http_rc - The return code of http. 200, 400 ...
-            msg     - Output message
-            payload - The http response from http server
-=cut
-
-sub send_http_request
-{
-    my $http_params = shift;
-    my $http_request = shift;
-
-    # Load the library LWP::Protocol::https for https support
-    if ($http_params->{protocol} eq 'https') {
-        eval { require LWP::Protocol::https};
-        if ($@) {
-            return ({rc => 1, msg => "Failed to load perl library LWP::Protocol::https"});
-        }
-    }
-
-    # create a new HTTP User Agent Object
-    my $ua = LWP::UserAgent->new(ssl_opts => { verify_hostname => 0, SSL_verify_mode => 0});
-    if ($http_params->{timeout}) {
-        $ua->timeout($http_params->{timeout});
-    } else {
-        $ua->timeout(10);   # the default timeout is 10s
-    }
-
-    if (defined($http_params->{verbose}) && defined ($http_params->{callback})) {
-        $http_params->{callback}({data => ["\n========CIM Request Start========", $http_request->as_string(), "=======CIM Request End======="]});
-    }
-
-    # send request and receive the response
-    my $response = $ua->request($http_request);
-
-    if (defined($http_params->{verbose}) && defined ($http_params->{callback}) && defined ($response->{_content})) {
-        $http_params->{callback}({data => ["\n========CIM Response Start========", $response->{_content}, "=======CIM Response End======="]});
-    }
-
-    # check the http response
-    if (defined ($response) && defined ($response->{_rc}) && defined ($response->{_msg})) {
-        if ($response->{_rc} eq "200" && $response->{_msg} eq "OK") {
-            return ({rc => 0, http_rc => $response->{_rc}, msg => "$response->{_msg} [http return code: $response->{_rc}]", payload => $response->{_content}});
-        }
-    }
-    
-    return ({rc => 1, http_rc => $response->{_rc}, msg => $response->{_msg}});
-}
-
-
-1;
@@ -8,11 +8,9 @@ BEGIN

 # if AIX - make sure we include perl 5.8.2 in INC path.
 #       Needed to find perl dependencies shipped in deps tarball.
-use Storable qw/nstore_fd fd_retrieve/;
 if ($^O =~ /^aix/i) {
 	unshift(@INC, qw(/usr/opt/perl5/lib/5.8.2/aix-thread-multi /usr/opt/perl5/lib/5.8.2 /usr/opt/perl5/lib/site_perl/5.8.2/aix-thread-multi /usr/opt/perl5/lib/site_perl/5.8.2));
 }
-use IO::Handle;

 my $inet6support;
 if ($^O =~ /^aix/i) {  # disable AIX IPV6  TODO fix
@@ -29,7 +27,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 addr | grep inet6`;
    if (!$ipv6enabled) {
        $inet6support = 0;
    }
@@ -79,23 +77,6 @@ sub rspclean {
 	}
 	return 0;
 }
-sub send_request {
-    my $request = shift;
-    my $sock = shift;
-    my $encode = shift;
-    if ($encode eq "xml") {
-        my $msg=XMLout($request,RootName=>'xcatrequest',NoAttr=>1,KeyAttr=>[]);
-        if ($ENV{XCATXMLTRACE}) { print $msg; }
-        if($ENV{XCATXMLWARNING}) {
-            validateXML($msg);
-        }
-        print $sock $msg;
-        $sock->flush();
-    } else {
-        nstore_fd($request,$sock);
-        $sock->flush();
-    }
-}
 #################################
 # submit_request will take an xCAT command and pass it to the xCAT
 #   server for execution.
@@ -237,10 +218,6 @@ if (ref($request) eq 'HASH') { # the request is an array, not pure XML
     }
  }
  my $client;
-  my %sslargs;
-  if (defined($ENV{'XCATSSLVER'})) {
-    $sslargs{SSL_version} = $ENV{'XCATSSLVER'};
-  }
  if (-r $keyfile and -r $certfile and -r $cafile) {
    $client = IO::Socket::SSL->start_SSL($pclient,
    SSL_key_file => $keyfile,
@@ -249,7 +226,6 @@ if (ref($request) eq 'HASH') { # the request is an array, not pure XML
    SSL_verify_mode => SSL_VERIFY_PEER,
    SSL_use_cert => 1,
    Timeout => 0,
-    %sslargs,
   );
  } else {
    $client =  IO::Socket::SSL->start_SSL($pclient,
@@ -267,26 +243,20 @@ if (ref($request) eq 'HASH') { # the request is an array, not pure XML
  }

  my $msg;
-  my $encode = "xml";
-  #storable encoding is unsafe, carry on with the unsafe xml scheme
-  #perhaps one day will support faster schemes
-  #my $encode = "storable";
-  #my $straightprint=0;
-  #if ($ENV{XCATXMLTRACE} or $ENV{XCATXMLWARNING}) { $encode="xml"; }
  if (ref($request) eq 'HASH') { # the request is an array, not pure XML
-    #print $client "xcatencoding: $encode\n";
-    #my $encok=<$client>;
-    send_request($request,$client,$encode);
+    $msg=XMLout($request,RootName=>'xcatrequest',NoAttr=>1,KeyAttr=>[]);
  } else { #XML
-    $straightprint=1;
    $msg=$request;
-    print $client $msg;
  }
-  $SIG{TERM} =  $SIG{INT} = sub { send_request({abortcommand=>[1]},$client,$encode); exit 0; };
+  if ($ENV{XCATXMLTRACE}) { print $msg; }
+  if($ENV{XCATXMLWARNING}) {
+    validateXML($msg);
+  }
+  $SIG{TERM} =  $SIG{INT} = sub { print $client XMLout({abortcommand=>1},RootName=>'xcatrequest',NoAttr=>1,KeyAttr=>[]); exit 0; };
+  print $client $msg;
  my $response;
  my $rsp;
  my $cleanexit=0;
-  if ($encode eq 'xml') {
  my $massresponse="<massresponse>";
  my $nextcoalescetime=time()+1;
  my $coalescenow=0;
@@ -340,27 +310,6 @@ if (ref($request) eq 'HASH') { # the request is an array, not pure XML
 	$massresponse .= "</massresponse>";
         $cleanexit = rspclean($massresponse,$callback);
  }
-  } else { #storable encode
-    my $rsp;
-    eval { $rsp = fd_retrieve($client); };
-    SERVERINPUT: while ($rsp) {
-     my @rsps;
-     if (ref $rsp eq 'ARRAY') {
-        @rsps = @$rsp;
-     } else {
-        @rsps = ($rsp);
-    }
-    foreach (@rsps) {
-     $callback->($_);
-     if ($_->{serverdone}) {
-         $cleanexit=1;
-         last SERVERINPUT;
-      }
-     }
-     $rsp = undef;
-     eval { $rsp = fd_retrieve($client); };
-    }
-  }
  $massresponse="";
  unless ($cleanexit) {
     print STDERR "ERROR/WARNING: communication with the xCAT server seems to have been ended prematurely\n";
@@ -1164,12 +1113,7 @@ sub handle_response {
 #print "printing node\n";
    my $node;
    foreach $node (@$nodes) {
-      my $desc;
-      if (ref($node->{name}) eq 'ARRAY') {
-      $desc=$node->{name}->[0];
-      } else {
-      $desc=$node->{name};
-      }
+      my $desc=$node->{name}->[0];
      if ($node->{errorcode}) {
        if (ref($node->{errorcode}) eq 'ARRAY') {
          foreach my $ecode (@{$node->{errorcode}}) {
@@ -1189,24 +1133,7 @@ sub handle_response {
 		 $errflg=1;
      }
      if ($node->{data}) {
-         if (ref(\($node->{data})) eq 'SCALAR') {
-            $desc=$desc.": ".$node->{data};
-         } elsif (ref($node->{data}) eq 'HASH') {
-            if ($node->{data}->{desc}) {
-             if (ref($node->{data}->{desc}) eq 'ARRAY') {
-              $desc=$desc.": ".$node->{data}->{desc}->[0];
-              } else {
-              $desc=$desc.": ".$node->{data}->{desc};
-              }
-            }
-            if ($node->{data}->{contents}) {
-                if (ref($node->{data}->{contents}) eq 'ARRAY') {
-        $desc="$desc: ".$node->{data}->{contents}->[0];
-                } else {
-        $desc="$desc: ".$node->{data}->{contents};
-                }
-            }
-         } elsif (ref(\($node->{data}->[0])) eq 'SCALAR') {
+         if (ref(\($node->{data}->[0])) eq 'SCALAR') {
            $desc=$desc.": ".$node->{data}->[0];
         } else {
            if ($node->{data}->[0]->{desc}) {
@@ -2747,7 +2747,7 @@ sub collapsenicsattr()
        # e.g nicips.eth0
        # do not need to handle nic attributes without the postfix .ethx,
        # it will be overwritten by the attributes with the postfix .ethx,
-        if ($nodeattr =~ /^(nic\w+)\.(.*)$/)
+        if ($nodeattr =~ /^(nic\w+)\.(\w+)$/)
        {       
           if ($1 && $2)
           {       
@@ -598,7 +598,7 @@ sub _execute_dsh
                }
                else
                {
-                    # HERE: This is where the output shows up
+                    # LKV: This is where the output shows up
                    #print STDOUT @{$output_buffers{$user_target}};
                    #print STDERR @{$error_buffers{$user_target}};
                    chomp(@{$output_buffers{$user_target}});
@@ -1020,7 +1020,6 @@ sub fork_fanout_dsh
        }
    }
    # save the original exports,  we are going to add the unique node name below
-    my $firstpass=0;
    while (@$targets_waiting
           && (keys(%$targets_active) < $$options{'fanout'}))
    {
@@ -1047,7 +1046,6 @@ sub fork_fanout_dsh
        }
        if ($$options{'environment'})
        {
-          if ($firstpass ==0) {   # do the servicenode stuff only once
            # if we are on a servicenode need to get the environment file
            # from the SNsyncfiledir, not local
            if (xCAT::Utils->isServiceNode()) {
@@ -1070,10 +1068,8 @@ sub fork_fanout_dsh
               $rsp->{error}->[0] = "File $$options{'environment'} does not exist";
               xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
            }
-            $firstpass=1;
-           }
-           # build the xdsh command
-           push @dsh_command,
+            # build the xdsh command
+            push @dsh_command,
              "$exportnode$$options{'pre-command'} . $$options{'environment'} ; $$options{'command'}$$options{'post-command'}";
        }

@@ -3997,7 +3993,8 @@ sub parse_and_run_dsh
    {
        $options{'user'} = $ENV{'DSH_TO_USERID'};
    }
-    if ((!(defined($nodes))) && (!(defined($options{'rootimg'}))))
+
+    if ((!(defined(@$nodes))) && (!(defined($options{'rootimg'}))))
    {    #  no nodes and not -i option, error
        my $rsp = ();
        $rsp->{error}->[0] = "Unless using -i option,  noderange is required.";
@@ -4036,7 +4033,7 @@ sub parse_and_run_dsh
        {    # from sinv, discard this name
            undef @$nodes;
        }
-        if (@$nodes[0])
+        if (defined(@$nodes))
        {
            my $rsp = {};
            $rsp->{error}->[0] =
@@ -4407,16 +4404,8 @@ sub parse_and_run_dcp
            xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
            return;
        }
-        if (@$nodes[0])
-        {
-            my $rsp = {};
-            $rsp->{error}->[0] =
-              "Input noderange:@$nodes and any other xdsh flags or environment variables are not valid with -i flag.";
-            xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
-            return;
-        }
    }
-    if ((!(defined($nodes))) && (!(defined($options{'rootimg'}))))
+    if ((!(defined(@$nodes))) && (!(defined($options{'rootimg'}))))
    {    #  no nodes and not -i option, error
        my $rsp = {};
        $rsp->{error}->[0] = "Unless using -i option,  noderange is required.";
@@ -4513,7 +4502,7 @@ sub parse_and_run_dcp
    #
    # build list of nodes
    my @nodelist;
-    if (@$nodes[0])
+    if (defined(@$nodes))
    {    # there are nodes
        @nodelist = @$nodes;
        $options{'nodes'} = join(',', @nodelist);
@@ -4983,8 +4972,7 @@ sub parse_rsync_input_file_on_MN
    $::process_line = 0;
    my $destfileisdir;
    my $clause=0;
-    my $addmergescript =0;
-    my $addappendscript =0;
+    
    open(INPUTFILE, "< $input_file") || die "File $input_file does not exist\n";
    while (my $line = <INPUTFILE>)
    {
@@ -5025,16 +5013,12 @@ sub parse_rsync_input_file_on_MN
                  # this triggers the running of the appendscript
                  $::appendscript ="/opt/xcat/share/xcat/scripts/xdcpappend.sh";
                }
-
                # add the append script to the sync
-                if ($addappendscript == 0) {  # only add once
-                  my  $appscript ="/opt/xcat/share/xcat/scripts/xdcpappend.sh";
-                  my $appendscriptline = "$appscript -> $appscript"; 
-                  $syncappendscript=1;  # syncing the xdcpappend.sh script
-                   &build_append_rsync($appendscriptline,$nodes, $options, $input_file,$rsyncSN, $syncdir,$nodesyncfiledir,$onServiceNode,$syncappendscript);
-                   $addappendscript=1;
-                 } 
-               }  # end APPEND clause
+                my  $appscript ="/opt/xcat/share/xcat/scripts/xdcpappend.sh";
+                my $appendscriptline = "$appscript -> $appscript"; 
+                $syncappendscript=1;  # syncing the xdcpappend.sh script
+                 &build_append_rsync($appendscriptline,$nodes, $options, $input_file,$rsyncSN, $syncdir,$nodesyncfiledir,$onServiceNode,$syncappendscript);
+               }
               if ($clause =~ /MERGE:/) {
                 # location of the base merge script
                 # for MERGE we have to sync the mergescript and the
@@ -5046,16 +5030,12 @@ sub parse_rsync_input_file_on_MN
                  # this triggers the running of the mergescript
                  $::mergescript ="/opt/xcat/share/xcat/scripts/xdcpmerge.sh";
                }
-                
                # add the merge script to the sync
-                if ($addmergescript == 0) {  # only add once
-                  my  $mergescript ="/opt/xcat/share/xcat/scripts/xdcpmerge.sh";
-                  my $mergescriptline = "$mergescript -> $mergescript"; 
-                  $syncmergescript=1;  # syncing the xdcpmerge.sh script
-                  &build_merge_rsync($mergescriptline,$nodes, $options, $input_file,$rsyncSN, $syncdir,$nodesyncfiledir,$onServiceNode,$syncmergescript);
-                  $addmergescript=1;
-                }
-               }  # end MERGE clause
+                my  $mergescript ="/opt/xcat/share/xcat/scripts/xdcpmerge.sh";
+                my $mergescriptline = "$mergescript -> $mergescript"; 
+                $syncmergescript=1;  # syncing the xdcpmerge.sh script
+                 &build_merge_rsync($mergescriptline,$nodes, $options, $input_file,$rsyncSN, $syncdir,$nodesyncfiledir,$onServiceNode,$syncmergescript);
+               }
           
           }
         } else {  # not processing EXECUTE, EXECUTEALWAYS or APPEND
@@ -5219,7 +5199,6 @@ sub build_append_rsync
              push @::appendlines,$line;
            }
            my $src_file  = $1; # append file left of arror
-            my $orig_src_file  = $1; # append file left of arror
            # it will be sync'd to $nodesyncfiledir/$append_file
            my $dest_file = $nodesyncfiledir;
            $dest_file .= $src_file;  
@@ -5248,7 +5227,7 @@ sub build_append_rsync
                    # to pick up files from /var/xcat/syncfiles...
                    if ($onServiceNode == 1) {
                      my $newsrcfile = $syncdir;    # add SN syndir on front
-                      $newsrcfile .= $orig_src_file;
+                      $newsrcfile .= $src_file;
                      $src_file=$newsrcfile;
                    }
                    # destination file name
@@ -5331,8 +5310,7 @@ sub build_merge_rsync
            if ($syncmergescript == 0) { # don't add the xdcpmerge.sh line 
              push @::mergelines,$line;
            }
-            my $src_file  = $1; # merge file left of arrow
-            my $orig_src_file = $1;
+            my $src_file  = $1; # merge file left of arror
            # it will be sync'd to $nodesyncfiledir/$merge_file
            my $dest_file = $nodesyncfiledir;
            $dest_file .= $src_file;  
@@ -5361,7 +5339,7 @@ sub build_merge_rsync
                    # to pick up files from /var/xcat/syncfiles...
                    if ($onServiceNode == 1) {
                      my $newsrcfile = $syncdir;    # add SN syndir on front
-                      $newsrcfile .= $orig_src_file; 
+                      $newsrcfile .= $src_file;
                      $src_file=$newsrcfile;
                    }
                    # destination file name
@@ -6051,11 +6029,11 @@ sub run_always_rsync_postscripts
        # if on the service node need to add the $syncdir directory 
        # to the path
        if (xCAT::Utils->isServiceNode()) {
-         my $tmps=$syncdir . $ps;
-         push @args, $tmps;
-        } else{
-          push @args, $ps;
+         my $tmpp=$syncdir . $ps;
+         $ps=$tmpp;
        }
+        push @args, $ps;
+
        push (@nodes, @{$$dshparms{'postscripts'}{$ps}}); 
         
        $out=xCAT::Utils->runxcmd( { command => ['xdsh'],
@@ -253,6 +253,64 @@ use strict;



+#---------------------------------------------------------------------------
+
+=head3
+        ifconfig_inet
+
+        Builds a list of all IP Addresses bound to the local host and
+        stores them in a global list
+
+        Arguments:
+        	None
+
+        Returns:
+        	None
+                
+        Globals:
+        	@local_inet
+    
+        Error:
+        	None
+    
+        Example:
+        	xCAT::DSHCore->ifconfig_inet;
+
+        Comments:
+        	Internal routine only
+
+=cut
+
+#---------------------------------------------------------------------------
+
+sub ifconfig_inet
+{
+    my @local_inet = ();
+
+    if ($^O eq 'aix')
+    {
+        my @ip_address = ();
+        my @output     = `/usr/sbin/ifconfig -a`;
+
+        foreach my $line (@output)
+        {
+            ($line =~ /inet ((\d{1,3}?\.){3}(\d){1,3})\s/o)
+              && (push @local_inet, $1);
+        }
+    }
+
+    elsif ($^O eq 'linux')
+    {
+        my @ip_address = ();
+        my @output     = `/sbin/ifconfig -a`;
+
+        foreach my $line (@output)
+        {
+            ($line =~ /inet addr:((\d{1,3}?\.){3}(\d){1,3})\s/o)
+              && (push @local_inet, $1);
+        }
+    }
+}

 #---------------------------------------------------------------------------

@@ -67,7 +67,7 @@ sub getHcpAttribs
 	}
    }
    
-    my @ps = $tabs->{ppc}->getAllNodeAttribs(['node','parent','nodetype','hcp','id']); 
+    my @ps = $tabs->{ppc}->getAllNodeAttribs(['node','parent','nodetype','hcp']); 
    for my $entry ( @ps ) {
        my $tmp_parent = $entry->{parent};
        my $tmp_node = $entry->{node};
@@ -79,9 +79,6 @@ sub getHcpAttribs
        if (defined($tmp_node) && defined($tmp_type) && ($tmp_type eq "blade") && defined($entry->{hcp})) {
            push @{$ppchash{$tmp_node}{children}}, $entry->{hcp};
        }
-        if (defined($tmp_node) && defined($entry->{id}) && defined($tmp_parent) && defined($tmp_type) && ($tmp_type eq "lpar")) {
-            $ppchash{$tmp_parent}{mapping}{$tmp_node} = $entry->{id};
-        }

 	#if(exists($ppchash{$tmp_node})) {
 	#     if( defined($tmp_type) ) {
@@ -407,7 +407,7 @@ sub lshwconn_parse_args
    }
    if (scalar(@error_type_nodes)) {
        my $tmp_nodelist = join ',', @error_type_nodes;
-        my $link = (scalar(@error_type_nodes) eq '1')? 'is':'are';
+        my $link = (scalar(@error_type_nodes) == '1')? 'is':'are';
        return( ["Node type of node(s) $tmp_nodelist $link not supported for this command in FSPAPI.\n"]);
    }
    #$nodetypetab->close();
@@ -517,14 +517,12 @@ sub getmacs {
 	         $data.= "\n$_\n";
 	         push @$value, "\n$_\n";
 	      } elsif ( /^ent\s+/ ||  /^hfi-ent\s+/ ) {
-	         #my @fields = split /\s+/, $_;
-	         #my $mac    = $fields[2];
-	         #$mac    = format_mac( $mac );
-	         #$fields[2] = $mac;
-	         #$data  .= join(" ",@fields)."\n";
-	         #push @$value, join(" ",@fields)."\n";
-                 $data .= "$_\n";
-                 push @$value, "$_\n";
+	         my @fields = split /\s+/, $_;
+	         my $mac    = $fields[2];
+	         $mac    = format_mac( $mac );
+	         $fields[2] = $mac;
+	         $data  .= join(" ",@fields)."\n";
+	         push @$value, join(" ",@fields)."\n";
 	      }
 	   }
 	   push @$res,[$node,$data,0];
@@ -264,7 +264,7 @@ sub temp {
            # No frame commands for IVM 
            ################################# 
            if ( $hwtype eq "ivm" ) {
-                push @result, [$name,"$prefix Not available (No BPA)",0];
+                push @result, [$name,"$prefix Not available (No BPA)",1];
                next;
            }
            ################################# 
@@ -272,14 +272,14 @@ sub temp {
            ################################# 
            if ( @$d[4] !~ /^(fsp|lpar|cec)$/ ) {
                my $text = "$prefix Only available for CEC/LPAR";
-                push @result, [$name,$text,0];
+                push @result, [$name,$text,1];
                next;
            }
            ################################# 
            # Error - No frame 
            #################################
            if ( $mtms eq "0" ) {
-                push @result, [$name,"$prefix Not available (No BPA)",0];
+                push @result, [$name,"$prefix Not available (No BPA)",1];
                next;
            }
            #################################
@@ -352,7 +352,7 @@ sub rackenv {
            ################################# 
            if ( @$d[4] !~ /^(bpa|frame)$/ ) {
                my $text = "$prefix Only available for BPA/Frame";
-                push @result, [$name,$text,0];
+                push @result, [$name,$text,1];
                next;
            }
            
@@ -435,7 +435,7 @@ sub lcds {
    if( $type eq "lpar" ) {
        $action = "query_lcds";
    } elsif ($type eq "blade") {
-        $action = "pblade_query_lcds";  
+        $action = "pblade_query_lcds";
    } else {
        $action = "cec_query_lcds";
    } 
@@ -16,7 +16,7 @@ use xCAT::Usage;
 use xCAT::NodeRange;
 use xCAT::FSPUtils;
 use xCAT::VMCommon;
-use Data::Dumper;
+#use Data::Dumper;
 use xCAT::MsgUtils qw(verbose_message);
 ##############################################
 # Globals
@@ -48,26 +48,15 @@ sub parse_args {
 ##########################################################################
 # Parse the chvm command line for options and operands
 ##########################################################################
-my @query_array = ();
-my %param_list_map = (
-    'vmcpus' => 'part_get_lpar_processing',
-    'vmmemory' => 'part_get_lpar_memory',
-    'add_physlots' => 'part_get_all_io_bus_info',
-    'del_physlots' => 'part_get_all_io_bus_info',
-    'add_vmnics' => 'part_get_all_vio_info',
-    'add_vmstorage' => 'part_get_all_vio_info',
-    'del_vadapter' => 'part_get_all_vio_info'
-);

 sub chvm_parse_extra_options {
 	my $args = shift;
 	my $opt = shift;
    # Partition used attributes #
-    my @support_ops = qw(vmcpus vmmemory add_physlots vmothersetting add_vmstorage add_vmnics del_vadapter del_physlots);
+    my @support_ops = qw(vmcpus vmmemory vmphyslots vmothersetting vmstorage vmnics del_vadapter);
 	if (ref($args) ne 'ARRAY') {
 		return "$args";
 	}	
-    my %tmp_hash = ();
 	foreach (@$args) {
 		my ($cmd, $value) = split (/\=/, $_);
 		if (!defined($value)) {
@@ -86,33 +75,17 @@ sub chvm_parse_extra_options {
 #				return "'$value' invalid";
 #			}
        } elsif (grep(/^$cmd$/, @support_ops)) {
-            if (exists($param_list_map{$cmd})) {
-                $tmp_hash{$param_list_map{$cmd}} = 1;
-            }
            if (exists($opt->{p775})) {
                return "'$cmd' doesn't work for Power 775 machines.";
-            } elsif ($cmd eq "del_vadapter") {
-                if ($value !~ /^\d+$/) {
-                    return "Invalid param '$value', only one slot id can be specified";
-                }
-            } elsif ($cmd eq "del_physlots") {
-                my @tmp_array = split ",",$value;
-                foreach (@tmp_array) {
-                    unless (/(0x\w{8})/) {
-                        return "'$_' is invalid";
-                    }
-                }
            } elsif ($cmd eq "vmothersetting") {
                if ($value =~ /hugepage:\s*(\d+)/i) {
                    $opt->{huge_page} = $1;
-                    $tmp_hash{'get_huge_page'} = 1;
                }
                if ($value =~ /bsr:\s*(\d+)/i) {
                    $opt->{bsr} = $1;
-                    $tmp_hash{'get_cec_bsr'} = 1;
                }
                next;
-            } elsif ($cmd eq "add_vmstorage") {
+            } elsif ($cmd eq "vmstorage") {
                if (exists($opt->{vios})) {
                    if ($value !~ /\d+/) {
                        return "'$value' is invalid, must be numbers";
@@ -130,53 +103,6 @@ sub chvm_parse_extra_options {
                        return "'$value' is invalid, must be in form of 'Server_name:slotnum'";
                    }
                }
-            } elsif ($cmd eq "vmcpus") {
-                if ($value =~ /^(\d+)\/(\d+)\/(\d+)$/) {
-                    unless ($1 <= $2 and $2 <= $3) {
-                        return "'$value' is invalid, must be in order";
-                    }
-                } else {
-                    return "'$value' is invalid, must be integer";
-                }
-            } elsif ($cmd eq "vmmemory") {
-                if ($value =~ /^([\d|.]+)([G|M]?)\/([\d|.]+)([G|M]?)\/([\d|.]+)([G|M]?)$/i) {
-                    my ($mmin, $mcur, $mmax);
-                    if ($2 eq "G" or $2 eq '') {
-                        $mmin = $1 * 1024;
-                    } 
-                    if ($4 eq "G" or $4 eq '') {
-                        $mcur = $3 * 1024;
-                    }
-                    if ($6 eq "G" or $6 eq '') {
-                        $mmax = $5 * 1024;
-                    }
-                    unless ($mmin <= $mcur and $mcur <= $mmax) {
-                        return "'$value' is invalid, must be in order";
-                    }
-                } else {
-                    return "'$value' is invalid";
-                }
-            } elsif ($cmd eq "add_physlots") {
-                my @tmp_array = split ",",$value;
-                foreach (@tmp_array) {
-                    unless (/(0x\w{8})/) {
-                        return "'$_' is invalid";
-                    }
-                }
-            } elsif ($cmd eq "vmothersetting") {
-                my @tmp_array = split ",", $value;
-                foreach (@tmp_array) {
-                    unless (/^(bsr|hugepage):\d+$/) {
-                        return "'$_' is invalid";
-                    }
-                }
-            } elsif ($cmd eq "add_vmnics") {
-                my @tmp_array = split ",", $value;
-                foreach (@tmp_array) {
-                    unless (/^vlan\d+$/i) {
-                        return "'$_' is invalid";
-                    }
-                }
            }

        } else {
@@ -184,7 +110,6 @@ sub chvm_parse_extra_options {
 		}
 		$opt->{$cmd} = $value;
 	}
-    @query_array = keys(%tmp_hash);
 	return undef;
 }

@@ -206,9 +131,8 @@ sub chvm_parse_args {
    # Process command-line arguments
    #############################################
    if ( !defined( $args )) {
-        #$request->{method} = $cmd;
-        #return( \%opt );
-        return ( usage() );
+        $request->{method} = $cmd;
+        return( \%opt );
    }
    #############################################
    # Checks case in GetOptions, allows opts
@@ -423,7 +347,7 @@ sub chvm_parse_args {
        my $check_chvm_arg = chvm_parse_extra_options(\@ARGV, \%opt);
        if (defined($check_chvm_arg)) {
            return (usage("Invalid argument: $check_chvm_arg"));
-        } elsif (($opt{lparname}) && ($opt{lparname} ne '*') && (scalar(@{$request->{node}}) > '1')){
+        } elsif (($opt{lparname} ne '*') && (scalar(@{$request->{node}}) > '1')){
            return(usage( "Invalid argument: must specify '*' for more than one node" ));
        }
        if ((exists($opt{lparname}) ||exists($opt{huge_page})) && 
@@ -616,6 +540,7 @@ sub mkvm_parse_args {
    if ( (!exists( $opt{i} ) ||  !exists( $opt{r} )) ) {
        return(usage());
    }
+    } 
    $opt{target} = \@{$request->{node}};
    my $ppctab = xCAT::Table->new( 'ppc');
    unless($ppctab) {
@@ -640,11 +565,9 @@ sub mkvm_parse_args {
            return(usage("For Power 775, please make sure the noderange are in one CEC "));
        }
    } 
-    #if (exists($opt{p775})) {
+    if (exists($opt{p775})) {
        $request->{node} = [$other_p]; 
        $request->{noderange} = $other_p;  
-    #}
-
    }
    ####################################
    # No operands - add command name 
@@ -749,7 +672,7 @@ sub lsvm_parse_args {
    $Getopt::Long::ignorecase = 0;
    Getopt::Long::Configure( "bundling" );

-    if ( !GetOptions( \%opt, qw(V|verbose l|long p775 updatedb) )) {
+    if ( !GetOptions( \%opt, qw(V|verbose l|long p775) )) {
        return( usage() );
    }
    if (exists($opt{l}) && !exists($opt{p775})) {
@@ -788,12 +711,11 @@ sub modify {
    return op_extra_cmds ($request, $hash) if ($request->{opt}->{lparname} || $request->{opt}->{huge_page});
    return ([["Error", "Miss argument\n".$usage_string, 1]]);
 }
-
 sub do_op_extra_cmds {
    my $request = shift;
    my $hash = shift;
    my @values = ();
-    my %lpar_hash = ();
+
    while (my ($mtms, $h) = each(%$hash)) {
        my $memhash;
        while (my($name, $d) = each(%$h)) {
@@ -803,27 +725,14 @@ sub do_op_extra_cmds {
 	        if ($op eq "lparname") {
 		    $action = "set_lpar_name";
 	        } elsif ($op eq "huge_page") {
-                    my @td = @$d;
-                    @td[0] = 0;
-                    my $tmphash = &query_cec_info_actions($request, $name, \@td, 1, ["get_huge_page"]);
-                    if ($tmphash->{huge_page_avail}) {
-                        if ($param > $tmphash->{huge_page_avail}) {
-                            push @values, [$name, "No enough huge pages, only $tmphash->{huge_page_avail} pages available", 0];
-                            $param = $tmphash->{huge_page_avail};
-                        }
-                        $param = "1/$param/$param";
-                    } else {
-                        push @values, [$name, "No huge page available to configure", 0];
-                        next;
-                    }
 		    $action = "set_huge_page";
 	        } elsif ($op eq "vmcpus") {
                    $action = "part_set_lpar_pending_proc";
-                } elsif ($op eq "add_physlots" or $op eq "del_physlots") {
+                } elsif ($op eq "vmphyslots") {
                    $action = "set_io_slot_owner_uber";
                } elsif ($op eq "del_vadapter") {
                    $action = "part_clear_vslot_config";
-                } elsif ($op eq "add_vmnics") {
+                } elsif ($op eq "vmnics") {
                    my @vlans = split /,/,$param;
                    foreach (@vlans) {
                        if (/vlan(\d+)/i) {
@@ -842,7 +751,7 @@ sub do_op_extra_cmds {
                        }
                    }
                    next;
-                } elsif ($op eq "add_vmstorage") {
+                } elsif ($op eq "vmstorage") {
                    foreach my $v_info (@$param) {
                        if ($v_info =~ /(\d+),([\w_-]*):(\d+)/) {
                            my $vios = &find_lpar_id($request, @$d[3], $2);
@@ -864,28 +773,24 @@ sub do_op_extra_cmds {
                    my @td = @$d;
                    @td[0] = 0;
                    $memhash = &query_cec_info_actions($request, $name, \@td, 1, ["part_get_hyp_process_and_mem"]);
-                    unless (scalar keys(%$memhash)) {
-                        push @values, [$mtms, "Can not get hypervisor information", 1];
-                        next;
-                    }
                    if (!exists($memhash->{run})) {
                        if ($param =~ /(\d+)([G|M]?)\/(\d+)([G|M]?)\/(\d+)([G|M]?)/i) {
                            my $memsize = $memhash->{mem_region_size};
                            my $min = $1;
-                            if ($2 eq "G" or $2 eq '') {
+                            if ($2 == "G" or $2 == '') {
                                $min = $min * 1024;
                            } 
-                            $min = int($min/$memsize);
+                            $min = $min/$memsize;
                            my $cur = $3;
-                            if ($4 eq "G" or $4 eq '') {
+                            if ($4 == "G" or $4 == '') {
                                $cur = $cur * 1024;
                            }
-                            $cur = int($cur/$memsize);
+                            $cur = $cur/$memsize;
                            my $max = $5;
-                            if ($6 eq "G" or $6 eq '') {
+                            if ($6 == "G" or $6 == '') {
                                $max = $max * 1024;
                            }
-                            $max = int($max/$memsize);
+                            $max = $max/$memsize;
                            $request->{opt}->{$op} ="$min/$cur/$max";
                            $param = $request->{opt}->{$op};
                        } else {
@@ -897,11 +802,7 @@ sub do_op_extra_cmds {
                    $memhash->{lpar_used_regions} = 0;
                    my $ret = &deal_with_avail_mem($request, $name, $d, $memhash);
                    if (ref($ret) eq "ARRAY") {
-                        if (@$ret[2]) {
-                            return ([[@$ret]]);
-	                 } else {
-                            push @values, $ret;
-                        }
+                        return ([[@$ret]]);
                    }
                    $param = $memhash->{memory};
                    $action = "part_set_lpar_pending_mem";
@@ -915,32 +816,15 @@ sub do_op_extra_cmds {
                }
                my $tmp_value = ($param eq '*') ? $name : $param;
                xCAT::MsgUtils->verbose_message($request, "$request->{command} $action for node:$name, parm:$tmp_value."); 
-                my @tmpd = @$d;
-                if ($op eq "del_physlots") {
-                    @tmpd[0] = "-1";
-                }
-                my $value = xCAT::FSPUtils::fsp_api_action($request, $name, \@tmpd, $action, 0, $tmp_value);
+                my $value = xCAT::FSPUtils::fsp_api_action($request, $name, $d, $action, 0, $tmp_value);
                if (@$value[1] && ((@$value[1] =~ /Error/i) && (@$value[2] ne '0'))) {
                    return ([[$name, @$value[1], '1']]) ;
                } else {
                    push @values, [$name, "Success", '0'];
                } 
            }
-            if (@query_array) {
-                my $rethash = query_cec_info_actions($request, $name, $d, 1, \@query_array);
-                unless (scalar keys(%$rethash)) {
-                    push @values, [$mtms, "Can not get hypervisor information", 1];
-                    next;
-                }
-                # need to add update db here 
-                $lpar_hash{$name} = $rethash;     
-                $lpar_hash{$name}->{parent} = @$d[3];
-            }
        }
    } 
-    if (%lpar_hash) {
-        update_vm_db($request, \%lpar_hash);
-    }
    return \@values;
 }
 sub check_node_info {
@@ -1183,7 +1067,7 @@ sub get_cec_lpar_name {
    my @value = split(/\n/, $lpar_info);
    foreach my $v (@value) {
        if($v =~ /lparname:\s*([^\,]*),\s*lparid:\s*([\d]+),/) {
-            if($2 eq $lparid) {
+            if($2 == $lparid) {
                return $1;
            }
        }
@@ -1707,7 +1591,7 @@ sub xCATdB {
                $profile,
                $parent ); 
        
-        return( xCAT::PPCdb::add_ppc( $hwtype, [$values],'','',"FSP" )); 
+        return( xCAT::PPCdb::add_ppc( $hwtype, [$values] )); 
    }
    return undef;
 }
@@ -1721,7 +1605,6 @@ my @partition_query_actions = qw(part_get_partition_cap part_get_hyp_process_and
 sub parse_part_get_info {
    my $hash = shift;
    my $data = shift;
-    my $lparid = shift;
    my @array = split /\n/, $data;
    foreach my $line (@array) {
        chomp($line);
@@ -1738,16 +1621,13 @@ sub parse_part_get_info {
            $hash->{process_units_avail} = $2;
        } elsif ($line =~ /Authority Lpar id:(\w+)/i) {
            $hash->{service_lparid} = $1;
-        } elsif ($line =~ /(\d+),(\d+),[^,]*,(\w+),\w*\(([\w| |-|_|\/]*)\)/) {
+        } elsif ($line =~ /(\d+),(\d+),[^,]*,(\w+),\w*\(([\w| |-|_]*)\)/) {
            $hash->{bus}->{$3}->{cur_lparid} = $1;
            $hash->{bus}->{$3}->{bus_slot} = $2;
            $hash->{bus}->{$3}->{des} = $4;
-            if ($lparid and $lparid eq $1) {
-                push @{$hash->{lpar_phy_bus}}, $3;
-            }
        } elsif ($line =~ /Phy drc_index:(\w+), Port group: (\w+), Phy port id: (\w+)/) {
            $hash->{phy_drc_group_port}->{$1}->{$2}->{$3} = '1';
-        #} elsif ($line =~ /adapter_id=(\w+),lpar_id=([\d|-]+).*port_group=(\d+),phys_port_id=(\d+).*drc_index=(\w+),.*/) {
+        } elsif ($line =~ /adapter_id=(\w+),lpar_id=([\d|-]+).*port_group=(\d+),phys_port_id=(\d+).*drc_index=(\w+),.*/) {
            if (($2 == -1) && ($4 == 255)) {
                $hash->{logic_drc_phydrc}->{$3}->{$5} = $1;
                #$hash->{logic_drc_phydrc}->{$5}->{$1} = [$2,$3,$4];
@@ -1760,49 +1640,12 @@ sub parse_part_get_info {
            $hash->{lpar0_used_mem} = $2;
            $hash->{phy_min_mem_req} = $3;
            #print "===>lpar0_used_mem:$hash->{lpar0_used_mem}.\n";
-        } elsif ($line =~ /Curr Memory (Min|Req|Max):\s*([\d]*)[^\(]*\((\d+)\s*regions\)/) {
-            if ($1 eq 'Min') {
-                $hash->{lpar_mem_min} = $2
-            } elsif ($1 eq 'Max') {
-                $hash->{lpar_mem_max} = $2;
-            } else {
-                $hash->{lpar_mem_req} = $2;
-                $hash->{lpar_used_regions} = $3;
-            }
-        } elsif ($line =~ /Curr Processor (Min|Req|Max):\s*(\d+)/) {
-            if ($1 eq 'Min') {
-                $hash->{lpar_cpu_min} = $2;
-            } elsif ($1 eq 'Max') {
-                $hash->{lpar_cpu_max} = $2;
-            } else {
-                $hash->{lpar_cpu_req} = $2;
-            }
-        } elsif ($line =~ /\s*lpar_id=(\d+),type=vSCSI,slot=(\d+),attr=(\d+).*remote_lpar_id=0x(\w+),remote_slot_num=0x(\w+)/) {
-            if ($3 eq '0') {
-                my $lparid = hex($4);
-                my $slotid = hex($5);
-                push @{$hash->{lpar_vmstorage_client}}, "$lparid:$slotid";
-            } else {
-                if (exists($hash->{lpar_vmstorage_server})) {
-                    $hash->{lpar_vmstorage_server}++;
-                } else {
-                    $hash->{lpar_vmstorage_server} = 1;
-                }
-            }
-        } elsif ($line =~ /\s*lpar_id=(\d+),type=(vEth),slot=(\d+).*port_vlan_id=(\d+),mac_addr=(\w+)/) {
-            push @{$hash->{lpar_vmnics}}, "vlan$4";
+        } elsif ($line =~ /Curr Memory Req:[^\(]*\((\d+)\s*regions\)/) {
+            $hash->{lpar_used_regions} = $1;
        } elsif ($line =~ /Available huge page memory\(in pages\):\s*(\d+)/) {
            $hash->{huge_page_avail} = $1;
        } elsif ($line =~ /Available BSR array:\s*(\d+)/) {
            $hash->{cec_bsr_avail} = $1;
-        } elsif ($line =~ /^\d+\/(\d+)\/\d+$/) {
-            if ($1 ne 0) {
-                push @{$hash->{lpar_othersetting}}, "hugepage:$1";
-            }
-        } elsif ($line =~ /^(\d+)\.$/) {
-            if ($1 ne 0) {
-                push @{$hash->{lpar_othersetting}}, "bsr:$1";
-            }
        }
    }
 }
@@ -1813,7 +1656,6 @@ sub query_cec_info_actions {
    my $td = shift;
    my $usage = shift;
    my $action_array = shift;
-    my $lpar_hash = shift;
    my $lparid = @$td[0];
    my $data;
    my @array = ();
@@ -1828,16 +1670,12 @@ sub query_cec_info_actions {
        chomp(@$values[1]);
        #if ($action eq "part_get_partition_cap" and (@$values[1] =~ /Error:/i or @$values[2] ne 0)) {
        if (@$values[1] =~ /Error:/i or @$values[2] ne 0) {
-            next; #return ([[@$values]]);
+            return ([[@$values]]);
        }
        if (@$values[1] =~ /^$/) {
            next;
        }
-        if ($usage eq 1 or $usage eq 2) {
-            &parse_part_get_info(\%hash, @$values[1], $lparid);
-        }
-
-        if ($usage eq 0 or $usage eq 2) {
+        if ($usage eq 0) {
            if ($lparid) {
                if ($action eq "lpar_lhea_mac") {
                    my @output = split /\n/,@$values[1];
@@ -1892,72 +1730,18 @@ sub query_cec_info_actions {
            }
 	    #$data .= "@$values[1]\n\n";
            push @array, [$name, @$values[1], @$values[2]];
-        } 
-    }
-    if ($usage eq 0 or $usage eq 2) {
-        #return $data;
-        if ($usage eq 2) {
-            %$lpar_hash = %hash;
+        } else {
+            &parse_part_get_info(\%hash, @$values[1]);
        }
+    }
+    if ($usage eq 0) {
+        #return $data;
        return \@array;
    } else {
        return \%hash; 
    }
 }

-sub update_vm_db {
-    my $request = shift;
-    my $lpar_hash = shift;
-    my $vm_hd = xCAT::Table->new('vm');
-    my %name_id_map = ();
-    my $commit = 0;
-    foreach (keys (%$lpar_hash)) {
-        my %db_update = ();
-        my $node_hash = $lpar_hash->{$_};
-        if (exists($node_hash->{lpar_cpu_min})) {
-            $db_update{cpus} = "$node_hash->{lpar_cpu_min}/$node_hash->{lpar_cpu_req}/$node_hash->{lpar_cpu_max}";
-        }
-        if (exists($node_hash->{lpar_mem_min})) {
-            $db_update{memory} = "$node_hash->{lpar_mem_min}/$node_hash->{lpar_mem_req}/$node_hash->{lpar_mem_max}";
-        }
-        if (exists($node_hash->{lpar_vmstorage_server})) {
-            $db_update{storage} = $node_hash->{lpar_vmstorage_server};
-        } elsif (exists($node_hash->{lpar_vmstorage_client})) {
-            my @tmp_array = ();
-            foreach (@{$node_hash->{lpar_vmstorage_client}}) {
-                if (/(\d+):(\d+)/) {
-                    if (exists($name_id_map{$1})) {
-                        push @tmp_array, "$name_id_map{$1}:$2";
-                    } else {
-                        my $vios_name = &find_lpar_name($request, $node_hash->{parent}, $1);
-                        if (defined($vios_name)) {
-                            $name_id_map{$1} = $vios_name;
-                            push @tmp_array, "$vios_name:$2";
-                        }
-                    }
-                }
-            }
-            $db_update{storage} = join(",",@tmp_array);
-        }
-        if (exists($node_hash->{lpar_vmnics})) {
-            $db_update{nics} = join(",",@{$node_hash->{lpar_vmnics}});
-        }
-        if (exists($node_hash->{lpar_phy_bus})) {
-            $db_update{physlots} = join(",",@{$node_hash->{lpar_phy_bus}});
-        }
-        if (exists($node_hash->{lpar_othersetting})) {
-            $db_update{othersettings} = join(",",@{$node_hash->{lpar_othersetting}});
-        }
-        if (%db_update) {
-            $vm_hd->setNodeAttribs($_,\%db_update);
-            $commit = 1;
-        }
-    }
-    if ($commit) {
-        $vm_hd->commit;
-    }
-}
-
 #my @partition_query_actions = qw(part_get_partition_cap part_get_num_of_lpar_slots part_get_hyp_config_process_and_mem part_get_hyp_avail_process_and_mem part_get_service_authority_lpar_id part_get_shared_processing_resource part_get_all_vio_info lpar_lhea_mac part_get_all_io_bus_info part_get_lpar_processing part_get_lpar_memory get_huge_page get_cec_bsr);
 sub query_cec_info {
    my $request = shift;
@@ -1965,48 +1749,25 @@ sub query_cec_info {
    my $args    = $request->{opt};
    my @td = ();
    my @result = ();
-    my $usage = 0;
-    my %lpar_hash = ();
    #print Dumper($request);
    #print Dumper($hash);
    while (my ($mtms,$h) = each(%$hash) ) {
        while (my ($name, $d) = each (%$h)) {
-            my %tmp_hash = ();
            @td = @$d;
            if (@$d[0] == 0 && @$d[4] !~ /lpar|vios/) {
                last;
            }
            #my $rethash = query_cec_info_actions($request, $name, $d, 0, ["part_get_lpar_processing","part_get_lpar_memory","part_get_all_vio_info","lpar_lhea_mac","part_get_all_io_bus_info","get_huge_page","get_cec_bsr"]);
-            if ($args->{updatedb}) {
-                $usage = 2;
-            }
-            my $rethash = query_cec_info_actions($request, $name, $d, $usage, ["part_get_lpar_processing","part_get_lpar_memory","part_get_all_io_bus_info","part_get_all_vio_info","get_huge_page","get_cec_bsr"], \%tmp_hash);
+            my $rethash = query_cec_info_actions($request, $name, $d, 0, ["part_get_lpar_processing","part_get_lpar_memory","part_get_all_io_bus_info","part_get_all_vio_info","get_huge_page","get_cec_bsr"]);
 	        #push @result, [$name, $rethash, 0];
-	        #push @result, @$rethash;
-                if (scalar (@$rethash)) {
-                    push @result, @$rethash;
-                } else {
-                    push @result, [$name, "No information got", -1];
-                    last;
-                }
-                $lpar_hash{$name} = \%tmp_hash;
-                $lpar_hash{$name}->{parent} = @$d[3];
+	        push @result, @$rethash;
        }
        if (@td[0] == 0) {
-            my $rethash = query_cec_info_actions($request, @td[3],\@td, $usage);
-            if (scalar (@$rethash)) {
-                push @result, @$rethash;
-            } else {
-                push @result, [@td[3], "No information got", -1];
-                last;
-            }
+            my $rethash = query_cec_info_actions($request, @td[3],\@td, 0);
            #push @result, [@td[3], $rethash, 0];
-            #push @result, @$rethash;
+            push @result, @$rethash;
        }  
    }
-    if ($args->{updatedb} and %lpar_hash) {
-        update_vm_db($request, \%lpar_hash);
-    }
    return \@result;
 }

@@ -2098,15 +1859,11 @@ sub deal_with_avail_mem {
            }
            #xCAT::MsgUtils->verbose_message($request, "====****====used:$used_regions,avail:$cur_avail,($min:$cur:$max)."); 
            if ($cur_avail < $min) {
-                my $cur_mem_in_G = $lparhash->{hyp_avail_mem} * $lparhash->{mem_region_size} * 1.0 / 1024;
-                return([$name, "Parse reserverd regions failed, no enough memory, available:$cur_mem_in_G GB.", 1]);
+                return([$name, "Parse reserverd regions failed, no enough memory, available:$lparhash->{hyp_avail_mem}.", 1]);
            }           
-            if (($cur_avail > 0) and ($cur > $cur_avail)) {
-                my $cur_avail_in_G = $cur_avail * $lparhash->{mem_region_size} * 1.0 / 1024;
-                $lparhash->{memory} = "$min/$cur_avail/$max";
-		 unless ($lparhash->{full_par}) {
-                     return([$name, "Available memory is less than required, allocate $cur_avail_in_G GB.", 0]);
-		 }
+            if ($cur > $cur_avail) {
+                my $new_cur = $cur_avail;
+                $lparhash->{memory} = "$min/$new_cur/$max";
            }
        } else {
            return ([$name, "Failed to get hypervisor reserved memory regions.", 1]);
@@ -2126,25 +1883,11 @@ sub find_lpar_id {
    return undef;
 }

-sub find_lpar_name {
-    my $request = shift;
-    my $parent = shift;
-    my $id = shift;
-    my %mapping = %{$request->{ppc}->{$parent}->{mapping}};
-    foreach (keys %mapping) {
-        if ($mapping{$_} eq $id) {
-            return $_;
-        }
-    }
-    return undef;
-}
-
 sub create_lpar {
    my $request = shift;
    my $name = shift;
    my $d = shift;
    my $lparhash = shift;
-    my @ret = ();
    my $values;
    if (exists($request->{opt}->{vios})) {
        $values = xCAT::FSPUtils::fsp_api_action($request, $name, $d, "part_set_lpar_def_state", 0, 0x03);
@@ -2157,7 +1900,7 @@ sub create_lpar {
    $values = xCAT::FSPUtils::fsp_api_action($request, $name, $d, "set_lpar_name", 0, $name);
    if (@$values[2] ne 0) {
        &set_lpar_undefined($request, $name, $d);
-        return ([[$name, @$values[1], @$values[0]]]);
+        return ([$name, @$values[1], @$values[0]]);
    }
    xCAT::FSPUtils::fsp_api_action($request, $name, $d, "part_set_lpar_shared_pool_util_auth");
    xCAT::FSPUtils::fsp_api_action($request, $name, $d, "part_set_lpar_group_id");
@@ -2168,7 +1911,7 @@ sub create_lpar {
        #$values = xCAT::FSPUtils::fsp_api_action($request, $name, $d, "set_io_slot_owner", 0, join(",",@phy_io_array)); 
        if (@$values[2] ne 0) {
            &set_lpar_undefined($request, $name, $d);
-            return ([[$name, @$values[1], @$values[2]]]);
+            return ([$name, @$values[1], @$values[2]]);
        }
    }
    if (exists($lparhash->{nics})) {
@@ -2184,7 +1927,7 @@ sub create_lpar {
                $values = xCAT::FSPUtils::fsp_api_action($request,$name, $d, "part_set_veth_slot_config",0,"0,$vlanid,$mac");
                if (@$values[2] ne 0) {
                    &set_lpar_undefined($request, $name, $d);
-                    return ([[$name, @$values[1], @$values[2]]]);
+                    return ([$name, @$values[1], @$values[2]]);
                }
            }
        }
@@ -2194,7 +1937,7 @@ sub create_lpar {
            $values = xCAT::FSPUtils::fsp_api_action($request,$name, $d, "part_set_vscsi_slot_config",0,$v_info);
            if (@$values[2] ne 0) {
                &set_lpar_undefined($request, $name, $d);
-                return ([[$name, @$values[1], @$values[2]]]);
+                return ([$name, @$values[1], @$values[2]]);
            }
        }
    }
@@ -2225,23 +1968,19 @@ sub create_lpar {
    $values = xCAT::FSPUtils::fsp_api_action($request, $name, $d, "part_set_lpar_pending_proc", 0, $lparhash->{cpus});
    if (@$values[2] ne 0) {
        &set_lpar_undefined($request, $name, $d);
-        return ([[$name, @$values[1], @$values[2]]]);
+        return ([$name, @$values[1], @$values[2]]);
    }
    $values = &deal_with_avail_mem($request, $name, $d,$lparhash);
    if (ref($values) eq "ARRAY") {
-        if (@$values[2]) {
-            &set_lpar_undefined($request, $name, $d);
-            return ([[@$values]]);
-	 } else {
-            push @ret, $values;
-        }
+        &set_lpar_undefined($request, $name, $d);
+        return ([@$values]);
    }

    #print "======>memory:$lparhash->{memory}.\n";
    $values = xCAT::FSPUtils::fsp_api_action($request, $name, $d, "part_set_lpar_pending_mem", 0, $lparhash->{memory});
    if (@$values[2] ne 0) {
        &set_lpar_undefined($request, $name, $d);
-        return ([[$name, @$values[1], @$values[2]]]);
+        return ([$name, @$values[1], @$values[2]]);
    }
    
    xCAT::FSPUtils::fsp_api_action($request, $name, $d, "part_set_lpar_comp_modes"); 
@@ -2256,26 +1995,22 @@ sub create_lpar {
        $values = xCAT::FSPUtils::fsp_api_action($request, $name, $d, "part_set_lpar_def_state", 0, 0x02);
    }
    if (@$values[2] ne 0) {
-        return ([[$name, @$values[1], @$values[2]]]);
+        return ([$name, @$values[1], @$values[2]]);
    }
-    push @ret, [$name, "Done", 0];
-    #return ([$name, "Done", 0]);
-    return \@ret;
+    return ([$name, "Done", 0]);
 }
-
 sub mkspeclpar {
    my $request = shift;
    my $hash = shift;
    my $opt = $request->{opt};
    my $values;
    my @result = ();
-    my %lpar_hash = ();
    my $vmtab = xCAT::Table->new( 'vm');
    unless($vmtab) {
        return([["Error","Cannot open vm table", 1]]);
    }
    while (my ($mtms, $h) = each (%$hash)) {
-        my $memhash = undef;
+        my $memhash;
        my @nodes = keys(%$h);
        my $ent = $vmtab->getNodesAttribs(\@nodes, ['cpus', 'memory','physlots', 'othersettings', 'storage', 'nics']); 
        while (my ($name, $d) = each (%$h)) {
@@ -2283,18 +2018,12 @@ sub mkspeclpar {
                push @result, [$name, "Node must be LPAR", 1];
                last;
            }
-            #if (!exists($memhash->{run})) 
-            #{
+            if (!exists($memhash->{run})) {
                my @td = @$d;
                @td[0] = 0;
                $memhash = &query_cec_info_actions($request, $name, \@td, 1, ["part_get_hyp_process_and_mem","lpar_lhea_mac","part_get_all_io_bus_info"]);
-                unless (scalar keys(%$memhash)) {
-                    push @result, [$mtms, "Can not get hypervisor information", 1];
-                    last;
-                }
-                #$memhash->{run} = 1; 
-            #}
-            
+                $memhash->{run} = 1; 
+            }
            my $tmp_ent = $ent->{$name}->[0];
            if (exists($opt->{vmcpus})) {
                $tmp_ent->{cpus} = $opt->{vmcpus};
@@ -2315,87 +2044,6 @@ sub mkspeclpar {
            if (exists($opt->{vmnics})) {
                $tmp_ent->{nics} = $opt->{vmnics};
            }
-
-
-            if (!defined($tmp_ent) ) {
-                return ([[$name, "Not find params", 1]]);
-            #} elsif (!exists($tmp_ent->{cpus}) || !exists($tmp_ent->{memory}) || !exists($tmp_ent->{physlots})) {
-            } elsif (!exists($tmp_ent->{cpus}) || !exists($tmp_ent->{memory})) {
-                return ([[$name, "The attribute 'vmcpus', 'vmmemory' are needed to be specified.", 1]]);
-            }
-	    # FIX bug 3873 [FVT]DFM illegal action could work
-	    #
-
-	    if ($tmp_ent->{cpus} =~ /^(\d+)\/(\d+)\/(\d+)$/) {
-                unless ($1 <= $2 and $2 <= $3) {
-                    return([[$name, "Parameter for 'vmcpus' is invalid", 1]]);
-	        } elsif ($memhash->{process_units_avail} eq '0') {
-                    push @result, [$name, "No process available", 1];
-                    next;
-                } elsif ($2 > $memhash->{process_units_avail}) {
-                    my $cur = $memhash->{process_units_avail};
-                    my $min = $1 > $cur ? $cur : $1;
-                    $tmp_ent->{cpus} = "$min/$cur/$3";
-                    push @result, [$name, "Available processor is less than required, allocate $cur processors.", 0];
-                }
-            } else {
-                return([[$name, "Parameter for 'vmcpus' is invalid", 1]]);
-            }
-            if ($tmp_ent->{memory} =~ /^([\d|.]+)([G|M]?)\/([\d|.]+)([G|M]?)\/([\d|.]+)([G|M]?)$/i) {
-                if ($memhash->{hyp_avail_mem} eq '0') {
-                    push @result, [$name, "No memory available", 1];
-                    next;
-                }
-                my ($mmin, $mcur, $mmax);
-                if ($2 eq "G" or $2 eq '') {
-                    $mmin = $1 * 1024;
-                } 
-                if ($4 eq "G" or $4 eq '') {
-                    $mcur = $3 * 1024;
-                }
-                if ($6 eq "G" or $6 eq '') {
-                    $mmax = $5 * 1024;
-                }
-                unless ($mmin <= $mcur and $mcur <= $mmax) {
-                    return([[$name, "Parameter for 'vmmemory' is invalid", 1]]);
-                }
-                my $memsize = $memhash->{mem_region_size};
-                $mmin = int(($mmin + $memsize - 1) / $memsize);
-                $mcur = int(($mcur + $memsize - 1) / $memsize);
-                $mmax = int(($mmax + $memsize - 1) / $memsize);
-                $tmp_ent->{memory} = "$mmin/$mcur/$mmax";
-                $tmp_ent->{mem_region_size} = $memsize;
-            } else {
-                return([[$name, "Parameter for 'vmmemory' is invalid", 1]]);
-            }
-            
-            if (exists($tmp_ent->{physlots})) {
-                my @tmp_array = split ",",$tmp_ent->{physlots};
-                foreach (@tmp_array) {
-                    unless (/(0x\w{8})/i) {
-                        return([[$name, "Parameter:$_ for 'vmphyslots' is invalid", 1]]);
-                    }
-                }
-            }
-            if (exists($tmp_ent->{othersettings})) {
-                my @tmp_array = split ",",$tmp_ent->{othersettings};
-                foreach (@tmp_array) {
-                    unless (/^(bsr|hugepage):\d+$/) {
-                        return([[$name, "Parameter:$_ for 'vmothersetting' is invalid", 1]]);
-                    }
-                }
-            }
-            
-            if (exists($tmp_ent->{nics})) {
-                my @tmp_array = split ",",$tmp_ent->{nics};
-                foreach (@tmp_array) {
-                    unless (/^vlan\d+$/i) {
-                        return([[$name, "Parameter:$_ for 'vmnics' is invalid", 1]]);
-                    }
-                }
-            }
-
-
            if (exists($opt->{vios})) {
                if (!exists($tmp_ent->{physlots})) {
                    my @phy_io_array = keys(%{$memhash->{bus}});
@@ -2412,63 +2060,66 @@ sub mkspeclpar {
                    $tmp_ent->{storage} = \@array;
                }
            } else {
-                if (exists($tmp_ent->{storage})) {
-                    my @tmp_array = split ",",$tmp_ent->{storage};
-                    my $storage_array = undef;
-                    foreach (@tmp_array) {
-                        if (/([\w_-]*):(\d+)/) {
-                            my $vios = &find_lpar_id($request, @$d[3], $1);
-                            my $r_slotid = $2;
-                            if (defined($vios)) {
-                                push @$storage_array, "0,$vios,$r_slotid";
-                            } else {
-                                return ([[$name, "Cannot find lparid for Server lpar:$1"]]);
-                            }
-                        } else {
-                            return ([[$name, "Parameter for 'vmstorage' is invalid", 1]]);
+                if (exists($tmp_ent->{storage}) and $tmp_ent->{storage} !~ /^[\w_-]*:\d+$/) {
+                    return ([[$name, "Parameter for 'vmstorage' is invalid", 1]]);
+                } elsif (exists($tmp_ent->{storage})) {
+                    if ($tmp_ent->{storage} =~ /([\w_-]*):(\d+)/) {
+                        my $vios = &find_lpar_id($request, @$d[3], $1);
+                        my $r_slotid = $2;
+                        if (!defined($vios)) {
+                            return ([[$name, "Cannot find lparid for Server lpar:$1"]]);
                        }
+                        $tmp_ent->{storage} = ["0,$vios,$r_slotid"];
                    }
-                    $tmp_ent->{storage} = $storage_array;
-                    
                }
            }
-
+            if (!defined($tmp_ent) ) {
+                return ([[$name, "Not find params", 1]]);
+            #} elsif (!exists($tmp_ent->{cpus}) || !exists($tmp_ent->{memory}) || !exists($tmp_ent->{physlots})) {
+            } elsif (!exists($tmp_ent->{cpus}) || !exists($tmp_ent->{memory})) {
+                return ([[$name, "The attribute 'vmcpus', 'vmmemory' are needed to be specified.", 1]]);
+            }
+            if ($tmp_ent->{memory} =~ /(\d+)([G|M]?)\/(\d+)([G|M]?)\/(\d+)([G|M]?)/i) {
+                my $memsize = $memhash->{mem_region_size};
+                my $min = $1;
+                if ($2 == "G" or $2 == '') {
+                    $min = $min * 1024;
+                }
+                $min = $min/$memsize;
+                my $cur = $3;
+                if ($4 == "G" or $4 == '') {
+                    $cur = $cur * 1024;
+                }
+                $cur = $cur/$memsize;
+                my $max = $5;
+                if ($6 == "G" or $6 == '') {
+                    $max = $max * 1024;
+                }
+                $max = $max/$memsize;
+                $tmp_ent->{memory} = "$min/$cur/$max";
+            }
            $tmp_ent->{hyp_config_mem} = $memhash->{hyp_config_mem};
            $tmp_ent->{hyp_avail_mem} = $memhash->{hyp_avail_mem};
+            $tmp_ent->{huge_page} = "0/0/0"; 
+            $tmp_ent->{bsr_num} = "0";
            if (exists($tmp_ent->{othersettings}))  {
                my $setting = $tmp_ent->{othersettings};
                if ($setting =~ /hugepage:(\d+)/) {
                    my $tmp = $1;
-                    if ($tmp >= 1) {
-                        $tmp_ent->{huge_page} = "1/".$tmp."/".$tmp;
-                    }
+                    $tmp_ent->{huge_page} = "1/".$tmp."/".$tmp;
                }
                if ($setting =~ /bsr:(\d+)/) {
-                    if ($1 >= 1) {
-                        $tmp_ent->{bsr_num} = $1;
-                    }
+                    $tmp_ent->{bsr_num} = $1;
                }
            }
            $tmp_ent->{phy_hea} = $memhash->{phy_drc_group_port};
            $tmp_ent->{logic_drc_phydrc} = $memhash->{logic_drc_phydrc};
            $values = &create_lpar($request, $name, $d, $tmp_ent); 
-            push @result, @$values;
-            #need to add update db here
-            my $rethash = query_cec_info_actions($request, $name, $d, 1, ["part_get_lpar_processing","part_get_lpar_memory","part_get_all_vio_info","part_get_all_io_bus_info","get_huge_page","get_cec_bsr"]);
-            unless (scalar keys(%$rethash)) {
-                push @result, [$mtms, "Can not get hypervisor information", 1];
-                next;
-            }
-            $lpar_hash{$name} = $rethash;     
-            $lpar_hash{$name}->{parent} = @$d[3];
-
+            push @result, $values;
            $name = undef;
            $d = undef;
        }
    }
-    if (%lpar_hash) {
-        update_vm_db($request, \%lpar_hash);
-    }
    return \@result;    
 }

@@ -2488,9 +2139,8 @@ sub mkfulllpar {
                my @td = @$d;
                @td[0] = 0;
                $rethash = query_cec_info_actions($request, $name, \@td, 1); 
-                unless (scalar keys(%$rethash)) {
-                    push @result, [$mtms, "Can not get hypervisor information", 1];
-                    next;
+                if (ref($rethash) ne 'HASH') {
+                    return ([[$mtms, "Cann't get hypervisor info hash", 1]]);
                }
                $rethash->{run} = 1; 
                #print Dumper($rethash);
@@ -2500,17 +2150,15 @@ sub mkfulllpar {
            $lpar_param{memory} = "1/".$rethash->{hyp_avail_mem}."/".$rethash->{hyp_config_mem};
            $lpar_param{hyp_config_mem} = $rethash->{hyp_config_mem};
            $lpar_param{hyp_avail_mem} = $rethash->{hyp_avail_mem};
-            $lpar_param{mem_region_size} = $rethash->{mem_region_size};
            my @phy_io_array = keys(%{$rethash->{bus}});
            $lpar_param{physlots} = join(",", @phy_io_array);
            $lpar_param{huge_page} = "1/".$rethash->{huge_page_avail}."/".$rethash->{huge_page_avail};
            $lpar_param{bsr_num} = $rethash->{cec_bsr_avail};
            $lpar_param{phy_hea} = $rethash->{phy_drc_group_port};
            $lpar_param{logic_drc_phydrc} = $rethash->{logic_drc_phydrc}; 
-            $lpar_param{full_par} = 1;
            $values = &create_lpar($request, $name, $d, \%lpar_param);
            $rethash->{logic_drc_phydrc} = $lpar_param{logic_drc_phydrc};
-            push @result, @$values;
+            push @result, $values;
            $name = undef;
            $d = undef;
        }    
@@ -217,23 +217,14 @@ sub is_me
    #my ($b1, $b2, $b3, $b4) = split /\./, $nameIP;

    # get all the possible IPs for the node I'm running on
-    # this is a common subroutine for both AIX and Linux,
-    # AIX does not have ip command
-    my $ipcmd;
-    if ( -f "/sbin/ip" )
-    {
-        $ipcmd = "ip addr | grep 'inet'";
-    }
-    else
-    {
-        $ipcmd = "ifconfig -a | grep 'inet'";
-    }
-    my $result = xCAT::Utils->runcmd($ipcmd, -1, 1);
+    my $ifcmd = "ifconfig -a | grep 'inet'";
+    my $result = xCAT::Utils->runcmd($ifcmd, -1, 1);
    if ($::RUNCMD_RC != 0)
    {
-        my $str="Error running ipcmd";
-        xCAT::MsgUtils->message("S", $str);
-        $::VERBOSE = $verb;
+        my $rsp;
+        #	push @{$rsp->{data}}, "Could not run $ifcmd.\n";
+        #    xCAT::MsgUtils->message("E", $rsp, $callback);
+		$::VERBOSE = $verb;
        return 0;
    }

@@ -241,6 +232,7 @@ sub is_me
    {
        my ($inet, $myIP, $str) = split(" ", $int);
        chomp $myIP;
+        $myIP =~ s/addr://;
        $myIP =~ s/\/.*//; # ipv6 address 4000::99/64
        $myIP =~ s/\%.*//; # ipv6 address ::1%1/128

@@ -1031,7 +1023,7 @@ sub dolitesetup
        $nrange = join(',',@nodel);
    }

-	@flist = xCAT::Utils->runcmd("/opt/xcat/bin/litefile $nrange", -1);
+	my @flist = xCAT::Utils->runcmd("/opt/xcat/bin/litefile $nrange", -1);
    if (scalar(@flist) > 0) {
        foreach my $l (@flist) {
 			my ($j1, $j2, $file) = split /\s+/, $l;
@@ -629,8 +629,7 @@ sub  get_adap_prop    {
    $cmd[0] = "\" supported-network-types\" " . $phandle . " get-package-property\r";
    $msg[0] = "Status: rc and all supported network types now on stack\n";
    #$pattern[0] = "(.*)3 >(.*)";
-    #$pattern[0] = "3 >";
-    $pattern[0] = "ok";
+    $pattern[0] = "3 >";
    $newstate[0] = 1;

    # state 1, return code and string on stack
@@ -638,8 +637,7 @@ sub  get_adap_prop    {
    $cmd[1] = ".\r";
    $msg[1] = "Status: All supported network types now on stack\n";
    #$pattern[1] = "(.*)2 >(.*)";
-    #$pattern[1] = "2 >";
-    $pattern[1] = "ok";
+    $pattern[1] = "2 >";
    $newstate[1] = 2;

    # state 2, data ready to decode
@@ -693,16 +691,6 @@ sub  get_adap_prop    {
        $timeout,
        [ qr/$pattern[$state]/i,
            sub {
-               if ($state eq 1) {
-                    if ($rconsole->before() =~ /-\d+/) {
-                        nc_msg($verbose, "Status: Error getting adapter property for phandle=$phandle.\n");
-                        $state = 7;
-                        $rconsole->clear_accum();
-                        $rc = 1;
-                        return 1;
-                    }
-                }
-
                nc_msg($verbose, $msg[$state]);
                $state = $newstate[$state];
                $rconsole->clear_accum();
@@ -890,15 +878,6 @@ sub get_mac_addr {
            $timeout,
            [qr/$pattern[$state]/=>
            sub {
-                if ($state eq 1) {
-                    if ($rconsole->before() =~ /-\d+/) {
-                        nc_msg($verbose, "Status: Error getting MAC address for phandle=$phandle.\n");
-                        $rconsole->clear_accum();
-                        $state = 4;
-                        $rc = 1;
-                        return undef;
-                    }
-                }
                nc_msg($verbose, $msg[$state]);
                $state = $newstate[$state];
                $rconsole->clear_accum();
@@ -1040,8 +1019,7 @@ sub get_mac_addr {
    $cmd[0] = "\" ibm,loc-code\" $phandle get-package-property\r";
    $msg[0] = "Status:  return code and loc-code now on stack\n";
    #$pattern[0] = "(.*)3 >(.*)";
-    #$pattern[0] = "3 >";
-    $pattern[0] = "ok";
+    $pattern[0] = "3 >";
    $newstate[0] = 1;

    # cmd(1) is a dot (.). This is a stack manipulation command that removes one
@@ -1074,16 +1052,6 @@ sub get_mac_addr {
            $timeout,
            [qr/$pattern[$state]/=>
            sub {
-                if ($state eq 1) {
-                    if ($rconsole->before() =~ /-\d+/) {
-                        nc_msg($verbose, "Status: Error getting adapter location for phandle=$phandle.");
-                        $rconsole->clear_accum();
-                        $state = 3;
-                        $rc = 1;
-                        return undef;
-                    }
-                }
-
                nc_msg($verbose, $msg[$state]);
                $rconsole->clear_accum();
                $state = $newstate[$state];
@@ -1157,19 +1125,10 @@ sub get_mac_addr {
        return undef if ($rc eq 1);
    }
    # Did we find one or more adapters?
-    my @loc_array = split /\n/,$result[3];
-    my $found = 0;
-    $loc_code = '';
-    foreach my $line ( @loc_array ) {
-        if ($line =~ /(\w*):(.*):([\w|\.|-]*):/) {
-            $loc_code .= $3; 
-            $found = 1;
-        }
-    }
-    if ($found) {
-        $loc_code =~ s/\.$//;
-        return $loc_code;
-    } else {
+
+    if ($result[3] =~ /(\w*):(.*):(\w*\.\w*\.\w*):/) {
+        $loc_code = $3;
+    }else {
        return undef;
    }
 }
@@ -1281,12 +1240,6 @@ sub  ping_server{
    $msg[3] = "Status: ping return code now on stack\n";
    $newstate[3] = 4;

-    # get the timeout for ping test
-    my $to4pt;
-    if ( $ENV{TIMEOUT4PINGTEST} =~ /^\d+$/ ) {
-        $to4pt = ",$ENV{TIMEOUT4PINGTEST}";
-    } 
-
    #IPv6
    if ( $server_ip =~ /:/ ) {
        #::1, calculate link local address
@@ -1296,9 +1249,9 @@ sub  ping_server{
        } else {
            $linklocal_ip = $client_ip;
        }
-        $cmd[3] = "ping $full_path_name:ipv6,$server_ip,$linklocal_ip,$gateway_ip$to4pt\r";
+        $cmd[3] = "ping $full_path_name:ipv6,$server_ip,$linklocal_ip,$gateway_ip\r";
    } else {
-        $cmd[3] = "ping $full_path_name:$server_ip,$client_ip,$gateway_ip$to4pt\r";
+        $cmd[3] = "ping $full_path_name:$server_ip,$client_ip,$gateway_ip\r";
    }
    $pattern[3] = ".*ping(.*)ok(.*)0 >(.*)";

@@ -2675,7 +2628,7 @@ sub lparnetbootexp
            sub {
                $rc = 2;
                $rconsole->clear_accum();
-                nc_msg(1, "Please make sure rcons $node works.\n");
+                nc_msg($verbose, "Please make sure rcons $node works.\n");
            }
        ],
    );
@@ -3047,21 +3000,6 @@ sub lparnetbootexp
                        $device_type = "physical";
                    }

-                    if (defined($mac_address)) {
-                        my @newmacs = ();
-                        my @allmacs = split /\|/,$mac_address;
-                        if ( !xCAT::Utils->isAIX() ) {
-                            foreach my $mac_a ( @allmacs ) {
-                                $mac_a = lc($mac_a);
-                                $mac_a =~ s/(\w{2})/$1:/g;
-                                $mac_a =~ s/:$//;
-                                push @newmacs, $mac_a;
-                            }
-                            $mac_address = join("|",@newmacs);
-                        } 
-                    }
-
-
                    if($colon) {
                        nc_msg($verbose, "$adap_type[$i]\:$loc_code\:$mac_address\:$full_path_name_array[$i]\:$ping_result\:$device_type\:\:\:\:\n");
                        $outputarrayindex++;
@@ -138,9 +138,8 @@ This program module file, supports the xcat messaging and logging
                N - Node informational  goes to STDOUT
                S - Message will be logged to syslog ( severe error)
                     Note S can be combined with other flags for example
-		            SE logs message to syslog and is sent to STDERR.
-			        SA logs message to syslog and to the auditlog DB table. (only xcatd)
-		        A logs message auditlog DB table only. (only for xcatd) 
+					 SE logs message to syslog and is sent to STDERR.
+					 SA logs message to syslog and to the auditlog DB table 
                V - verbose.  This flag is not valid, the calling routine
 				should check for verbose mode before calling the message

@@ -176,7 +175,7 @@ This program module file, supports the xcat messaging and logging
        # Message to Syslog 
        xCAT::MsgUtils->message('S', "Host $host not responding\n");
 		
-        # Message to Syslog and auditlog table (only used by xcatd) 
+        # Message to Syslog and auditlog table 
 		# see tabdump -d auditlog
        my $rsp = {};
 		$rsp->{syslogdata}->[0] = "$host not responding\n"; # for syslog
@@ -190,18 +189,6 @@ This program module file, supports the xcat messaging and logging
 		$rsp->{status} -> [0] = $status; 
        xCAT::MsgUtils->message('SA', $rsp);
 		
-        # Message to only  auditlog table (only used by xcatd) 
-		# see tabdump -d auditlog
-        my $rsp = {};
-		$rsp->{userid} ->[0] = $user; 
-		$rsp->{clientname} -> [0] = $client; 
-		$rsp->{clienttype} -> [0] = $clienttype; 
-		$rsp->{command} -> [0] = $command; 
-		$rsp->{noderange} -> [0] = $noderange; 
-		$rsp->{args} -> [0] = $arguments; 
-		$rsp->{status} -> [0] = $status; 
-        xCAT::MsgUtils->message('A', $rsp);
-		
        # Message to Log and Syslog 
        xCAT::MsgUtils->message('LS', "Host $host not responding\n");
 		
@@ -210,44 +197,44 @@ This program module file, supports the xcat messaging and logging

    Use with callback
        # Message to callback
-        my $rsp = {};
+      my $rsp = {};
 		$rsp->{data}->[0] = "Job did not run. \n";
 	    xCAT::MsgUtils->message("D", $rsp, $::CALLBACK);

-        my $rsp = {};
+      my $rsp = {};
 		$rsp->{error}->[0] = "No hosts in node list\n";
 	    xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);

-        my $rsp = {};
-        $rsp->{node}->[0]->{name}->[0] ="mynode";
-        $rsp->{node}->[0]->{data}->[0] ="mydata";
-        xCAT::MsgUtils->message("N", $rsp, $callback);
+      my $rsp = {};
+     $rsp->{node}->[0]->{name}->[0] ="mynode";
+     $rsp->{node}->[0]->{data}->[0] ="mydata";
+     xCAT::MsgUtils->message("N", $rsp, $callback);

-         my $rsp = {};
+      my $rsp = {};
 		$rsp->{info}->[0] = "No hosts in node list\n";
 	    xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);

-        my $rsp = {};
+      my $rsp = {};
 		$rsp->{sinfo}->[0] = "No hosts in node list\n";
 	    xCAT::MsgUtils->message("IS", $rsp, $::CALLBACK);


-        my $rsp = {};
+      my $rsp = {};
 		$rsp->{warning}->[0] = "No hosts in node list\n";
 	    xCAT::MsgUtils->message("W", $rsp, $::CALLBACK);

-        my $rsp = {};
+      my $rsp = {};
 		$rsp->{error}->[0] = "Host not responding\n";
 	    xCAT::MsgUtils->message("S", $rsp, $::CALLBACK);


        # Message to Syslog and callback
-        my $rsp = {};
+      my $rsp = {};
 		$rsp->{error}->[0] = "Host not responding\n";
 	    xCAT::MsgUtils->message("SE", $rsp, $::CALLBACK);

        # Message to Syslog and callback
-        my $rsp = {};
+      my $rsp = {};
 		$rsp->{info}->[0] = "Host not responding\n";
 	    xCAT::MsgUtils->message("SI", $rsp, $::CALLBACK);

@@ -287,19 +274,17 @@ sub message
    my $call_back = shift;    # optional
    my $exitcode  = shift;    # optional

-    # should be I,IS, D, E, S, SA,A ,LS, W , L,N
+    # should be I,IS, D, E, S, SA ,LS, W , L,N
    #  or S(I, D, E, S, W, L,N)
    #
-    # if  SA option need to split syslog messages from auditlog entry
+    # if new SA option need to split syslog messages from auditlog entry
    #
    my $newrsp;
-    if (($sev eq 'SA') || ($sev eq 'A'))
-    {    # if SA ( syslog and auditlog) or A ( only auditlog)then need to pull first entry from $rsp
-         # for syslog, to preserve old interface
+    if ($sev eq 'SA')
+    {    # if SA then need to pull first entry from $rsp
+            # for syslog, to preserve old interface
        $newrsp = $rsp;
-       if ($sev eq 'SA'){  # syslog and auditlog
        $rsp    = $newrsp->{syslogdata}->[0];
-       }
    }
    my $stdouterrf = \*STDOUT;
    my $stdouterrd = '';
@@ -464,10 +449,11 @@ sub message
        }
    }

-    # is syslog option requested 
+    # is syslog requested

    if ($sev =~ /S/)
    {
+
        # If they want this msg to also go to syslog, do that now
        eval {
            openlog("xCAT", "nofatal,pid", "local4");
@@ -488,7 +474,7 @@ sub message

    # if write to auditlog table requested, if not on service node
    if (xCAT::Utils->isMN()){
-     if (($sev eq 'SA') || ($sev eq 'A'))
+     if ($sev eq 'SA')
     {
        require xCAT::Table;
        my $auditlogentry;
@@ -19,7 +19,6 @@ use File::Path;
 use Math::BigInt;
 use Socket;
 use xCAT::GlobalDef;
-#use Data::Dumper;
 use strict;
 use warnings "all";
 my $socket6support = eval { require Socket6 };
@@ -69,14 +68,14 @@ This program module file, is a set of network utilities used by xCAT commands.
 #-------------------------------------------------------------------------------
 sub getNodeDomains()
 {
-        my $class    = shift;
+    my $class    = shift;
 	my $nodes  = shift;

 	my @nodelist = @$nodes;
 	my %nodedomains;

 	# Get the network info for each node
-        my %nethash = xCAT::DBobjUtils->getNetwkInfo(\@nodelist);
+    my %nethash = xCAT::DBobjUtils->getNetwkInfo(\@nodelist);

 	# get the site domain value
 	my @domains = xCAT::TableUtils->get_site_attribute("domain");
@@ -85,13 +84,12 @@ sub getNodeDomains()
 	# for each node - set hash value to network domain or default 
 	#		to site domain 
 	foreach my $node (@nodelist) {
-            unless (defined($node)) {next;}
-            if (defined($nethash{$node}) && $nethash{$node}{domain}) {
-                $nodedomains{$node} = $nethash{$node}{domain};
-            } else {
-                $nodedomains{$node} = $sitedomain;
-            }
-        }
+		if ($nethash{$node}{domain}) {
+			$nodedomains{$node} = $nethash{$node}{domain};
+		} else {
+			$nodedomains{$node} = $sitedomain;
+		}
+	}

 	return \%nodedomains;
 }
@@ -644,11 +642,16 @@ sub get_nic_ip
 {
    my $nic;
    my %iphash;
+    my $cmd     = "ifconfig -a";
+    my $result  = `$cmd`;
    my $mode    = "MULTICAST";
-        my $payingattention=0;
-        my $interface;
-        my $keepcurrentiface;

+    #############################################
+    # Error running command
+    #############################################
+    if ( !$result ) {
+        return undef;
+    }

    if (xCAT::Utils->isAIX()) {
        ##############################################################
@@ -660,14 +663,6 @@ sub get_nic_ip
        # en1: ...
        #
        ##############################################################
-        my $cmd     = "ifconfig -a";
-        my $result  = `$cmd`;
-        #############################################
-        # Error running command
-        #############################################
-        if ( !$result ) {
-          return undef;
-        }
        my @adapter = split /(\w+\d+):\s+flags=/, $result;
        foreach ( @adapter ) {
            if ($_ =~ /^(en\d)/) {
@@ -687,39 +682,37 @@ sub get_nic_ip
            }
        }
    }
-    else {   # linux
-        my @ipoutput = `ip addr`;
-        #############################################
-        # Error running command
-        #############################################
-        if ( !@ipoutput ) {
-          return undef;
-        }
-        foreach my $line (@ipoutput) {
-            if ($line =~ /^\d/) { # new interface, new context..
-                if ($interface and not $keepcurrentiface) {
-                    #don't bother reporting unusable nics
-                    delete $iphash{$interface};
+    else {
+        ##############################################################
+        # Should look like this for Linux:
+        # eth0 Link encap:Ethernet  HWaddr 00:02:55:7B:06:30
+        #      inet addr:9.114.154.193  Bcast:9.114.154.223
+        #      inet6 addr: fe80::202:55ff:fe7b:630/64 Scope:Link
+        #      UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+        #      RX packets:1280982 errors:0 dropped:0 overruns:0 frame:0
+        #      TX packets:3535776 errors:0 dropped:0 overruns:0 carrier:0
+        #      collisions:0 txqueuelen:1000
+        #      RX bytes:343489371 (327.5 MiB)  TX bytes:870969610 (830.6 MiB)
+        #      Base address:0x2600 Memory:fbfe0000-fc0000080
+        #
+        # eth1 ...
+        #
+        ##############################################################
+        my @adapter= split /\n{2,}/, $result;
+        foreach ( @adapter ) {
+            if ( !($_ =~ /LOOPBACK / ) and
+                   $_ =~ /UP / and
+                   $_ =~ /$mode / ) {
+                my @ip = split /\n/;
+                for my $ent ( @ip ) {
+                    if ($ent =~ /^(eth\d|ib\d|hf\d)\s+/) {
+                        $nic = $1;
+                    }    
+                    if ( $ent =~ /^\s*inet addr:\s*(\d+\.\d+\.\d+\.\d+)/ ) {
+                        $iphash{$nic} = $1; 
+                        next;
+                    }
                }
-                $keepcurrentiface=0;
-                if ( !($line =~ /LOOPBACK/ ) and
-                   $line =~ /UP( |,|>)/ and 
-                   $line =~ /$mode/ ) {
-                
-                    $payingattention=1;
-                    $line =~ /^([^:]*): ([^:]*):/;
-                    $interface=$2;
-               } else {
-                    $payingattention=0;
-                    next;
-               }
-            }
-            unless ($payingattention) { next; } 
-            if ($line =~ /inet/) {
-                $keepcurrentiface=1;
-            }
-            if ( $line =~ /^\s*inet \s*(\d+\.\d+\.\d+\.\d+)/ ) {
-                 $iphash{$interface} = $1;
            }
        }
    }
@@ -1098,8 +1091,7 @@ sub my_if_netmap
    Error:
        none
    Example:
-        my $ip = xCAT::NetworkUtils->my_ip_facing($peerip)
-        my @ip = xCAT::NetworkUtils->my_ip_facing($peerip)  # return multiple
+        xCAT::NetworkUtils->my_ip_facing
    Comments:
        none
 =cut
@@ -1117,8 +1109,6 @@ sub my_ip_facing
    unless ($peernumber) { return undef; }
    my $noden = unpack("N", inet_aton($peer));
    my @nets = split /\n/, `/sbin/ip addr`;
-
-    my @ips;
    foreach (@nets)
    {
        my @elems = split /\s+/;
@@ -1131,19 +1121,10 @@ sub my_ip_facing
        my $curn = unpack("N", inet_aton($curnet));
        if (($noden & $curmask) == ($curn & $curmask))
        {
-            push @ips, $curnet;
+            return $curnet;
        }
    }
-
-    if (@ips) {
-        if (wantarray) {
-            return @ips;
-        } else {
-            return $ips[0];
-        }
-    } else {
-        return undef;
-    }
+    return undef;
 }

 #-------------------------------------------------------------------------------
@@ -1614,124 +1595,56 @@ sub thishostisnot
 =cut

 #-----------------------------------------------------------------------------
-#sub gethost_ips1
-#{
-#    my ($class) = @_;
-#    my $cmd;
-#    my @ipaddress;
-#    $cmd = "ifconfig" . " -a";
-#    $cmd = $cmd . "| grep \"inet\"";
-#    my @result = xCAT::Utils->runcmd($cmd, 0);
-#    if ($::RUNCMD_RC != 0)
-#    {
-#        xCAT::MsgUtils->message("S", "Error from $cmd\n");
-#        exit $::RUNCMD_RC;
-#    }
-#    foreach my $addr (@result)
-#    {
-#        my @ip;
-#        if (xCAT::Utils->isLinux())
-#        {
-#            if ($addr =~ /inet6/)
-#            {
-#               #TODO, Linux ipv6 
-#            }
-#            else
-#            {
-#                my ($inet, $addr1, $Bcast, $Mask) = split(" ", $addr);
-#                #@ip = split(":", $addr1);
-#                #push @ipaddress, $ip[1];
-#                $addr1 =~ s/.*://;
-#                push @ipaddress, $addr1;
-#            }
-#        }
-#        else
-#        {    #AIX
-#            if ($addr =~ /inet6/)
-#            {
-#               $addr =~ /\s*inet6\s+([\da-fA-F:]+).*\/(\d+)/;
-#               my $v6ip = $1;
-#               my $v6mask = $2;
-#               if ($v6ip)
-#               {
-#                   push @ipaddress, $v6ip;
-#               }
-#            }
-#            else
-#            {
-#                my ($inet, $addr1, $netmask, $mask1, $Bcast, $bcastaddr) =
-#                  split(" ", $addr);
-#                push @ipaddress, $addr1;
-#            }
-#
-#        }
-#    }
-#    my @names = @ipaddress;
-#    foreach my $ipaddr (@names)
-#    {
-#        my $hostname = xCAT::NetworkUtils->gethostname($ipaddr);
-#        if ($hostname)
-#        {
-#            my @shorthost = split(/\./, $hostname);
-#            push @ipaddress, $shorthost[0];
-#        }
-#    }
-#
-#    return @ipaddress;
-#}
-
-
 sub gethost_ips
 {
    my ($class) = @_;
    my $cmd;
    my @ipaddress;
-    if (xCAT::Utils->isLinux())
+    $cmd = "ifconfig" . " -a";
+    $cmd = $cmd . "| grep \"inet\"";
+    my @result = xCAT::Utils->runcmd($cmd, 0);
+    if ($::RUNCMD_RC != 0)
    {
-       $cmd="ip -4 --oneline addr show |awk -F ' ' '{print \$4}'|awk -F '/' '{print \$1}'";
-       my @result =xCAT::Utils->runcmd($cmd);
-       if ($::RUNCMD_RC != 0)
-       {
-           xCAT::MsgUtils->message("S", "Error from $cmd\n");
-           exit $::RUNCMD_RC;
-       }   
-       
-       push @ipaddress, @result;
+        xCAT::MsgUtils->message("S", "Error from $cmd\n");
+        exit $::RUNCMD_RC;
    }
-    else
-    {    #AIX
-    
-       $cmd = "ifconfig" . " -a";
-       $cmd = $cmd . "| grep \"inet\"";
-       my @result = xCAT::Utils->runcmd($cmd, 0);
-       if ($::RUNCMD_RC != 0)
-       {
-           xCAT::MsgUtils->message("S", "Error from $cmd\n");
-           exit $::RUNCMD_RC;
-       }
-       
-       foreach my $addr (@result)
-       {
-          if ($addr =~ /inet6/)
-          {
-             $addr =~ /\s*inet6\s+([\da-fA-F:]+).*\/(\d+)/;
-             my $v6ip = $1;
-             my $v6mask = $2;
-             if ($v6ip)
-             {
-                 push @ipaddress, $v6ip;
-             }
-          }
-          else
-          {
-              my ($inet, $addr1, $netmask, $mask1, $Bcast, $bcastaddr) =
-                split(" ", $addr);
-              push @ipaddress, $addr1;
-          }
+    foreach my $addr (@result)
+    {
+        my @ip;
+        if (xCAT::Utils->isLinux())
+        {
+            if ($addr =~ /inet6/)
+            {
+               #TODO, Linux ipv6 
+            }
+            else
+            {
+                my ($inet, $addr1, $Bcast, $Mask) = split(" ", $addr);
+                @ip = split(":", $addr1);
+                push @ipaddress, $ip[1];
+            }
+        }
+        else
+        {    #AIX
+            if ($addr =~ /inet6/)
+            {
+               $addr =~ /\s*inet6\s+([\da-fA-F:]+).*\/(\d+)/;
+               my $v6ip = $1;
+               my $v6mask = $2;
+               if ($v6ip)
+               {
+                   push @ipaddress, $v6ip;
+               }
+            }
+            else
+            {
+                my ($inet, $addr1, $netmask, $mask1, $Bcast, $bcastaddr) =
+                  split(" ", $addr);
+                push @ipaddress, $addr1;
+            }

-       }
+        }
    }
-
    my @names = @ipaddress;
    foreach my $ipaddr (@names)
    {
@@ -1742,9 +1655,9 @@ sub gethost_ips
            push @ipaddress, $shorthost[0];
        }
    }
+
    return @ipaddress;
 }
-
 #-------------------------------------------------------------------------------

 =head3 get_subnet_aix 
@@ -1920,6 +1833,102 @@ sub validate_ip
    }
    return([0]);
 }
+
+#-------------------------------------------------------------------------------
+
+=head3   getFacingIP
+       Gets the ip address of the adapter of the localhost that is facing the
+    the given node.
+       Assume it is the same as my_ip_facing...
+    Arguments:
+       The name of the node that is facing the localhost.
+    Returns:
+       The ip address of the adapter that faces the node.
+
+=cut
+
+#-------------------------------------------------------------------------------
+sub getFacingIP
+{
+    my ($class, $node) = @_;
+    my $ip;
+    my $cmd;
+    my @ipaddress;
+
+    my $nodeip = inet_ntoa(inet_aton($node));
+    unless ($nodeip =~ /\d+\.\d+\.\d+\.\d+/)
+    {
+        return 0;    #Not supporting IPv6 here IPV6TODO
+    }
+
+    $cmd = "ifconfig" . " -a";
+    $cmd = $cmd . "| grep \"inet \"";
+    my @result = xCAT::Utils->runcmd($cmd, 0);
+    if ($::RUNCMD_RC != 0)
+    {
+        xCAT::MsgUtils->message("S", "Error from $cmd\n");
+        exit $::RUNCMD_RC;
+    }
+
+    # split node address
+    my ($n1, $n2, $n3, $n4) = split('\.', $nodeip);
+
+    foreach my $addr (@result)
+    {
+        my $ip;
+        my $mask;
+        if (xCAT::Utils->isLinux())
+        {
+            my ($inet, $addr1, $Bcast, $Mask) = split(" ", $addr);
+            if ((!$addr1) || (!$Mask)) { next; }
+            my @ips   = split(":", $addr1);
+            my @masks = split(":", $Mask);
+            $ip   = $ips[1];
+            $mask = $masks[1];
+        }
+        else
+        {    #AIX
+            my ($inet, $addr1, $netmask, $mask1, $Bcast, $bcastaddr) =
+              split(" ", $addr);
+            if ((!$addr1) && (!$mask1)) { next; }
+            $ip = $addr1;
+            $mask1 =~ s/0x//;
+            $mask =
+              `printf "%d.%d.%d.%d" \$(echo "$mask1" | sed 's/../0x& /g')`;
+        }
+
+        if ($ip && $mask)
+        {
+
+            # split interface IP
+            my ($h1, $h2, $h3, $h4) = split('\.', $ip);
+
+            # split mask
+            my ($m1, $m2, $m3, $m4) = split('\.', $mask);
+
+            # AND this interface IP with the netmask of the network
+            my $a1 = ((int $h1) & (int $m1));
+            my $a2 = ((int $h2) & (int $m2));
+            my $a3 = ((int $h3) & (int $m3));
+            my $a4 = ((int $h4) & (int $m4));
+
+            # AND node IP with the netmask of the network
+            my $b1 = ((int $n1) & (int $m1));
+            my $b2 = ((int $n2) & (int $m2));
+            my $b3 = ((int $n3) & (int $m3));
+            my $b4 = ((int $n4) & (int $m4));
+
+            if (($b1 == $a1) && ($b2 == $a2) && ($b3 == $a3) && ($b4 == $a4))
+            {
+                return $ip;
+            }
+        }
+    }
+
+    xCAT::MsgUtils->message("S", "Cannot find master for the node $node\n");
+    return 0;
+}
+
 #-------------------------------------------------------------------------------

 =head3    isIpaddr
@@ -1972,65 +1981,6 @@ sub isIpaddr
    }
 }

-
-
-
-#-------------------------------------------------------------------------------
-=head3  getNodeNameservers 
-    Description:
-        Get nameservers of  specified nodes. 
-        The priority: noderes.nameservers > networks.nameservers > site.nameservers
-    Arguments:
-        node: node name list
-    Returns:
-        Return a hash ref, of the $nameservers{$node}
-        undef - Failed to get the nameservers
-    Globals:
-        none
-    Error:
-        none
-    Example:
-        my $nameservers = xCAT::NetworkUtils::getNodeNameservers(\@node);
-    Comments:
-        none
-
-=cut
-#-------------------------------------------------------------------------------
-sub getNodeNameservers{
-    my $nodes=shift;
-    if( $nodes =~ /xCAT::NetworkUtils/)
-    {
-      $nodes=shift;
-    }
-    my @nodelist = @$nodes;
-    my %nodenameservers;
-    my $nrtab = xCAT::Table->new('noderes',-create=>0);
-    my %nrhash = %{$nrtab->getNodesAttribs(\@nodelist,['nameservers'])};
-    
-    my $nettab = xCAT::Table->new("networks");
-    my %nethash = xCAT::DBobjUtils->getNetwkInfo( \@nodelist );
-
-    my @nameservers = xCAT::TableUtils->get_site_attribute("nameservers");
-    my $sitenameservers=$nameservers[0];
-
-
-    foreach my $node (@nodelist){
-       if ($nrhash{$node} and $nrhash{$node}->[0] and $nrhash{$node}->[0]->{nameservers})
-       {
-           $nodenameservers{$node}=$nrhash{$node}->[0]->{nameservers};
-       }elsif($nethash{$node}{nameservers})
-       {
-           $nodenameservers{$node}=$nethash{$node}{nameservers};
-       }elsif($sitenameservers)
-       {
-           $nodenameservers{$node}=$sitenameservers;
-       }
-    }
-
-    return \%nodenameservers;
-}
-
-
 #-------------------------------------------------------------------------------

 =head3   getNodeNetworkCfg 
@@ -2057,31 +2007,19 @@ sub getNodeNameservers{
 sub getNodeNetworkCfg
 {
    my $node = shift;
-    if( $node =~ /xCAT::NetworkUtils/)
-    {
-       $node =shift;
-    }

+    my $nets = xCAT::NetworkUtils::my_nets();
    my $ip   = xCAT::NetworkUtils->getipaddr($node);
    my $mask = undef;
-    my $gateway = undef;
-
-    my $nettab = xCAT::Table->new("networks");
-    if ($nettab) {
-	   my @nets = $nettab->getAllAttribs('net','mask','gateway');
-	   foreach my $net (@nets) {
-	      if (xCAT::NetworkUtils::isInSameSubnet( $net->{'net'}, $ip, $net->{'mask'}, 0)) {
-	          $gateway=$net->{'gateway'};
-	          $mask=$net->{'mask'};
-	       }
-	   }
+    for my $net (keys %$nets)
+    {
+        my $netname;
+        ($netname,$mask) = split /\//, $net;
+        last if ( xCAT::NetworkUtils::isInSameSubnet( $netname, $ip, $mask, 1));
    }
- 
-    return ($ip, $node, $gateway, xCAT::NetworkUtils::formatNetmask($mask,0,0));
+    return ($ip, $node, undef, xCAT::NetworkUtils::formatNetmask($mask,1,0));
 }

-
-
 #-------------------------------------------------------------------------------

 =head3   get_hdwr_ip 
@@ -2155,13 +2093,7 @@ sub pingNodeStatus {
 	    foreach (@mon_nodes) {
 		$deadnodes{$_}=1;
 	    }	 
-
-		# get additional options from site table
-		my @nmap_options = xCAT::TableUtils->get_site_attribute("nmapoptions"); 
-		my $more_options = $nmap_options[0];
-
-        #call namp
-	    open (NMAP, "nmap -PE --system-dns --send-ip -sP $more_options ". $nodes . " 2> /dev/null|") or die("Cannot open nmap pipe: $!");
+	    open (NMAP, "nmap -PE --system-dns --send-ip -sP ". $nodes . " 2> /dev/null|") or die("Cannot open nmap pipe: $!");
 	    my $node;
 	    while (<NMAP>) {
 		if (/Host (.*) \(.*\) appears to be up/) {
@@ -2428,105 +2360,6 @@ sub get_all_nicips{
    }
 }

-#-------------------------------------------------------------------------------

-=head3  gen_net_boot_params
-
-    Description:
-        This subroutine is used to generate all possible kernel parameters for network boot (rh/sles/ubuntu + diskfull/diskless)
-        The supported network boot parameters:
-            ksdevice - Specify network device for Anaconda. For rh6 and earlier. Format: 'ksdevice={$mac|$nicname}'
-            BOOTIF - Specify network device for Anaconda. The boot device which set by pxe. xCAT also set it if the bootload is not pxe. Format 'BOOTIF={$mac}'
-            ifname - Specify a interfacename<->mac pair, it will set the interfacename to the interface which has the <mac>. Format 'ifname=$ifname:$mac'
-               # This will only be generated when linuximage.nodebootif is set. 
-            bootdev - Specify the boot device. Mostly it's used with <ip> parameter and when there are multiple <ip> params. Format 'bootdev={$mac|$ifname}
-            ip - Specify the network configuration for an interface. Format: 'ip=dhcp', 'ip=$ifname:dhcp'
-           
-            netdevice - Specify network device for Linuxrc (Suse bootloader). Format: 'netdevice={$mac|$nicname}'
-           
-            netdev - Specify the interfacename which is used by xCAT diskless boot script to select the network interface. Format: 'netdev=$nicname'
-
-        Reference:
-            Redhat anaconda doc: https://github.com/rhinstaller/anaconda/blob/master/docs/boot-options.txt
-            Suse Linuxrc do: https://en.opensuse.org/SDB:Linuxrc
-            
-    Arguments:
-        $installnic   <- node.installnic
-        $primarynic <- node.primarynic
-        $macmac    <- node.mac
-        $nodebootif <- linuximage.nodebootif
-        
-    Returns: 
-        $net_params - The key will be the parameter name, the value for the key will be the parameter value.
-        Valid Parameter Name:
-            ksdevice
-            netdev
-            netdevice
-            ip
-            ifname
-            BOOTIF
-
-        And following two keys also will be returned for reference
-            mac
-            nicname
-
-    Example:
-        my $netparams = xCAT::NetworkUtils->gen_net_boot_params($installnic, $primmarynic, $macmac, $nodebootif);
-
-=cut
-
-#-------------------------------------------------------------------------------
-
-sub gen_net_boot_params 
-{
-    my $class = shift;
-    my $installnic = shift;
-    my $primarynic = shift;
-    my $macmac = shift;
-    my $nodebootif = shift;
-
-    my $net_params;
-    
-    # arbitrary use primarynic if installnic is not set
-    unless ($installnic) {
-         $installnic = $primarynic;
-    }
-    
-    # just use the installnic to generate the nic related kernel parameters
-    my $mac;
-    my $nicname;
-    
-    if ((! defined ($installnic)) || ($installnic eq "") || ($installnic =~ /^mac$/i)) {
-        $mac = $macmac;
-        $net_params->{mac} = $mac;
-    } elsif ($installnic =~ /^[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}$/) {
-        $mac = $installnic;
-        $net_params->{mac} = $mac;
-        $net_params->{setmac} = $mac;
-    } else {
-        $mac = $macmac;
-        $nicname = $installnic;
-        $net_params->{nicname} = $nicname;
-        $net_params->{mac} = $mac;
-    }
-    if ($nicname) {
-        $net_params->{ksdevice} = "ksdevice=$nicname";
-        $net_params->{ip} = "ip=$nicname:dhcp";
-        $net_params->{netdev} = "netdev=$nicname";
-        $net_params->{netdevice} = "netdevice=$nicname";
-        $net_params->{ifname} = "ifname=$nicname:$mac";
-    } elsif ($mac) {
-        $net_params->{ksdevice} = "ksdevice=$mac";
-        $net_params->{BOOTIF} = "BOOTIF=$mac";
-        $net_params->{bootdev} = "bootdev=$mac";
-        $net_params->{ip} = "ip=dhcp";
-        if ($nodebootif) {
-            $net_params->{ifname} = "ifname=$nodebootif:$mac";
-        }
-        $net_params->{netdevice} = "netdevice=$mac";
-    }
-
-    return $net_params;
-}

 1;
@@ -196,7 +196,6 @@ sub expandatom {
 	$nodelist->_set_use_cache(1);
        @allnodeset = $nodelist->getAllAttribs('node','groups');
        %allnodehash = map { $_->{node} => 1 } @allnodeset;
-	$nodelist->_set_use_cache(0);   #The {_use_cache} for nodelist table object must be turn off, otherwise it will keep open and affect the Table.pm subroutines like getNodesAttribs when it tries to access nodelist table to get status column.
    }
 	my $verify = (scalar(@_) >= 1 ? shift : 1);
  my %options = @_;      # additional options
@@ -311,6 +311,9 @@ sub notify {
    my ($modname, $path, $suffix) = fileparse($_, ".pm");
     # print "modname=$modname, path=$path, suffix=$suffix\n";
    if ($suffix =~ /.pm/) { #it is a perl module
+      my $pid;
+      if ($pid=xCAT::Utils->xfork()) { }
+      elsif (defined($pid)) {
 	my $fname;
        if (($path eq "") || ($path eq ".\/")) {
          #default path is /opt/xcat/lib/perl/xCAT_monitoring/ if there is no path specified
@@ -325,7 +328,8 @@ sub notify {
        else {
          ${"xCAT_monitoring::".$modname."::"}{processTableChanges}->($action, $tablename, $old_data, $new_data);
        }
-        return 0;
+        exit 0;
+      }
    }
    else { #it is a command
      my $pid;
@@ -21,6 +21,7 @@ sub parse_args {
    my %opt     = ();
    my $cmd     = $request->{command};
    my $args    = $request->{arg};
+    my @VERSION = qw( 2.1 );

    #############################################
    # Responds with usage statement
@@ -59,8 +60,7 @@ sub parse_args {
    # Option -v for version
    ####################################
    if ( exists( $opt{v} )) {
-        my $version = xCAT::Utils->Version();
-        return ([$version]);
+        return( \@VERSION );
    }

    if ( exists( $opt{s} ) ){
@@ -350,27 +350,6 @@ sub do_rnetboot {
            last;
        }
    }
-
-    # Set the boot mode to norm from 'of' (open firmware)
-    # NOW, only necessary for IVM
-    my $hwtype = @$exp[2];
-    if ($hwtype eq "ivm") {
-        my $server = @$exp[3];
-
-        # creat connection first
-        my @newexp = xCAT::PPCcli::connect( $request, $hwtype, $server );
-        if (ref($newexp[0]) eq "Expect" ) {
-            my $cfg = "lpar_id=@$d[0],boot_mode=norm";
-            # change the boot mode to 'norm'
-            xCAT::PPCcli::chsyscfg(\@newexp, "prof", $d, $cfg);
-            xCAT::PPCcli::disconnect(\@newexp);
-        } else {
-            my $rsp;
-            $rsp->{data} = ["Failed to set the boot mode to normal. For rnetboot command, you have to rpower off and then on the node after finishing the OS deployment."];
-            xCAT::MsgUtils->message("E", $rsp, $request->{callback});
-        }
-    }
-
    return  $result;
 }

@@ -436,9 +436,9 @@ sub sshcfg {
    #####################################
    # userid@host not found in key file
    #####################################
-    #if ( $sshkey !~ /\s+(\S+\@\S+$)/ ) {
-    #    return( [[$server,"Cannot find userid\@host in '$fname'",RC_ERROR]] );
-    #}
+    if ( $sshkey !~ /\s+(\S+\@\S+$)/ ) {
+        return( [[$server,"Cannot find userid\@host in '$fname'",RC_ERROR]] );
+    }
    my $logon = $1;

    #####################################
@@ -156,7 +156,7 @@ sub connect {
    # Shell prompt regexp based on HW Type 
    ##################################################
    my %prompt = (
-        hmc => "~>\\s*\$",
+        hmc => "~> \$",
        ivm => "\\\$ \$"
    );
    ##################################################
@@ -339,7 +339,7 @@ sub lshwconn_parse_args
    }
    if (scalar(@error_type_nodes)) {
        my $tmp_nodelist = join ',', @error_type_nodes;
-        my $link = (scalar(@error_type_nodes) eq '1')? 'is':'are';
+        my $link = (scalar(@error_type_nodes) == '1')? 'is':'are';
        return( ["Node type of node(s) $tmp_nodelist $link not supported for this command.\n"]);
    }
    $request->{nodetype} = $nodetype;
@@ -75,7 +75,6 @@ sub add_ppc {
    my $values   = shift;
    my $not_overwrite = shift;
    my $otherinterfaces = shift;
-    my $callfile = shift;
    my @tabs     = qw(ppc vpd nodehm nodelist nodetype hosts mac); 
    my %db       = ();
    ###################################
@@ -120,12 +119,7 @@ sub add_ppc {
        
        # Specify CEC and Frame's mgt as fsp and bpa
        if ( $type =~ /^cec$/)  {
-            if ( $callfile eq "PPC" )  {
-                $mgt = "hmc";
-            }
-            if ( $callfile eq "FSP" )   {
-                $mgt = "fsp";
-            }
+            $mgt = "fsp";
        }
        if ( $type =~ /^frame$/)  {
            $mgt = "bpa";
@@ -326,7 +320,7 @@ sub update_lpar {
            }
    }
    if (defined($write)) {
-        &add_ppc($hwtype, \@write_list,'','',"FSP");
+        &add_ppc($hwtype, \@write_list);
        return ([@update_list,@write_list]);
    } else {
        foreach ( @tabs ) {
@@ -14,7 +14,7 @@ use xCAT::Usage;
 use xCAT::NodeRange;
 use xCAT::DBobjUtils;
 use xCAT::FSPUtils;
-use xCAT::TableUtils;
+use xCAT::TableUtils qw(get_site_Master);
 %::QUERY_ATTRS = (
 'savingstatus' => 1,
 'dsavingstatus' => 1,
@@ -223,6 +223,7 @@ sub renergy {
    my ($node, $attrs) = %$nodehash;
    my $cec_name = @$attrs[2];
    my $hw_type = @$attrs[4];
+
    
    if (!$cec_name) {
        return ([[$node, "ERROR: Cannot find the cec name, check the attributes: vpd.serial, vpd.mtm.", 1]]);
@@ -294,43 +295,43 @@ sub renergy {
 	foreach (@hcps_ip) {
 	    $deadnodes{$_}=1;
 	}	 
-
-	# get additional options from site table
-	my @nmap_options = xCAT::TableUtils->get_site_attribute("nmapoptions"); 
-	my $more_options = $nmap_options[0];
-
-	open (NMAP, "nmap -PE --system-dns --send-ip -sP $more_options ". join(' ',@hcps_ip) . " 2> /dev/null|") or die("Cannot open nmap pipe: $!");
-	my $node;
+	open (NMAP, "nmap -PE --system-dns --send-ip -sP ". join(' ',@hcps_ip) . " 2> /dev/null|") or die("Cannot open nmap pipe: $!");
+	my $node1;
+	my $msg1;
 	while (<NMAP>) {
 	    #print "$_\n";
 	    if (/Host (.*) \((.*)\) appears to be up/) {
-		$node=$2;
-		unless ($deadnodes{$node}) {
+		$node1=$2;
+		unless ($deadnodes{$node1}) {
 		    foreach (keys %deadnodes) {
-			if ($node =~ /^$_\./) {
-			    $node = $_;
+			if ($node1 =~ /^$_\./) {
+			    $node1 = $_;
 			    last;
 			}
 		    }
 		}
-		delete $deadnodes{$node};
+		delete $deadnodes{$node1};
 		if ($verbose) {
 		    push @return_msg, [$node, $_, 0];
 		}
-		push(@pingable_hcp, $node);
-	    } elsif (/Nmap scan report for ([^ ]*)/) {
-		$node=$1;
+		push(@pingable_hcp, $node1);
+	    } elsif (/Nmap scan report for ([^ ]*) \((.*)\)/) {
+		$node1=$2;
+		$msg1=$_;
 	    } elsif (/Host is up./) {
-		unless ($deadnodes{$node}) {
+		unless ($deadnodes{$node1}) {
 		    foreach (keys %deadnodes) {
-			if ($node =~ /^$_\./) {
-			    $node = $_;
+			if ($node1 =~ /^$_\./) {
+			    $node1 = $_;
 			    last;
 			}
 		    }
 		}
-		delete $deadnodes{$node};
-		push(@pingable_hcp, $node);
+		delete $deadnodes{$node1};
+		if ($verbose) {
+		    push @return_msg, [$node, "$msg1$_", 0];
+		}
+		push(@pingable_hcp, $node1);
 	    }
 	}	
    } else {
@@ -144,16 +144,12 @@ sub connect {
    ##################################
    # Set options
    ##################################
-    #my $hosttab  = xCAT::Table->new( 'hosts' );
-    #if ( $hosttab) {
-    #    my $hostshash = $hosttab->getNodeAttribs( $server, [qw(ip otherinterfaces)]);
-    #    if ( $hostshash ) {
-    #        $server = $hostshash->{ip};
-    #    }
-    #}
-    $server = xCAT::NetworkUtils::getNodeIPaddress( $server );
-    unless ($server) {
-             return( "Unable to get IP address for $server" );
+    my $hosttab  = xCAT::Table->new( 'hosts' );
+    if ( $hosttab) {
+        my $hostshash = $hosttab->getNodeAttribs( $server, [qw(ip otherinterfaces)]);
+        if ( $hostshash ) {
+            $server = $hostshash->{ip};
+        }
    }
 #    my $serverip = inet_ntoa(inet_aton($server));
    my $url = "https://$server/cgi-bin/cgi?form=2";
@@ -347,7 +347,7 @@ sub bus {
            #################################
            # Output header 
            #################################
-            push @result, [$name,"I/O Bus Information", 0];
+            push @result, [$name,"I/O Bus Information"];

            #################################
            # Output error 
@@ -532,7 +532,7 @@ sub config {
            #################################
            # Output header
            #################################
-            push @result, [$name,"Machine Configuration Info", 0];
+            push @result, [$name,"Machine Configuration Info"];
            my $i;

            foreach ( @prefix ) {
@@ -555,9 +555,6 @@ sub getmacs {
                    } else {
                        $type = "virtualio";
                    }
-                    if ($mac_addr) {
-                        $mac_addr = format_mac($mac_addr);
-                    }

                    my %att = ();
                    $att{'MAC_Address'}        = ($mac_addr) ? $mac_addr : "N/A";
@@ -630,9 +627,9 @@ sub getmacs {
                }
                foreach ( @$value ) {
                    if ( /^#\s?Type/ ) {
-                       $data.= "\n$_\n";
+                        $data.= "\n$_\n";
                    } else {
-                        $data.= "$_\n";
+                        $data.= format_mac( $_ );
                    }
                }

@@ -759,7 +756,7 @@ sub getmacs {
            if ( /^#\s?Type/ ) {
                $data.= "\n$_\n";
            } elsif ( /^ent\s+/ or /^hfi-ent\s+/ ) {
-                $data.= "$_\n";
+                $data.= format_mac( $_ );
            }
        }
        #####################################
@@ -804,8 +801,10 @@ sub cal_mac {
 ##########################################################################
 sub format_mac {

-    my $mac = shift;
+    my $data = shift;

+    $data =~ /^(\S+\s+\S+\s+)(\S+)(\s+.*)$/;
+    my $mac = $2;
    #####################################
    # Get adapter mac
    #####################################
@@ -814,10 +813,6 @@ sub format_mac {

    if ( !xCAT::Utils->isAIX() ) {
        foreach my $mac_a ( @macs ) {
-            if (&checkmac($mac_a)) {
-                push @newmacs, $mac_a;
-                next;
-            }
            #################################
            # Delineate MAC with colons
            #################################
@@ -826,30 +821,14 @@ sub format_mac {
            $mac_a =~ s/:$//;
            push @newmacs, $mac_a;
        }
-        $mac = join("|",@newmacs);
+        my $newmac = join("|",@newmacs);
+        $data   =~ s/$mac/$newmac/;
    }

-    return( "$mac\n" );
+    return( "$data\n" );

 }

-##########################################################################
-# checkmac format 
-##########################################################################
-
-sub checkmac {
-    my $mac = shift;
-    if ( !xCAT::Utils->isAIX()) {
-        if ($mac =~ /\w{2}:\w{2}:\w{2}:\w{2}:\w{2}:\w{2}/) {
-            return 1;
-        } else {
-            return 0;
-        }
-    } else {
-        return 1;
-    }
-}
-

 ##########################################################################
 # Write first valid adapter MAC to database 
@@ -868,9 +847,6 @@ sub writemac {
    # Find first valid adapter
    #####################################
    foreach ( @$data ) {
-        unless (&checkmac($_)) {
-            next;
-        }
        if ( /^ent\s+/ or /^hfi-ent\s+/ ) {
            $value = $_;
            #####################################
@@ -893,9 +869,6 @@ sub writemac {
    #####################################
    if ( $pingret ne "successful" ) {
        foreach ( @$data ) {
-            unless (&checkmac($_)) {
-                next;
-            }
            if ( /^ent\s+/ or /^hfi-ent\s+/ ) {
                $value = $_;
                $ping_test = 0;
@@ -917,7 +890,7 @@ sub writemac {
    #####################################
    # Get adapter mac
    #####################################
-    #$value = format_mac( $value ); 
+    $value = format_mac( $value ); 
    @fields = split /\s+/, $value;
    $mac    = $fields[2];

@@ -411,7 +411,7 @@ sub format_output {
        # Strip errors for results
        #######################################
        my @val = grep( !/^#.*: ERROR /, @$values );
-        xCAT::PPCdb::add_ppc( $hwtype, \@val ,'','',"PPC");
+        xCAT::PPCdb::add_ppc( $hwtype, \@val );
    }

    ###########################################
@@ -203,7 +203,7 @@ sub voltage {
            # Voltages available in frame
            ################################# 
            if ( @$d[4] ne "bpa" ) {
-                push @result, [$name,"$text Only available for BPA",0];
+                push @result, [$name,"$text Only available for BPA",1];
                next;
            }
            my $volt = enumerate_volt( $exp, $d );
@@ -256,7 +256,7 @@ sub temp {
            # No frame commands for IVM 
            ################################# 
            if ( $hwtype eq "ivm" ) {
-                push @result, [$name,"$prefix Not available (No BPA)",0];
+                push @result, [$name,"$prefix Not available (No BPA)",1];
                next;
            }
            ################################# 
@@ -264,14 +264,14 @@ sub temp {
            ################################# 
            if ( @$d[4] !~ /^(fsp|cec|lpar)$/ ) {
                my $text = "$prefix Only available for CEC/LPAR";
-                push @result, [$name,$text,0];
+                push @result, [$name,$text,1];
                next;
            }
            ################################# 
            # Error - No frame 
            #################################
            if ( $mtms eq "0" ) {
-                push @result, [$name,"$prefix Not available (No BPA)",0];
+                push @result, [$name,"$prefix Not available (No BPA)",1];
                next;
            }
            #################################
@@ -1913,7 +1913,7 @@ sub xCATdB {
                $profile,
                $parent ); 
        
-        return( xCAT::PPCdb::add_ppc( $hwtype, [$values],'','',"PPC" )); 
+        return( xCAT::PPCdb::add_ppc( $hwtype, [$values] )); 
    }
    return undef;
 }
@@ -277,7 +277,7 @@ sub get_nodes_nic_attrs{
    my $nodes = shift;

    my $nicstab = xCAT::Table->new( 'nics');
-    my $entry = $nicstab->getNodesAttribs($nodes, ['nictypes', 'nichostnamesuffixes', 'nichostnameprefixes', 'niccustomscripts', 'nicnetworks', 'nicips', 'nicextraparams']);
+    my $entry = $nicstab->getNodesAttribs($nodes, ['nictypes', 'nichostnamesuffixes', 'nichostnameprefixes', 'niccustomscripts', 'nicnetworks', 'nicips']);

    my %nicsattrs;
    my @nicattrslist;
@@ -361,19 +361,6 @@ sub get_nodes_nic_attrs{
                $nicsattrs{$node}{$nicattrs[0]}{'ip'} = $nicattrs[1];
            }
        }
-
-        if($entry->{$node}->[0]->{'nicextraparams'}){
-            @nicattrslist = split(",", $entry->{$node}->[0]->{'nicextraparams'});
-            foreach (@nicattrslist){
-				my @nicattrs;
-				if ($_  =~ /!/) {
-					@nicattrs = split("!", $_);
-				} else {
-					@nicattrs = split(":", $_);
-				}
-                $nicsattrs{$node}{$nicattrs[0]}{'extraparams'} = $nicattrs[1];
-            }
-        }
    }

    return \%nicsattrs;
@@ -666,39 +653,6 @@ sub get_all_cecs
    }
 }

-#-------------------------------------------------------------------------------
- 
-=head3 get_all_lparids
-      Description : Get all LPAR ids  in system.
-      Arguments   : ref of all cecs
-      Returns     : ref for LPAR ids hash.
-      Example     : 
-                    my $arrayref = xCAT::ProfiledNodeUtils->get_all_lparids(\%allcecs);
-=cut
-
-#-------------------------------------------------------------------------------
-sub get_all_lparids
-{
-    my $class= shift;
-    my $cecsref = shift;
-    my %allcecs = %$cecsref;
-    my %lparids;
-
-    my $ppctab = xCAT::Table->new('ppc');
-    foreach my $cec (keys  %allcecs) {
-        my @ids = $ppctab->getAllAttribsWhere("hcp = '$cec'", 'id');
-        foreach (@ids) {
-            if ( $_->{'id'} ){
-                $lparids{$cec}{$_->{'id'}} = 0;
-            }
-        }
-    }
-    $ppctab->close();
-    
-    return \%lparids;
-}
-
-
 #-------------------------------------------------------------------------------

 =head3 is_discover_started
@@ -736,7 +690,6 @@ sub get_nodes_profiles
 {
    my $class = shift;
    my $nodelistref = shift;
-    my $groupnamemode = shift;
    my %profile_dict;

    my $nodelisttab = xCAT::Table->new('nodelist');
@@ -756,12 +709,8 @@ sub get_nodes_profiles
                if ( $idx == 2 ){
                    # The group string will like @NetworkProfile_<profile name>
                    # So, index should +3, 2 for '__', 1 for _.
-                    if ($groupnamemode) { 
-                        $profile_dict{$_}{$profile} = $group;
-                    } else{
-                        my $append_index = length($profile) + 3;
-                        $profile_dict{$_}{$profile} = substr $group, $append_index;
-                    }
+                    my $append_index = length($profile) + 3;
+                    $profile_dict{$_}{$profile} = substr $group, $append_index;
                    last;
                }
            }
@@ -790,7 +739,7 @@ sub get_imageprofile_prov_method

    my $nodetypestab = xCAT::Table->new('nodetype');
    my $entry = ($nodetypestab->getAllAttribsWhere("node = '$imgprofilename'", 'ALL' ))[0];
-    return $entry->{'provmethod'};
+    my $osimgname = $entry->{'provmethod'};

    #my $osimgtab = xCAT::Table->new('osimage');
    #my $osimgentry = ($osimgtab->getAllAttribsWhere("imagename = '$osimgname'", 'ALL' ))[0];
@@ -851,20 +800,16 @@ sub check_profile_consistent{
        }
    }

+    # Profile consistent keys, arch=>netboot,  mgt=>nictype
+    my %profile_dict = ('x86' => 'xnba','x86_64' => 'xnba', 'ppc64' => 'yaboot',
+                        'fsp' => 'FSP', 'ipmi' => 'BMC');
+                        
    # Get Imageprofile arch
    my $nodetypetab = xCAT::Table->new('nodetype');
-    my $nodetypeentry = $nodetypetab->getNodeAttribs($imageprofile, ['os','arch']);
-    my $os = $nodetypeentry->{'os'};
+    my $nodetypeentry = $nodetypetab->getNodeAttribs($imageprofile, ['arch']);
    my $arch = $nodetypeentry->{'arch'};
    $nodetypetab->close();
    
-    # Get Imageprofile pkgdir
-    my $osdistroname = $os . "-" . $arch;
-    my $osdistrotab = xCAT::Table->new('osdistro');
-    my $osdistroentry = ($osdistrotab->getAllAttribsWhere("osdistroname = '$osdistroname'", 'ALL' ))[0];
-    my $pkgdir = $osdistroentry->{'dirpaths'};
-    $osdistrotab->close();
-    
    # Get networkprofile netboot and installnic
    my $noderestab = xCAT::Table->new('noderes');
    my $noderesentry = $noderestab->getNodeAttribs($networkprofile, ['netboot', 'installnic']);
@@ -896,33 +841,16 @@ sub check_profile_consistent{
    my $nodetype = undef;
    $nodetype = $ntentry->{'nodetype'} if ($ntentry->{'nodetype'});
    $ppctab->close(); 
-    
-    # Checking whether netboot initrd image for Ubuntu ppc64
-    # This image should be downloaded from internet
-    if ($arch =~ /ppc64/i and $os =~ /ubuntu/i and !(-e "$pkgdir/install/netboot/initrd.gz")){
-        return 0, "The netboot initrd is not found in $pkgdir/install/netboot, please download it firstly.";
-    }
 
    # Check if exists provision network
    if (not ($installnic and exists $netprofile_nicshash{$installnic}{"network"})){
        return 0, "Provisioning network not defined for network profile."
    }

-    # Remove check mechanism about arch and netboot attribute
-    # Attribute 'neboot' will be generated based on arch, management method, os
-    
-    # Profile consistent keys, arch=>netboot,  mgt=>nictype
-    #my $ppc_netboot = 'yaboot';
-    #if( $os =~ /rhels7/ ){
-    #    $ppc_netboot = 'grub2';
-    #}
-    #my %profile_dict = ('x86' => 'xnba','x86_64' => 'xnba', 'ppc64' => $ppc_netboot,
-    #                    'ppc64el' => $ppc_netboot,
-    #                    'fsp' => 'FSP', 'ipmi' => 'BMC');
    # Check if imageprofile is consistent with networkprofile
-    #if ($profile_dict{$arch} ne $netboot) {
-    #    return 0, "Imageprofile's arch is not consistent with networkprofile's netboot."
-    #}
+    if ($profile_dict{$arch} ne $netboot) {
+        return 0, "Imageprofile's arch is not consistent with networkprofile's netboot."
+    }
    
    # Check if networkprofile is consistent with hardwareprofile
    if (not $hardwareprofile) { # Not define hardwareprofile
@@ -932,29 +860,24 @@ sub check_profile_consistent{
            return 0, "$nictype networkprofile must use with hardwareprofile.";
        }
    }
-    
-    my %mgt_dict = ('fsp' => 'FSP', 'ipmi' => 'BMC', 'kvm' => '');
       
-    if ($mgt eq 'vm') {
-        return 1, "";
+    # For nodetype is lpar node, not need to check the nictype as it is not required for lpar node
+    if (not $nictype and $mgt and $nodetype ne 'lpar' ) { 
+        # define hardwareprofile, not define fsp or bmc networkprofile, and the node type is not lpar
+        return 0, "$profile_dict{$mgt} hardwareprofile must use with $profile_dict{$mgt} networkprofile.";
    }
    
-    if ($nodetype eq 'lpar') {
-        if ($nictype) {
-            # Can not associate FSP/BMC network if the node type is lpar
-            return 0, "The node with hardware type $nodetype can not use with $nictype networkprofile.";
-        }
-        return 1, ""
+    if ($profile_dict{$mgt} ne $nictype and $nodetype ne 'lpar') {
+        # Networkprofile's nictype is not consistent with hadrwareprofile's mgt, and the node type is not lpar
+        return 0, "Networkprofile's nictype is not consistent with hardwareprofile's mgt.";
    }
-    
-    if ($mgt and $mgt_dict{$mgt} ne $nictype) {
-        my $errmsg = "$mgt hardwareprofile must use with $mgt_dict{$mgt} networkprofile.";
-        if ( $mgt eq 'kvm' ) {
-            $errmsg = "$mgt hardwareprofile must use with non-BMC and non-FSP networkprofile."
-        }
-        return 0, $errmsg;
+
+    if ($nodetype eq 'lpar' and $nictype eq 'FSP') 
+    {
+        # can not associate FSP network if the node type is lpar
+        return 0, "The node with hardware type $nodetype can not use with $nictype networkprofile.";
    }
-            
+        
    return 1, "";
 }

@@ -996,72 +919,6 @@ sub is_fsp_node

 #-------------------------------------------------------------------------------

-=head3 is_kvm_node
-      Description : Judge whether nodes are KVM nodes.
-      Arguments   : $hardwareprofile - hardwareprofile name
-      Returns     : 1 - KVM nodes
-                    0 - Not KVM nodes
-=cut
-
-#-------------------------------------------------------------------------------
-sub is_kvm_node
-{
-    my $class = shift;
-    my $hardwareprofile = shift;
-    
-    if (not $hardwareprofile) {
-        return 0;
-    }
- 
-    #Get hardwareprofile mgt
-    my $nodehmtab = xCAT::Table->new('nodehm');
-    my $mgtentry = $nodehmtab->getNodeAttribs($hardwareprofile, ['mgt']);  
-    my $mgt = undef;
-    $mgt = $mgtentry->{'mgt'} if ($mgtentry->{'mgt'});
-    $nodehmtab->close();
-    
-    if ($mgt eq 'kvm') {
-        return 1;
-    } 
-    
-    return 0;
-}
-
-#-------------------------------------------------------------------------------
-
-=head3 is_kvm_hypv_node
-      Description : Judge whether nodes are KVM nodes.
-      Arguments   : $imageprofile - imageprofile name
-      Returns     : 1 - KVM hypervisor nodes
-                    0 - Not KVM hypervisor nodes
-=cut
-
-#-------------------------------------------------------------------------------
-sub is_kvm_hypv_node
-{
-    my $class = shift;
-    my $imageprofile = shift;
-    
-    # Get provmethod
-    my $provmethod = xCAT::ProfiledNodeUtils->get_imageprofile_prov_method($imageprofile);
-    unless ($provmethod ){
-        return 0;
-    }
-    
-    my $osimage_tab = xCAT::Table->new('osimage');
-    my $osimage_tab_entry = $osimage_tab->getAttribs({'imagename'=> $provmethod},('osdistroname'));
-    my $osdistroname = $osimage_tab_entry->{'osdistroname'};
-    $osimage_tab->close();
-    
-    if ($osdistroname and $osdistroname =~ /^pkvm/ ) {
-        return 1;
-    }
-    
-    return 0;
-}
-
-#-------------------------------------------------------------------------------
-
 =head3 get_nodes_cmm
      Description : Get the CMM of nodelist 
      Arguments   : $nodelist - the ref of node list array
@@ -1282,270 +1139,3 @@ sub check_nicips{
    return (0, \%nics_hash, "");
 }

-#-------------------------------------------------------------------------------
-=head3 gen_chain_for_profiles
-    Description: Generate a chain string based on Network/Hardware/Image profiles.
-    Arguments: $profiles_hash: The reference for profiles hash.
-             For example: 
-             $profiles_hash = { 'HardwareProfile' => 'IBM_NeXtScale_M4',
-                                'ImageProfile' => 'rhels6.5-x86_64-stateful-compute',
-                                'NetworkProfile' => 'default_network_profile',
-                              }
-             $hw_reconfig: the flag shows whether we need re-configure all hardware
-                           relative settings or not: like runcmds, runimg...etc
-    Returns: ($retcode, $chain)
-              $retcode = 1. Generate chain failed, $chain stands for error message.
-              $retcode = 0. Generate chain OK. $chain stands for the chain string.
-
-=cut
-#-------------------------------------------------------------------------------
-sub gen_chain_for_profiles{
-    my $class = shift;
-    my $profiles_hashref = shift;
-    my $hw_reconfig = shift;
-    my $final_chain = "";
-    if (! $profiles_hashref){
-        return (1, "Missing parameter for gen_chain_for_profiles.");
-    }
-    # A node must have at least imageprofile and network profile.
-    unless (defined $profiles_hashref->{'ImageProfile'}){
-        return (1, "No imageprofile specified in profiles hash.");
-    }
-    unless (defined $profiles_hashref->{'NetworkProfile'}){
-        return (1, "No networkprofile specified in profiles hash.");
-    }
-    my $hwprofile = $profiles_hashref->{'HardwareProfile'};
-    my $imgprofile = $profiles_hashref->{'ImageProfile'};
-    my $netprofile = $profiles_hashref->{'NetworkProfile'};
-
-    # Get node's provisioning method
-    my $provmethod = xCAT::ProfiledNodeUtils->get_imageprofile_prov_method($imgprofile);
-    unless ($provmethod ){
-        return (1, "Can not get provisioning method for image profile $imgprofile");
-    }
-    my $netprofileattr = xCAT::ProfiledNodeUtils->get_nodes_nic_attrs([$netprofile])->{$netprofile};
-    unless ($netprofileattr){
-        return (1, "Can not get attributes for network profile $netprofile");
-    }
-    
-    # Get node's netboot attribute
-    my ($retcode, $retval) = xCAT::ProfiledNodeUtils->get_netboot_attr($imgprofile, $hwprofile);
-    if (not $retcode) {
-        return (1, $retval);
-    }
-    my $netboot = $retval;
-
-    $final_chain = 'osimage='.$provmethod.":--noupdateinitrd";
-    # get the chain attribute from hardwareprofile and insert it to node.
-    if (defined $hwprofile and $hwprofile and $hw_reconfig){
-        my $chaintab = xCAT::Table->new('chain');
-        my $chain = $chaintab->getNodeAttribs($hwprofile, ['chain']);
-        if (exists $chain->{'chain'}) {
-               my $hw_chain = $chain->{'chain'};
-               $final_chain = $hw_chain.',osimage='.$provmethod.":--noupdateinitrd";
-        }
-    }
-    #run bmcsetups.
-    #PowerNV nodes can't use 'runcmd=bmcsetup' to set BMC.
-    if ((exists $netprofileattr->{"bmc"}) and $hw_reconfig and $netboot ne 'petitboot'){ 
-        if (index($final_chain, "runcmd=bmcsetup") == -1){
-            $final_chain = 'runcmd=bmcsetup,'.$final_chain.':reboot4deploy';
-        }
-        else{
-            $final_chain = $final_chain.':reboot4deploy';
-        }
-    }
-    return (0, $final_chain);
-}
-
-#-------------------------------------------------------------------------------
-
-=head3 get_all_vmhosts
-      Description : Get all vm hosts/hypervisor from DB. 
-      Arguments   : N/A
-      Returns     : ref for vm hosts/hypervisor hash.
-      Example     : 
-                    my $hashref = xCAT::ProfiledNodeUtils->get_all_vmhosts();
-=cut
-
-#-------------------------------------------------------------------------------
-sub get_all_vmhosts
-{
-    my %vmhostshash;
-
-    my $nodelisttab = xCAT::Table->new('nodelist');
-    # groups like '__Hypervisor_pkvm' means this node is Power KVM hypervisor
-    my @vmhosts = $nodelisttab->getAllAttribsWhere("groups like '%__Hypervisor_kvm%'", 'node');
-    foreach (@vmhosts) {
-        if($_->{'node'}) {
-            $vmhostshash{$_->{'node'}} = 1;
-        }
-    }
-    $nodelisttab->close();
-
-    # Return the ref accordingly 
-    return \%vmhostshash;
-}
-
-#-------------------------------------------------------------------------------
-
-=head3 get_netboot_attr
-      Description : Get netboot attribute for node
-      Arguments   : $imageprofile - image profile name, mandatory. e.g. "__ImageProfile_rhels7.0-x86_64-stateful-mgmtnode"
-                    $hardwareprofile - harware profile name, optional. e.g. "__HardwareProfile_IBM_System_x_M4"
-      Returns     : (returncode, netboot)
-                    returncode=0 - can not get netboot value,netboot is the error message
-                    returncode=1 - can get netboot value,netboot is the right value
-=cut
-
-#-------------------------------------------------------------------------------
-sub get_netboot_attr{
-    my $class = shift;
-    my $imageprofile = shift;
-    my $hardwareprofile = shift;
-    my $netboot;
-
-    my @nodegrps = xCAT::TableUtils->list_all_node_groups();
-    unless(grep{ $_ eq $imageprofile} @nodegrps)
-    {
-        return 0, "Image profile not defined in DB."
-    }
-    $imageprofile =~ s/^__ImageProfile_//;
-
-    if ($hardwareprofile){
-        unless(grep{ $_ eq $hardwareprofile} @nodegrps)
-        {
-            return 0, "Hardware profile not defined in DB."
-        }
-    }
-    else
-    {
-        $hardwareprofile = '*';
-    }
-
-    # Get os name, os major version, osarch
-    my $osimage_tab = xCAT::Table->new('osimage');
-    my $osimage_tab_entry = $osimage_tab->getAttribs({'imagename'=> $imageprofile},('osdistroname'));
-    my $osdistroname = $osimage_tab_entry->{'osdistroname'};
-    $osimage_tab->close();
-
-    my $osdistro_tab = xCAT::Table->new('osdistro');
-    my $osdistro_tab_entry = $osdistro_tab->getAttribs({'osdistroname'=> $osdistroname},('basename', 'majorversion', 'arch'));
-    my $os_name = $osdistro_tab_entry->{'basename'};
-    my $os_major_version = $osdistro_tab_entry->{'majorversion'};
-    my $os_arch = $osdistro_tab_entry->{'arch'};
-    $osdistro_tab->close;
-
-    # Treate os name rhel,centos,rhelhpc same as rhels
-    if ($os_name eq 'centos' || $os_name eq 'rhelhpc' || $os_name eq 'rhel')
-    {
-        $os_name = 'rhels';
-    }
-    # Treate arch ppc64el same as ppc64le,x86 same as x86_64
-    if ($os_arch eq 'ppc64el')
-    {
-        $os_arch = 'ppc64le';
-    }elsif ($os_arch eq 'x86')
-    {
-        $os_arch = 'x86_64';
-    }
-    
-    # Identify whether this node is PowerKVM or PowerNV if os arch is ppc64le
-    # If hardware profile is defined 
-    my $mgt = '*';
-    if ($os_arch eq 'ppc64le' and $hardwareprofile ne '*') {
-        my $nodehmtab = xCAT::Table->new('nodehm');
-        my $nodehmtab_entry = $nodehmtab->getNodeAttribs($hardwareprofile, ['mgt']);
-        if (defined $nodehmtab_entry->{'mgt'}) {
-            $mgt = $nodehmtab_entry->{'mgt'};
-        }
-    }
-    
-
-# Rule for netboot attribute.If update the rule,just update %netboot_dict and @condition_array
-# It's sequence sensitive: os arch -> os name -> os major version -> hardware profile
-# Priority |  Arch       | OS Name | OS Major Version | Management method | Noderes.netboot  |
-# 1        |  x86_64/x86 | *       | *                | *                 | xnba             |
-# 2        |  ppc64      | rhels   | 7                | *                 | grub2            |
-# 2        |  ppc64      | pkvm    | *                | *                 | petitboot        |
-# 3        |             | *       | *                | *                 | yaboot           |
-# 4        |  ppc64le/el | *       | *                | *                 | grub2
-# 4        |  ppc64le/el | *       | *                | ipmi              | petitboot
-#          arch          osname       version  hardware           netboot
-    my %netboot_dict = ( 'x86_64'                                             => 'xnba', 
-                         'ppc64'   => { 
-                                        'rhels' => { 
-                                                     '7'                      => 'grub2', 
-                                                     '*'                      => 'yaboot',
-                                                   }, 
-                                        'pkvm'                                => 'petitboot',
-                                        '*'                                   => 'yaboot', 
-                                      },                                  
-                         'ppc64le' => {
-                                        '*'    =>  { 
-                                                     '*' => { 
-                                                              '*'    => 'grub2',
-                                                              'ipmi' => 'petitboot',
-                                                            },
-                                                   },
-                                      },
-                       );
-    my $condition_array_ref = [$os_arch, $os_name, $os_major_version, $mgt];
-    $netboot = cal_netboot(\%netboot_dict, $condition_array_ref);
-    if($netboot eq '0')
-    {
-        return 0, "Can not get the netboot attribute";
-    }
-    else
-    {    
-        return 1, $netboot;
-    }
-}
-#-------------------------------------------------------------------------------
-
-=head3 cal_netboot
-      Description : Calculate netboot attribute by conditions recursively, internal use.
-      Arguments   : $netboot_dict_ref
-                    $condition_array_ref
-      Returns     : netboot
-                    returncode=0 - can not get netboot value
-=cut
-
-#-------------------------------------------------------------------------------
-sub cal_netboot{
-    my $netboot_dict_ref = shift;
-    my $condition_array_ref = shift;
-    my $condition_array_len = scalar @$condition_array_ref;
-    
-    if( $condition_array_len == 0 ){
-        return 0;
-    }
-
-    my $condition = shift @$condition_array_ref;
-    if( (exists($netboot_dict_ref->{$condition})) || (exists($netboot_dict_ref->{'*'})) )
-    {
-        if(!exists($netboot_dict_ref->{$condition}))
-        {
-            $condition = '*';
-        }
-        if(ref($netboot_dict_ref->{$condition}) eq 'HASH')
-        {
-            if($condition_array_len > 1)
-            {
-                return cal_netboot($netboot_dict_ref->{$condition}, $condition_array_ref);
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        else
-        {
-            return $netboot_dict_ref->{$condition};
-        }
-    }
-    else
-    {
-        return 0;
-    }
-}
@@ -35,7 +35,7 @@ package xCAT::RemoteShellExp;
                  node.
   DSH_TO_USERID - The userid on the node where the ssh keys will be updated.
   DSH_ENABLE_SSH - Node to node root passwordless ssh will be setup.
-   DSH_ZONE_SSHKEYS  - directory containing the zones root .ssh keys 
+ 

 Usage: remoteshellexp
   [-t node list]  test ssh connection to the node 
@@ -144,7 +144,7 @@ sub remoteshellexp
  } else {
     $from_userid="root";
  }
-  # set User  on the node where we will send the keys 
+  # set User on the node where we will send the keys 
  # this id can be a local id as well as root 
  if ($ENV{'DSH_TO_USERID'}) {
     $to_userid=$ENV{'DSH_TO_USERID'};
@@ -154,19 +154,18 @@ sub remoteshellexp
  # set User home directory to find the ssh public key to send 
  # For non-root ids information may not be in /etc/passwd
  #  but elsewhere like LDAP 
-   
  if ($ENV{'DSH_FROM_USERID_HOME'}) {
-       $home=$ENV{'DSH_FROM_USERID_HOME'};
+     $home=$ENV{'DSH_FROM_USERID_HOME'};
  } else {
-      $home=xCAT::Utils->getHomeDir($from_userid);
+     $home=xCAT::Utils->getHomeDir($from_userid);
  }
+  
  # This indicates we will generate new ssh keys for the user,
  # if they are not already there
-  # unless using zones
-   my $key="$home/.ssh/id_rsa";
-   my $key2="$home/.ssh/id_rsa.pub";
-   # Check to see if empty
-   if (-z $key) {
+  my $key="$home/.ssh/id_rsa";
+  my $key2="$home/.ssh/id_rsa.pub";
+  # Check to see if empty
+  if (-z $key) {
         my $rsp = {};
         $rsp->{error}->[0] = 
         "The $key file is empty. Remove it and rerun the command.";
@@ -184,7 +183,8 @@ sub remoteshellexp
  } 
  if (($flag eq "k") && (!(-e $key))) 
  {
-     # updating keys and the key file does not exist 
+     # if the file size of the id_rsa key is 0, tell them to remove it
+     # and run the command again
     $rc=xCAT::RemoteShellExp->gensshkeys($expecttimeout);
  }
  # send ssh keys to the nodes/devices, to setup passwordless ssh 
@@ -200,9 +200,6 @@ sub remoteshellexp
    if ($ssh_setup_cmd) { # setup ssh on devices
     $rc=xCAT::RemoteShellExp->senddeviceskeys($remoteshell,$remotecopy,$to_userid,$to_user_password,$home,$ssh_setup_cmd,$nodes, $expecttimeout);
    } else {  #setup ssh on nodes
-     if ($ENV{'DSH_ZONE_SSHKEYS'}) {   # if using zones the override the location of the keys
-        $home= $ENV{'DSH_ZONE_SSHKEYS'};
-     }  
     $rc=xCAT::RemoteShellExp->sendnodeskeys($remoteshell,$remotecopy,$to_userid,$to_user_password,$home,$nodes, $expecttimeout);
    } 
  }
@@ -498,15 +495,11 @@ sub sendnodeskeys
    #  in $HOME/.ssh/tmp/authorized_keys 
    #  copy to the node to the temp directory 
    #  scp $HOME/.ssh/tmp/authorized_keys to_userid@<node>:/tmp/$to_userid/.ssh
-    #  scp $HOME/.ssh/id_rsa.pub to_userid@<node>:/tmp/$to_userid/.ssh
-    #  Note if using zones,  the keys do not come from ~/.ssh but from the
-    #  zone table, sshkeydir attribute.  For zones the userid is always root
    #  If you are going to enable ssh to ssh between nodes, then
    #  scp $HOME/.ssh/id_rsa to that temp directory on the node
    #  copy the script $HOME/.ssh/copy.sh to the node, it will do the 
    #  the work of setting up the user's ssh keys  and clean up
    #  ssh (run)  copy.sh on the node
-    
    my @nodelist=split(/,/,$nodes);
    foreach my $node (@nodelist) {
      $sendkeys = new Expect;
@@ -614,11 +607,11 @@ sub sendnodeskeys
      my $spawncopyfiles;
      if ($ENV{'DSH_ENABLE_SSH'}) { # we will enable node to node ssh 
         $spawncopyfiles=
-        "$remotecopy $home/.ssh/id_rsa $home/.ssh/id_rsa.pub $home/.ssh/copy.sh $home/.ssh/tmp/authorized_keys $to_userid\@$node:/tmp/$to_userid/.ssh "; 
+        "$remotecopy $home/.ssh/id_rsa $home/.ssh/copy.sh $home/.ssh/tmp/authorized_keys $to_userid\@$node:/tmp/$to_userid/.ssh "; 
          
      } else {    # no node to node ssh ( don't send private key)
         $spawncopyfiles=
-        "$remotecopy $home/.ssh/id_rsa.pub $home/.ssh/copy.sh $home/.ssh/tmp/authorized_keys $to_userid\@$node:/tmp/$to_userid/.ssh "; 
+        "$remotecopy $home/.ssh/copy.sh $home/.ssh/tmp/authorized_keys $to_userid\@$node:/tmp/$to_userid/.ssh "; 
      }
      # send copy command 
      unless ($sendkeys->spawn($spawncopyfiles))
@@ -810,10 +803,6 @@ sub senddeviceskeys
    # add to the command
    $setupcmd .=$key; 
    $setupcmd .="\"";
-    # Special case for vios
-    if ($ENV{DEVICETYPE} eq 'vios') {
-        $setupcmd = "\"echo $key | tee -a ~/.ssh/authorized_keys2\"";
-    }
    # For each input device
    my @nodelist=split(/,/,$nodes);
    foreach my $node (@nodelist) {
@@ -116,9 +116,6 @@ sub dodiscover {
                   send_message($args{reqcallback}, 0, "The rarge is too large and may be time consuming. Broadcast is recommended.");
               }
            }
-
-            #no need to check site.nmapoptions because it specifilly 
-			# uses T5 for certain performance requirement.
            `/usr/bin/nmap $range -sn -PE -n --send-ip -T5 `;
            my $nmapres = `/usr/bin/nmap $range -PE -p 427 -n --send-ip -T5 `;
            foreach my $line (split(/\n\n/,$nmapres)) {
@@ -290,7 +287,7 @@ sub dodiscover {
                    if ($rethash{$peername}) {
                            next; #got a dupe, discard
                    }
-                    my $result = process_slp_packet(packet=>$slpkg,sockaddr=>$pkg,'socket'=>$args{'socket'}, peername=>$peername, callback=>$args{reqcallback});
+                    my $result = process_slp_packet(packet=>$slpkg,sockaddr=>$pkg,'socket'=>$args{'socket'});
                    if ($result) {
                        if ($peername =~ /\./) { #ipv4
                            $peername =~ s/::ffff://;
@@ -374,10 +371,9 @@ sub process_slp_packet {
        if ($parsedpacket->{FunctionId} == 2) {#Service Reply
            parse_service_reply($parsedpacket->{payload},$parsedpacket);
            unless (ref $parsedpacket->{service_urls} and scalar @{$parsedpacket->{service_urls}}) { return undef; }
-            if ($parsedpacket->{attributes} && get_mac_for_addr($args{peername})) {
-                #service reply had ext. Stop here if has gotten attributes and got mac. 
-                #continue the unicast request for service attributes if cannot find mac for peernode
-                return $parsedpacket; #don't bother sending attrrequest, already got it in first packet
+            if ($parsedpacket->{attributes}) { #service reply had ext
+
+                    return $parsedpacket; #don't bother sending attrrequest, already got it in first packet
            }
            my $srvtype = $xid_to_srvtype_map{$parsedpacket->{Xid}};
            my $packet = generate_attribute_request(%args,SrvType=>$srvtype);
@@ -650,8 +650,7 @@ sub decode_spd {
        8 => "DDR2 SDRAM",
        9 => "DDR2 SDRAM FB-DIMM",
        10 => "DDR2 SDRAM FB-DIMM PROBE",
-        11 => "DDR3 SDRAM",
-        12 => "DDR4 SDRAM",
+        11 => "DDR3 SDRAM"
    );
    
    my %modtypes = (
@@ -669,35 +668,33 @@ sub decode_spd {
        1333 => 10600,
        1600 => 12800,
        1867 => 14900,
-        2132 => 17000,
        2133 => 17000,
        2134 => 17000,
    );

-    my %ddrmodcap = (
+    my %ddr3modcap = (
        0 => 256,
        1 => 512,
        2 => 1024,
        3 => 2048,
        4 => 4096,
        5 => 8192,
-        6 => 16384,
-        7 => 32768,
+        6 => 16384
    );

-    my %ddrdevwidth = (
+    my %ddr3devwidth = (
        0 => 4,
        1 => 8,
        2 => 16,
        3 => 32
    );
-    my %ddrranks = (
+    my %ddr3ranks = (
        0 => 1,
        1 => 2,
        2 => 3,
        3 => 4
    );
-    my %ddrbuswidth = (
+    my %ddr3buswidth = (
        0 => 8,
        1 => 16,
        2 => 32,
@@ -731,10 +728,10 @@ sub decode_spd {
            $rethash->{product}->{name} .= " ECC";
        }
        $rethash->{product}->{name}.=" ".$modtypes{$spd[3]&0x0f};
-        my $sdramcap=$ddrmodcap{$spd[4]&0xf};
-        my $buswidth=$ddrbuswidth{$spd[8]&0b111};
-        my $sdramwidth=$ddrdevwidth{$spd[7]&0b111};
-        my $ranks = $ddrranks{($spd[7]&0b111000)>>3};
+        my $sdramcap=$ddr3modcap{$spd[4]&0xf};
+        my $buswidth=$ddr3buswidth{$spd[8]&0b111};
+        my $sdramwidth=$ddr3devwidth{$spd[7]&0b111};
+        my $ranks = $ddr3ranks{($spd[7]&0b111000)>>3};


        my $capacity = $sdramcap/8*$buswidth/$sdramwidth*$ranks;
@@ -772,61 +769,6 @@ sub decode_spd {
 	#	$rawspd .= sprintf("%02X ",$_);
 	#}
 	#push @{$rethash->{product}->{extra}},$rawspd;
-    } elsif  ($spd[2] == 12) { #DDR4 spec applies
-        # spd[125] spd[18] spd[18is sdram min cycle time .. spd125 is fine offset for min time
-        # mtb and ftb are fixed in ddr4 spd spec.. mtb is always 0.125 ns and ftb is always 0.001 ns
-        my $speed;
-        my $clock;
-        if ($spd[17] == 0) {
-            my $fineoffset = $spd[125];
-            if ($fineoffset & 0b10000000) {
-                #negative value, twos complement
-                $fineoffset = 0-(($fineoffset ^ 0xff) + 1);
-            }
-            $clock = int(2/((0.125*$spd[18] + $fineoffset*0.001)*0.001));
-            $speed = $speedfromclock{$clock};
-            unless ($speed) { $speed = "UNKNOWN"; }
-        } else { # this would mean a different MTB and FTB than spec indicated..
-            $clock = "UNKNOWN";
-            $speed = "UNKNOWN";
-        }
-        $rethash->{product}->{name}="PC4-".$speed." ($clock MT/s)";
-        if ($spd[13]&0b11000 == 0b1000) {
-            $rethash->{product}->{name} .= " ECC";
-        }
-        $rethash->{product}->{name}.=" ".$modtypes{$spd[3]&0x0f};
-        my $sdramcap=$ddrmodcap{$spd[4]&0xf};
-        my $buswidth=$ddrbuswidth{$spd[13]&0b111};
-        my $sdramwidth=$ddrdevwidth{$spd[12]&0b111};
-        my $ranks = $ddrranks{($spd[12]&0b111000)>>3};
-
-
-        my $capacity = $sdramcap/8*$buswidth/$sdramwidth*$ranks;
-        if ($capacity < 1024) {
-            $capacity = $capacity."MB";
-        } else {
-            $capacity = ($capacity/1024)."GB";
-        }
-        $rethash->{product}->{name} = $capacity." ".$rethash->{product}->{name};
-
-        $rethash->{product}->{manufacturer} = decode_manufacturer($spd[320],$spd[321]);
-        $rethash->{product}->{buildlocation} = sprintf("%02x",$spd[322]);
-        if ($spd[120] != 0 or $spd[121] != 0) {
-            $rethash->{product}->{builddate} = sprintf("Week %x of 20%02x",$spd[323],$spd[324]);
-        }
-        foreach (@spd[329..348]) {
-            if ($_ > 126 or $_ < 32) {
-                $rethash->{product}->{model}="Malformed SPD";
-            }
-        }
-        unless ($rethash->{product}->{model}) {
-            $rethash->{product}->{model}=pack("C*",@spd[329..348]);
-        }
-	#my $rawspd="SPD Dump: ";
-	#foreach (@spd) {
-	#	$rawspd .= sprintf("%02X ",$_);
-	#}
-	#push @{$rethash->{product}->{extra}},$rawspd;
    } else {
        $rethash->{product}->{model}="Unrecognized SPD";
    } 
@@ -267,14 +267,11 @@ virtsd => {
 },

 storage => {
-    cols => [qw(node osvolume size state storagepool hypervisor fcprange volumetag type controller comments disable)],
+    cols => [qw(node osvolume size state storagepool hypervisor fcprange volumetag comments disable)],
    keys => [qw(node)],
    table_descr => 'Node storage resources',
    descriptions => {
        node => 'The node name',
-        controller => 'The management address to attach/detach new volumes.
-                       In the scenario involving multiple controllers, this data must be
-                       passed as argument rather than by table value',
        osvolume => "Specification of what storage to place the node OS image onto.  Examples include:
                localdisk (Install to first non-FC attached disk)
                usbdisk (Install to first USB mass storage device seen)
@@ -284,7 +281,6 @@ storage => {
        storagepool => 'Name of storage pool where the volume is assigned.',
        hypervisor => 'Name of the hypervisor where the volume is configured.',
        fcprange => 'A range of acceptable fibre channels that the volume can use. Examples include: 3B00-3C00;4B00-4C00.',
-        type => 'The plugin used to drive storage configuration (e.g. svc)',
        volumetag => 'A specific tag used to identify the volume in the autoyast or kickstart template.',
        comments => 'Any user-written notes.',
        disable => "Set to 'yes' or '1' to comment out this row.",
@@ -326,7 +322,7 @@ bootparams => {
      '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::"',
+      'addkcmdline' => 'User specified one or more parameters to be passed to the kernel',
      '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.',
@@ -393,46 +389,7 @@ ipmi => {
 descriptions => {
  node => 'The node name or group name.',
  bmc => 'The hostname of the BMC adapater.',
-  bmcport => ' In systems with selectable shared/dedicated ethernet ports,
-           this parameter can be used to specify the preferred port.  0
-           means use the shared port, 1 means dedicated, blank is to not
-           assign.
-
-           The following special cases exist for IBM System x servers:
-
-           For x3755 M3 systems, 0 means use the dedicated port, 1 means
-           shared, blank is to not assign.
-
-       For certain systems which have a mezzaine or ML2 adapter, there is a second
-       value to include:
-
-
-           For x3750 M4 (Model 8722):
-
-
-           0 2   1st 1Gbps interface for LOM
-
-           0 0   1st 10Gbps interface for LOM
-
-           0 3   2nd 1Gbps interface for LOM
-
-           0 1   2nd 10Gbps interface for LOM
-
-
-           For  x3750 M4 (Model 8752), x3850/3950 X6, dx360 M4, x3550 M4, and x3650 M4:
-
-
-           0     Shared (1st onboard interface)
-
-           1     Dedicated
-
-           2 0   First interface on ML2 or mezzanine adapter
-
-           2 1   Second interface on ML2 or mezzanine adapter
-
-           2 2   Third interface on ML2 or mezzanine adapter
-
-           2 3   Fourth interface on ML2 or mezzanine adapter',
+  bmcport => 'In systems with selectable shared/dedicated ethernet ports, this parameter can be used to specify the preferred port.  0 means use the shared port, 1 means dedicated, blank is to not assign',
  taggedvlan => 'Have bmcsetup place the BMC on the specified vlan tag on a shared netwirk interface.  Some network devices may be incompatible with this option',
  bmcid => 'Unique identified data used by discovery processes to distinguish known BMCs from unrecognized BMCs',
  username => 'The BMC userid.  If not specified, the key=ipmi row in the passwd table is used as the default.',
@@ -542,7 +499,7 @@ networks => {
  netname => 'Name used to identify this network definition.',
  net => 'The network address.',
  mask => 'The network mask.',
-  mgtifname => 'The interface name of the management/service node facing this network.  !remote!<nicname> indicates a non-local network on a specific nic for relay DHCP.',
+  mgtifname => 'The interface name of the management/service node facing this network.  !remote! indicates a non-local network for relay DHCP.',
  gateway => 'The network gateway. It can be set to an ip address or the keyword <xcatmaster>, the keyword <xcatmaster> indicates the cluster-facing ip address configured on this management node or service node. Leaving this field blank means that there is no gateway for this network.',
  dhcpserver => 'The DHCP server that is servicing this network.  Required to be explicitly set for pooled service node operation.',
  tftpserver => 'The TFTP server that is servicing this network.  If not set, the DHCP server is assumed.',
@@ -575,7 +532,7 @@ nodegroup => {
 },
  },
 nodehm => {
-    cols => [qw(node power mgt cons termserver termport conserver serialport serialspeed serialflow getmac cmdmapping consoleondemand comments disable)],
+    cols => [qw(node power mgt cons termserver termport conserver serialport serialspeed serialflow getmac cmdmapping comments disable)],
    keys => [qw(node)],
    tablespace =>'XCATTBS16K',
    table_desc => "Settings that control how each node's hardware is managed.  Typically, an additional table that is specific to the hardware type of the node contains additional info.  E.g. the ipmi, mp, and ppc tables.",
@@ -592,7 +549,6 @@ nodehm => {
  serialflow => "The flow control value of the serial port for this node.  For SOL this is typically 'hard'.",
  getmac => 'The method to use to get MAC address of the node with the getmac command. If not set, the mgt attribute will be used.  Valid values: same as values for mgmt attribute.',
  cmdmapping => 'The fully qualified name of the file that stores the mapping between PCM hardware management commands and xCAT/third-party hardware management commands for a particular type of hardware device.  Only used by PCM.',
-  consoleondemand => 'This overrides the value from site.consoleondemand; (0=no, 1=yes). Default is the result from site.consoleondemand.',
     comments => 'Any user-written notes.',
     disable => "Set to 'yes' or '1' to comment out this row.",
 },
@@ -611,7 +567,7 @@ nodelist => {
     appstatustime =>'The date and time when appstatus was updated.',
     primarysn => 'Not used currently. The primary servicenode, used by this node.',
     hidden => "Used to hide fsp and bpa definitions, 1 means not show them when running lsdef and nodels",
-     updatestatus => "The current node update status. Valid states are synced, out-of-sync,syncing,failed.",
+     updatestatus => "The current node update status. Valid states are synced out-of-sync,syncing,failed.",
     updatestatustime => "The date and time when the updatestatus was updated.",
     zonename => "The name of the zone to which the node is currently assigned. If undefined, then it is not assigned to any zone. ",
     comments => 'Any user-written notes.',
@@ -643,14 +599,14 @@ noderes => {
 descriptions => {
  node => 'The node name or group name.',
  servicenode => 'A comma separated list of node names (as known by the management node) that provides most services for this node. The first service node on the list that is accessible will be used.  The 2nd node on the list is generally considered to be the backup service node for this node when running commands like snmove.',
-  netboot => 'The type of network booting to use for this node.  Valid values:  pxe or xnba for x86* architecture, yaboot for POWER architecture, grub2-tftp and grub2-http for RHEL7 on Power and all the os deployment on Power LE. Notice: yaboot is not supported from rhels7 on Power,use grub2-tftp or grub2-http instead, the difference between the 2 is the file transfer protocol(i.e, http or tftp)',
+  netboot => 'The type of network booting to use for this node.  Valid values:  pxe or xnba for x86* architecture, yaboot for POWER architecture.',
  tftpserver => 'The TFTP server for this node (as known by this node). If not set, it defaults to networks.tftpserver.',
  tftpdir => 'The directory that roots this nodes contents from a tftp and related perspective.  Used for NAS offload by using different mountpoints.',
  nfsserver => 'The NFS or HTTP server for this node (as known by this node).',
  monserver => 'The monitoring aggregation point for this node. The format is "x,y" where x is the ip address as known by the management node and y is the ip address as known by the node.',
  nfsdir => 'The path that should be mounted from the NFS server.',
-  installnic => 'The network adapter on the node that will be used for OS deployment, the installnic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table will be used.  If not set, primarynic will be used. If primarynic is not set too, the keyword "mac" will be used as default.',
-  primarynic => 'This attribute will be deprecated. All the used network interface will be determined by installnic. The network adapter on the node that will be used for xCAT management, the primarynic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table  will be used.  Default is eth0.',
+  installnic => 'The network adapter on the node that will be used for OS deployment, the installnic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table will be used.  If not set, primarynic will be used.',
+  primarynic => 'The network adapter on the node that will be used for xCAT management, the primarynic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table  will be used.  Default is eth0.',
  discoverynics => 'If specified, force discovery to occur on specific network adapters only, regardless of detected connectivity.  Syntax can be simply "eth2,eth3" to restrict discovery to whatever happens to come up as eth2 and eth3, or by driver name such as "bnx2:0,bnx2:1" to specify the first two adapters managed by the bnx2 driver',
  cmdinterface => 'Not currently used.',
  xcatmaster => 'The hostname of the xCAT service node (as known by this node).  This acts as the default value for nfsserver and tftpserver, if they are not set.  If xcatmaster is not set, the node will use whoever responds to its boot request as its master.  For the directed bootp case for POWER, it will use the management node if xcatmaster is not set.',
@@ -728,7 +684,7 @@ osimage => {
  description => 'OS Image Description',
  provmethod => 'The provisioning method for node deployment. The valid values are install, netboot,statelite,boottarget,dualboot,sysclone. If boottarget is set, you must set linuximage.boottarget to the name of the boottarget definition. It is not used by AIX.',
  rootfstype => 'The filesystem type for the rootfs is used when the provmethod is statelite. The valid values are nfs or ramdisk. The default value is nfs',
-  osdistroname => 'The name of the OS distro definition.  This attribute can be used to specify which OS distro to use, instead of using the osname,osvers,and osarch attributes. For *kit commands,  the attribute will be used to read the osdistro table for the osname, osvers, and osarch attributes. If defined, the osname, osvers, and osarch attributes defined in the osimage table will be ignored.',
+  osdistroname => 'The name of the OS distro definition.  This attribute can be used to specify which OS distro to use, instead of using the osname,osvers,and osarch attributes.',
  osupdatename => 'A comma-separated list of OS distro updates to apply to this osimage.',
  cfmdir => 'CFM directory name for PCM. Set to /install/osimages/<osimage name>/cfmdir by PCM. ',
  profile => 'The node usage category. For example compute, service.',
@@ -752,16 +708,16 @@ linuximage  => {
 table_desc => 'Information about a Linux operating system image that can be used to deploy cluster nodes.',
 descriptions => {
  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).',
+  template => 'The fully qualified name of the template file that is used to create the kick start file for diskful installation.',
  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 arguments to be passed to the kernel.  The user arguments are appended to xCAT.s default kernel arguments.   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 multiple paths.The multiple paths must be seperated 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 multiple paths.The multiple paths must be seperated by ",".',
-  otherpkgdir => 'The base directory where the non-distro packages are stored. Only 1 local directory supported at present.', 
+  pkgdir => 'The name of the directory where the distro packages are stored. It could be set multiple paths.The multiple paths must be seperated 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. ',
+  otherpkglist => 'The fully qualified name of the file that stores non-distro package lists that will be included in the image.',
+  otherpkgdir => 'The base directory where the non-distro packages are stored.', 
  exlist => 'The fully qualified name of the file that stores the file names and directory names that will be excluded from the image during packimage command.  It is used for diskless image only.',
-  postinstall => 'The fully qualified name of the script file that will be run at the end of the genimage command. It could be set multiple paths.The multiple paths must be seperated by ",". It is used for diskless image only.',
-  rootimgdir => 'The directory name where the image is stored.  It is generally used for diskless image. it also can be used in sysclone environment to specify where the image captured from golden client is stored. in sysclone environment, rootimgdir is generally assigned to some default value by xcat, but you can specify your own store directory. just one thing need to be noticed, wherever you save the image, the name of last level directory must be the name of image. for example, if your image name is testimage and you want to save this image under home directoy, rootimgdir should be assigned to value /home/testimage/',
+  postinstall => 'The fully qualified name of the script file that will be run at the end of the genimage command. It is used for diskless image only.',
+  rootimgdir => 'The directory name where the image is stored.  It is used for diskless image only.',
  kerneldir => 'The directory name where the 3rd-party kernel is stored. It is used for diskless image only.',
  nodebootif => 'The network interface the stateless/statelite node will boot over (e.g. eth0)',
  otherifce => 'Other network interfaces (e.g. eth1) in the image that should be configured via DHCP',
@@ -771,7 +727,7 @@ linuximage  => {
  permission => 'The mount permission of /.statelite directory is used, its default value is 755',
  dump => qq{The NFS directory to hold the Linux kernel dump file (vmcore) when the node with this image crashes, its format is "nfs://<nfs_server_ip>/<kdump_path>". If you want to use the node's "xcatmaster" (its SN or MN), <nfs_server_ip> can be left blank. For example, "nfs:///<kdump_path>" means the NFS directory to hold the kernel dump file is on the node's SN, or MN if there's no SN.},
  crashkernelsize => 'the size that assigned to the kdump kernel. If the kernel size is not set, 256M will be the default value.',
-  partitionfile => 'The path of the configuration file which will be used to partition the disk for the node. For stateful osimages,two types of files are supported: "<partition file absolute path>" which contains a partitioning definition that will be inserted directly into the generated autoinst configuration file and must be formatted for the corresponding OS installer (e.g. kickstart for RedHat, autoyast for SLES).  "s:<partitioning script absolute path>" which specifies a shell script that will be run from the OS installer configuration file %pre section;  the script must write the correct partitioning definition into the file /tmp/partitionfile on the node which will be included into the configuration file during the install process. For statelite osimages, partitionfile should specify "<partition file absolute path>";  see the xCAT Statelite documentation for the xCAT defined format of this configuration file.',
+  partitionfile => 'The path of the configuration file which is used to part the disk for the node. For stateful: two types of value can be set for this attribute. One is "<partition file absolute path>", the content of the partition file must use the corresponding format with the OS type. The other one is "s:<partition file absolute path>", the content of the partition file should be a shell script which must write the partition definition into /tmp/partitionfile on the node. For statelite: the valid value is <partition file absolute path>, refer to the statelite doc for the xCAT defined format of the configuration file.',
  driverupdatesrc => 'The source of the drivers which need to be loaded during the boot. Two types of driver update source are supported: Driver update disk and Driver rpm package. The value for this attribute should be comma separated sources. Each source should be the format tab:full_path_of_srouce_file. The tab keyword can be: dud (for Driver update disk) and rpm (for driver rpm). If missing the tab, the rpm format is the default. e.g. dud:/install/dud/dd.img,rpm:/install/rpm/d.rpm',
  comments => 'Any user-written notes.',
  disable => "Set to 'yes' or '1' to comment out this row.",
@@ -786,7 +742,7 @@ winimage => {
  imagename => 'The name of this xCAT OS image definition.',
  template => 'The fully qualified name of the template file that is used to create the windows unattend.xml file for diskful installation.',
  installto => 'The disk and partition that the Windows will be deployed to. The valid format is <disk>:<partition>. If not set, default value is 0:1 for bios boot mode(legacy) and 0:3 for uefi boot mode; If setting to 1, it means 1:1 for bios boot and 1:3 for uefi boot',
-  partitionfile => 'The path of partition configuration file. Since the partition configuration for bios boot mode and uefi boot mode are different, this configuration file can include both configurations if you need to support both bios and uefi mode. Either way, you must specify the boot mode in the configuration. Example of partition configuration file: [BIOS]xxxxxxx[UEFI]yyyyyyy. To simplify the setting, you also can set installto in partitionfile with section like [INSTALLTO]0:1',
+  partitionfile => 'The path of partition configuration file. Since the partition configuration for bios boot mode and uefi boot mode are different, this configuration file should include two parts if customer wants to support both bios and uefi mode. If customer just wants to support one of the modes, specify one of them anyway. Example of partition configuration file: [BIOS]xxxxxxx[UEFI]yyyyyyy. To simplify the setting, you also can set installto in partitionfile with section likes [INSTALLTO]0:1',
  winpepath => 'The path of winpe which will be used to boot this image. If the real path is /tftpboot/winboot/winpe1/, the value for winpepath should be set to winboot/winpe1',
  comments => 'Any user-written notes.',
  disable => "Set to 'yes' or '1' to comment out this row.",
@@ -809,11 +765,11 @@ passwd => {
 policy => {
    cols => [qw(priority name host commands noderange parameters time rule comments disable)],
    keys => [qw(priority)],
-    table_desc => 'The policy table in the xCAT database controls who has authority to run specific xCAT operations. It is basically the Access Control List (ACL) for xCAT. It is sorted on the priority field before evaluating.',
+    table_desc => 'The policy table in the xCAT database controls who has authority to run specific xCAT operations. It is basically the Access Control List (ACL) for xCAT.',
 descriptions => {
-  priority => 'The priority value for this rule.  This value is used to identify this policy data object (i.e. this rule) The table is sorted on this field with the lower the number the higher the priority. For example 1.0 is higher priority than 4.1 is higher than 4.9.',
+  priority => 'The priority value for this rule.  This value is used to identify this policy data object (i.e. this rule).',
  name => 'The username that is allowed to perform the commands specified by this rule.  Default is "*" (all users).',
-  host => 'The host from which users may issue the commands specified by this rule.  Default is "*" (all hosts). Only all or one host is supported',
+  host => 'The host from which users may issue the commands specified by this rule.  Default is "*" (all hosts). Only all or one host supported. ',
  commands => 'The list of commands that this rule applies to.  Default is "*" (all commands).',
  noderange => 'The Noderange that this rule applies to.  Default is "*" (all nodes). Not supported with the *def commands.',
  parameters => 'A regular expression that matches the command parameters (everything except the noderange) that this rule applies to.  Default is "*" (all parameters). Not supported with the *def commands.',
@@ -827,11 +783,11 @@ postscripts => {
    cols => [qw(node postscripts postbootscripts comments disable)],
    keys => [qw(node)],
    tablespace =>'XCATTBS16K',
-    table_desc => 'The scripts that should be run on each node after installation or diskless boot.',
+    table_desc => ' The scripts that should be run on each node after installation or diskless boot.',
 descriptions => {
  node => 'The node name or group name.',
  postscripts => 'Comma separated list of scripts that should be run on this node after diskfull installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". xCAT automatically adds the postscripts from  the xcatdefaults.postscripts attribute of the table to run first on the nodes after install or diskless boot. For installation of RedHat, CentOS, Fedora, the scripts will be run before the reboot. For installation of SLES, the scripts will be run after the reboot but before the init.d process. For diskless deployment, the scripts will be run at the init.d time, and xCAT will automatically add the list of scripts from the postbootscripts attribute to run after postscripts list. For installation of AIX, the scripts will run after the reboot and acts the same as the postbootscripts attribute.  For AIX, use the postbootscripts attribute. Support will be added in the future for  the postscripts attribute to run the scripts before the reboot in AIX. ',
-  postbootscripts => 'Comma separated list of scripts that should be run on this node after diskfull installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". On AIX these scripts are run during the processing of /etc/inittab.  On Linux they are run at the init.d time. xCAT automatically adds the scripts in the xcatdefaults.postbootscripts attribute to run first in the list.',
+  postbootscripts => 'Comma separated list of scripts that should be run on thisnode after diskfull installation or diskless boot. Each script can take zero or more parameters. For example: "script1 p1 p2,script2,...". On AIX these scripts are run during the processing of /etc/inittab.  On Linux they are run at the init.d time. xCAT automatically adds the scripts in the xcatdefaults.postbootscripts attri bute to run first in the list.',
    comments => 'Any user-written notes.',
     disable => "Set to 'yes' or '1' to comment out this row.",
 },
@@ -924,11 +880,8 @@ site => {
   " -----------------\n".
   "DATABASE ATTRIBUTES\n".
   " -----------------\n".
-   " auditnosyslog: If set to 1, then commands will only be written to the auditlog table.\n".
-   "                This attribute set to 1 and auditskipcmds=ALL means no logging of commands.\n".
-   "                Default is to write to both the auditlog table and syslog.\n".
   " auditskipcmds: List of commands and/or client types that will not be\n".
-   "                written to the auditlog table and syslog. See auditnosyslog.\n".
+   "                written to the auditlog table.\n".
   "                'ALL' means all cmds will be skipped. If attribute is null, all\n".
   "                commands will be written.\n". 
   "                clienttype:web would skip all commands from the web client\n". 
@@ -946,7 +899,6 @@ site => {
   " nodestatus:  If set to 'n', the nodelist.status column will not be updated during\n".
   "              the node deployment, node discovery and power operations. The default is to update.\n\n".
   " skiptables:  Comma separated list of tables to be skipped by dumpxCATdb\n\n".
-   " skipvalidatelog:  If set to 1, then getcredentials and getpostscripts calls will not be logged in syslog.\n\n".
   " -------------\n".
   "DHCP ATTRIBUTES\n".
   " -------------\n".
@@ -964,11 +916,6 @@ site => {
   "                 '0' value 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".
-   "                     If set to 'static', the network configuration will be configured \n".
-   "                     in static mode based on the node and network definition on MN.\n".
-   "                     If set to 'dhcp', the network will be configured with dhcp protocol.\n".
-   "                     The default is 'dhcp'.\n\n".
   " ------------\n".
   "DNS ATTRIBUTES\n".
   " ------------\n".
@@ -989,22 +936,6 @@ site => {
   "               \"<xcatmaster>\" to mean the DNS server for each node should be the\n".
   "               node that is managing it (either its service node or the management\n".
   "               node).\n\n".
-   " externaldns:  To specify that external dns is used. If externaldns is set to any value\n".
-   "               then, makedns command will not start the local nameserver on xCAT MN. \n".
-   "               Default is to start the local nameserver.\n\n".
-   " dnsupdaters:  The value are \',\' separated string which will be added to the zone config\n".
-   "               section. This is an interface for user to add configuration entries to\n". 
-   "               the zone sections in named.conf.\n\n".
-   " dnsinterfaces:  The network interfaces DNS server should listen on.  If it is the same\n".
-   "                  for all nodes, use a simple comma-separated list of NICs.  To\n".
-   "                  specify different NICs for different nodes:\n".
-   "                       xcatmn|eth1,eth2;service|bond0.\n".
-   "                  In this example xcatmn is the name of the xCAT MN, and DNS there\n".
-   "                  should listen on eth1 and eth2.  On all of the nodes in group\n".
-   "                  'service' DNS should listen on the bond0 nic.\n".
-   "                  NOTE: if using this attribute to block certain interfaces, make sure\n".
-   "                  the ip maps to your hostname of xCAT MN is not blocked since xCAT needs to\n".
-   "                  use this ip to communicate with the local NDS server on MN.\n\n".
   " -------------------------\n".
   "HARDWARE CONTROL ATTRIBUTES\n".
   " -------------------------\n".
@@ -1121,8 +1052,7 @@ site => {
   "                   Set to NOGROUPS,if you do not wish to enabled any group of compute nodes.\n".
   "                   Service Nodes are not affected by this attribute\n".
   "                   they are always setup with\n".
-   "                   passwordless root access to nodes and other SN.\n".
-   "                   If using the zone table, this attribute in not used.\n\n".
+   "                   passwordless root access to nodes and other SN.\n\n".
   " -----------------\n".
   "SERVICES ATTRIBUTES\n".
   " -----------------\n".
@@ -1132,13 +1062,6 @@ site => {
   " httpport:    The port number that the booting/installing nodes should contact the\n".
   "              http server on the MN/SN on. It is your responsibility to configure\n".
   "              the http server to listen on that port - xCAT will not do that.\n\n".
-   " nmapoptions: Additional options for the nmap command. nmap is used in pping, \n".
-   "              nodestat, xdsh -v and updatenode commands. Sometimes additional \n".
-   "              performance tuning may be needed for nmap due to network traffic.\n".
-   "              For example, if the network response time is too slow, nmap may not\n".
-   "              give stable output. You can increase the timeout value by specifying \n".
-   "              '--min-rtt-timeout 1s'. xCAT will append the options defined here to \n".
-   "              the nmap command.\n\n".
   " ntpservers:  A comma delimited list of NTP servers for the cluster - often the\n".
   "              xCAT management node.\n\n".
   " svloglocal:  if set to 1, syslog on the service node will not get forwarded to the\n".
@@ -1167,10 +1090,6 @@ site => {
   "                   will not interfere.\n\n".
   " vmwarereconfigonpower:  When set to no, the VMWare plugin will make no effort to\n".
   "                         push vm.cpus/vm.memory updates from xCAT to VMWare.\n\n".
-   " persistkvmguests:  Keep the kvm definition on the kvm hypervisor when you power off\n".
-   "                    the kvm guest node. This is useful for you to manually change the \n".
-   "                    kvm xml definition file in virsh for debugging. Set anything means\n".
-   "                    enable.\n\n".
   " --------------------\n".
   "XCAT DAEMON ATTRIBUTES\n".
   " --------------------\n".
@@ -1181,9 +1100,9 @@ site => {
   "               locking out admin interactive use. This value works with the\n".
   "               xcatmaxconnections and xcatmaxbatch attributes. Is not supported on AIX.\n".
   "               If the value is no, nodes sleep for a random time before contacting\n".
-   "               xcatd, and retry. The default is no.\n".
+   "               xcatd, and retry. On a new install of xcat, this value will be set to yes.\n".
   "               See the following document for details:\n".
-   "               Hints_and_Tips_for_Large_Scale_Clusters\n\n".
+   "               https://sourceforge.net/apps/mediawiki/xcat/index.php?title=Hints_and_Tips_for_Large_Scale_Clusters\n\n".
   " xcatmaxconnections:  Number of concurrent xCAT protocol requests before requests\n".
   "                      begin queueing. This applies to both client command requests\n".
   "                      and node requests, e.g. to get postscripts. Default is 64.\n\n".
@@ -1272,13 +1191,12 @@ performance => {
 },
  },
 zone => {
-    cols => [qw(zonename sshkeydir sshbetweennodes defaultzone comments disable)],
+    cols => [qw(zonename sshkeydir defaultzone comments disable)],
    keys => [qw(zonename)],
    table_desc => 'Defines a cluster zone for nodes that share root ssh key access to each other.',
 descriptions => {
   zonename => 'The name of the zone.',
   sshkeydir => 'Directory containing the shared root ssh RSA keys.',
-   sshbetweennodes => 'Indicates whether passwordless ssh will be setup between the nodes of this zone. Values are yes/1 or no/0. Default is yes. ',
   defaultzone => 'If nodes are not assigned to any other zone, they will default to this zone. If value is set to yes or 1.',
   comments => 'Any user-provided notes.',
   disable => "Set to 'yes' or '1' to comment out this row.",
@@ -1420,7 +1338,7 @@ firmware => {
 },

 nics => {
-        cols => [qw(node nicips  nichostnamesuffixes nichostnameprefixes nictypes niccustomscripts nicnetworks nicaliases nicextraparams comments disable)], 
+        cols => [qw(node nicips  nichostnamesuffixes nichostnameprefixes nictypes niccustomscripts nicnetworks nicaliases comments disable)], 
        keys => [qw(node)],
        tablespace =>'XCATTBS16K',
        table_desc => 'Stores NIC details.',
@@ -1457,12 +1375,6 @@ nics => {
            Format: eth0!<alias list>,eth1!<alias1 list>|<alias2 list>
 			For multiple aliases per nic use a space-separated list.
            For example: eth0!moe larry curly,eth1!tom|jerry',
-            nicextraparams => 'Comma-separated list of extra parameters that will be used for each NIC configuration.
-                If only one ip address is associated with each NIC:
-                    <nic1>!<param1=value1 param2=value2>,<nic2>!<param3=value3>, for example, eth0!MTU=1500,ib0!MTU=65520 CONNECTED_MODE=yes.
-                If multiple ip addresses are associated with each NIC:
-                    <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.
-            The xCAT object definition commands support to use nicextraparams.<nicname> as the sub attributes.',
            comments => 'Any user-written notes.',
            disable => "Set to 'yes' or '1' to comment out this row.",
        },
@@ -1584,7 +1496,7 @@ discoverydata => {
       method => 'The method which handled the discovery request. The method could be one of: switch, blade, profile, sequential.',
       discoverytime => 'The last time that xCAT received the discovery message.',
       arch => 'The architecture of the discovered node. e.g. x86_64.',
-       cpucount => 'The number of cores multiply by threads core supported for the discovered node. e.g. 192.',
+       cpucount => 'The cpu number of the discovered node. e.g. 32.', 
       cputype => 'The cpu type of the discovered node. e.g. Intel(R) Xeon(R) CPU E5-2690 0 @ 2.90GHz',
       memory => 'The memory size of the discovered node. e.g. 198460852',
       mtm => 'The machine type model of the discovered node. e.g. 786310X',
@@ -1638,25 +1550,13 @@ mic => {
 hwinv => {
    cols => [qw(node cputype cpucount memory disksize comments disable)],
    keys => [qw(node)],
-    table_desc => 'The hareware inventory for the node.',
+    table_desc => 'The hardware inventory for the node.',
    descriptions => {
        node => 'The node name or group name.',
        cputype => 'The cpu model name for the node.',
        cpucount => 'The number of cpus for the node.',
-        memory => 'The size of the memory for the node in MB.',
-        disksize => 'The size of the disks for the node in GB.',
-        comments => 'Any user-provided notes.',
-        disable =>  "Set to 'yes' or '1' to comment out this row.",
-    },
-},
-token => {
-    cols => [qw(tokenid username expire comments disable)],
-    keys => [qw(tokenid)],
-    table_desc => 'The token of users for authentication.',
-    descriptions => {
-        tokenid => 'It is a UUID as an unified identify for the user.',
-        username => 'The user name.',
-        expire => 'The expire time for this token.',
+        memory => 'The size of the memory for the node.',
+        disksize => 'The size of the disks for the node.',
        comments => 'Any user-provided notes.',
        disable =>  "Set to 'yes' or '1' to comment out this row.",
    },
@@ -2004,10 +1904,6 @@ my @nodeattrs = (
        {attr_name => 'serialflow',
                 tabentry => 'nodehm.serialflow',
                 access_tabentry => 'nodehm.node=attr:node',
-  },
-        {attr_name => 'consoleondemand',
-                 tabentry => 'nodehm.consoleondemand',
-                 access_tabentry => 'nodehm.node=attr:node',
  },
 ##################
 #  vpd table     #
@@ -2389,11 +2285,7 @@ my @nodeattrs = (
 				tabentry => 'nics.nicaliases',
 				access_tabentry => 'nics.node=attr:node',
 		},
-		{attr_name => 'nicextraparams',
-				tabentry => 'nics.nicextraparams',
-				access_tabentry => 'nics.node=attr:node',
-		},
-#######################
+######################
 #  prodkey table     #
 ######################
                {attr_name => 'productkey',
@@ -2430,14 +2322,6 @@ my @nodeattrs = (
                 tabentry => 'storage.osvolume',
                 access_tabentry => 'storage.node=attr:node',
                },
-                {attr_name => 'storagcontroller',
-                 tabentry => 'storage.controller',
-                 access_tabentry => 'storage.node=attr:node',
-                },
-                {attr_name => 'storagetype',
-                 tabentry => 'storage.type',
-                 access_tabentry => 'storage.node=attr:node',
-                },
 ######################
 #  vm table          #
 ######################
@@ -2679,7 +2563,7 @@ my @nodeattrs = (
 		tabentry => 'hwinv.disksize',
 		access_tabentry => 'hwinv.node=attr:node',
 	},
-		
+	
  );	# end of @nodeattrs that applies to both nodes and groups


@@ -2729,11 +2613,11 @@ my @nodeattrs = (
 		{attr_name => 'updatestatustime',
                 tabentry => 'nodelist.updatestatustime',
                 access_tabentry => 'nodelist.node=attr:node',
-             },       
-                {attr_name => 'zonename',
+             },             
+		{attr_name => 'zonename',
                 tabentry => 'nodelist.zonename',
                 access_tabentry => 'nodelist.node=attr:node',
-             },
+             },             
 		{attr_name => 'usercomment',
                 tabentry => 'nodelist.comments',
                 access_tabentry => 'nodelist.node=attr:node',
@@ -3199,10 +3083,6 @@ push(@{$defspec{node}->{'attrs'}}, @nodeattrs);
                tabentry => 'zone.sshkeydir',
                access_tabentry => 'zone.zonename=attr:zonename',
        },
-        {attr_name => 'sshbetweennodes',
-                tabentry => 'zone.sshbetweennodes',
-                access_tabentry => 'zone.zonename=attr:zonename',
-        },
        {attr_name => 'defaultzone',
                tabentry => 'zone.defaultzone',
                access_tabentry => 'zone.zonename=attr:zonename',
@@ -3217,6 +3097,11 @@ push(@{$defspec{node}->{'attrs'}}, @nodeattrs);
 #########################
 #     routes table    #
 #########################
+#########################
+#  route data object  #
+#########################
+#     routes table    #
+#########################
@{$defspec{route}->{'attrs'}} = (
        {attr_name => 'routename',
                 tabentry => 'routes.routename',
@@ -3644,10 +3529,6 @@ push(@{$defspec{group}->{'attrs'}}, @nodeattrs);
                 tabentry => 'kit.kitdeployparams',
                 access_tabentry => 'kit.kitname=attr:kitname',
        },
-        {attr_name => 'kitdir',
-                 tabentry => 'kit.kitdir',
-                 access_tabentry => 'kit.kitname=attr:kitname',
-        },

 );
 #############################
@@ -3664,8 +3545,8 @@ push(@{$defspec{group}->{'attrs'}}, @nodeattrs);
                 tabentry => 'kitrepo.kitname',
                 access_tabentry => 'kitrepo.kitreponame=attr:kitreponame',
        },
-        {attr_name => 'osbasename',
-                 tabentry => 'kitrepo.osbasename',
+        {attr_name => 'osname',
+                 tabentry => 'kitrepo.osname',
                 access_tabentry => 'kitrepo.kitreponame=attr:kitreponame',
        },
        {attr_name => 'osmajorversion',
@@ -3710,7 +3591,7 @@ push(@{$defspec{group}->{'attrs'}}, @nodeattrs);
                 access_tabentry => 'kitcomponent.kitcompname=attr:kitcompname',
        },
        {attr_name => 'kitreponame',
-                 tabentry => 'kitcomponent.kitreponame',
+                 tabentry => 'kitcomponent.kitrepoid',
                 access_tabentry => 'kitcomponent.kitcompname=attr:kitcompname',
        },
        {attr_name => 'basename',
@@ -3733,10 +3614,6 @@ push(@{$defspec{group}->{'attrs'}}, @nodeattrs);
                 tabentry => 'kitcomponent.kitpkgdeps',
                 access_tabentry => 'kitcomponent.kitcompname=attr:kitcompname',
        },
-        {attr_name => 'prerequisite',
-                 tabentry => 'kitcomponent.prerequisite',
-                 access_tabentry => 'kitcomponent.kitcompname=attr:kitcompname',
-        },
        {attr_name => 'driverpacks',
                 tabentry => 'kitcomponent.driverpacks',
                 access_tabentry => 'kitcomponent.kitcompname=attr:kitcompname',
@@ -3749,10 +3626,6 @@ push(@{$defspec{group}->{'attrs'}}, @nodeattrs);
                 tabentry => 'kitcomponent.postbootscripts',
                 access_tabentry => 'kitcomponent.kitcompname=attr:kitcompname',
        },
-        {attr_name => 'genimage_postinstall',
-                 tabentry => 'kitcomponent.genimage_postinstall',
-                 access_tabentry => 'kitcomponent.kitcompname=attr:kitcompname',
-        },
        {attr_name => 'exlist',
                 tabentry => 'kitcomponent.exlist',
                 access_tabentry => 'kitcomponent.kitcompname=attr:kitcompname',
@@ -10,8 +10,12 @@ BEGIN
 # if AIX - make sure we include perl 5.8.2 in INC path.
 #       Needed to find perl dependencies shipped in deps tarball.
 if ($^O =~ /^aix/i) {
-    unshift(@INC, qw(/usr/opt/perl5/lib/5.8.2/aix-thread-multi /usr/opt/perl5/lib/5.8.2 /usr/opt/perl5/lib/site_perl/5.8.2/aix-thread-multi /usr/opt/perl5/lib/site_perl/5.8.2));
-    }
+        use lib "/usr/opt/perl5/lib/5.8.2/aix-thread-multi";
+        use lib "/usr/opt/perl5/lib/5.8.2";
+        use lib "/usr/opt/perl5/lib/site_perl/5.8.2/aix-thread-multi";
+        use lib "/usr/opt/perl5/lib/site_perl/5.8.2";
+}
+
 use lib "$::XCATROOT/lib/perl";
 use strict;
 #-----------------------------------------------------------------------------
@@ -185,13 +189,6 @@ sub isServiceReq
      if (!exists($servicehash->{'tftpserver'})) { 
           $servicehash->{'tftpserver'} = 1;
      }
-      # On Ubuntu management node, we disabled the isc-dhcp-server in upstart,
-      # through file /etc/init/isc-dhcp-server.override, see bug 4399
-      # however, this causes a new problem, bug 4515
-      # the fix is to start dhcp server when starting xcatd
-      if (!exists($servicehash->{'dhcpserver'}) && xCAT::Utils->osver() =~ /ubuntu.*/i) {
-          $servicehash->{'dhcpserver'} = 1;
-      }
    }
    $servicenodetab->close;

@@ -179,10 +179,6 @@ sub init_dbworker {
        #setup signal in NotifHandler so that the cache can be updated
        xCAT::NotifHandler::setup($$, 0);

-        # NOTE: There's a bug that sometimes the %SIG is cleaned up by accident, but we cannot figure out when and why
-        # this happens. The temporary fix is to backup the %SIG and recover it when necessary.
-        my %SIGbakup = %SIG;
-
        while (not $exitdbthread) {
            eval {
                my @ready_socks = $clientset->can_read;
@@ -195,7 +191,6 @@ sub init_dbworker {
                    } else {
                        eval {
                            handle_dbc_conn($currcon,$clientset);
-                            unless (%SIG && defined ($SIG{USR1})) { %SIG = %SIGbakup; }
                        };
                        if ($@) { 
                            my $err=$@;
@@ -220,9 +215,6 @@ sub init_dbworker {
                exit(0);
            }
        }
-
-        # sleep a while to make sure the client process has done
-        sleep 1.5;
        close($dbworkersocket);
        unlink($dbsockpath);
        exit 0;
@@ -3842,7 +3834,7 @@ sub writeAllEntries
    }
    my $filename = shift;
    my $fh;
-    my $rc = 0;
+    my $rc;
    # open the file for write
    unless (open($fh," > $filename")) {
     my $msg="Unable to open $filename for write \n.";
@@ -4021,8 +4013,7 @@ sub output_table {
    Example:

 	 my $tabh = xCAT::Table->new($table);
-         my $recs=$tabh->getEntries("recid"); # returns row with recid max value in database 
-                                              # and the row with the min value.
+         my $recs=$tabh->getMAXMINEntries("recid"); 

    Comments:
        none
@@ -4040,14 +4031,13 @@ sub getMAXMINEntries
    my $rets;
    my $query;
    my $xcatcfg=get_xcatcfg();
-
    # delimit the disable column based on the DB 
    my $disable= &delimitcol("disable");	
    my $qstring;
-    if ($xcatcfg =~ /^DB2:/) {  # for DB2
+    if ($xcatcfg =~ /^DB2:/) {  # for DB2 
       $qstring = "SELECT MAX (\"$attr\") FROM " . $self->{tabname} . " WHERE " . $disable . " is NULL or " .  $disable . " in ('0','no','NO','No','nO')";
    } else {
-     $qstring = "SELECT MAX($attr) FROM " . $self->{tabname} . " WHERE " . $disable . " is NULL or " .  $disable . " in ('0','no','NO','No','nO')";
+       $qstring = "SELECT MAX($attr) FROM " . $self->{tabname} . " WHERE " . $disable . " is NULL or " .  $disable . " in ('0','no','NO','No','nO')";
    }
    $query = $self->{dbh}->prepare($qstring);

@@ -4068,10 +4058,10 @@ sub getMAXMINEntries
        }
    }
    $query->finish();
-    if ($xcatcfg =~ /^DB2:/) {  # for DB2
+    if ($xcatcfg =~ /^DB2:/) {  # for DB2 
       $qstring = "SELECT MIN (\"$attr\") FROM " . $self->{tabname} . " WHERE " . $disable . " is NULL or " .  $disable . " in ('0','no','NO','No','nO')";
    } else {
-      $qstring = "SELECT MIN($attr) FROM " . $self->{tabname} . " WHERE " . $disable . " is NULL or " .  $disable . " in ('0','no','NO','No','nO')";
+    $qstring = "SELECT MIN($attr) FROM " . $self->{tabname} . " WHERE " . $disable . " is NULL or " .  $disable . " in ('0','no','NO','No','nO')";
    }
    $query = $self->{dbh}->prepare($qstring);

@@ -4086,10 +4076,11 @@ sub getMAXMINEntries
            } else {
                $rets->{"min"} = $data->{$_};
            }
-            last;    # better be only one value for min
+            last;   # better be only one value  for min
        }
    }
    return $rets;
 }
+
 1;

@@ -10,13 +10,15 @@ BEGIN
 # if AIX - make sure we include perl 5.8.2 in INC path.
 #       Needed to find perl dependencies shipped in deps tarball.
 if ($^O =~ /^aix/i) {
-    unshift(@INC, qw(/usr/opt/perl5/lib/5.8.2/aix-thread-multi /usr/opt/perl5/lib/5.8.2 /usr/opt/perl5/lib/site_perl/5.8.2/aix-thread-multi /usr/opt/perl5/lib/site_perl/5.8.2));
-    }
+        use lib "/usr/opt/perl5/lib/5.8.2/aix-thread-multi";
+        use lib "/usr/opt/perl5/lib/5.8.2";
+        use lib "/usr/opt/perl5/lib/site_perl/5.8.2/aix-thread-multi";
+        use lib "/usr/opt/perl5/lib/site_perl/5.8.2";
+}

 use lib "$::XCATROOT/lib/perl";
 use strict;
 require xCAT::Table;
-require xCAT::Zone;
 use File::Path;
 #-----------------------------------------------------------------------

@@ -269,7 +271,7 @@ sub bldnonrootSSHFiles
        Error:
             0=good,  1=error
        Example:
-                xCAT::TableUtils->setupSSH(@target_nodes,$expecttimeout);
+                xCAT::TableUtils->setupSSH(@target_nodes);
        Comments:
 			Does not setup known_hosts.  Assumes automatically
 			setup by SSH  ( ssh config option StrictHostKeyChecking no should
@@ -333,21 +335,21 @@ sub setupSSH

    $::REMOTE_SHELL = "/usr/bin/ssh";
    my $rsp = {};
-    

    # Get the home directory
    my $home = xCAT::Utils->getHomeDir($from_userid);
    $ENV{'DSH_FROM_USERID_HOME'} = $home;
+
    if ($from_userid eq "root")
    {
+
        # make the directory to hold keys to transfer to the nodes
        if (!-d $SSHdir)
        {
            mkpath("$SSHdir", { mode => 0755 });
        }

-        # generates new keys for root, if they do not already exist ~/.ssh
-
+        # generates new keys for root, if they do not already exist
        # nodes not used on this option but in there to preserve the interface
        my $rc=
          xCAT::RemoteShellExp->remoteshellexp("k",$::CALLBACK,$::REMOTE_SHELL,$n_str,$expecttimeout);
@@ -372,10 +374,7 @@ else
 fi
 mkdir -p \$dest_dir
 cat /tmp/$to_userid/.ssh/authorized_keys >> \$home/.ssh/authorized_keys 2>&1
-cat /tmp/$to_userid/.ssh/id_rsa.pub >> \$home/.ssh/authorized_keys 2>&1
-rm -f \$home/.ssh/id_rsa 2>&1
 cp /tmp/$to_userid/.ssh/id_rsa  \$home/.ssh/id_rsa 2>&1
-cp /tmp/$to_userid/.ssh/id_rsa.pub  \$home/.ssh/id_rsa.pub 2>&1
 chmod 0600 \$home/.ssh/id_* 2>&1
 rm -f /tmp/$to_userid/.ssh/* 2>&1
 rmdir \"/tmp/$to_userid/.ssh\"
@@ -387,7 +386,6 @@ rmdir \"/tmp/$to_userid\" \n";
    my $auth_key2=0;
    if ($from_userid eq "root")
    {
-       # this will put the root/.ssh/id_rsa.pub key in the authorized keys file to put on the node
       my $rc = xCAT::TableUtils->cpSSHFiles($SSHdir);
       if ($rc != 0)
       {    # error
@@ -420,46 +418,50 @@ rmdir \"/tmp/$to_userid\" \n";
            xCAT::TableUtils->bldnonrootSSHFiles($from_userid);
    }

-    # send the keys 
+    # send the keys to the nodes   for root or some other id
+    #
+    # This environment variable determines whether to setup 
+    # node to node ssh
+    # The nodes must be checked against the site.sshbetweennodes attribute
    # For root user and not to devices only to nodes 
    if (($from_userid eq "root") && (!($ENV{'DEVICETYPE'}))) {
-      # Need to check if nodes are in a zone.  
-      my @zones;
-      my $tab = xCAT::Table->new("zone"); 
-      if ($tab) 
+      my $enablenodes;
+      my $disablenodes;
+      my @nodelist=  split(",", $n_str);
+      foreach my $n (@nodelist)
      {
-          # if we have zones, need to send the zone keys to each node in the zone
-          my @attribs = ("zonename");
-          @zones = $tab->getAllAttribs(@attribs);
-          $tab->close();
-      } else {
-         $rsp->{data}->[0] = "Could not open zone table.\n";
-         xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
-         return 1;
-      }
-      # check for zones,  key send is different if zones defined or not
-      
-      if (@zones) {  # we have zones defined
-         my $rc = xCAT::TableUtils->sendkeysTOzones($ref_nodes,$expecttimeout);
-         if ($rc != 0)
-         {   
-                $rsp->{data}->[0] = "Error sending ssh keys to the zones.\n";
-                xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
-                exit 1;
-
+         my $enablessh=xCAT::TableUtils->enablessh($n);
+         if ($enablessh == 1) {
+           $enablenodes .= $n;
+           $enablenodes .= ","; 
+         } else {
+           $disablenodes .= $n;
+           $disablenodes .= ","; 
         }
-      } else { # no zones
-      
-         #  if no zone table  defined, do it the old way , keys are in  ~/.ssh 
-         my $rc = xCAT::TableUtils->sendkeysNOzones($ref_nodes,$expecttimeout);
+
+      }
+      my $cmd;
+      if ($enablenodes) {  # node on list to setup nodetonodessh
+         chop $enablenodes;  # remove last comma
+         $ENV{'DSH_ENABLE_SSH'} = "YES";
+         my $rc=xCAT::RemoteShellExp->remoteshellexp("s",$::CALLBACK,"/usr/bin/ssh",$enablenodes,$expecttimeout);
         if ($rc != 0)
-         {   
-            $rsp->{data}->[0] = "Error sending ssh keys to the nodes.\n";
-            xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
+         {
+          $rsp->{data}->[0] = "remoteshellexp failed sending keys to enablenodes.";
+          xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
+
+          }
+      }
+      if ($disablenodes) {  # node on list to setup nodetonodessh
+         chop $disablenodes;  # remove last comma
+         my $rc=xCAT::RemoteShellExp->remoteshellexp("s",$::CALLBACK,"/usr/bin/ssh",$disablenodes,$expecttimeout);
+         if ($rc != 0)
+         {
+          $rsp->{data}->[0] = "remoteshellexp failed sending keys to disablenodes.";
+          xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);

         }
      }
-
    } else { # from user is not root or it is a device , always send private key
       $ENV{'DSH_ENABLE_SSH'} = "YES";
       my $rc=xCAT::RemoteShellExp->remoteshellexp("s",$::CALLBACK,"/usr/bin/ssh",$n_str,$expecttimeout);
@@ -501,235 +503,6 @@ rmdir \"/tmp/$to_userid\" \n";

 #--------------------------------------------------------------------------------

-=head3  sendkeysNOzones 
-
-        Transfers the ssh keys 
-		for the root id on the nodes no zones 
-          key from ~/.ssh   site.sshbetweennodes honored
-
-
-        Arguments:
-               Array of nodes
-               Timeout for expect call (optional)
-        Returns:
-
-        Env Variables: $DSH_FROM_USERID,  $DSH_TO_USERID, $DSH_REMOTE_PASSWORD
-          the ssh keys are transferred from the $DSH_FROM_USERID to the $DSH_TO_USERID
-          on the node(s).  The DSH_REMOTE_PASSWORD and the DSH_FROM_USERID 
-               must be obtained by
-		         the calling script or from the xdsh client
-
-        Globals:
-              $::XCATROOT  ,  $::CALLBACK
-        Error:
-             0=good,  1=error
-        Example:
-                xCAT::TableUtils->sendkeysNOzones($ref_nodes,$expecttimeout);
-        Comments:
-			Does not setup known_hosts.  Assumes automatically
-			setup by SSH  ( ssh config option StrictHostKeyChecking no should
-			   be set in the ssh config file).
-
-=cut
-
-#--------------------------------------------------------------------------------
-sub sendkeysNOzones 
-{
-      my ($class, $ref_nodes,$expecttimeout) = @_;
-      my @nodes=$ref_nodes;
-      my $enablenodes;
-      my $disablenodes;
-      my $n_str    = $nodes[0];
-      my @nodelist=  split(",", $n_str);
-      my $rsp = ();
-      foreach my $n (@nodelist)
-      {
-         my $enablessh=xCAT::TableUtils->enablessh($n);
-         if ($enablessh == 1) {
-           $enablenodes .= $n;
-           $enablenodes .= ","; 
-         } else {
-           $disablenodes .= $n;
-           $disablenodes .= ","; 
-         }
-
-      }
-      if ($enablenodes) {  # node on list to setup nodetonodessh
-         chop $enablenodes;  # remove last comma
-         $ENV{'DSH_ENABLE_SSH'} = "YES";
-         # send the keys to the nodes
-         my $rc=xCAT::RemoteShellExp->remoteshellexp("s",$::CALLBACK,"/usr/bin/ssh",$enablenodes,$expecttimeout);
-         if ($rc != 0)
-         {
-          $rsp->{data}->[0] = "remoteshellexp failed sending keys to enablenodes.";
-          xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
-
-          }
-      }
-      if ($disablenodes) {  # node on list to disable nodetonodessh
-         chop $disablenodes;  # remove last comma
-         # send the keys to the nodes
-         my $rc=xCAT::RemoteShellExp->remoteshellexp("s",$::CALLBACK,"/usr/bin/ssh",$disablenodes,$expecttimeout);
-         if ($rc != 0)
-         {
-          $rsp->{data}->[0] = "remoteshellexp failed sending keys to disablenodes.";
-          xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
-
-         }
-      }
-}
-#--------------------------------------------------------------------------------
-
-=head3  sendkeysTOzones 
-
-        Transfers the ssh keys 
-		for the root id on the nodes using the zone table.
-       If in a zone, then root ssh keys for the node will be taken from the zones ssh keys not ~/.ssh
-       zones are only supported on nodes that are not a service node.
-       Also for the call to  RemoteShellExp,  we must group the nodes that are in the same zone 
-
-
-        Arguments:
-               Array of nodes
-               Timeout for expect call (optional)
-        Returns:
-
-        Env Variables: $DSH_FROM_USERID,  $DSH_TO_USERID, $DSH_REMOTE_PASSWORD
-          the ssh keys are transferred from the $DSH_FROM_USERID to the $DSH_TO_USERID
-          on the node(s).  The DSH_REMOTE_PASSWORD and the DSH_FROM_USERID 
-               must be obtained by
-		         the calling script or from the xdsh client
-
-        Globals:
-              $::XCATROOT  ,  $::CALLBACK
-        Error:
-             0=good,  1=error
-        Example:
-                xCAT::TableUtils->sendkeysTOzones($ref_nodes,$expecttimeout);
-        Comments:
-			Does not setup known_hosts.  Assumes automatically
-			setup by SSH  ( ssh config option StrictHostKeyChecking no should
-			   be set in the ssh config file).
-
-=cut
-
-#--------------------------------------------------------------------------------
-sub sendkeysTOzones 
-{
-      my ($class, $ref_nodes,$expecttimeout) = @_;
-      my @nodes=$ref_nodes;
-      my $n_str    = $nodes[0];
-      @nodes=  split(",", $n_str);
-      my $rsp = ();
-      my $cmd;
-      my $roothome = xCAT::Utils->getHomeDir("root");
-      my $zonehash =xCAT::Zone->getzoneinfo($::CALLBACK,\@nodes);
-      foreach my $zonename (keys %$zonehash) {
-        # build list of nodes
-        my $zonenodelist="";
-        foreach my $node (@{$zonehash->{$zonename}->{nodes}}) {
-          $zonenodelist .= $node;
-          $zonenodelist .= ",";
-               
-        }
-        $zonenodelist =~ s/,$//;   # remove last comma
-        # if any nodes defined for the zone
-        if ($zonenodelist) {
-          # check to see if we enable passwordless ssh between the nodes
-          if (!(defined($zonehash->{$zonename}->{sshbetweennodes}))|| 
-            (($zonehash->{$zonename}->{sshbetweennodes} =~ /^yes$/i )
-             || ($zonehash->{$zonename}->{sshbetweennodes} eq "1"))) {
- 
-             $ENV{'DSH_ENABLE_SSH'} = "YES";
-          } else { 
-             delete $ENV{'DSH_ENABLE_SSH'};  # do not enable passwordless ssh
-          }
-          # point to the ssh keys to send for this zone
-          my $keydir = $zonehash->{$zonename}->{sshkeydir} ;
-
-          # check to see if the id_rsa and id_rsa.pub key is in the directory
-          my $key="$keydir/id_rsa";
-          my $key2="$keydir/id_rsa.pub";
-          # Check to see if empty
-          if (!(-e $key)) {
-            my $rsp = {};
-             $rsp->{error}->[0] =
-            "The $key file does not exist for $zonename. Need to use chzone to regenerate the keys.";
-            xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
-            return 1;
-          }
-          if (!(-e $key2)) {
-             my $rsp = {};
-             $rsp->{error}->[0] =
-             "The $key2 file does not exist for $zonename. Need to use chzone to regenerate the keys.";
-             xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
-             return 1;
-
-          }
-          
-          # now put copy.sh in the zone directory from ~/.ssh
-          my $rootkeydir="$roothome/.ssh";
-          if ($rootkeydir ne $keydir) {  # the zone keydir is not the same as ~/.ssh.  
-            $cmd="cp $rootkeydir/copy.sh $keydir";
-            xCAT::Utils->runcmd($cmd, 0);
-            if ($::RUNCMD_RC != 0)
-            {
-               my $rsp = {};
-               $rsp->{error}->[0] =
-               "Could not copy copy.sh to the zone key dir";
-               xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
-               return 1;
-            }
-          }
-          # Also create  $keydir/tmp and put root's id_rsa.pub (in authorized_keys) for the transfer
-          $cmd="mkdir -p $keydir/tmp";
-          xCAT::Utils->runcmd($cmd, 0);
-          if ($::RUNCMD_RC != 0)
-          {
-             my $rsp = {};
-             $rsp->{error}->[0] =
-             "Could not mkdir the zone $keydir/tmp";
-             xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
-             return 1;
-          }
-          # create authorized_keys file 
-          if (xCAT::Utils->isMN()) {    # if on Management Node
-             $cmd = " cp $roothome/.ssh/id_rsa.pub $keydir/tmp/authorized_keys";
-          } else {  # SN
-             $cmd = " cp $roothome/.ssh/authorized_keys $keydir/tmp/authorized_keys";
-          }
-          xCAT::Utils->runcmd($cmd, 0);
-          if ($::RUNCMD_RC != 0)
-          {
-            $rsp->{data}->[0] = "$cmd failed.\n";
-            xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
-            return (1);
-          }
-          else
-          {
-             chmod 0600, "$keydir/.ssh/tmp/authorized_keys";
-          }
-          # strip off .ssh
-          my ($newkeydir,$ssh) = (split(/\.ssh/, $keydir));
-          $ENV{'DSH_ZONE_SSHKEYS'} =$newkeydir ;
-          # send the keys to the nodes
-           my $rc=xCAT::RemoteShellExp->remoteshellexp("s",$::CALLBACK,"/usr/bin/ssh",
-           $zonenodelist,$expecttimeout);
-           if ($rc != 0)
-           {
-             $rsp = {};
-             $rsp->{data}->[0] = "remoteshellexp failed sending keys to $zonename.";
-             xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
-
-           }
-        } # end nodes in the zone
-          
-       }  # end for each zone
-
-    return (0);
-}
-#--------------------------------------------------------------------------------
-
 =head3    cpSSHFiles

           Builds authorized_keyfiles for root 
@@ -1174,9 +947,7 @@ sub getAppStatus
    my ($class, $nodes_ref, $application) = @_;
    my @nodes = @$nodes_ref;

-    # FIXME: why autocommit matters for a read-only subroutine getNodesAttribs?
-    # but could not get the appstatus without the autocommit=0
-    my $nltab = xCAT::Table->new('nodelist', -autocommit => 0);
+    my $nltab = xCAT::Table->new('nodelist');
    my $nodeappstat = $nltab->getNodesAttribs(\@nodes,['appstatus']);

    my $ret_nodeappstat;
@@ -1823,8 +1594,8 @@ sub enableSSH
       
    } else { 
        # if not a service node we need to check, before enabling
-          if (keys %$groups_hash) {   # not empty
-            if  ($groups_hash->{ALLGROUPS} == 1)
+        if (defined($groups_hash)) {
+            if ($groups_hash->{ALLGROUPS} == 1)
            {
              $enablessh=1;
            }
@@ -1998,7 +1769,7 @@ sub updatenodegroups {
        }
    }
    my ($ent) = $tabhd->getNodeAttribs($node, ['groups']);
-    my @list = ();
+    my @list = qw(all);
    if (defined($ent) and $ent->{groups}) {
        push @list, split(/,/,$ent->{groups});
    }   
@@ -2012,54 +1783,5 @@ sub updatenodegroups {
    @list = keys %saw;
    $tabhd->setNodeAttribs($node, {groups=>join(",",@list)});
 }
-#-----------------------------------------------------------------------------
-
-
-=head3 rmnodegroups
-    remove groups from the group attribute for the specified node
-
-    Arguments:
-      node
-      tabhd: the handler of 'nodelist' table, 
-      groups: the groups that need to be removed.
-              Can be an array or string. 
-    Globals:
-        none
-    Error:
-    Example:
-         xCAT::TableUtils->rmnodegroups($node, $tab, $groups);
-
-=cut
-
-#-----------------------------------------------------------------------------
-
-sub rmnodegroups {
-    my ($class, $node, $tabhd, $groups) = @_;
-    my ($ent) = $tabhd->getNodeAttribs($node, ['groups']);
-    my @definedgroups;
-    my @removegroups;
-    my @newgroups;
-    if (defined($ent) and $ent->{groups}) {
-        push @definedgroups, split(/,/,$ent->{groups});
-    }   
-    if (ref($groups) eq 'ARRAY') {
-        push @removegroups, @$groups;
-    } else {
-        push @removegroups, split(/,/,$groups);
-    }
-    # take out any groups that match the input list of groups to remove
-    foreach my $dgrp (@definedgroups){
-       if (grep(/^$dgrp$/, @removegroups)) { # is the group to be removed
-          next;
-       } else {  # keep this group
-         push @newgroups,$dgrp;
-       } 
-    }
-    my %saw;
-    @saw{@newgroups} = ();
-    @newgroups = keys %saw;
-    
-    $tabhd->setNodeAttribs($node, {groups=>join(",",@newgroups)});
-}

 1;
@@ -18,9 +18,8 @@ use xCAT::Utils;
 my %usage = (
    "rnetboot" => 
 "Usage: rnetboot <noderange> [-s net|hd] [-F] [-f] [-V|--verbose] [-m table.colum==expectedstatus] [-m table.colum==expectedstatus...] [-r <retrycount>] [-t <timeout>]
-       rnetboot [-h|--help|-v|--version]
-     zVM specific:
-       rnetboot <noderange> [ipl= address]",
+       rnetboot <noderange> [ipl= address]
+       rnetboot [-h|--help|-v|--version]",
    "rpower" => 
 "Usage: rpower <noderange> [--nodeps] [on|onstandby|off|suspend|reset|stat|state|boot] [-V|--verbose] [-m table.colum==expectedstatus][-m table.colum==expectedstatus...] [-r <retrycount>] [-t <timeout>]
       rpower [-h|--help|-v|--version]
@@ -28,12 +27,10 @@ my %usage = (
       rpower <noderange> [boot] [ -c <path to iso> ]
     PPC (with IVM or HMC) specific:
       rpower <noderange> [--nodeps] [of] [-V|--verbose]
-     CEC (with HMC) specific:
-       rpower <noderange> [on|off|reset|boot|onstandby]
-     LPAR(with HMC) specific:
-       rpower <noderange> [on|off|reset|stat|state|boot|of|sms|softoff]
+     PPC (HMC) specific:
+       rpower <noderange> [onstandby] [-V|--verbose]
     CEC(using Direct FSP Management) specific:
-       rpower <noderange> [on|onstandby|off|stat|state|resetsp]
+       rpower <noderange> [on|onstandby|off|stat|state|lowpower|resetsp]
     Frame(using Direct FSP Management) specific:
       rpower <noderange> [stat|state|rackstandby|exit_rackstandby|resetsp]
     LPAR(using Direct FSP Management) specific:
@@ -134,7 +131,7 @@ my %usage = (
           textid=<*>|
           frame=<*>|
           ntp=<[ntp],[ip],[frequency],[v3]>
-   FSP/CEC (using ASM Interface) Specific:
+   FSP/BPA Common:
       rspconfig <noderange> [autopower|iocap|decfg|memdecfg|procdecfg|time|date|spdump|sysdump|network|hostname]
       rspconfig <noderange> autopower=<enable|disable>|
           iocap=<enable|disable>|
@@ -225,7 +222,7 @@ my %usage = (
       lsvm <noderange> [-a|--all]
   PPC (using Direct FSP Management) specific:
       lsvm <noderange> [-l|--long] --p775
-       lsvm <noderange> 
+       lsvm <noderange>
   zVM specific:
       lsvm noderange
       lsvm noderange --getnetworknames
@@ -244,10 +241,8 @@ my %usage = (
       chvm <noderange> --p775 -i <id> [-m <memory_interleaving>] -r <partition_rule>
       chvm <noderange> [lparname=<*|name>]
       chvm <noderange> [vmcpus=min/req/max] [vmmemory=min/req/max]
-                        [vmothersetting=hugepage:N,bsr:N]
-                        [add_physlots=drc_index1,drc_index2...] 
-                        [add_vmnics=vlan1,vlan2] [add_vmstorage=<N|viosnode:slotid>] [--vios]
-       chvm <noderange> [del_physlots=drc_index1,drc_index2...]
+                        [vmphyslots=drc_index1,drc_index2...] [vmothersetting=hugepage:N,bsr:N]
+                        [vmnics=vlan1,vlan2] [vmstorage=<N|viosnode:slotid>] [--vios]
       chvm <noderange> [del_vadapter=slotid]
   VMware specific:
       chvm <noderange> [-a size][-d disk][-p disk][--resize disk=size][--cpus count][--mem memory]
@@ -333,16 +328,12 @@ my %usage = (
    renergy [-v | --version] 

    Power 6 server specific :
-      renergy noderange [-V] { all | { [savingstatus] [cappingstatus] [cappingmaxmin] [cappingvalue] [cappingsoftmin] [averageAC] [averageDC] [ambienttemp] [exhausttemp] [CPUspeed] } }
-      renergy noderange [-V] { {savingstatus}={on | off} | {cappingstatus}={on | off} | {cappingwatt}=watt | {cappingperc}=percentage } 
+    renergy noderange [-V] { all | { [savingstatus] [cappingstatus] [cappingmaxmin] [cappingvalue] [cappingsoftmin] [averageAC] [averageDC] [ambienttemp] [exhausttemp] [CPUspeed] } }
+    renergy noderange [-V] { {savingstatus}={on | off} | {cappingstatus}={on | off} | {cappingwatt}=watt | {cappingperc}=percentage } 

    Power 7 server specific :
-      renergy noderange [-V] { all | { [savingstatus] [dsavingstatus] [cappingstatus] [cappingmaxmin] [cappingvalue] [cappingsoftmin] [averageAC] [averageDC] [ambienttemp] [exhausttemp] [CPUspeed] [syssbpower] [sysIPLtime] [fsavingstatus] [ffoMin] [ffoVmin] [ffoTurbo] [ffoNorm] [ffovalue] } }
-      renergy noderange [-V] { {savingstatus}={on | off} | {dsavingstatus}={on-norm | on-maxp | off} | {fsavingstatus}={on | off} | {ffovalue}=MHZ | {cappingstatus}={on | off} | {cappingwatt}=watt | {cappingperc}=percentage }
-
-    Power 8 server specific :
-      renergy noderange [-V] { all | [savingstatus] [dsavingstatus] [averageAC] [averageAChistory] [averageDC] [averageDChistory] [ambienttemp] [ambienttemphistory] [exhausttemp] [exhausttemphistory] [fanspeed] [fanspeedhistory] [CPUspeed] [CPUspeedhistory] [syssbpower] [sysIPLtime] [fsavingstatus] [ffoMin] [ffoVmin] [ffoTurbo] [ffoNorm] [ffovalue]}
-      renergy noderange [-V] { savingstatus={on | off} | dsavingstatus={on-norm | on-maxp | off} | fsavingstatus={on | off} | ffovalue=MHZ }
+    renergy noderange [-V] { all | { [savingstatus] [dsavingstatus] [cappingstatus] [cappingmaxmin] [cappingvalue] [cappingsoftmin] [averageAC] [averageDC] [ambienttemp] [exhausttemp] [CPUspeed] [syssbpower] [sysIPLtime] [fsavingstatus] [ffoMin] [ffoVmin] [ffoTurbo] [ffoNorm] [ffovalue] } }
+    renergy noderange [-V] { {savingstatus}={on | off} | {dsavingstatus}={on-norm | on-maxp | off} | {fsavingstatus}={on | off} | {ffovalue}=MHZ | {cappingstatus}={on | off} | {cappingwatt}=watt | {cappingperc}=percentage }

    BladeCenter specific :
      For Management Modules:
@@ -49,7 +49,7 @@ This program module file, is a set of Zone utilities used by xCAT *zone commands
 =cut

 #--------------------------------------------------------------------------------
-sub genSSHRootKeys 
+sub  genSSHRootKeys 
 {
    my ($class, $callback, $keydir,$zonename,$rsakey) = @_;
    
@@ -71,6 +71,22 @@ sub genSSHRootKeys
        }
    }

+    #
+    #  create /install/postscripts/_ssh/zonename if needed
+    #
+    my $installdir = xCAT::TableUtils->getInstallDir();  # get installdir
+    if (!-d "$installdir/postscripts/_ssh/$zonename")
+    {
+        my $cmd = "/bin/mkdir -m 755 -p $installdir/postscripts/_ssh/$zonename";
+        my $output = xCAT::Utils->runcmd("$cmd", 0);
+        if ($::RUNCMD_RC != 0)
+        {
+            my $rsp = {};
+            $rsp->{error}->[0] = "Could not create $installdir/postscripts/_ssh/$zonename directory.";
+            xCAT::MsgUtils->message("E", $rsp, $callback);
+           return 1;
+        }
+    }

    #need to gen a new rsa key for root for the zone 
    my $pubfile = "$keydir/id_rsa.pub";
@@ -136,6 +152,29 @@ sub genSSHRootKeys
            xCAT::MsgUtils->message("E", $rsp, $callback);
            return 1;
    }
+    # copy authorized_keys for install on node
+    if (-r $pubfile)
+    {
+        my $cmd =
+          "/bin/cp -p $pubfile $installdir/postscripts/_ssh/$zonename ";
+        my $output = xCAT::Utils->runcmd("$cmd", 0);
+        if ($::RUNCMD_RC != 0)
+        {
+            my $rsp = {};
+            $rsp->{error}->[0] = 
+           "Could not copy $pubfile to $installdir/postscripts/_ssh/$zonename";
+            xCAT::MsgUtils->message("E", $rsp, $callback);
+            return 1;
+
+        }
+    }
+    else
+    {
+            my $rsp = {};
+            $rsp->{error}->[0] = 
+           "Could not copy $pubfile to $installdir/postscripts/_ssh/$zonename, because $pubfile does not exist.";
+            xCAT::MsgUtils->message("E", $rsp, $callback);
+    }
 }
 #--------------------------------------------------------------------------------

@@ -145,11 +184,11 @@ sub genSSHRootKeys
    Returns:
    Name of the current default  zone from the zone table
    Example:
-     my $defaultzone =xCAT::Zone->getdefaultzone($callback); 
+     my $defaultzone =xCAT::Zone->getdefaultzone(); 
 =cut

 #--------------------------------------------------------------------------------
-sub getdefaultzone 
+sub  getdefaultzone 
 {
 my ($class, $callback) = @_;
 my $defaultzone;
@@ -160,8 +199,7 @@ sub getdefaultzone
   foreach my $zone (@zones) {
    # Look for the  defaultzone=yes/1 entry
    if ((defined($zone->{defaultzone})) && 
-          (($zone->{defaultzone} =~ /^yes$/i )
-           || ($zone->{defaultzone} eq "1"))) {
+          (($zone->{defaultzone} =~ "yes") || ($zone->{defaultzone} = "1"))) {
       $defaultzone = $zone->{zonename};
    }
    $tab->close();
@@ -192,133 +230,9 @@ sub iszonedefined
 my ($class,$zonename) = @_;
 # checks the zone table to see if input zonename already in the table 
 my $tab = xCAT::Table->new("zone");
+ my $zone = $tab->getAttribs({zonename => $zonename},'sshkeydir');
 $tab->close();
- my $zonehash = $tab->getAttribs({zonename => $zonename},'sshkeydir');
- if ( keys %$zonehash) {
-    return 1;
- }else{
-    return 0;
- }
-}
-#--------------------------------------------------------------------------------
-
-=head3  getzonekeydir 
-    Arguments:
-      zonename 
-    Returns:
-     path to the root ssh keys for the zone /etc/xcat/sshkeys/<zonename>/.ssh 
-     1 - zone not defined 
-    Example:
-     xCAT::Zone->getzonekeydir($zonename); 
-=cut
-
-#--------------------------------------------------------------------------------
-sub getzonekeydir 
-{
- my ($class,$zonename) = @_;
- my $tab = xCAT::Table->new("zone");
- $tab->close();
- my $zonehash = $tab->getAttribs({zonename => $zonename},'sshkeydir');
- if ( keys %$zonehash) {
-    my $zonesshkeydir=$zonehash->{sshkeydir};
-    return $zonesshkeydir;
- }else{
-    return 1;   # this is a bad error  zone not defined
- }
-}
-#--------------------------------------------------------------------------------
-
-=head3    getmyzonename 
-    Arguments:
-       $node -one nodename      
-    Returns:
-     $zonename 
-    Example:
-     my $zonename=xCAT::Zone->getmyzonename($node); 
-=cut
-
-#--------------------------------------------------------------------------------
-sub getmyzonename 
-{
- my ($class,$node,$callback) = @_;
- my @node;
- push @node,$node;
- my $zonename;
- my $nodelisttab = xCAT::Table->new("nodelist");
- my $nodehash = $nodelisttab->getNodesAttribs(\@node, ['zonename']); 
- $nodelisttab->close();
- if ( defined ($nodehash->{$node}->[0]->{zonename})) { # it was defined in the nodelist table
-    $zonename=$nodehash->{$node}->[0]->{zonename};
- } else {  # get the default zone
-    $zonename =xCAT::Zone->getdefaultzone($callback);
- }
-   return $zonename;
-}
-#--------------------------------------------------------------------------------
-
-=head3    enableSSHbetweennodes 
-    Arguments:
-      zonename 
-    Returns:
-     1 if the  sshbetweennodes attribute is yes/1 or undefined
-     0 if the  sshbetweennodes attribute is no/0 
-    Example:
-     xCAT::Zone->enableSSHbetweennodes($zonename); 
-=cut
-
-#--------------------------------------------------------------------------------
-sub enableSSHbetweennodes 
-{
- my ($class,$node,$callback) = @_;
- # finds the zone of the node
- my $enablessh = 1;   # default
- my $zonename=xCAT::Zone->getmyzonename($node);
- # reads the zone table 
- my $tab = xCAT::Table->new("zone");
- $tab->close();
- # read both keys,  want to know zone is in the zone table. If sshkeydir is not there
- # it is either missing or invalid anyway
- my $zonehash = $tab->getAttribs({zonename => $zonename},'sshbetweennodes','sshkeydir');
- if (! ( keys %$zonehash)) {
-          my $rsp = {};
-          $rsp->{error}->[0] = 
-         "$node has a  zonename: $zonename that is  not define in the zone table. Remove the zonename from the node, or create the zone using mkzone. The generated mypostscript may not reflect the correct setting for  ENABLESSHBETWEENNODES";
-          xCAT::MsgUtils->message("E", $rsp, $callback);
-          return $enablessh;
- }
- my $sshbetweennodes=$zonehash->{sshbetweennodes};
- if (defined ($sshbetweennodes)) {
-   if (($sshbetweennodes  =~ /^no$/i) ||  ($sshbetweennodes eq "0")) {
-     $enablessh = 0;  
-   } else {
-     $enablessh = 1;  
-   }
- } else { # not defined default yes
-   $enablessh = 1 ;   # default
- }
- return $enablessh;
-}
-#--------------------------------------------------------------------------------
-
-=head3    usingzones 
-    Arguments:
-      none 
-    Returns:
-     1 if the zone table is not empty
-     0 if empty
-    Example:
-     xCAT::Zone->usingzones; 
-=cut
-
-#--------------------------------------------------------------------------------
-sub usingzones 
-{
- my ($class) = @_;
- # reads the zonetable 
- my $tab = xCAT::Table->new("zone");
- my  @zone = $tab->getAllAttribs('zonename');
- $tab->close();
- if (@zone) {
+ if (defined($zone)) {
    return 1;
 }else{
    return 0;
@@ -328,48 +242,44 @@ sub usingzones

 =head3    getzoneinfo
    Arguments:
-     callback
     An array of nodes
    Returns:
     Hash array  by zonename point to the nodes in that zonename  and sshkeydir
-      <zonename1> -> {nodelist} -> array of nodes in the zone
+      zonename1 -> {nodelist} -> array of nodes in the zone
                 -> {sshkeydir} -> directory containing ssh RSA keys
                 -> {defaultzone} ->  is it the default zone             
    Example:
-     my %zonehash =xCAT::Zone->getzoneinfo($callback,@nodearray); 
+     my %zonehash =xCAT::Zone->getNodeZones($nodelist); 
    Rules:
       If the nodes nodelist.zonename attribute is a zonename, it is assigned to that zone
       If the nodes nodelist.zonename attribute is undefined:
          If there is a defaultzone in the zone table, the node is assigned to that zone
          If there is no defaultzone in the zone table, the node is assigned to the ~.ssh keydir
-    $::GETZONEINFO_RC
-           0 = good return
-           1 = error occured
 =cut

 #--------------------------------------------------------------------------------
-sub getzoneinfo 
+sub  getzoneinfo 
 {
  my ($class, $callback,$nodes) = @_;
- $::GETZONEINFO_RC=0; 
+ 
+ # make the list into an array
+# $nodelist=~ s/\s*//g; # remove blanks
+# my @nodes = split ',', $nodelist;
 my $zonehash;
 my $defaultzone;
 # read all the zone table 
 my $zonetab = xCAT::Table->new("zone");
- my @zones;
 if ($zonetab){
-    @zones = $zonetab->getAllAttribs('zonename','sshkeydir','sshbetweennodes','defaultzone');
+    my @zones = $zonetab->getAllAttribs('zonename','sshkeydir','defaultzone');
    $zonetab->close();
    if (@zones) {
       foreach  my $zone (@zones) {
          my $zonename=$zone->{zonename};
          $zonehash->{$zonename}->{sshkeydir}= $zone->{sshkeydir};
          $zonehash->{$zonename}->{defaultzone}= $zone->{defaultzone};
-          $zonehash->{$zonename}->{sshbetweennodes}= $zone->{sshbetweennodes};
          # find the defaultzone
-          if ((defined($zone->{defaultzone})) &&
-          (($zone->{defaultzone} =~ /^yes$/i ) 
-              || ($zone->{defaultzone} eq "1"))) {
+          if ((defined($zone->{defaultzone})) && 
+             (($zone->{defaultzone} =~ "yes") || ($zone->{defaultzone} = "1"))) {
              $defaultzone = $zone->{zonename};
          }
       }
@@ -379,74 +289,41 @@ sub getzoneinfo
    $rsp->{error}->[0] = 
    "Error reading the zone table. ";
    xCAT::MsgUtils->message("E", $rsp, $callback);
-    $::GETZONEINFO_RC =1;
    return;

 }
 my $nodelisttab = xCAT::Table->new("nodelist");
 my $nodehash = $nodelisttab->getNodesAttribs(\@$nodes, ['zonename']); 
 # for each of the nodes, look up it's zone name and assign to the zonehash
+ # if the node is a service node, it is assigned to the __xcatzone which gets its keys from
+ #    the ~/.ssh dir no matter what in the database for the zonename. 
 # If the nodes nodelist.zonename attribute is a zonename, it is assigned to that zone
 # If the nodes nodelist.zonename attribute is undefined:
 #         If there is a defaultzone in the zone table, the node is assigned to that zone
- #         If there is no defaultzone error out 
+ #         If there is no defaultzone in the zone table, the node is assigned to the ~.ssh keydir
 

+ my @allSN=xCAT::ServiceNodeUtils->getAllSN("ALL");  # read all the servicenodes define 
+ my $xcatzone = "__xcatzone";  # if node is in no zones or a service node, use this one
+ $zonehash->{$xcatzone}->{sshkeydir}= "~/.ssh"; 
 foreach my $node (@$nodes) {
    my $zonename;
-    $zonename=$nodehash->{$node}->[0]->{zonename};
+    if (grep(/^$node$/, @allSN)) {  # this is a servicenode, treat special
+      $zonename=$xcatzone;    # always use ~/.ssh directory
+    } else { # use the nodelist.zonename attribute
+      $zonename=$nodehash->{$node}->[0]->{zonename};
+    }
    if (defined($zonename)) {  # zonename explicitly defined in nodelist.zonename
-     # check to see if defined in the zone table
-     unless ( xCAT::Zone->iszonedefined($zonename)) {
-          my $rsp = {};
-          $rsp->{error}->[0] = 
-         "$node has a  zonename: $zonename that is  not define in the zone table. Remove the zonename from the node, or create the zone using mkzone.";
-          xCAT::MsgUtils->message("E", $rsp, $callback);
-          $::GETZONEINFO_RC =1;
-          return;
-      }
-      push @{$zonehash->{$zonename}->{nodes}},$node;
+       push @{$zonehash->{$zonename}->{nodes}},$node;
    } else { # no explict zonename
      if (defined ($defaultzone)) {  # there is a default zone in the zone table, use it
       push @{$zonehash->{$defaultzone}->{nodes}},$node;
-      } else {  # if no default, this is an error
-          my $rsp = {};
-          $rsp->{error}->[0] = 
-         "There is no default zone defined in the zone table. There must be exactly one default zone. ";
-          xCAT::MsgUtils->message("E", $rsp, $callback);
-          $::GETZONEINFO_RC =1;
-          return;
+      } else {  # if no default then use the ~/.ssh keys as the default, put them in the __xcatzone
+          push @{$zonehash->{$xcatzone}->{nodes}},$node;
       
      }   
    }   
 }
- return $zonehash;
-}
-#--------------------------------------------------------------------------------
-
-=head3    getnodesinzone
-    Arguments:
-     callback
-     zonename 
-    Returns:
-     Array of nodes 
-    Example:
-     my @nodes =xCAT::Zone->getnodesinzone($callback,$zonename); 
-=cut
-
-#--------------------------------------------------------------------------------
-sub getnodesinzone 
-{
- my ($class, $callback,$zonename) = @_;
- my @nodes;
- my $nodelisttab = xCAT::Table->new("nodelist");
- my @nodelist=$nodelisttab->getAllAttribs('node','zonename');
- # build the array of nodes in this zone
- foreach my $nodename (@nodelist) {
-     if  ((defined($nodename->{'zonename'})) && ($nodename->{'zonename'} eq $zonename)) {
-       push @nodes,$nodename->{'node'};
-     }
- }
- return @nodes;
+ return;
 }
 1;
@@ -14,11 +14,9 @@ require Exporter;

 %distnames = (
                 "1310229985.226287" => "centos6",
-                 "1323560292.885204" => "centos6.2",
-                 "1341569670.539525" => "centos6.3",#x86
-                 "1362445555.957609" => "centos6.4",#x86_64
-                 "1385726732.061157" => "centos6.5",#x86_64
-                 "1404489053.504589" => "centos7.0",
+		 "1323560292.885204" => "centos6.2",
+		 "1341569670.539525" => "centos6.3",#x86
+		 "1362445555.957609" => "centos6.4",#x86_64
                 "1176234647.982657" => "centos5",
                 "1156364963.862322" => "centos4.4",
                 "1178480581.024704" => "centos4.5",
@@ -30,7 +28,6 @@ require Exporter;
                 "1272326751.405938" => "centos5.5",
                 "1330913492.861127" => "centos5.8",#x86_64
                 "1357930415.252042" => "centos5.9",#x86_64
-                 "1381776971.473332" => "centos5.10",#x86_64
                 "1195488871.805863" => "centos4.6",
                 "1195487524.127458" => "centos4.6",
                 "1301444731.448392" => "centos5.6",
@@ -67,21 +64,11 @@ require Exporter;
                 "1359576196.686790" => "rhels6.4", #ppc64
                 "1384196515.415715" => "rhels6.5", #x86_64
                 "1384198011.520581" => "rhels6.5", #ppc64
-                 "1411733344.627228" => "rhels6.6", #x86_64
-                 "1411733344.616389" => "rhels6.6", #ppc64
-                 "1399449226.171922" => "rhels7", #x86_64
-                 "1399449226.155578" => "rhels7", #ppc64
-                 "1424360759.989976" => "rhels7.1", #x86_64
-                 "1424360759.878519" => "rhels7.1", #ppc64
-                 "1424361409.280138" => "rhels7.1", #ppc64le
 		 "1285193176.593806" => "rhelhpc6", #x86_64
 		 "1305067719.718814" => "rhelhpc6.1",#x86_64				
 		 "1321545261.599847" => "rhelhpc6.2",#x86_64				
 		 "1339640148.070971" => "rhelhpc6.3",#x86_64				
 		 "1359576195.413831" => "rhelhpc6.4",#x86_64, RHEL ComputeNode
-		 "1384196516.465862" => "rhelhpc6.5",#x86_64, RHEL ComputeNode
-		 "1411733344.599861" => "rhelhpc6.6",#x86_64, RHEL ComputeNode
-		 "1399449226.140088" => "rhelhpc7.0",#x86_64, RHEL ComputeNode
                 "1194015916.783841" => "fedora8",
                 "1194015385.299901" => "fedora8",
                 "1210112435.291709" => "fedora9",
@@ -100,12 +87,8 @@ require Exporter;
                 "1194512327.501046" => "rhas4.6",
                 "1241464993.830723" => "rhas4.8", #x86-64

-                 "1273608367.051780" => "SL5.5", #x86_64 DVD ISO
-                 "1299104542.844706" => "SL6", #x86_64 DVD ISO
-                 "1390839789.062069" => "SL6.5", #x86_64 DVD ISO Install
-
-                 "1394111947.452332" => "pkvm2.1", # ppc64, PowerKVM
-                 "1413749127.352649" => "pkvm2.1.1", # ppc64, PowerKVM
+		 "1273608367.051780" => "SL5.5", #x86_64 DVD ISO
+                "1299104542.844706" => "SL6", #x86_64 DVD ISO
                );
 my %numdiscs = (
                "1156364963.862322" => 4,
@@ -611,23 +611,39 @@ sub punch2Reader {
            
    # Punch to reader
    # VMUR located in different directories on RHEL and SLES
-    my $out;
+    my $vmur;
    if ( $os =~ m/sles10/i ) {
-        $out = `ssh -o ConnectTimeout=5 $user\@$hcp "$sudo /sbin/vmur punch $options -u $userId -r $srcFile -N $tgtFile"`;
-    } elsif ( $os =~ m/rhel/i ) {
-    	$out = `ssh -o ConnectTimeout=5 $user\@$hcp "$sudo /usr/sbin/vmur punch $options -u $userId -r $srcFile -N $tgtFile"`;
+        $vmur = "/sbin/vmur";
    } else {
-    	$out = `ssh -o ConnectTimeout=5 $user\@$hcp "$sudo /usr/sbin/vmur punch $options -u $userId -r $srcFile -N $tgtFile"`;
+        $vmur = "/usr/sbin/vmur";
+    }
+    my $out;
+    my $done = 0;
+    
+    until ( $done ) {
+        $out = `ssh -o ConnectTimeout=5 $user\@$hcp "$sudo $vmur punch $options -u $userId -r $srcFile -N $tgtFile" 2>&1`;
+        my $rc = $? >> 8;
+        if ( $rc == 255 ) {
+            $out = "(Error) Unable to communicate with the zHCP system: $hcp";
+            $done = 1;
+        } elsif ( $out =~ m/A concurrent instance of vmur is already active/i ) {
+            # Recoverable error: retry the command after a delay
+            xCAT::zvmUtils->printSyslog( "punch2Reader() Punch in use on $hcp, retrying in 15 seconds" );
+            sleep( 15 );
+        } else {
+            # Punch appears successful -- Look for the completion string
+            my $searchStr = "created and transferred";
+            if ( !( $out =~ m/$searchStr/i ) ) {
+                chomp( $out );
+                $out = "Failed, punch info: '$out'\n";
+                xCAT::zvmUtils->printSyslog( "punch2Reader() Failed punching $srcFile to $userId from $hcp, info: '$out'" );
+            } else {
+                $out = "Done\n";
+            }
+            $done = 1;
+        }
    }
    
-    # If punch is successful -- Look for this string
-    my $searchStr = "created and transferred";
-    if ( !( $out =~ m/$searchStr/i ) ) {
-        $out = "Failed\n";
-    } else {
-        $out = "Done\n";
-    }
-
    return $out;
 }

@@ -289,7 +289,7 @@ sub printLn {
    # Print string
    my $rsp;
    my $type = "I";
-    if ($str =~ m/error/i) {  # Set to print error if the string contains error
+    if ($str =~ m/(\(error\)|\sfailed)/i) {  # Set to print error if the string contains error
        $type = "E";
    }
    
@@ -1246,7 +1246,7 @@ sub getArch {
    }

    # Get host using VMCP
-    my $arch = `ssh $user\@$node "$sudo uname -p"`;
+    my $arch = `ssh $user\@$node "$sudo uname -m"`;

    return ( xCAT::zvmUtils->trimStr($arch) );
 }
@@ -2308,19 +2308,20 @@ sub getUsedFcpDevices {
    Arguments   : Sudoer user name
                  Sudo keyword
                  zHCP hostname
+                  Install root directory
                  Local directory to remotely mount
                  Mount access ('ro' for read only, 'rw' for read write)
                  Directory as known to zHCP (out)
    Returns     : 0 - Mounted, or zHCP and MN are on the same system
                  1 - Mount failed
-    Example     : establishMount( $callback, $::SUDOER, $::SUDO, $hcp, "$installRoot/$provMethod", "ro", \$remoteDeployDir );
+    Example     : establishMount( $callback, $::SUDOER, $::SUDO, $hcp, $installRoot, $provMethod, "ro", \$remoteDeployDir );
    
 =cut

 #-------------------------------------------------------
 sub establishMount {
    # Get inputs
-    my ($class, $callback, $sudoer, $sudo, $hcp, $localDir, $access, $mountedPt) = @_;    
+    my ($class, $callback, $sudoer, $sudo, $hcp, $installRoot, $localDir, $access, $mountedPt) = @_;    
    my $out;

    # If the target system is not on this system then establish the NFS mount point.
@@ -2338,7 +2339,7 @@ sub establishMount {
    
    if ($masterIp eq $hcpIP) {
        # xCAT MN and zHCP are on the same box and will use the same directory without the need for an NFS mount.
-        $$mountedPt = $localDir;
+        $$mountedPt = "$installRoot/$localDir";
    } else {
        # Determine the hostname for this management node
        my $masterHostname = Sys::Hostname::hostname();
@@ -2347,15 +2348,23 @@ sub establishMount {
            $masterHostname = $masterIp;
        }
        
+        $$mountedPt = "/mnt/$masterHostname$installRoot/$localDir";
+        
+        # If the mount point already exists then return because we are done.
+        my $rc = `ssh $sudoer\@$hcp "$sudo mount | grep $$mountedPt > /dev/null; echo \\\$?"`;
+        if ($rc == 0) {
+            return 0;
+        }
+        
        xCAT::zvmUtils->printSyslog( "establishMount() Preparing the NFS mount point on zHCP ($hcpIP) to xCAT MN $masterHostname($masterIp) for $localDir" );
        
        # Prepare the staging mount point on zHCP, if they need to be established
-        $$mountedPt = "/mnt/$masterHostname$localDir";
-        my $rc = `ssh $sudoer\@$hcp "$sudo mkdir -p $$mountedPt && mount -t nfs -o $access $masterIp:$localDir $$mountedPt; echo \\\$?"`;
+        $rc = `ssh $sudoer\@$hcp "$sudo mkdir -p $$mountedPt && mount -t nfs -o $access $masterIp:/$localDir $$mountedPt; echo \\\$?"`;
        
-        # Return code = 0 (mount succeeded) or 32 (mount already exists)
-        if ($rc != '0' && $rc != '32') {
+        # Return code = 0 (mount succeeded)
+        if ($rc != '0') {
            xCAT::zvmUtils->printLn( $callback, "$hcp: (Error) Unable to establish zHCP mount point: $$mountedPt" );
+            xCAT::zvmUtils->printSyslog( "establishMount() Unable to establish zHCP mount point: $$mountedPt, rc: $rc" );
            return 1;
        }
    }
@@ -2367,9 +2376,12 @@ sub establishMount {

 =head3   getFreeRepoSpace

-    Description : Get the free space of image repository under /install
+    Description : Get the free space of image repository under /install.
    Arguments   : Node
-    Returns     : The available space for /install
+    Returns     : The available space for /install (e.g. "2.1G ").  
+                  The value is returned as a perl string (e.g. "0 ") to 
+                  avoid perl returning null instead of "0" in the case
+                  of no space available.
    Example     : my $free = getFreeRepoSpace($callback, $node);
    
 =cut
@@ -2393,9 +2405,12 @@ sub getFreeRepoSpace {
    if ($master eq $ip) {
        # If the master IP and node IP match, then it is the management node
        my $out = `$sudo /bin/df -h /install | sed 1d`;
-        # causing problems on other platforms $out =~ s/\h+/ /g;$out =~ s/\h+/ /g;
+        $out =~ s/\h+/ /g;
        my @results = split(' ', $out);
-        return ($results[3]);
+        if ( $results[3] eq "0" ) {
+            $results[3] = "0M";
+        }
+        return $results[3];
    } 

    return;
@@ -2475,12 +2490,12 @@ sub findAndUpdatezFcpPool {
        return \%results;
    }
    
-    # Check WWPN and LUN syntax
-    if ( $wwpn && ($wwpn =~ /[^0-9a-f;"]/i) ) {
-        xCAT::zvmUtils->printLn( $callback, "$header: (Error) Invalid world wide portname $wwpn." );
+    # Owner must be specified if status is used
+    if ($status =~ m/used/i && !$owner) {
+        xCAT::zvmUtils->printLn( $callback, "$header: (Error) Owner must be specified if status is used." );
        return \%results;
-    } if ( $lun && ($lun =~ /[^0-9a-f]/i) ) {
-        xCAT::zvmUtils->printLn( $callback, "$header: (Error) Invalid logical unit number $lun." );
+    } elsif ($status =~ m/free/i && $owner) {
+        xCAT::zvmUtils->printLn( $callback, "$header: (Error) Owner must not be specified if status is free." );
        return \%results;
    }
        
@@ -2509,6 +2524,15 @@ sub findAndUpdatezFcpPool {
        # Make sure WWPN and LUN do not have 0x prefix
        $wwpn = xCAT::zvmUtils->replaceStr($wwpn, "0x", "");
        $lun = xCAT::zvmUtils->replaceStr($lun, "0x", "");
+        
+        # Check WWPN and LUN syntax
+        if ( $wwpn && ($wwpn =~ /[^0-9a-f;"]/i) ) {
+            xCAT::zvmUtils->printLn( $callback, "$header: (Error) Invalid world wide portname $wwpn." );
+            return \%results;
+        } if ( $lun && ($lun =~ /[^0-9a-f]/i) ) {
+            xCAT::zvmUtils->printLn( $callback, "$header: (Error) Invalid logical unit number $lun." );
+            return \%results;
+        }
    }
    
    # Find disk pool (create one if non-existent)
@@ -2569,15 +2593,19 @@ sub findAndUpdatezFcpPool {
        }
        
        # Do not continue if no devices can be found
-        if (!$wwpn && !$lun) {
+        if (!$wwpn || !$lun) {
            xCAT::zvmUtils->printLn($callback, "$header: (Error) A suitable device of $size" . "M or larger could not be found");
            return \%results;
        }
    } else {
-    	# Find given WWPN and LUN. Do not continue if device is used
+        # Find given WWPN and LUN. Do not continue if device is used
        my $select = `ssh $user\@$hcp "$sudo cat $zfcpDir/$pool.conf" | grep -i "$wwpn,$lun"`;
        chomp($select);
-        
+        if (!$select) {
+            xCAT::zvmUtils->printLn($callback, "$header: (Error) zFCP device 0x$wwpn/0x$lun could not be found in zFCP pool $pool");
+            return \%results;
+        }
+
        @info = split(',', $select);
        
        if ($size) {
@@ -2585,13 +2613,11 @@ sub findAndUpdatezFcpPool {
                # Convert to MegaBytes
                $info[3] =~ s/\D//g;
                $info[3] = int($info[3]) * 1024
-            } elsif ($info[3] =~ m/M/i) {
+            } else {
                # Do nothing
                $info[3] =~ s/\D//g;
-            } else {
-                next;
            }
-                
+            
            # Do not continue if specified device does not have enough capacity
            if ($info[3] < $size) {
                xCAT::zvmUtils->printLn($callback, "$header: (Error) FCP device $wwpn/$lun is not large enough");
@@ -2602,7 +2628,7 @@ sub findAndUpdatezFcpPool {
        # Find range of the specified disk
        $range = $info[4];
    }
-       
+    
    # If there are multiple paths, take the 1st one
    # Handle multi-pathing in postscript because autoyast/kickstart does not support it.
    my $origWwpn = $wwpn;
@@ -2612,117 +2638,23 @@ sub findAndUpdatezFcpPool {
    }
        
    xCAT::zvmUtils->printLn($callback, "$header: Found FCP device 0x$wwpn/0x$lun");
-        
-    # Find a free FCP device based on the given range
-    if ($fcpDevice =~ m/^auto/i) {
-        my @ranges;
-        my $min;
-        my $max;
-        my $found = 0;
-                
-        if ($range =~ m/;/i) {
-            @ranges = split(';', $range);
-        } else {
-            push(@ranges, $range);
-        }
-                    
-        if (!$found) {
-            # If the node has an eligible FCP device, use it
-            my @deviceList = xCAT::zvmUtils->getDedicates($callback, $user, $owner);
-            foreach (@deviceList) {
-                # Check if this devide is eligible (among the range specified for disk $lun)
-                @info = split(' ', $_);
-                my $candidate = $info[2];
-                foreach (@ranges) {
-                    ($min, $max) = split('-', $_);
-                    if (hex($candidate) >= hex($min) && hex($candidate) <= hex($max)) {
-                        $found = 1;
-                        $fcpDevice = uc($candidate);
-                        
-                        last;
-                    }
-                }
-                
-                if ($found) {
-                	xCAT::zvmUtils->printLn($callback, "$header: Found eligible FCP channel $fcpDevice");
-                    last;
-                }       
-            }
-        }
-        
-        if (!$found) {
-            # If the node has no eligible FCP device, find a free one for it.
-            my %usedDevices = xCAT::zvmUtils->getUsedFcpDevices($user, $hcp);
-            
-            my $hcpUserId = xCAT::zvmCPUtils->getUserId($user, $hcp);
-            $hcpUserId =~ tr/a-z/A-Z/;
-        
-            # Find a free FCP channel
-            $out = `ssh $user\@$hcp "$sudo $dir/smcli System_WWPN_Query -T $hcpUserId" | egrep -i "FCP device number|Status"`;
-            my @devices = split( "\n", $out );
-            for (my $i = 0; $i < @devices; $i++) {
-                # Extract the device number and status
-                $fcpDevice = $devices[$i];
-                $fcpDevice =~ s/^FCP device number:(.*)/$1/;
-                $fcpDevice =~ s/^\s+//;
-                $fcpDevice =~ s/\s+$//;
-                        
-                $i++;
-                my $fcpStatus = $devices[$i];
-                $fcpStatus =~ s/^Status:(.*)/$1/;
-                $fcpStatus =~ s/^\s+//;
-                $fcpStatus =~ s/\s+$//;                    
-                        
-                # Only look at free FCP devices
-                if ($fcpStatus =~ m/free/i) {                    
-                    # If the device number is within the specified range, exit out of loop
-                    # Range: 3B00-3C00;4B00-4C00;5E12-5E12
-                    foreach (@ranges) {
-                        ($min, $max) = split('-', $_);
-                        if (hex($fcpDevice) >= hex($min) && hex($fcpDevice) <= hex($max)) {
-                            $fcpDevice = uc($fcpDevice);
-                
-                            # Used found FCP channel if not in use or allocated                        
-                            if (!$usedDevices{$fcpDevice}) {
-                                $found = 1;
-                                last;
-                            }
-                        }
-                    }
-                }
-                
-                # Break out of loop if FCP channel is found
-                if ($found) {
-                	xCAT::zvmUtils->printLn($callback, "$header: Found FCP channel within acceptable range $fcpDevice");
-                    last;
-                }
-            }
-        }
-            
-        # Do not continue if no FCP channel is found
-        if (!$found) {
-            xCAT::zvmUtils->printLn($callback, "$header: (Error) A suitable FCP channel could not be found");
+    
+    if ( ($status =~ m/used/i) && ($fcpDevice =~ /^auto/i) ) {
+        # select an eligible FCP device
+        $fcpDevice = xCAT::zvmUtils->selectFcpDevice($callback, $header, $user, $hcp, $fcpDevice, $range, $owner);
+        if (!$fcpDevice) {
            return \%results;
        }
-    }
-    
-    # If there are multiple devices (multipathing), take the 1st one
-    if ($fcpDevice) {
-        if ($fcpDevice =~ m/;/i) {
-            @info = split(';', $fcpDevice);
-            $fcpDevice = xCAT::zvmUtils->trimStr($info[0]);
-        }
-                    
-        # Make sure channel has a length of 4
-        while (length($fcpDevice) < 4) {
-            $fcpDevice = "0" . $fcpDevice;
-        }
+    } elsif ($status =~ m/free/i) {
+        # Owner and FCP channel make no sense when status is free
+        $fcpDevice = "";
+        $owner = "";
    }
            
    # Mark WWPN and LUN as used, free, or reserved and set the owner/channel appropriately
    # This config file keeps track of the owner of each device, which is useful in nodeset
    $size = $size . "M";
-    my $select = `ssh $user\@$hcp "$sudo cat $zfcpDir/$pool.conf" | grep -i "$lun" | grep -i "$wwpn"`;
+    my $select = `ssh $user\@$hcp "$sudo cat $zfcpDir/$pool.conf" | grep -i "$lun"`;
    chomp($select);
    if ($select) {
        @info = split(',', $select);
@@ -2759,6 +2691,156 @@ sub findAndUpdatezFcpPool {

 #-------------------------------------------------------

+=head3   selectFcpDevice
+
+    Description : Select an eligible FCP device for attaching a zFCP device to a node
+    Arguments   :   Message header
+                    User (root or non-root)
+                    zHCP
+                    candidate FCP devices or auto
+                    FCP device range
+                    zFCP device owner
+    Returns     : selected FCP device or empty if no one is selected
+    Example     : my $fcpDevice = xCAT::zvmUtils->selectFcpDevice($callback, $header, $user, $hcp, $fcpDevice, $range, $owner);
+    
+=cut
+
+#-------------------------------------------------------
+sub selectFcpDevice {
+    # Get inputs
+    my ($class, $callback, $header, $user, $hcp, $fcpDevice, $range, $owner) = @_;
+        
+    # Determine if sudo is used
+    my $sudo = "sudo";
+    if ($user eq "root") {
+        $sudo = "";
+    }
+    
+    # Directory where executables are on zHCP
+    my $dir = "/opt/zhcp/bin";
+        
+    # Directory where FCP disk pools are on zHCP
+    my $zfcpDir = "/var/opt/zhcp/zfcp";
+    
+    my %results = ('rc' => -1);  # Default to error
+    
+    # Check FCP device syntax
+    if ($fcpDevice && ($fcpDevice !~ /^auto/i) && ($fcpDevice =~ /[^0-9a-f]/i)) {
+        xCAT::zvmUtils->printLn($callback, "$header: (Error) Invalid FCP channel address $fcpDevice.");
+        return;
+    }
+    
+    # Find a free FCP device based on the given range
+    if ($fcpDevice =~ m/^auto/i) {
+        my @ranges;
+        my $min;
+        my $max;
+        my $found = 0;
+                
+        if ($range =~ m/;/i) {
+            @ranges = split(';', $range);
+        } else {
+            push(@ranges, $range);
+        }
+                    
+        if (!$found) {
+            # If the node has an eligible FCP device, use it
+            my @deviceList = xCAT::zvmUtils->getDedicates($callback, $user, $owner);
+            foreach (@deviceList) {
+                # Check if this devide is eligible (among the range specified for disk $lun)
+                my @info = split(' ', $_);
+                my $candidate = $info[2];
+                foreach (@ranges) {
+                    ($min, $max) = split('-', $_);
+                    if (hex($candidate) >= hex($min) && hex($candidate) <= hex($max)) {
+                        $found = 1;
+                        $fcpDevice = uc($candidate);
+                        
+                        last;
+                    }
+                }
+                
+                if ($found) {
+                    xCAT::zvmUtils->printLn($callback, "$header: Found eligible FCP channel $fcpDevice");
+                    last;
+                }       
+            }
+        }
+        
+        if (!$found) {
+            # If the node has no eligible FCP device, find a free one for it.
+            my %usedDevices = xCAT::zvmUtils->getUsedFcpDevices($user, $hcp);
+            
+            my $hcpUserId = xCAT::zvmCPUtils->getUserId($user, $hcp);
+            $hcpUserId =~ tr/a-z/A-Z/;
+        
+            # Find a free FCP channel
+            my $out = `ssh $user\@$hcp "$sudo $dir/smcli System_WWPN_Query -T $hcpUserId" | egrep -i "FCP device number|Status"`;
+            my @devices = split( "\n", $out );
+            for (my $i = 0; $i < @devices; $i++) {
+                # Extract the device number and status
+                $fcpDevice = $devices[$i];
+                $fcpDevice =~ s/^FCP device number:(.*)/$1/;
+                $fcpDevice =~ s/^\s+//;
+                $fcpDevice =~ s/\s+$//;
+                        
+                $i++;
+                my $fcpStatus = $devices[$i];
+                $fcpStatus =~ s/^Status:(.*)/$1/;
+                $fcpStatus =~ s/^\s+//;
+                $fcpStatus =~ s/\s+$//;                    
+                        
+                # Only look at free FCP devices
+                if ($fcpStatus =~ m/free/i) {                    
+                    # If the device number is within the specified range, exit out of loop
+                    # Range: 3B00-3C00;4B00-4C00;5E12-5E12
+                    foreach (@ranges) {
+                        ($min, $max) = split('-', $_);
+                        if (hex($fcpDevice) >= hex($min) && hex($fcpDevice) <= hex($max)) {
+                            $fcpDevice = uc($fcpDevice);
+                
+                            # Use found FCP channel if not in use or allocated                        
+                            if (!$usedDevices{$fcpDevice}) {
+                                $found = 1;
+                                last;
+                            }
+                        }
+                    }
+                }
+                
+                # Break out of loop if FCP channel is found
+                if ($found) {
+                    xCAT::zvmUtils->printLn($callback, "$header: Found FCP channel within acceptable range $fcpDevice");
+                    last;
+                }
+            }
+        }
+            
+        # Do not continue if no FCP channel is found
+        if (!$found) {
+            xCAT::zvmUtils->printLn($callback, "$header: (Error) A suitable FCP channel could not be found");
+            return;
+        }
+    }
+    
+    # If there are multiple devices (multipathing), take the 1st one
+    if ($fcpDevice) {
+        if ($fcpDevice =~ m/;/i) {
+            my @info = split(';', $fcpDevice);
+            $fcpDevice = xCAT::zvmUtils->trimStr($info[0]);
+        }
+                    
+        # Make sure channel has a length of 4
+        while (length($fcpDevice) < 4) {
+            $fcpDevice = "0" . $fcpDevice;
+        }
+    }
+    
+    return $fcpDevice;
+}
+
+#-------------------------------------------------------
+
 =head3   findzFcpDevicePool

    Description : Find the zFCP storage pool that contains the given zFCP device
@@ -2807,7 +2889,7 @@ sub findzFcpDevicePool {
                    WWPN
                    LUN
    Returns     : Architecture of node
-    Example     : my $deviceRef = xCAT::zvmUtils->findzFcpDeviceAttr($user, $hcp, $wwpn, $lun);
+    Example     : my $deviceRef = xCAT::zvmUtils->findzFcpDeviceAttr($user, $hcp, $pool, $wwpn, $lun);
    
 =cut

@@ -2827,7 +2909,7 @@ sub findzFcpDeviceAttr {

    # Find the SCSI/FCP device
    # Entry order: status,wwpn,lun,size,range,owner,channel,tag
-    my @info = split("\n", `ssh $user\@$hcp "$sudo grep \"$wwpn,$lun\" $zfcpDir/$pool.conf"`);
+    my @info = split("\n", `ssh $user\@$hcp "$sudo grep -i \"$wwpn,$lun\" $zfcpDir/$pool.conf"`);
    my $entry = $info[0];
    chomp($entry);
    
@@ -1,48 +0,0 @@
-/* IBM(c) 2013 EPL licens http://www.eclipse.org/legal/epl-v10.html
- * Jarrod Johnson - jbjohnso@us.ibm.com
- * This program periodically transmits a udp packet to designated xCAT server
- * It waits for an 'ok' and then exits
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-int main(int argc, char* argv[]) { 
-	int server;
-	struct addrinfo hints;
-	struct addrinfo *results,*cur;
-	struct timeval timeout;
-	int canread=0;
-	char buffer[128];
-	srand(time(NULL));
-	memset(&hints,0,sizeof(struct addrinfo));
-	hints.ai_family = AF_UNSPEC;
-	hints.ai_socktype = SOCK_DGRAM;
-	hints.ai_protocol = IPPROTO_UDP;
-	fd_set selectset;
-	getaddrinfo(argv[1],argv[2],&hints,&results);
-	server = socket(AF_UNSPEC,SOCK_DGRAM,17);
-	for (cur=results; cur != NULL; cur = cur->ai_next) {
-		server = socket(cur->ai_family,cur->ai_socktype,cur->ai_protocol);
-		if (server == -1) continue;
-		if (connect(server,cur->ai_addr,cur->ai_addrlen) != -1) break;
-		close(server);
-	}
-	FD_ZERO(&selectset);
-	FD_SET(server,&selectset);
-	while (1) {
-		timeout.tv_sec = rand() % 120+60;
-		timeout.tv_usec = rand() % 10000;
-		write(server,"resourcerequest: xcatd\n",strlen("resourcerequest: xcatd\n"));
-		canread = select(FD_SETSIZE,&selectset,NULL,NULL,&timeout);
-		if (canread) {
-			read(server,buffer,sizeof(buffer));
-			if (strncmp(buffer,"resourcerequest: ok",strlen("resourcerequest: ok"))==0) {
-				exit(0);
-			}
-		}
-	}
-}
@@ -1,10 +0,0 @@
-# AIX Bundle file for compiler runtime packages
-
-I:xlC.aix61
-I:xlC.rte
-I:xlfrte
-I:xlfrte.aix61
-I:xlfrte.msg.en_US
-I:xlsmp.aix61.rte
-I:xlsmp.msg.en_US.rte
-I:xlsmp.rte
@@ -41,8 +41,8 @@ if [ $OS != "AIX" ]; then
        mkdir -p /tmp/gpfs_updates
        rm -f -R /tmp/gpfs_updates/*
        cd /tmp/gpfs_updates
-#        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=3 ftp://$MASTER/$UPDATES_DIR/*.rpm 2> /tmp/wget.log
-        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=4 --reject "index.html*"  --no-parent http://$MASTER$INSTALL_DIR/$UPDATES_DIR/ 2> /tmp/wget.log
+#        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=3 ftp://$SITEMASTER/$UPDATES_DIR/*.rpm 2> /tmp/wget.log
+        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=4 --reject "index.html*"  --no-parent http://$SITEMASTER$INSTALL_DIR/$UPDATES_DIR/ 2> /tmp/wget.log
        if [ -n "`ls *.rpm 2> /dev/null`" ] ; then
            rpm -Uvh *.rpm
        fi
@@ -103,7 +103,7 @@ else  # assume Linux
    fi
    if [ ! -e $gpfsprofile.sh ]; then
        echo 'export PATH=$PATH:/usr/lpp/mmfs/bin' > $gpfsprofile.sh
-        echo 'setenv PATH ${PATH}:/usr/lpp/mmfs/bin' > $gpfsprofile.csh
+        echo 'setenv PATH $PATH:/usr/lpp/mmfs/bin' > $gpfsprofile.csh
        # Turn off LANG support since we did not install other msg catalogs
        echo 'export LC_CTYPE=POSIX' >> $gpfsprofile.sh
        echo 'setenv LC_CTYPE POSIX' >> $gpfsprofile.csh
@@ -62,8 +62,7 @@ else
   file=$1
 fi

-#ifconfig -a  | grep 'inet ' | awk ' { print $2 } ' | grep -v 127.0.0.1 | 
-ip -4 -oneline addr show 2>/dev/null |grep inet | sed -ne "s/.*inet //p"|awk -F ' ' '{print $1}'|awk -F '/' '{print $1}'|
+ifconfig -a  | grep 'inet ' | awk ' { print $2 } ' | grep -v 127.0.0.1 | 
 while read my_address ; do
    ##print "checking $my_address"
    grep -q " ${my_address}$" $file
@@ -1,6 +0,0 @@
-xcat-openstack-baremetal for Debian
-----------------------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- root <root@unknown>  Wed, 12 Mar 2014 01:47:54 -0700
@@ -1,9 +0,0 @@
-xcat-openstack-baremetal for Debian
-----------------------------------
-
-<this file describes information about the source package, see Debian policy
-manual section 4.14. You WILL either need to modify or delete this file>
-
-
-
-
@@ -1,5 +0,0 @@
-xcat-openstack-baremetal (2.8.4-1) unstable; urgency=low
-
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
-
- -- root <root@unknown>  Wed, 12 Mar 2014 01:47:54 -0700
@@ -1 +0,0 @@
-8
@@ -1,14 +0,0 @@
-Source: xcat-openstack-baremetal
-Section: admin
-Priority: extra
-Maintainer: xCAT <xcat-user@lists.sourceforge.net>
-Build-Depends: debhelper (>= 8.0.0)
-Standards-Version: 3.9.4
-Homepage: http://xcat.sourceforge.net/
-#Vcs-Git: git://git.debian.org/collab-maint/xcat-openstack-baremetal.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/xcat-openstack-baremetal.git;a=summary
-
-Package: xcat-openstack-baremetal
-Architecture: all
-Depends: xCAT-client
-Description:  Executables and data of the xCAT baremetal driver for OpenStack
@@ -1,88 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
-
- 
@@ -1,7 +0,0 @@
-opt/xcat/bin
-opt/xcat/sbin
-opt/xcat/lib/perl/xCAT_plugin
-opt/xcat/lib/python/xcat/openstack/baremetal
-opt/xcat/share/xcat/openstack/postscripts
-opt/xcat/share/man/man1
-opt/xcat/share/doc/man1
@@ -1,6 +0,0 @@
-lib/* opt/xcat/lib/
-share/xcat/openstack/postscripts/* opt/xcat/share/xcat/openstack/postscripts/
-share/man/man1/* opt/xcat/share/man/man1/
-share/doc/man1/*  opt/xcat/share/doc/man1/
-
-
@@ -1,43 +0,0 @@
-#!/bin/sh
-# postinst script for xcat-openstack-baremetal
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure)
-#copy the postscripts under /installl/postscripts directory on MN only
-if [ -f "/etc/xCATMN" ]; then
-        cp /opt/xcat/share/xcat/openstack/postscripts/* /install/postscripts/
-fi
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
@@ -1,46 +0,0 @@
-#!/bin/sh
-# prerm script for xcat-openstack-baremetal
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-    #remove postscripts under /installl/postscripts directory on MN only
-    if [ -f "/etc/xCATMN" ]; then
-        for fn in /opt/xcat/share/xcat/openstack/postscripts/*
-        do
-                bn=`basename $fn`
-                rm /install/postscripts/$bn
-        done
-    fi
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
@@ -1,44 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-build:
-	pwd
-	`pwd`/xpod2man
-
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean -d
-
-install:
-	pwd
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	dh_install -X".svn"
-	chmod 444 `pwd`/debian/xcat-openstack-baremetal/opt/xcat/share/man/man1/*
-	chmod 644 `pwd`/debian/xcat-openstack-baremetal/opt/xcat/share/doc/man1/*
-	dh_link
-
-binary-indep: build install
-	pwd
-	export
-	dh_installman
-	dh_compress
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch:
-	pwd
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
@@ -1 +0,0 @@
-1.0
@@ -1,4 +0,0 @@
-opt/xcat/bin/xcatclient opt/xcat/sbin/deploy_ops_bm_node
-opt/xcat/bin/xcatclient opt/xcat/sbin/cleanup_ops_bm_node
-opt/xcat/bin/xcatclient opt/xcat/bin/opsaddbmnode
-opt/xcat/bin/xcatclientnnr opt/xcat/bin/opsaddimage
@@ -1 +0,0 @@
-misc:Depends=
@@ -1,965 +0,0 @@
-# IBM(c) 2013 EPL license http://www.eclipse.org/legal/epl-v10.html
-package xCAT_plugin::openstack;
-BEGIN
-{
-    $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
-}
-use lib "$::XCATROOT/lib/perl";
-use xCAT::Utils;
-use xCAT::TableUtils;
-use xCAT::SvrUtils;
-use xCAT::NetworkUtils;
-use xCAT::Table;
-use Data::Dumper;
-use File::Path;
-use File::Copy;
-use Getopt::Long;
-Getopt::Long::Configure("bundling");
-Getopt::Long::Configure("pass_through");
-
-
-sub handled_commands {
-    return {
-		opsaddbmnode => "openstack",  #external command
-		opsaddimage => "openstack",   #external command
-		deploy_ops_bm_node => "openstack",   #internal command called from the baremetal driver
-		cleanup_ops_bm_node => "openstack",  #internal command called from the baremetal driver
-   }
-}
-
-sub process_request {
-	my $request = shift;
-	my $callback = shift;
-	my $doreq = shift;
-	my $command = $request->{command}->[0];
-	
-	if ($command eq "opsaddbmnode") {
-		return opsaddbmnode($request, $callback, $doreq);
-	} elsif ($command eq "opsaddimage") {
-		return opsaddimage($request, $callback, $doreq);
-	} elsif ($command eq "deploy_ops_bm_node") {
-		return deploy_ops_bm_node($request, $callback, $doreq);
-	} elsif ($command eq "cleanup_ops_bm_node") {
-		return cleanup_ops_bm_node($request, $callback, $doreq);
-	} else {
-		$callback->({error=>["Unsupported command: $command."],errorcode=>[1]});
-		return 1;
-	}
-}
-
-
-#-------------------------------------------------------------------------------
-
-=head3  opsaddbmnode
-     This function takes the xCAT nodes and register them
-     as the OpenStack baremetal nodes
-=cut
-
-#-------------------------------------------------------------------------------
-sub opsaddbmnode {
-	my $request = shift;
-	my $callback = shift;
-	my $doreq = shift;
-	
-	@ARGV = @{$request->{arg}};
-	Getopt::Long::Configure("bundling");
-	Getopt::Long::Configure("no_pass_through");
-	
-	my $help;
-	my $version;
-	my $verbose;
-	my $host;
-	
-    if(!GetOptions(
-            'h|help'      => \$help,
-            'v|version'   => \$version,
-            'V|verbose'   => \$verbose,
-            's=s'         => \$host,
-       ))
-    {
-        &opsaddbmnode_usage($callback);
-        return 1;
-    }
-    # display the usage if -h or --help is specified
-    if ($help) {
-        &opsaddbmnode_usage($callback);
-        return 0;
-    }
-    # display the version statement if -v or --verison is specified
-    if ($version)
-    {
-        my $rsp={};
-        $rsp->{data}->[0]= xCAT::Utils->Version();
-        $callback->($rsp);
-        return 0;
-    }
-	
-	if (!$request->{node}) {
-		$callback->({error=>["Please specify at least one node."],errorcode=>[1]});
-		return 1;  
-	}
-	if (!$host) {
-		$callback->({error=>["Please specify the OpenStack compute host name with -s flag."],errorcode=>[1]});
-		return 1;  
-	}
-    
-    my $nodes = $request->{node};
-
-    #get node mgt
-    my $nodehmhash;
-    my $nodehmtab = xCAT::Table->new("nodehm");
-    if ($nodehmtab) {
-        $nodehmhash = $nodehmtab->getNodesAttribs($nodes,['power', 'mgt']);
-    }
-
-    #get bmc info for the nodes
-	my $ipmitab = xCAT::Table->new("ipmi", -create => 0);
-	my $tmp_ipmi;
-	if ($ipmitab) {
-		$tmp_ipmi = $ipmitab->getNodesAttribs($nodes, ['bmc','username', 'password'], prefetchcache=>1);
-		#print Dumper($tmp_ipmi);
-	} else {
-		$callback->({error=>["Cannot open the ipmi table."],errorcode=>[1]});
-		return 1;		
-	}
-
-    #get mac for the nodes
-	my $mactab = xCAT::Table->new("mac", -create => 0);
-	my $tmp_mac;
-	if ($mactab) {
-		$tmp_mac = $mactab->getNodesAttribs($nodes, ['mac'], prefetchcache=>1);
-		#print Dumper($tmp_mac);
-	} else {
-		$callback->({error=>["Cannot open the mac table."],errorcode=>[1]});
-		return 1;		
-	}
-
-    #get cpu, memory and disk info for the nodes
-	my $hwinvtab = xCAT::Table->new("hwinv", -create => 0);
-	my $tmp_hwinv;
-	if ($hwinvtab) {
-		$tmp_hwinv = $hwinvtab->getNodesAttribs($nodes, ['cpucount', 'memory', 'disksize'], prefetchcache=>1);
-		#print Dumper($tmp_hwinv);
-	} else {
-		$callback->({error=>["Cannot open the hwinv table."],errorcode=>[1]});
-		return 1;		
-	}
-
-    #get default username and password for bmc
-    my $d_bmcuser;
-    my $d_bmcpasswd;
-	my $passtab = xCAT::Table->new('passwd');
-	if ($passtab) {
-		($tmp_passwd)=$passtab->getAttribs({'key'=>'ipmi'},'username','password');
-		if (defined($tmp_passwd)) {
-			$d_bmcuser = $tmp_passwd->{username};
-			$d_bmcpasswd = $tmp_passwd->{password};
-		}
-	}
-
-	#print "d_bmcuser=$d_bmcuser, d_bmcpasswd=$d_bmcpasswd \n";
-	foreach my $node (@$nodes) {
-        #collect the node infomation needed for each node, some info
-		my $mgt;
-		my $ref_nodehm = $nodehmhash->{$node}->[0];
-		if ($ref_nodehm) {
-			if ($ref_nodehm->{'power'}) {
-				$mgt = $ref_nodehm->{'power'};
-			} elsif ($ref_nodehm->{'mgt'}) {
-				$mgt = $ref_nodehm->{'mgt'};
-			}
-		}
-
-		my ($bmc, $bmc_user, $bmc_password, $mac, $cpu, $memory, $disk);
-		if (($mgt) && ($mgt eq 'ipmi')) { 
-			my $ref_ipmi = $tmp_ipmi->{$node}->[0]; 
-			if ($ref_ipmi) {
-				if (exists($ref_ipmi->{bmc})) {
-					$bmc = $ref_ipmi->{bmc};
-				}
-				if (exists($ref_ipmi->{username})) {
-					$bmc_user = $ref_ipmi->{username};
-					if (exists($ref_ipmi->{password})) {
-						$bmc_password = $ref_ipmi->{password};
-					} 
-				} else { #take the default if they cannot be found on ipmi table
-					if ($d_bmcuser) { $bmc_user = $d_bmcuser; }
-					if ($d_bmcpasswd) { $bmc_password = $d_bmcpasswd; }
-				}
-			}
-		} # else { # for hardware control point other than ipmi, just fake it in OpenStack.
-			#$bmc = "0.0.0.0";
-			#$bmc_user = "xCAT";
-			#$bmc_password = "xCAT";
-		#}
-
-		my $ref_mac = $tmp_mac->{$node}->[0]; 
-	    if ($ref_mac) {
-			if (exists($ref_mac->{mac})) {
-				$mac = $ref_mac->{mac};
-			}
-		}
-
-		$ref_hwinv = $tmp_hwinv->{$node}->[0]; 
-	    if ($ref_hwinv) {
-			if (exists($ref_hwinv->{cpucount})) {
-				$cpu = $ref_hwinv->{cpucount};
-			}
-			if (exists($ref_hwinv->{memory})) {
-				$memory = $ref_hwinv->{memory};
-                #TODO: what if the unit is not in MB? We need to convert it to MB
-				$memory =~ s/MB|mb//g;
-			}
-			if (exists($ref_hwinv->{disksize})) {
-				#The format of the the disk size is: sda:250GB,sdb:250GB or just 250GB
-                #We need to get the size of the first one
-				$disk = $ref_hwinv->{disksize};
-				my @a = split(',', $disk);
-				my @b = split(':', $a[0]);
-				if (@b > 1) {
-					$disk = $b[1];
-				} else {
-					$disk = $b[0];
-				}
-                #print "a=@a, b=@b\n";
-                #TODO: what if the unit is not in GB? We need to convert it to MB
-				$disk =~ s/GB|gb//g;
-			}
-		}
-
-		#some info are mendatory
-        if (!$mac) {
-			$callback->({error=>["Mac address is not defined in the mac table for node $node."],errorcode=>[1]});
-			next;
-		}
-		if (!$cpu) {
-			#default cpu count is 1
-			$cpu = 1;
-		}
-		if (!$memory) {
-			#default memory size is 1024MB=1GB
-			$memory = 1024;
-		}
-		if (!$disk) {
-			#default disk size is 1GB
-			$disk = 1;
-		}				
-		
-		if ($verbose) {
-			my $rsp;
-			push @{$rsp->{data}}, "Attributes gathered from the xCAT database:";
-			push @{$rsp->{data}}, "  bmc=$bmc";
-			push @{$rsp->{data}}, "  bmc_user=$bmc_user";
-			push @{$rsp->{data}}, "  bmc_password=$bmc_password";
-			push @{$rsp->{data}}, "  mac=$mac";
-			push @{$rsp->{data}}, "  cpu=$cpu";
-			push @{$rsp->{data}}, "  memory=$memory";
-			push @{$rsp->{data}}, "  disk=$disk";
-			xCAT::MsgUtils->message("I", $rsp, $callback);
-		}
-
-		#call OpenStack command to add the node into the OpenStack as
-        #a baremetal node.
-        my $cmd_tmp = "nova baremetal-node-create";
-		if ($bmc) {
-			#make sure it is an ip address
-			if (($bmc !~ /\d+\.\d+\.\d+\.\d+/) && ($bmc !~ /:/)) {
-				$bmc =  xCAT::NetworkUtils->getipaddr($bmc);
-			}
-			$cmd_tmp .= " --pm_address=$bmc";			
-		}
-		if ($bmc_user) {
-			$cmd_tmp .= " --pm_user=$bmc_user";
-		}
-		if ($bmc_password) {
-			$cmd_tmp .= " --pm_password=$bmc_password";
-		}
-		$cmd_tmp .= " $host $cpu $memory $disk $mac";
- 
-		my $cmd = qq~$cmd_tmp~;
-		if ($verbose) {
-			my $rsp;
-			push @{$rsp->{data}}, "The command to run on $host:";
-			push @{$rsp->{data}}, "  $cmd";
-			push @{$rsp->{data}}, "  ";
-			xCAT::MsgUtils->message("I", $rsp, $callback);
-		}
-		#print "cmd=$cmd\n";
-		my $output =
-			xCAT::InstUtils->xcmd($callback, $doreq, "xdsh", [$host], $cmd, 0);
-		if ($::RUNCMD_RC != 0) {
-			my $rsp;
-			push @{$rsp->{data}}, "OpenStack creating baremetal node $node:";
-			push @{$rsp->{data}}, "$output";
-			push @{$rsp->{data}}, "The command was: $cmd";
-			xCAT::MsgUtils->message("E", $rsp, $callback);
-		} else {
-			if (($verbose) && ($output)) {
-				my $rsp;
-				push @{$rsp->{data}}, "$output";
-				push @{$rsp->{data}}, "  ";
-				xCAT::MsgUtils->message("I", $rsp, $callback);
-			}
-		}
-
-	}
-}
-
-
-#-------------------------------------------------------------------------------
-
-=head3  opsaddimage
-     This function takes the xCAT nodes and register them
-     as the OpenStack baremetal nodes
-=cut
-
-#-------------------------------------------------------------------------------
-sub opsaddimage {
-	my $request = shift;
-	my $callback = shift;
-	my $doreq = shift;
-	
-	@ARGV = @{$request->{arg}};
-	Getopt::Long::Configure("bundling");
-	Getopt::Long::Configure("no_pass_through");
-	
-	my $help;
-	my $version;
-	my $verbose;
-	#my $cloud;
-	my $ops_img_names;
-    my $controller;
-	
-    if(!GetOptions(
-            'h|help'      => \$help,
-            'v|version'   => \$version,
-            'V|verbose'   => \$verbose,
-            'c=s'         => \$controller,
-			'n=s'         => \$ops_img_names,
-       ))
-    {
-        &opsaddimage_usage($callback);
-        return 1;
-    }
-    # display the usage if -h or --help is specified
-    if ($help) {
-        &opsaddimage_usage($callback);
-        return 0;
-    }
-    # display the version statement if -v or --verison is specified
-    if ($version)
-    {
-        my $rsp={};
-        $rsp->{data}->[0]= xCAT::Utils->Version();
-        $callback->($rsp);
-        return 0;
-    }
-	
-	if (@ARGV ==0) {
-		$callback->({error=>["Please specify an image name or a list of image names."],errorcode=>[1]});
-		return 1;  
-	}
-
-	#make sure the input cloud name is valid.
-	#if (!$cloud) {
-	#	$callback->({error=>["Please specify the name of the cloud with -c flag."],errorcode=>[1]});
-	#	return 1;  
-	#} else {
-	#	my $cloudstab = xCAT::Table->new('clouds', -create => 0);
-	#	my @et = $cloudstab->getAllAttribs('name', 'controller');
-	#	if(@et) {
-	#		foreach my $tmp_et (@et) {
-	#			if ($tmp_et->{name} eq $cloud) {
-	#				if ($tmp_et->{controller}) {
-	#					$controller = $tmp_et->{controller};
-	#					last;
-	#				} else {
-	#					$callback->({error=>["Please specify the controller in the clouds table for the cloud: $cloud."],errorcode=>[1]});
-	#					return 1;  	
-	#				}
-	#			}
-	#		}
-	#	}
-	
-	if (!$controller) {
-		$callback->({error=>["Please specify the OpenStack controller node name with -c."],errorcode=>[1]});
-		return 1;  			
-	}
-	#}
-
-	#make sure that the images from the command are valid image names
-    @images = split(',', $ARGV[0]);
-    @new_names = ();
-	if ($ops_img_names) {
-		@new_names = split(',', $ops_img_names);
-	}
-	#print "images=@images, new image names=@new_names, controller=$controller\n";
-
-	my $image_hash = {};
-    my $osimgtab = xCAT::Table->new('osimage', -create => 0);
-    my @et = $osimgtab->getAllAttribs('imagename');
-	if(@et) {
-		foreach my $tmp_et (@et) {
-			$image_hash->{$tmp_et->{imagename}}{'xCAT'} = 1;
-		}
-	}
-	my @bad_images;
-	foreach my $image (@images) {
-		if (!exists($image_hash->{$image})) {
-			push @bad_images, $image;
-		}
-	}
-	if (@bad_images > 0) {
-		$callback->({error=>["The following images cannot be found in xCAT osimage table:\n  " . join("\n  ", @bad_images) . "\n"],errorcode=>[1]});
-		return 1;  
-	}
-
-	my $index=0;
- 	foreach my $image (@images) {
-		my $new_name = shift(@new_names);
-		if (!$new_name) {
-			$new_name = $image; #the default new name is xCAT image name
-		}
-        my $cmd_tmp = "glance image-create --name $new_name --public --disk-format qcow2 --container-format bare --property xcat_image_name=\'$image\' < /tmp/$image.qcow2";
-
-		my $cmd = qq~touch /tmp/$image.qcow2;$cmd_tmp~;
-		if ($verbose) {
-			my $rsp;
-			push @{$rsp->{data}}, "The command to run on $controller:";
-			push @{$rsp->{data}}, "   $cmd";
-			push @{$rsp->{data}}, "  ";
-			xCAT::MsgUtils->message("I", $rsp, $callback);
-		}
-		my $output =
-			xCAT::InstUtils->xcmd($callback, $doreq, "xdsh", [$controller], $cmd, 0);
-		if ($::RUNCMD_RC != 0) {
-			my $rsp;
-			push @{$rsp->{data}}, "OpenStack creating image $new_name:";
-			push @{$rsp->{data}}, "$output";
-			push @{$rsp->{data}}, "The command was: $cmd";
-			xCAT::MsgUtils->message("E", $rsp, $callback);
-		} else {
-			if (($verbose) && ($output)) {
-				my $rsp;
-				push @{$rsp->{data}}, "$output";
-				push @{$rsp->{data}}, "  ";
-				xCAT::MsgUtils->message("I", $rsp, $callback);
-			}
-		}		 
-		my $cmd1 = qq~rm /tmp/$image.qcow2~;
-		if ($verbose) {
-			my $rsp;
-			push @{$rsp->{data}}, "The command to run on $controller:";
-			push @{$rsp->{data}}, "  $cmd1";
-			push @{$rsp->{data}}, "  ";
-			xCAT::MsgUtils->message("I", $rsp, $callback);
-		}
-		my $output1 =
-			xCAT::InstUtils->xcmd($callback, $doreq, "xdsh", [$controller], $cmd1, 0);
-		if (($verbose) && ($output1)) {
-			my $rsp;
-			push @{$rsp->{data}}, "$output1";
-			push @{$rsp->{data}}, "  ";
-			xCAT::MsgUtils->message("I", $rsp, $callback);
-		}
-	}
-}
-
-#-------------------------------------------------------------------------------
-
-=head3  deploy_ops_bm_node
-	This is a internel command called by OpenStack xCAT-baremetal driver. 
-	It prepares the node by adding the config_ops_bm_node postbootscript 
-	to the postscript table for the node, then call nodeset and then boot 
-	the node up.
-=cut
-
-#-------------------------------------------------------------------------------
-sub deploy_ops_bm_node {
-	my $request = shift;
-	my $callback = shift;
-	my $doreq = shift;
-	
-	@ARGV = @{$request->{arg}};
-	Getopt::Long::Configure("bundling");
-	Getopt::Long::Configure("no_pass_through");
-
-	my $node = $request->{node}->[0];
-	
-	my $help;
-	my $version;
-	my $img_name;
-    my $hostname;
-	my $fixed_ip;
-	my $netmask;
-	
-    if(!GetOptions(
-            'h|help'      => \$help,
-            'v|version'   => \$version,
-            'image=s'     => \$img_name,
-			'host=s'      => \$hostname,
-			'ip=s'        => \$fixed_ip,
-			'mask=s'      => \$netmask,
-       ))
-    {
-        &deploy_ops_bm_node_usage($callback);
-        return 1;
-    }
-    # display the usage if -h or --help is specified
-    if ($help) {
-        &deploy_ops_bm_node_usage($callback);
-        return 0;
-    }
-    # display the version statement if -v or --verison is specified
-    if ($version)
-    {
-        my $rsp={};
-        $rsp->{data}->[0]= xCAT::Utils->Version();
-        $callback->($rsp);
-        return 0;
-    }
-	#print "node=$node, image=$img_name, host=$hostname, ip=$fixed_ip, mask=$netmask\n";
-
-	#validate the image name
-    my $osimagetab = xCAT::Table->new('osimage', -create=>1);
-	my $ref = $osimagetab->getAttribs({imagename => $img_name}, 'imagename');
-	if (!$ref) {
-		$callback->({error=>["Invalid image name: $img_name."],errorcode=>[1]});
-		return 1;  
-	}
-
-	#check if the fixed ip is within the xCAT management network.
-	#get the master ip address for the node then check if the master ip and 
-	#the OpenStack fixed_ip are on the same subnet.
-	#my $same_nw = 0;
-	#my $master = xCAT::TableUtils->GetMasterNodeName($node);
-	#my $master_ip = xCAT::NetworkUtils->toIP($master);
-	#if (xCAT::NetworkUtils::isInSameSubnet($master_ip, $fixed_ip, $netmask, 0)) {
-	#	$same_nw = 1;
-	#}
-	   
-	
-	#add config_ops_bm_node to the node's postbootscript
-	my $script = "config_ops_bm_node $hostname $fixed_ip $netmask";
-	add_postscript($callback, $node, $script);
-
-    #run nodeset 
-	my $cmd = qq~osimage=$img_name~;
-	my $output = xCAT::Utils->runxcmd(
-		{command => ["nodeset"],
-		 node    => [$node], 
-		 arg     => [$cmd]},
-		$doreq, -1, 1);
-	if ($::RUNCMD_RC != 0) {
-		my $rsp;
-		push @{$rsp->{data}}, "nodeset:";
-		push @{$rsp->{data}}, "$output";
-		xCAT::MsgUtils->message("E", $rsp, $callback);
-		return 1;
-	}		
- 
-    #deploy the node now, supported nodehm.mgt values: ipmi, blade,fsp, hmc.
-    my $hmtab  = xCAT::Table->new('nodehm');
-	my $hment = $hmtab->getNodeAttribs($node,['mgt']);
-	if ($hment && $hment->{'mgt'}) {
-		my $mgt = $hment->{'mgt'};
-		if ($mgt eq 'ipmi') { 
-			deploy_bmc_node($callback, $doreq, $node);
-		} elsif (($mgt eq 'blade') || ($mgt eq 'fsp')) {
-			deploy_blade($callback, $doreq, $node);
-		} elsif ($mgt eq 'hmc') {
-			deploy_hmc_node($callback, $doreq, $node);
-		} else {
-			my $rsp;
-			push @{$rsp->{data}}, "Node $node: nodehm.mgt=$mgt is not supported in the OpenStack cloud.";
-			xCAT::MsgUtils->message("E", $rsp, $callback);
-			return 1;
-		}
-	} else {
-		#nodehm.mgt must setup for node 
-		my $rsp;
-		push @{$rsp->{data}}, "Node $node: nodehm.mgt cannot be empty in order to deploy.";
-		xCAT::MsgUtils->message("E", $rsp, $callback);
-		return 1;
-	}
-
-}
-
-# Deploy a rack-mounted node
-sub deploy_bmc_node {
-	my $callback = shift;
-	my $doreq = shift;
-	my $node = shift;
-
-    #set boot order
-	my $cmd = qq~net~;
-	my $output = xCAT::Utils->runxcmd(
-		{command => ["rsetboot"],
-		 node    => [$node], 
-		 arg     => [$cmd]},
-		$doreq, -1, 1);
-	if ($::RUNCMD_RC != 0) {
-		my $rsp;
-		push @{$rsp->{data}}, "rsetboot:";
-		push @{$rsp->{data}}, "$output";
-		xCAT::MsgUtils->message("E", $rsp, $callback);
-	}		
-	
-    #reboot the node
-	my $cmd = qq~boot~;
-	my $output = xCAT::Utils->runxcmd(
-		{command => ["rpower"],
-		 node    => [$node], 
-		 arg     => [$cmd]},
-		$doreq, -1, 1);
-	if ($::RUNCMD_RC != 0) {
-		my $rsp;
-		push @{$rsp->{data}}, "rpower:";
-		push @{$rsp->{data}}, "$output";
-		xCAT::MsgUtils->message("E", $rsp, $callback);
-		return 1;
-	}
-}
-
-# Deploy a blade or fsp controlled node
-sub deploy_blade {
-	my $callback = shift;
-	my $doreq = shift;
-	my $node = shift;
-
-    #set boot order
-	my $cmd = qq~net~;
-	my $output = xCAT::Utils->runxcmd(
-		{command => ["rbootseq"],
-		 node    => [$node], 
-		 arg     => [$cmd]},
-		$doreq, -1, 1);
-	if ($::RUNCMD_RC != 0) {
-		my $rsp;
-		push @{$rsp->{data}}, "rbootseq:";
-		push @{$rsp->{data}}, "$output";
-		xCAT::MsgUtils->message("E", $rsp, $callback);
-	}		
-	
-    #reboot the node
-	my $cmd = qq~boot~;
-	my $output = xCAT::Utils->runxcmd(
-		{command => ["rpower"],
-		 node    => [$node], 
-		 arg     => [$cmd]},
-		$doreq, -1, 1);
-	if ($::RUNCMD_RC != 0) {
-		my $rsp;
-		push @{$rsp->{data}}, "rpower:";
-		push @{$rsp->{data}}, "$output";
-		xCAT::MsgUtils->message("E", $rsp, $callback);
-		return 1;
-	}	
-}
-
-# Deploy a node controlled by HMC
-sub deploy_hmc_node {
-	my $callback = shift;
-	my $doreq = shift;
-	my $node = shift;
-
-	my $output = xCAT::Utils->runxcmd(
-		{command => ["rnetboot"],
-		 node    => [$node]},
-		$doreq, -1, 1);
-	if ($::RUNCMD_RC != 0) {
-		my $rsp;
-		push @{$rsp->{data}}, "rnetboot:";
-		push @{$rsp->{data}}, "$output";
-		xCAT::MsgUtils->message("E", $rsp, $callback);
-		return 1;
-	}	
-}
-
-
-#-------------------------------------------------------------------------------
-
-=head3  cleanup_ops_bm_node
-	This is a internel command called by OpenStack xCAT-baremetal driver.
-	It undoes all the changes made by deploy_ops_bm_node command. It removes
-	the config_ops_bmn_ode postbootscript from the postscript table for the 
-	node, removes the alias ip and then power off the node.
-=cut
-
-#-------------------------------------------------------------------------------
-sub cleanup_ops_bm_node {
-	my $request = shift;
-	my $callback = shift;
-	my $doreq = shift;
-	
-	@ARGV = @{$request->{arg}};
-	Getopt::Long::Configure("bundling");
-	Getopt::Long::Configure("no_pass_through");
-
-	my $node = $request->{node}->[0];
-	
-	my $help;
-	my $version;
- 	my $fixed_ip;
-	
-    if(!GetOptions(
-            'h|help'      => \$help,
-            'v|version'   => \$version,
-			'ip=s'        => \$fixed_ip,
-       ))
-    {
-        &cleanup_ops_bm_node_usage($callback);
-        return 1;
-    }
-    # display the usage if -h or --help is specified
-    if ($help) {
-        &cleanup_ops_bm_node_usage($callback);
-        return 0;
-    }
-    # display the version statement if -v or --verison is specified
-    if ($version)
-    {
-        my $rsp={};
-        $rsp->{data}->[0]= xCAT::Utils->Version();
-        $callback->($rsp);
-        return 0;
-    }
-	#print "node=$node, ip=$fixed_ip\n";   
-	
-	#removes the config_ops_bm_node postbootscript from the postscripts table
-	remove_postscript($callback, $node, "config_ops_bm_node");
-
-
-	#run updatenode to remove the ip alias 
-	my $cmd = qq~-P deconfig_ops_bm_node $fixed_ip~;
-	my $output = xCAT::Utils->runxcmd(
-		{command => ["updatenode"],
-		 node    => [$node], 
-		 arg     => [$cmd]},
-		$doreq, -1, 1);
-	if ($::RUNCMD_RC != 0) {
-		my $rsp;
-		push @{$rsp->{data}}, "updatenode:";
-		push @{$rsp->{data}}, "$output";
-		xCAT::MsgUtils->message("E", $rsp, $callback);
-	}
-		
-    #turn the node power off
-	$ssh_ok = 0;
-	my $cmd = qq~stat~;
-	my $output = xCAT::Utils->runxcmd(
-		{command => ["rpower"],
-		 node    => [$node], 
-		 arg     => [$cmd]},
-		$doreq, -1, 1);
-
-	if ($::RUNCMD_RC != 0) {
-		my $rsp;
-		push @{$rsp->{data}}, "rpower:";
-		push @{$rsp->{data}}, "$output";
-		xCAT::MsgUtils->message("E", $rsp, $callback);
-		return 1;
-	}   else {
-		if ($output !~ /: off/) {
-			#power off the node
-			my $cmd = qq~off~;
-			my $output = xCAT::Utils->runxcmd(
-				{command => ["rpower"],
-				 node    => [$node], 
-				 arg     => [$cmd]},
-				$doreq, -1, 1);
-			if ($::RUNCMD_RC != 0) {
-				my $rsp;
-				push @{$rsp->{data}}, "rpower:";
-				push @{$rsp->{data}}, "$output";
-				xCAT::MsgUtils->message("E", $rsp, $callback);
-				return 1;
-			}		
-		}
-	}
-}
-
-#-------------------------------------------------------
-=head3  add_postscript
-
-	It adds the 'config_ops_bm_node' postbootscript to the 
-	postscript table for the given node.
-
-=cut
-#-------------------------------------------------------
-sub  add_postscript {
-    my $callback=shift;
-    my $node=shift;
-	my $script=shift;
-	#print "script=$script\n";
-
-    my $posttab=xCAT::Table->new("postscripts", -create =>1);
-	my %setup_hash;
-	my $ref = $posttab->getNodeAttribs($node,[qw(postscripts postbootscripts)]);
-	my $found=0;
-	if ($ref) {
-		if (exists($ref->{postscripts})) {
-		    my @a = split(/,/, $ref->{postscripts});
-		    if (grep(/^config_ops_bm_node/, @a)) {
-				$found = 1;
-				if (!grep(/^$script$/, @a)) {
-					#not exact match, must replace it with the new script
-					for (@a) {
-						s/^config_ops_bm_node.*$/$script/;
-					}
-					my $new_post = join(',', @a);
-					$setup_hash{$node}={postscripts=>"$new_post"};
-				}
-			}
-		}
-		
-
-		if (exists($ref->{postbootscripts})) {
-		    my $post=$ref->{postbootscripts};
-		    my @old_a=split(',', $post);
-		    if (grep(/^config_ops_bm_node/, @old_a)) {
-				if (!grep(/^$script$/, @old_a)) {
-					#not exact match, will replace it with new script
-					for (@old_a) {
-						s/^config_ops_bm_node.*$/$script/;
-					}
-					my $new_postboot = join(',', @old_a);
-					$setup_hash{$node}={postbootscripts=>"$new_postboot"};
-				}
-		    } else {
-				if (! $found) {
-					$setup_hash{$node}={postbootscripts=>"$post,$script"};
-				}
-		    }
-		} else {
-            if (! $found) {
-				$setup_hash{$node}={postbootscripts=>"$script"};
-			}
-		}
-	} else {
-		$setup_hash{$node}={postbootscripts=>"$script"};
-	}
-
-	if (keys(%setup_hash) > 0) {
-	    $posttab->setNodesAttribs(\%setup_hash);
-	}
-
-    return 0;
-}
-
-#-------------------------------------------------------
-=head3  remove_postscript
-
-	It removes the 'config_ops_bm_node' postbootscript from 
-	the postscript table for the given node.
-
-=cut
-#-------------------------------------------------------
-sub  remove_postscript {
-    my $callback=shift;
-    my $node=shift;
-	my $script=shift;
-
-    my $posttab=xCAT::Table->new("postscripts", -create =>1);
-	my %setup_hash;
-	my $ref = $posttab->getNodeAttribs($node,[qw(postscripts postbootscripts)]);
-	my $found=0;
-	if ($ref) {
-		if (exists($ref->{postscripts})) {
-		    my @old_a = split(/,/, $ref->{postscripts});
-		    my @new_a = grep(!/^$script/, @old_a);
-			if (scalar(@new_a) != scalar(@old_a)) {
-				my $new_post = join(',', @new_a);
-				$setup_hash{$node}={postscripts=>"$new_post"};
-			}
-		}
-
-		if (exists($ref->{postbootscripts})) {
-		    my @old_b = split(/,/, $ref->{postbootscripts});
-		    my @new_b = grep(!/^$script/, @old_b);
-			if (scalar(@new_b) != scalar(@old_b)) {
-				my $new_post = join(',', @new_b);
-				$setup_hash{$node}={postbootscripts=>"$new_post"};
-			}
-		}
-
-	}
-	
-	if (keys(%setup_hash) > 0) {
-	    $posttab->setNodesAttribs(\%setup_hash);
-	}
-
-    return 0;
-}
-
-
-#-------------------------------------------------------------------------------
-
-=head3  opsaddbmnode_usage
-	The usage text for opsaddbmnode command.
-=cut
-
-#-------------------------------------------------------------------------------
-sub opsaddbmnode_usage {
-    my $cb=shift;
-    my $rsp={};
-
-    $rsp->{data}->[0]= "Usage: opsaddbmnode -h";
-    $rsp->{data}->[1]= "       opsaddbmnode -v";
-    $rsp->{data}->[2]= "       opsaddbmnode <noderange> -s <service_host> [-V]";
-    $cb->($rsp);
-}
-
-
-#-------------------------------------------------------------------------------
-
-=head3  opsaddimage_usage
-	The usage text for opsaddimage command.
-=cut
-
-#-------------------------------------------------------------------------------
-sub opsaddimage_usage {
-    my $cb=shift;
-    my $rsp={};
-
-    $rsp->{data}->[0]= "Usage: opsaddimage -h";
-    $rsp->{data}->[1]= "       opsaddimage -v";
-    $rsp->{data}->[2]= "       opsaddimage <image1,image2...> [-n <new_name1,new_name2...> -c <controller> [-V]";
-    $cb->($rsp);
-}
-
-#-------------------------------------------------------------------------------
-
-=head3   deploy_ops_bm_node_usage
-	The usage text for deploy_ops_bm_node command.
-=cut
-
-#-------------------------------------------------------------------------------
-sub deploy_ops_bm_node_usage {
-    my $cb=shift;
-    my $rsp={};
-
-    $rsp->{data}->[0]= "Usage: deploy_ops_bm_node -h";
-    $rsp->{data}->[1]= "       deploy_ops_bm_node -v";
-    $rsp->{data}->[2]= "       deploy_ops_bm_node <node> --image <image_name> --host <ops_hostname> --ip <ops_fixed_ip> --mask <netmask>";
-    $cb->($rsp);
-}
-
-#-------------------------------------------------------------------------------
-
-=head3  cleanup_ops_bm_node_usage
-	The usage text cleanup_ops_bm_node command.
-=cut
-
-#-------------------------------------------------------------------------------
-sub cleanup_ops_bm_node_usage {
-    my $cb=shift;
-    my $rsp={};
-
-    $rsp->{data}->[0]= "Usage: cleanup_ops_bm_node -h";
-    $rsp->{data}->[1]= "       cleanup_ops_bm_node -v";
-    $rsp->{data}->[2]= "       cleanup_ops_bm_node <node> [--ip <ops_fixed_ip>]";
-    $cb->($rsp);
-}
-
-1;
@@ -1,17 +0,0 @@
-# Copyright (c) 2012 NTT DOCOMO, INC.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-from xcat.openstack.baremetal import driver
-
-BareMetalDriver = driver.xCATBareMetalDriver
@@ -1,256 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# coding=utf-8
-
-"""
-A driver for Bare-metal platform.
-"""
-
-from oslo.config import cfg
-
-from nova.compute import power_state
-from nova import context as nova_context
-from nova import exception
-from nova.openstack.common import excutils
-from nova.openstack.common.gettextutils import _
-from nova.openstack.common import importutils
-from nova.openstack.common import jsonutils
-from nova.openstack.common import log as logging
-from nova.virt.baremetal import baremetal_states
-from nova.virt.baremetal import db
-from nova.virt.baremetal import driver as bm_driver
-from nova.virt.baremetal import utils as bm_utils
-from nova.virt import driver
-from nova.virt import firewall
-from nova.virt.libvirt import imagecache
-from xcat.openstack.baremetal import xcat_driver
-from xcat.openstack.baremetal import exception as xcat_exception
-from xcat.openstack.baremetal import power_states
-
-
-LOG = logging.getLogger(__name__)
-CONF = cfg.CONF
-CONF.import_opt('use_ipv6', 'nova.netconf')
-
-
-class xCATBareMetalDriver(bm_driver.BareMetalDriver):
-    """BareMetal hypervisor driver."""
-
-    def __init__(self, virtapi, read_only=False):
-        super(xCATBareMetalDriver, self).__init__(virtapi)
-        self.xcat = xcat_driver.xCAT()
-
-    def _get_xCAT_image_name(self, image_meta):
-        prop = image_meta.get('properties')
-        xcat_image_name = prop.get('xcat_image_name')
-        if xcat_image_name:
-            return xcat_image_name
-        else:
-            raise xcat_exception.xCATInvalidImageError(image=image_meta.get('name'))
-
-    def spawn(self, context, instance, image_meta, injected_files,
-              admin_password, network_info=None, block_device_info=None):
-        """
-        Create a new instance/VM/domain on the virtualization platform.
-
-        Once this successfully completes, the instance should be
-        running (power_state.RUNNING).
-
-        If this fails, any partial instance should be completely
-        cleaned up, and the virtualization platform should be in the state
-        that it was before this call began.
-
-        :param context: security context
-        :param instance: Instance object as returned by DB layer.
-                         This function should use the data there to guide
-                         the creation of the new instance.
-        :param image_meta: image object returned by nova.image.glance that
-                           defines the image from which to boot this instance
-        :param injected_files: User files to inject into instance.
-        :param admin_password: Administrator password to set in instance.
-        :param network_info:
-           :py:meth:`~nova.network.manager.NetworkManager.get_instance_nw_info`
-        :param block_device_info: Information about block devices to be
-                                  attached to the instance.
-        """
- 	    #import pdb
-	    #pdb.set_trace()
-        node_uuid = self._require_node(instance)
-        node = db.bm_node_associate_and_update(context, node_uuid,
-                    {'instance_uuid': instance['uuid'],
-                     'instance_name': instance['hostname'],
-                     'task_state': baremetal_states.BUILDING})
-
-        try:
-            self._plug_vifs(instance, network_info, context=context)
-            self._attach_block_devices(instance, block_device_info)
-            self._start_firewall(instance, network_info)
-
-            macs = self.macs_for_instance(instance)
-            nodename = self.xcat.get_xcat_node_name(macs)
-            imagename = self._get_xCAT_image_name(image_meta)
-            hostname = instance.get('hostname')
-            
-            #get the network information for the new node
-            interfaces = bm_utils.map_network_interfaces(network_info, CONF.use_ipv6)
-            if CONF.use_ipv6:
-                fixed_ip = interfaces[0].get('address_v6')
-                netmask = interfaces[0].get('netmask_v6')
-                gateway = interfaces[0].get('gateway_v6')
-            else:
-                fixed_ip = interfaces[0].get('address')
-                netmask = interfaces[0].get('netmask')
-                gateway = interfaces[0].get('gateway')
-            #convert netmask from IPAddress to unicode string
-            if netmask:
-                netmask = unicode(netmask)
-
-            #let xCAT install it
-            bm_driver._update_state(context, node, instance, baremetal_states.DEPLOYING)
-            self.xcat.deploy_node(nodename, imagename, hostname, fixed_ip, netmask, gateway)
-            bm_driver._update_state(context, node, instance, baremetal_states.ACTIVE)
-        except Exception as e: 
-            with excutils.save_and_reraise_exception():
-                LOG.error(_("Error occured while deploying instance %(instance)s "
-                            "on baremetal node %(node)s: %(error)s") %
-                          {'instance': instance['uuid'],
-                           'node': node['uuid'],
-                           'error':str(e)})
-                bm_driver._update_state(context, node, instance, baremetal_states.ERROR)
-
-    def reboot(self, context, instance, network_info, reboot_type,
-               block_device_info=None, bad_volumes_callback=None):
-        """Reboot the specified instance.
-
-        After this is called successfully, the instance's state
-        goes back to power_state.RUNNING. The virtualization
-        platform should ensure that the reboot action has completed
-        successfully even in cases in which the underlying domain/vm
-        is paused or halted/stopped.
-
-        :param instance: Instance object as returned by DB layer.
-        :param network_info:
-           :py:meth:`~nova.network.manager.NetworkManager.get_instance_nw_info`
-        :param reboot_type: Either a HARD or SOFT reboot
-        :param block_device_info: Info pertaining to attached volumes
-        :param bad_volumes_callback: Function to handle any bad volumes
-            encountered
-        """
-        try: 
-            node = bm_driver._get_baremetal_node_by_instance_uuid(instance['uuid'])
-            macs = self.macs_for_instance(instance)
-            nodename = self.xcat.get_xcat_node_name(macs)
-            self.xcat.reboot_node(nodename)
-            bm_driver._update_state(context, node, instance, baremetal_states.RUNNING)
-        except xcat_exception.xCATCommandError as e: 
-            with excutils.save_and_reraise_exception():
-                LOG.error(_("Error occured while rebooting instance %(instance)s "
-                            "on baremetal node %(node)s: %(error)s") %
-                            {'instance': instance['uuid'],
-                             'node': node['uuid'],
-                             'error':str(e)})
-                bm_driver._update_state(context, node, instance, baremetal_states.ERROR)
-
-    def destroy(self, instance, network_info, block_device_info=None,
-                context=None):
-        """Destroy (shutdown and delete) the specified instance.
-
-        If the instance is not found (for example if networking failed), this
-        function should still succeed.  It's probably a good idea to log a
-        warning in that case.
-
-        :param context: security context
-        :param instance: Instance object as returned by DB layer.
-        :param network_info:
-           :py:meth:`~nova.network.manager.NetworkManager.get_instance_nw_info`
-        :param block_device_info: Information about block devices that should
-                                  be detached from the instance.
-        :param destroy_disks: Indicates if disks should be destroyed
-        """
- 	    #import pdb
-	    #pdb.set_trace()
-        context = nova_context.get_admin_context()
-        try:
-            node = bm_driver._get_baremetal_node_by_instance_uuid(instance['uuid'])
-            
-        except exception.InstanceNotFound:
-            LOG.warning(_("Destroy function called on a non-existing instance %s")
-                        % instance['uuid'])
-            return
-
-        try:
-            macs = self.macs_for_instance(instance)
-            nodename = self.xcat.get_xcat_node_name(macs)
-            interfaces = bm_utils.map_network_interfaces(network_info, CONF.use_ipv6)
-            fixed_ip=None
-            if interfaces and interfaces[0]: 
-                if CONF.use_ipv6:
-                    fixed_ip = interfaces[0].get('address_v6')
-                else:
-                    fixed_ip = interfaces[0].get('address')
-            if fixed_ip:
-                self.xcat.cleanup_node(nodename, fixed_ip)
-            else:
-                self.xcat.cleanup_node(nodename)
-        except Exception as e:
-            #just log it and move on
-            LOG.warning(_("Destroy called with xCAT error:" + str(e)))
-
-        try:
-            self._detach_block_devices(instance, block_device_info)
-            self._stop_firewall(instance, network_info)
-            self._unplug_vifs(instance, network_info)
-            
-            bm_driver._update_state(context, node, None, baremetal_states.DELETED)
-        except Exception as e:
-            with excutils.save_and_reraise_exception():
-                LOG.error(_("Error occurred while destroying instance %s: %s") 
-                          % (instance['uuid'], str(e)))
-                bm_driver._update_state(context, node, instance,
-                                        baremetal_states.ERROR)
-
-    def power_off(self, instance, node=None):
-        """Power off the specified instance."""
-        macs = self.macs_for_instance(instance)
-        nodename = self.xcat.get_xcat_node_name(macs)
-        self.xcat.power_off_node(nodename)
-            
-
-    def power_on(self, context, instance, network_info, block_device_info=None,
-                 node=None):
-        """Power on the specified instance."""
-        macs = self.macs_for_instance(instance)
-        nodename = self.xcat.get_xcat_node_name(macs)
-        self.xcat.power_on_node(nodename)
-
-
-    def get_console_output(self, instance):
-        pass
-
-    def get_info(self, instance):
-        """Get the current status of an instance, by name (not ID!)
-
-        Returns a dict containing:
-        :state:           the running state, one of the power_state codes
-        :max_mem:         (int) the maximum memory in KBytes allowed
-        :mem:             (int) the memory in KBytes used by the domain
-        :num_cpu:         (int) the number of virtual CPUs for the domain
-        :cpu_time:        (int) the CPU time used in nanoseconds
-        """
-
-        node = bm_driver._get_baremetal_node_by_instance_uuid(instance['uuid'])
-        macs = self.macs_for_instance(instance)
-        nodename = self.xcat.get_xcat_node_name(macs)
-
-        ps = self.xcat.get_node_power_state(nodename)
-        if ps == power_states.ON:
-            pstate = power_state.RUNNING
-        elif ps == power_states.OFF:
-            pstate = power_state.SHUTDOWN
-        else:
-            pstate = power_state.NOSTATE
-
-        return {'state': pstate,
-                'max_mem': node['memory_mb'],
-                'mem': node['memory_mb'],
-                'num_cpu': node['cpus'],
-                'cpu_time': 0}
@@ -1,41 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-"""xCAT baremtal exceptions.
-"""
-
-import functools
-import sys
-
-from oslo.config import cfg
-import webob.exc
-
-from nova.openstack.common import excutils
-from nova.openstack.common.gettextutils import _
-from nova.openstack.common import log as logging
-from nova import safe_utils
-from nova import exception as nova_exception
-
-LOG = logging.getLogger(__name__)
-
-class xCATException(Exception):
-    errmsg = _("xCAT general exception")
-
-    def __init__(self, errmsg=None, **kwargs):
-        if not errmsg:
-            errmsg = self.errmsg
-            errmsg = errmsg % kwargs
-
-        super(xCATException, self).__init__(errmsg)
-
-class xCATCommandError(xCATException):
-    errmsg =  _("Error returned when calling xCAT command %(cmd)s"
-                " for node %(node)s:%(error)s")
-
-class xCATInvalidImageError(xCATException):
-    errmsg = _("The image %(image)s is not an xCAT image")
-
-class xCATDeploymentFailure(xCATException):    
-    errmsg = _("xCAT node deployment failed for node %(node)s:%(error)s")
-
-class xCATRebootFailure(xCATException):    
-    errmsg = _("xCAT node rebooting failed for node %(node)s:%(error)s")
@@ -1,9 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-"""
-Possible xCAT node power states.
-"""
-
-OFF = 'off'
-ON = 'on'
-ERROR = 'error'
@@ -1,260 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# coding=utf-8
-
-
-"""
-Baremetal xCAT power manager.
-"""
-
-import os
-import sys
-import stat
-from oslo.config import cfg
-import datetime
-
-from nova import context as nova_context
-from nova.virt.baremetal import baremetal_states
-from nova.openstack.common.gettextutils import _
-from nova.openstack.common import log as logging
-from nova.openstack.common import loopingcall
-from nova.openstack.common import timeutils
-from nova import paths
-from nova import utils
-from xcat.openstack.baremetal import exception
-from xcat.openstack.baremetal import power_states
-
-LOG = logging.getLogger(__name__)
-
-# register configuration options
-xcat_opts = [
-    cfg.IntOpt('deploy_timeout',
-                help='Timeout for node deployment. Default: 0 second (unlimited)',
-                default=0),
-    cfg.IntOpt('reboot_timeout',
-                help='Timeout for rebooting a node. Default: 0 second (unlimited)',
-                default=0),    
-    cfg.IntOpt('deploy_checking_interval',
-                help='Checking interval for node deployment. Default: 10 seconds',
-                default=10),
-    cfg.IntOpt('reboot_checking_interval',
-                help='Checking interval for rebooting a node. Default: 5 seconds',
-                default=5),    
-   ]
-xcat_group = cfg.OptGroup(name='xcat',
-                          title='xCAT Options')
-CONF = cfg.CONF
-CONF.register_group(xcat_group)
-CONF.register_opts(xcat_opts, xcat_group)
-
-
-class xCAT(object):
-    """A driver that calls xCAT funcions"""
-
-    def __init__(self):
-        #setup the path for xCAT commands
-        #xcatroot = os.getenv('XCATROOT', '/opt/xcat/')
-        #sys.path.append("%s/bin" % xcatroot)
-        #sys.path.append("%s/sbin" % xcatroot)
-        pass
-
-    def _exec_xcat_command(self, command):
-        """Calls xCAT command."""
-        args = command.split(" ")
-        out, err = utils.execute(*args, run_as_root=True)
-        LOG.debug(_("xCAT command stdout: '%(out)s', stderr: '%(err)s'"),
-                  {'out': out, 'err': err})
-        return out, err
-
-    def get_xcat_node_name(self, macs):
-        """Get the xcat node name given mac addressed.
-
-        It uses the mac address to search for the node name in xCAT.
-        """
-        for mac in macs:
-            out, err = self._exec_xcat_command("lsdef -w mac=%s" % mac)
-            if out:
-                return out.split(" ")[0]
-        
-        errstr='No node found in xCAT with the following mac address: ' \
-            + ','.join(macs)
-        LOG.warning(errstr)
-        raise exception.xCATCommandError(errstr)
-
-        
-    def deploy_node(self, nodename, imagename, hostname, fixed_ip, netmask, gateway):
-        """
-        Install the node.
-
-        It calls xCAT command deploy_ops_bmnode which prepares the node
-        by adding the config_ops_bm_node postbootscript to the postscript
-        table for the node, then call nodeset and then boot the node up.
-        """
-        out, err = self._exec_xcat_command(
-            "deploy_ops_bm_node %(node)s --image %(image)s"
-            " --host %(host)s --ip %(ip)s --mask %(mask)s" 
-            % {'node': nodename,
-               'image': imagename,
-               'host': hostname,
-               'ip': fixed_ip,
-               'mask': netmask,
-            })
-        if err:
-            errstr = _("Error returned when calling xCAT deploy_ops_bm_node"
-                       " command for node %s:%s") % (nodename, err)
-            LOG.warning(errstr)
-            raise exception.xCATCommandError(errstr)
-        self._wait_for_node_deploy(nodename)
-
-    def cleanup_node(self, nodename, fixed_ip=None):
-        """
-        Undo all the changes made to the node by deploy_node function.
-
-        It calls xCAT command cleanup_ops_bm_node which removes the
-        config_ops_bm_node postbootscript from the postscript table
-        for the node, removes the alias ip and then power the node off.
-        """
-        cmd = "cleanup_ops_bm_node %s" % nodename
-        if fixed_ip:
-            cmd += " --ip %s" % fixed_ip
-        out, err = self._exec_xcat_command(cmd)
-
-        if err:
-            errstr = _("Error returned when calling xCAT cleanup_ops_bm_node"
-                       " command for node %s:%s") % (nodename, err)
-            LOG.warning(errstr)
-            raise exception.xCATCommandError(errstr)
-
-    def power_on_node(self, nodename):
-        """Power on the node."""
-        state = self.get_node_power_state(nodename)
-        if state ==  power_states.ON:
-            LOG.warning(_("Powring on node called, but the node %s "
-                          "is already on") % nodename)
-        out, err = self._exec_xcat_command("rpower %s on" % nodename)
-        if err:
-            errstr = _("Error returned when calling xCAT rpower on"
-                    " for node %s:%s") % (nodename, err)
-            LOG.warning(errstr)
-            raise exception.xCATCommandError(errstr)
-        else:
-            self._wait_for_node_reboot(nodename)
-            return power_states.ON
-    
-    def power_off_node(self, nodename):
-        """Power off the node."""
-        state = self.get_node_power_state(nodename)
-        if state ==  power_states.OFF:
-            LOG.warning(_("Powring off node called, but the node %s "
-                          "is already off") % nodename)
-        out, err = self._exec_xcat_command("rpower %s off" % nodename)
-        if err:
-            errstr = _("Error returned when calling xCAT rpower off"
-                    " for node %s:%s") % (nodename, err)
-            LOG.warning(errstr)
-            raise exception.xCATCommandError(errstr)
-        else:
-            return power_states.OFF
-
-    def reboot_node(self, nodename):
-        """Reboot the node."""
-        out, err = self._exec_xcat_command("rpower %s boot" % nodename)
-        if err:
-            errstr = _("Error returned when calling xCAT rpower boot"
-                    " for node %s:%s") % (nodename, err)
-            LOG.warning(errstr)
-            raise exception.xCATCommandError(errstr)
-        
-        self._wait_for_node_reboot(nodename)
-        return power_states.ON
-        
-
-    def get_node_power_state(self, nodename):
-        out, err = self._exec_xcat_command("rpower %s stat" % nodename)
-        if err:
-            errstr = _("Error returned when calling xCAT rpower stat"
-                    " for node %s:%s") % (nodename, err)
-            LOG.warning(errstr)
-            raise exception.xCATCommandError(errstr)
-        else:
-            state = out.split(":")[1]
-            if state:
-                state = state.strip()
-                if state == 'on':
-                    return power_states.ON
-                elif state == 'off':
-                    return power_states.OFF
-            
-            return power_states.ERROR
-            
-    def _wait_for_node_deploy(self, nodename):
-        """Wait for xCAT node deployment to complete."""
-        locals = {'errstr':''}
-
-        def _wait_for_deploy():
-            out,err = self._exec_xcat_command("nodels %s nodelist.status" % nodename)
-            if err:
-                locals['errstr'] = _("Error returned when quering node status"
-                           " for node %s:%s") % (nodename, err)
-                LOG.warning(locals['errstr'])
-                raise loopingcall.LoopingCallDone()
-
-            if out:
-                node,status = out.split(": ")
-                status = status.strip()
-                if status == "booted":
-                    LOG.info(_("Deployment for node %s completed.")
-                             % nodename)
-                    raise loopingcall.LoopingCallDone()
-
-            if (CONF.xcat.deploy_timeout and
-                    timeutils.utcnow() > expiration):
-                locals['errstr'] = _("Timeout while waiting for"
-                           " deployment of node %s.") % nodename
-                LOG.warning(locals['errstr'])
-                raise loopingcall.LoopingCallDone()
-
-        expiration = timeutils.utcnow() + datetime.timedelta(
-                seconds=CONF.xcat.deploy_timeout)
-        timer = loopingcall.FixedIntervalLoopingCall(_wait_for_deploy)
-        # default check every 10 seconds
-        timer.start(interval=CONF.xcat.deploy_checking_interval).wait()
-
-        if locals['errstr']:
-            raise exception.xCATDeploymentFailure(locals['errstr'])
-
-
-    def _wait_for_node_reboot(self, nodename):
-        """Wait for xCAT node boot to complete."""
-        locals = {'errstr':''}
-
-        def _wait_for_reboot():
-            out,err = self._exec_xcat_command("nodestat %s" % nodename)
-            if err:
-                locals['errstr'] = _("Error returned when quering node status"
-                           " for node %s:%s") % (nodename, err)
-                LOG.warning(locals['errstr'])
-                raise loopingcall.LoopingCallDone()
-
-            if out:
-                node,status = out.split(": ")
-                status = status.strip()
-                if status == "sshd":
-                    LOG.info(_("Rebooting node %s completed.")
-                             % nodename)
-                    raise loopingcall.LoopingCallDone()
-
-            if (CONF.xcat.reboot_timeout and
-                    timeutils.utcnow() > expiration):
-                locals['errstr'] = _("Timeout while waiting for"
-                           " rebooting node %s.") % nodename
-                LOG.warning(locals['errstr'])
-                raise loopingcall.LoopingCallDone()
-
-        expiration = timeutils.utcnow() + datetime.timedelta(
-                seconds=CONF.xcat.reboot_timeout)
-        timer = loopingcall.FixedIntervalLoopingCall(_wait_for_reboot)
-        # default check every 5 seconds
-        timer.start(interval=CONF.xcat.reboot_checking_interval).wait()
-
-        if locals['errstr']:
-            raise exception.xCATRebootFailure(locals['errstr'])
@@ -1,92 +0,0 @@
-=head1 NAME
-
-B<opsaddbmnode> - It adds xCAT baremetal nodes to an OpenStack cloud.
-
-=head1 SYNOPSIS
-
-B<opsaddbmnode> I<noderange> B<-s> I<service_host> [B<-V>|B<--verbose>]
-
-B<opsaddbmnode> [B<-h>|B<--help>]
-
-B<opsaddbmnode> [B<-v>|B<--version>]
-
-=head1 DESCRIPTION
-
-The B<opsaddbmnode> command registers xCAT nodes to an OpenStack cloud. An OpenStack nova baremetal node registration command takes several node attributes:
-
-=over
-
-=item BMC ip addresss, user id and password
-
-=item Name of nova compute host which will control this baremetal node
-
-=item Number of CPUs in the node
-
-=item Memory in the node (MB)
-
-=item Local hard disk in the node (GB)
-
-=item MAC address to provision the node
-
-=back
-
-The opsaddbmnode command pulls the above baremetal node information from xCAT tables and calls "nova baremetal-node-create" to register the baremetal node with the OpenStack cloud.
-
-Please make sure the following xCAT tables are filled with correct information for the given nodes before calling this command.
-
-=over
-
-=item ipmi (for BMC ip addresss, user id and password)
-
-=item mac (for MAC address)
-
-=item hwinv (for CPU, memory and disk info.)
-
-=back
-
-=head1 Parameters
-
-I<noderage> is a comma separated node or node group names. 
-
-
-=head1 OPTIONS
-
-=over 10
-
-=item B<-s>    The node name of the OpenStack compute host that hosts the baremetal nodes. 
-
-=item B<-h|--help>     Display usage message.
-
-=item B<-v|--version>  The Command Version.
-
-=item B<-V|--verbose>  Verbose output.
-
-=back
-
-=head1 RETURN VALUE
-
-0  The command completed successfully.
-
-1  An error has occurred.
-
-=head1 EXAMPLES
-
-=over 3
-
-=item 1
-
-To register node1, node2 and node3 to OpenStack, sv1 is the compute host.
-
-   opsassbmnode node1,node2,node3 -s sv1
-
-
-=back
-
-=head1 FILES
-
-/opt/xcat/bin/opadddbmnode
-
-=head1 SEE ALSO
-
-L<opsaddimage(1)|opsaddimage.1>
-
@@ -1,67 +0,0 @@
-=head1 NAME
-
-B<opsaddimage> - It adds or removes nodes for the vlan.
-
-=head1 SYNOPSIS
-
-B<opsaddimage> I<image1,image2,...> B<-n> I<new_name1,new_name2,...> [B<-c> I<controller>] [B<-V>|B<--verbose>] 
-
-B<opsaddimage> [B<-h>|B<--help>]
-
-B<opsaddimage> [B<-v>|B<--version>]
-
-=head1 DESCRIPTION
-
-The B<opsaddimage> command adds a list of xCAT images into the OpenStack cloud. 
-
-Under the cover, it creates a fake image and registers the fake image into OpenStack with command B<glance image-create>. It sets the property in the image to indicate that this is an xCAT image and also stores the original xCAT image name in the property for further reference. 
-
-The xCAT image names can be listed using B<lsdef -t osimage> command.      
-
-=head1 Parameters
-
-I<image1,image1...> a comma separated xCAT images names. 
-
-
-=head1 OPTIONS
-
-=over 10
-
-=item B<-n>    a comma separated new image names in the OpenStack. If omitted, the default is the original xCAT image nanme.  
-
-=item B<-c>  the node name of the OpenStack controller. This node must be an xCAT managed node.
-
-=item B<-h|--help>     Display usage message.
-
-=item B<-v|--version>  The Command Version.
-
-=item B<-V|--verbose>  Verbose output.
-
-=back
-
-=head1 RETURN VALUE
-
-0  The command completed successfully.
-
-1  An error has occurred.
-
-=head1 EXAMPLES
-
-=over 3
-
-=item 1.
-
-To register xCAT image rhels6.3-x86_64-install-compute into OpenStack.
-
-  opsaddimage rhels6.3-x86_64-install-compute -c sv2
-
-=back
-
-=head1 FILES
-
-/opt/xcat/bin/opsaddimage
-
-=head1 SEE ALSO
-
-L<opsaddbmnode(1)|opsaddbmnode.1>
-
@@ -1,215 +0,0 @@
-#!/bin/sh 
-# IBM(c) 2014 EPL license http://www.eclipse.org/legal/epl-v10.html
-
-# xCAT post script for configuring the openstack baremetal node.
-# The format is:
-# config_ops_bm_node ops_hostname ops_ip ops_netmask
-
-
-get_os_type()
-{
-    #get os type
-	str_os_type=`uname | tr 'A-Z' 'a-z'`
-	str_temp=''
-	if [ "$str_os_type" = "linux" ];then
-		str_temp=`echo $OSVER | grep -E '(sles|suse)'`
-		if [ -f "/etc/debian_version" ];then
-			str_os_type="debian"
-		elif [ -f "/etc/SuSE-release" -o -n "$str_temp" ];then
-			str_os_type="sles"
-		else
-			str_os_type="redhat"
-		fi
-	else
-		str_os_type="aix"
-	fi
-	echo "$str_os_type"
-}
-
-
-setup_ip()
-{
-	str_os_type=$1
-    str_if_name=$2
-    str_v4ip=$3
-    str_v4mask=$4
-
-	ret=`ifconfig $str_if_name |grep "inet addr" 2>&1`
-    if [ $? -eq 0 ]; then
-		old_ip=`echo $ret|cut -d':' -f2 |cut -d' ' -f1`
-		old_mask=`echo $ret|cut -d':' -f4`
-		#echo "old ip = $old_ip, old mask=$old_mask"
-		if [ "$old_ip" == "$str_v4ip" -a "$old_mask" == "$str_v4mask" ]; then
-			#if nic is up and the address is the same, then donothing
-			#echo "do nothing"
-			exit 0
-		else
-			#bring down the nic and reconstruct it.
-			#echo "bring down the old nic"
-			ifconfig $str_if_name del $old_ip
-        fi
-	fi
-
-    if [ "$str_os_type" = "sles" ];then
-        str_conf_file="/etc/sysconfig/network/ifcfg-${str_if_name}"
-		if [ -f $str_conf_file ]; then
-			rm $str_conf_file
-		fi
-        echo "DEVICE=${str_if_name}" > $str_conf_file
-        echo "BOOTPROTO=static" >> $str_conf_file
-        echo "IPADDR=${str_v4ip}" >> $str_conf_file
-        echo "NETMASK=${str_v4mask}" >> $str_conf_file
-		echo "NETWORK=''" >> $str_conf_file
-        echo "STARTMODE=onboot" >> $str_conf_file
-        echo "USERCONTROL=no" >> $str_conf_file
-		ifup $str_if_name
-    #debian ubuntu
-    elif [ "$str_os_type" = "debian" ];then
-        str_conf_file="/etc/network/interfaces.d/${str_if_name}"
-		if [ -f $str_conf_file ]; then
-			rm $str_conf_file
-		fi
-        echo "auto ${str_if_name}" > $str_conf_file
-        echo "iface ${str_if_name} inet static" >> $str_conf_file
-        echo "  address ${str_v4ip}" >> $str_conf_file
-        echo "  netmask ${str_v4mask}" >> $str_conf_file
-		ifconfig $str_if_name up
-    else
-        # Write the info to the ifcfg file for redhat
-        str_conf_file="/etc/sysconfig/network-scripts/ifcfg-${str_if_name}"
-		if [ -f $str_conf_file ]; then
-			rm $str_conf_file
-		fi
-        echo "DEVICE=${str_if_name}" > $str_conf_file
-        echo "BOOTPROTO=static" >> $str_conf_file
-        echo "NM_CONTROLLED=no" >> $str_conf_file
-        echo "IPADDR=${str_v4ip}" >> $str_conf_file
-        echo "NETMASK=${str_v4mask}" >> $str_conf_file
-        echo "ONBOOT=yes" >> $str_conf_file
-		ifup $str_if_name
-    fi
-}
-
-#change hostname permanently
-change_host_name()
-{
-    str_os_type=$1
-    str_hostname=$2
-
-    hostname $str_hostname
-
-    if [ "$str_os_type" = "sles" ];then
-        echo "Persistently changing the hostname not implemented yet."
-    #debian ubuntu and rh7
-    elif [ -f "/etc/hostname" ];then
-        conf_file="/etc/hostname"
-        echo "$str_hostname" > $conf_file
-    else
-        conf_file="/etc/sysconfig/network"
-        if [ ! -f $conf_file ]; then
-            touch $conf_file
-        fi
-        grep 'HOSTNAME' $conf_file 2>&1 > /dev/null
-        if [ $? -eq 0 ]; then
-            sed -i "s/HOSTNAME=.*/HOSTNAME=$str_hostname/" $conf_file
-        else
-            echo "HOSTNAME=$str_hostname" >> $conf_file
-        fi
-    fi
-    
-}
-
-str_os_type=$(get_os_type)
-echo "os_type=$str_os_type"
-if [ "$str_os_type" = "aix" ]; then
-	logger -t xcat "config_ops_bm_node dose not support AIX."
-	echo "config_ops_bm_node dose not support AIX."
-	exit 0
-fi
-
-#change the hostname
-if [[ -n "$1" ]]; then
-    change_host_name $str_os_type $1
-fi
-
-#Add the openstack ip to the node
-if [[ -n $2 ]]; then
-    ops_ip=$2
-	
-	if [[ -z $3 ]]; then
-        logger -t xcat "config_ops_bm_node: Please specify the netmask."
-		echo "config_ops_bm_node: Please specify the netmask."
-		exit 1
-	else
-		ops_mask=$3
-	fi
-
-	#figure out the install nic
-    if [[ -n $MACADDRESS ]]; then
-        pos=0
-        #mac has the following format: 01:02:03:04:05:0E!node5|01:02:03:05:0F!node6-eth1
-        for x in `echo "$MACADDRESS" | tr "|" "\n"`
-        do
-            node=""
-            mac=""
-            pos=$((pos+1))
-            i=`expr index $x !`
-            if [[ $i -gt 0 ]]; then
-                node=`echo ${x##*!}`
-                mac_tmp=`echo ${x%%!*}`
-            else
-                mac_tmp=$x
-            fi
-			
-            if [[ $pos -eq 1 ]]; then
-                mac1=$mac_tmp
-            fi
-			
-            if [[ "$PRIMARYNIC" = "$mac_tmp" ]]; then
-                mac=$mac_tmp
-                break
-            fi
-
-            if [[ -z "$PRIMARYNIC" ]] || [[ "$PRIMARYNIC" = "mac" ]]; then
-                if [[ -z $node ]] || [[ "$node" = "$NODE" ]]; then
-                    mac=$mac_tmp
-                    break
-                fi
-            fi
-        done
-
-        if [[ -z $mac ]]; then
-            if [[ -z "$PRIMARYNIC" ]] || [[ "$PRIMARYNIC" = "mac" ]]; then
-                mac=$mac1 #if nothing mathes, take the first mac
-            else
-                nic=$PRIMARYNIC #or the primary nic itself is the nic
-            fi
-        fi
-    else
-        logger -t xcat "config_ops_bm_node: no mac addresses are defined in the mac table for the node $NODE"
-        echo "config_ops_bm_node: no mac addresses are defined in the mac table for the node $NODE"
-        index=$((index+1))
-        continue
-    fi
-	echo "mac=$mac"
-    
-    #find the nic that has the mac
-    if [[ -z $nic ]];  then
-        #go to each nic to match the mac address
-        ret=`ifconfig |grep -i $mac 2>&1`;
-        if [ $? -eq 0 ]; then
-           nic=`echo $ret |head -n1|cut -d' ' -f 1`
-        else
-            logger -t xcat "config_ops_bm_node: The mac address for the network for $NODE is not defined."
-            echo "config_ops_bm_node: The mac address for the network for $NODE is not defined."
-        fi
-    fi
-    echo "nic=$nic"
-
-	#now setup the ip alias
-    setup_ip $str_os_type $nic:0 $ops_ip $ops_mask 
-fi
-
-
-
-
@@ -1,94 +0,0 @@
-#!/bin/sh 
-# IBM(c) 2014 EPL license http://www.eclipse.org/legal/epl-v10.html
-
-# xCAT post script for deconfiguring the openstack baremetal node.
-# The format is:
-# deconfig_ops_bm_node ops_ip
-
-
-get_os_type()
-{
-    #get os type
-	str_os_type=`uname | tr 'A-Z' 'a-z'`
-	str_temp=''
-	if [ "$str_os_type" = "linux" ];then
-		str_temp=`echo $OSVER | grep -E '(sles|suse)'`
-		if [ -f "/etc/debian_version" ];then
-			str_os_type="debian"
-		elif [ -f "/etc/SuSE-release" -o -n "$str_temp" ];then
-			str_os_type="sles"
-		else
-			str_os_type="redhat"
-		fi
-	else
-		str_os_type="aix"
-	fi
-	echo "$str_os_type"
-}
-
-#change hostname permanently
-change_host_name()
-{
-    str_os_type=$1
-    str_hostname=$2
-
-    hostname $str_hostname
-
-    if [ "$str_os_type" = "sles" ];then
-        echo "Persistently changing the hostname not implemented yet."
-    #debian ubuntu and rh7
-    elif [ -f "/etc/hostname" ];then 
-        conf_file="/etc/hostname"
-        echo "$str_hostname" > $conf_file
-    else
-        conf_file="/etc/sysconfig/network"
-        if [ ! -f $conf_file ]; then
-            touch $conf_file
-        fi
-        grep 'HOSTNAME' $conf_file 2>&1 > /dev/null
-        if [ $? -eq 0 ]; then
-            sed -i "s/HOSTNAME=.*/HOSTNAME=$str_hostname/" $conf_file
-        else
-            echo "HOSTNAME=$str_hostname" >> $conf_file
-        fi
-    fi
-}
-
-
-str_os_type=$(get_os_type)
-echo "os_type=$str_os_type"
-
-if [ $str_os_type == "aix" ]; then
-	logger -t xcat "deconfig_ops_bm_node dose not support AIX."
-	echo "deconfig_ops_bm_node dose not support AIX."
-	exit 0
-fi
-
-#change the hostname
-#hostname $NODE
-change_host_name $str_os_type $NODE
-
-#remove the openstack ip from the node
-if [[ -n $1 ]]; then
-    ops_ip=$1
-	nic=$(ip addr | grep $ops_ip | awk '{print $NF}')	
-	echo "nic=$nic, ops_ip=$ops_ip"
-
-	ifconfig $nic del $ops_ip
- 
-	#delete the configuration file
-    if [ "$str_os_type" = "sles" ]; then
-        str_conf_file="/etc/sysconfig/network/ifcfg-$nic"
-    elif [ "$str_os_type" = "debian" ]; then  #debian ubuntu
-        str_conf_file="/etc/network/interfaces.d/$nic"
-    else #redhat
-        str_conf_file="/etc/sysconfig/network-scripts/ifcfg-$nic"
-    fi
-	if [ -f $str_conf_file ]; then
-		rm $str_conf_file
-	fi
-fi
-
-
-
-
@@ -1,102 +0,0 @@
-Summary: Executables and data of the xCAT baremetal driver for OpenStack
-Name: xCAT-OpenStack-baremetal
-Version: %(cat Version)
-Release: snap%(date +"%Y%m%d%H%M")
-Epoch: 4
-License: IBM
-Group: Applications/System
-Source: xCAT-OpenStack-baremetal-%{version}.tar.gz
-Packager: IBM Corp.
-Vendor: IBM Corp.
-Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
-Prefix: /opt/xcat
-BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
-
-%ifos linux
-BuildArch: noarch
-%endif
-
-
-Provides: xCAT-OpenStack-baremetal = %{epoch}:%{version}
-
-Requires: xCAT-client
-
-%description
-xCAT-OpenStack-baremetal provides the baremetal driver for OpenStack.
-
-%prep
-%setup -q -n xCAT-OpenStack-baremetal
-%build
-
-# Convert pods to man pages and html pages
-./xpod2man
-
-%install
-# The install phase puts all of the files in the paths they should be in when the rpm is
-# installed on a system.  The RPM_BUILD_ROOT is a simulated root file system and usually
-# has a value like: /var/tmp/xCAT-OpenStack-baremetal-2.0-snap200802270932-root
-rm -rf $RPM_BUILD_ROOT
-
-mkdir -p $RPM_BUILD_ROOT/%{prefix}/bin
-mkdir -p $RPM_BUILD_ROOT/%{prefix}/sbin
-mkdir -p $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin
-mkdir -p $RPM_BUILD_ROOT/%{prefix}/lib/python/xcat/openstack/baremetal
-mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/openstack/postscripts
-mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/man/man1
-mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/man1
-
-
-set +x
-
-cp -R lib/* $RPM_BUILD_ROOT/%{prefix}/lib
-cp share/xcat/openstack/postscripts/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/openstack/postscripts
-
-
-# These were built dynamically in the build phase
-cp share/man/man1/* $RPM_BUILD_ROOT/%{prefix}/share/man/man1
-chmod 444 $RPM_BUILD_ROOT/%{prefix}/share/man/man1/*
-
-# These were built dynamically during the build phase
-cp share/doc/man1/* $RPM_BUILD_ROOT/%{prefix}/share/doc/man1
-chmod 644 $RPM_BUILD_ROOT/%{prefix}/share/doc/man1/*
-
-# These links get made in the RPM_BUILD_ROOT/prefix area
-ln -sf ../bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/sbin/deploy_ops_bm_node
-ln -sf ../bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/sbin/cleanup_ops_bm_node
-ln -sf ../bin/xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/opsaddbmnode
-ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/opsaddimage
-
-set -x
-
-
-%clean
-# This step does not happen until *after* the %files packaging below
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-#%doc LICENSE.html
-# Just package everything that has been copied into RPM_BUILD_ROOT
-%{prefix}
-
-
-%changelog
-
-%post
-#copy the postscripts under /installl/postscripts directory on MN only
-if [ -f "/etc/xCATMN" ]; then
-	cp $RPM_INSTALL_PREFIX0/share/xcat/openstack/postscripts/* /install/postscripts/
-fi
-
-%preun
-#remove postscripts under /installl/postscripts directory on MN only
-if [ -f "/etc/xCATMN" ]; then
-	for fn in $RPM_INSTALL_PREFIX0/share/xcat/openstack/postscripts/*
-	do
-		bn=`basename $fn`
-		rm /install/postscripts/$bn
-	done
-fi
-exit 0
-
-
@@ -1,214 +0,0 @@
-#!/usr/bin/perl
-# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
-
-# First builds the xCAT summary man page from Synopsis of each man page.
-# Then converts all of the pod man pages into html (including links to each other)
-
-# We assume that this script is run in the xCAT-vlan-2.0 dir, so everything is
-# done relative to that.
-
-use strict;
-#use lib '.';
-use Pod::Man;
-use Pod::Html;
-
-my $poddir = 'pods';
-my $mandir = 'share/man';
-my $htmldir = 'share/doc';
-my $cachedir = '/tmp';
-
-my @pods = getPodList($poddir);
-#foreach (@pods) { print "$_\n"; } exit;
-
-# Build the cmd overview page.
-#writesummarypage("$poddir/man1/xcat.1.pod", @pods);
-
-# Build the man page for each pod.
-#mkdir($mandir) or die "Error: could not create $mandir.\n";
-print "Converting PODs to man pages...\n";
-foreach my $podfile (@pods) {
-    my $manfile = $podfile;
-    $manfile =~ s/^$poddir/$mandir/;      # change the beginning of the path
-    $manfile =~ s/\.pod$//;			# change the ending
-    my $mdir = $manfile;
-    $mdir =~ s|/[^/]*$||;			# get rid of the basename part
-	if (system("mkdir -p $mdir")) { die "Error: could not create $mdir.\n"; }
-	my ($section) = $podfile =~ /\.(\d+)\.pod$/;
-    convertpod2man($podfile, $manfile, $section);
-}
-
-my @dummyPods = createDummyPods($poddir, \@pods);
-
-# Build the html page for each pod.
-#mkdir($htmldir) or die "Error: could not create $htmldir.\n";
-print "Converting PODs to HTML pages...\n";
-# have to clear the cache, because old entries can cause a problem
-unlink("$cachedir/pod2htmd.tmp", "$cachedir/pod2htmi.tmp");
-foreach my $podfile (@pods) {
-    my $htmlfile = $podfile;
-    $htmlfile =~ s/^$poddir/$htmldir/;      # change the beginning of the path
-    $htmlfile =~ s/\.pod$/\.html/;			# change the ending
-    my $hdir = $htmlfile;
-    $hdir =~ s|/[^/]*$||;			# get rid of the basename part
-	if (system("mkdir -p $hdir")) { die "Error: could not create $hdir.\n"; }
-    #print "$podfile, $htmlfile, $poddir, $htmldir\n";
-    convertpod2html($podfile, $htmlfile, $poddir, $htmldir);
-}
-
-# Remove the dummy pods
-unlink @dummyPods;
-rmdir "$poddir/man7";
-
-exit;
-
-
-# To enable linking between the cmd man pages and the db man pages, need to:
-#	grep thru the cmd pods searching for references (L<>) to any section 5 man page
-#	if that pod does not exist, create an empty one that will satisfy pod2html
-#	keep track of all dummy pods created, so they can be removed later
-sub createDummyPods {
-	my ($poddir, $pods) = @_;
-	my $cmd = "grep -r -E 'L<.+\\([57]\\)\\|.+\\.[57]>' " . $poddir;
-	#print "Running cmd: ", $cmd, "\n";
-	my @lines = `$cmd`;
-	if ($?) { print "Did not find any section 5 man page, creating dummy pods...\n"; print join('', @lines); }
-	#my @lines;
-	#system($cmd);
-	my @dummyPods;
-	foreach my $l (@lines) {
-		#print "$l\n";
-		my @matches = $l =~ /L<([^\(]+)\(([57])\)\|\1\.[57]>/g;		# get all the matches in the line
-		# The above line should create the array with every other entry being the man page name
-		# and every other entry is the section # (5 or 7)
-		my $cmd;
-		while ($cmd=shift @matches) {
-			#foreach my $m (@matches) {
-			my $section = shift @matches;
-			my $filename = "$poddir/man$section/$cmd.$section.pod";
-			#print "$filename\n";
-			if (!(grep /^$filename$/, @$pods) && !(grep /^$filename$/, @dummyPods)) { push @dummyPods, $filename; }
-		}
-	}
-	
-	
-	# Create these empty files
-	print "Creating empty linked-to files: ", join(', ', @dummyPods), "\n";
-	mkdir "$poddir/man7";
-	foreach my $d (@dummyPods) {
-		if (!open(TMP, ">>$d")) { warn "Could not create dummy pod file $d ($!)\n"; }
-		else { close TMP; }
-	}
-	
-	return @dummyPods;
-}
-
-# Recursively get the list of pod man page files.
-sub getPodList {
-	my $poddir = shift;
-	my @files;
-
-	# 1st get toplevel dir listing
-	opendir(DIR, $poddir) or die "Error: could not read $poddir.\n";
-	my @topdir = grep !/^\./, readdir(DIR);		# /
-	close(DIR);
-
-	# Now go thru each subdir (these are man1, man3, etc.)
-	foreach my $mandir (@topdir) {
-		opendir(DIR, "$poddir/$mandir") or die "Error: could not read $poddir/$mandir.\n";
-		my @dir = grep !/^\./, readdir(DIR);		# /
-		close(DIR);
-		foreach my $file (@dir) {
-			push @files, "$poddir/$mandir/$file";
-		}
-	}
-	return sort @files;
-}
-
-
-# Create the xcat man page that gives a summary description of each xcat cmd.
-# Not used
-sub writesummarypage {
-	my $file = shift;       # relative path file name of the man page
-	# the rest of @_ contains the pod files that describe each cmd
-
-	open(FILE, ">$file") or die "Error: could not open $file for writing.\n";
-
-	print FILE <<'EOS1';
-=head1 NAME
-
-B<xcat> - extreme Cluster Administration Tool.
-
-=head1 DESCRIPTION
-
-Extreme Cluster Administration Toolkit (xCAT). xCAT is a scalable distributed computing management
-and provisioning tool that provides a unified interface for hardware control, discovery, and
-OS diskful/diskfree deployment.
-
-
-=head1 XCAT DATABASE
-
-All of the cluster configuration information is in the xCAT database.  See L<xcatdb(5)|xcatdb.5> for
-descriptions of every table in the database.
-
-=head1 XCAT COMMANDS
-
-What follows is a short description of each xCAT command.  To get more information about a particular
-command, see its man page.  Note that the commands are listed in alphabetical order B<within each section>,
-i.e. all the commands in section 1, then the commands in section 3, etc.
-
-=over 12
-EOS1
-
-# extract the summary for each cmd from its man page
-foreach my $manpage (@_) {
-	my ($sectionnum) = $manpage =~ /\.(\d+)\.pod$/;
-	# Suck in the whole file, then we will parse it.
-	open(MANPAGE, "$manpage") or die "Error: could not open $manpage for reading.\n";
-	my @contents = <MANPAGE>;
-	my $wholemanpage = join('', @contents);
-	close(MANPAGE);
-	# This regex matches: optional space, =head1, space, title, space, cmd, space, description, newline
-	my ($cmd, $description) = $wholemanpage =~ /^\s*=head1\s+\S+\s+(\S+)\s+(.+?)\n/si;
-	if (!defined($cmd)) { print "Warning: $manpage is not in a recognized structure.  It will be ignored.\n"; next; }
-	if (!defined($description)) { print "Warning: $manpage does not have a description for $cmd.  It will be ignored.\n"; next; }
-	$cmd =~ s/^.<(.+)>$/$1/;		# if the cmd name has pod formatting around it, strip it off
-	$description =~ s/^-\s*//;		# if the description has a leading hypen, strip it off
-	print FILE "\n=item L<$cmd($sectionnum)|$cmd.$sectionnum>\n\n".$description."\n";
-}
-
-# Artificially add the xcattest cmd, because the xCAT-test rpm will add this
-print FILE "\n=item L<xcattest(1)|xcattest.1>\n\nRun automated xCAT test cases.\n";
-
-	print FILE <<"EOS3";
-
-=back
-EOS3
-
-	close FILE;
-}
-
-
-# Create the html page for one pod.
-sub convertpod2html {
-	my ($podfile, $htmlfile, $poddir, $htmldir) = @_;
-
-	#TODO: use --css=<stylesheet> and --title=<pagetitle> to make the pages look better
-	pod2html($podfile,
-			"--outfile=$htmlfile",
-			"--podpath=man1",
-			"--podroot=$poddir",
-			"--htmldir=$htmldir",
-			"--recurse",
-			"--cachedir=$cachedir",
-			);
-
-}
-
-
-# Create the man page for one pod.
-sub convertpod2man {
-	my ($podfile, $manfile, $section) = @_;
-
-	my $parser = Pod::Man->new(section => $section);
-    $parser->parse_from_file($podfile, $manfile);
-}
@@ -1,6 +0,0 @@
-include AUTHORS
-include ChangeLog
-exclude .gitignore
-exclude .gitreview
-
-global-exclude *.pyc
@@ -1,44 +0,0 @@
-xCAT Driver for ironic x86/64 machine
-==================================
-
-xCAT is a Extreme Cluster/Cloud Administration Toolkit. We can use xcat
-to do :
-1 hardward discoveery
-2 remote hardware control
-3 remote sonsole
-4 hardware inventory
-5 firmware flashing
-
-Ironic is a project in Openstack, it will replace the nova-baremetal in juno release. Ironic's design is very flexable, we can add driver to extend function
-without change any code in Openstack. Ironic xCAT driver takes the advantage of xcat and openstack, we can use it to deploy the baremetal machine very easily.
-
-Before using this driver, we must setup the openstack environment at least for two nodes( ironic conductor and neutron network node can't setup on the same node)
-Ironic conductor and the baremetal node( waiting for deploy) must in the same vlan 
-
-Add the follows in the ironic egg-info entry_points.txt file (ironic.drivers section) 
-
-pxe_xcat = ironic.drivers.xcat:XCATBaremetalDriver
- 
-When the openstack with ironic is ready, just execute command in the ironic_xcat directory as follows:
-
-$ python setup.py install
-
-Restart the ironic-conductor process
-
-Initialize the xcat environment according  to http://sourceforge.net/p/xcat/wiki/XCAT_iDataPlex_Cluster_Quick_Start/
-Using xCAT baremetal driver need config site table and run copycds to generate image. The node definition is not requirement.
-
-Ironic use neutron as the network service.
-Check the openvswitch config on the network node ,make sure brbm bridge connect to the baremetal node. 
-
-==================================================================================
-Some Example to use the xCAT baremetal driver. 
-
-$touch /tmp/rhelhpc6.5-x86_64-install-compute.qcow2;glance image-create --name rhelhpc6.5-x86_64-install-compute --public --disk-format qcow2 --container-format bare --property xcat_image_name='rhels6.4-x86_64-install-compute' < /tmp/rhelhpc6.5-x86_64-install-compute.qcow2
--name rhelhpc6.5-x86_64-install-compute is the image name in xcat. You can use lsdef -t osimage on the ironic-conductor node which xcat is installed.
-
-$ ironic node-create --driver pxe_xcat -i ipmi_address=xxx.xxx.xxx.xxx   -i ipmi_username=userid -i ipmi_password=password  -i xcat_node=x3550m4n02  -i xcatmaster=10.1.0.241 -i netboot=xnba -i ipmi_terminal_port=0 -p memory_mb=2048 -p cpus=8
-
-$ ironic port-create --address ff:ff:ff:ff:ff:ff --node_uuid <ironic node uuid>
-
-$ nova boot --flavor baremetal --image <image-id>  testing --nic net-id=<internal network id>
@@ -1,25 +0,0 @@
-"""xCAT baremtal exceptions.
-"""
-
-from oslo.config import cfg
-import six
-
-from ironic.openstack.common.gettextutils import _
-from ironic.openstack.common import log as logging
-from ironic.common.exception import IronicException
-LOG = logging.getLogger(__name__)
-
-class xCATCmdFailure(IronicException):
-    message = _("xcat call failed: %(cmd)s %(node)s %(args)s.")
-
-class xCATDeploymentFailure(IronicException):
-    message = _("xCAT node deployment failed for node %(node)s:%(error)s")
-
-class GetNetworkFixedIPFailure(IronicException):
-    message = _("get fixed ip failed for mac %(mac_address)s")
-
-class GetNetworkIdFailure(IronicException):
-    message = _("get node network in failed for mac %(mac_address)s")
-
-class FailedToGetInfoOnPort(IronicException):
-    message = _("Show info on port: %(port_id)s failed.")
@@ -1,41 +0,0 @@
-"""
-Get the network from neutron
-This is a xcat patch for the ironic/common/neutron.py
-"""
-
-from neutronclient.common import exceptions as neutron_client_exc
-from ironic.common import exception
-from ironic.openstack.common import log as logging
-from ironic.common import neutron
-from ironic.drivers.modules import xcat_exception
-
-LOG = logging.getLogger(__name__)
-
-def get_vif_port_info(task, port_id):
-    """ Get  detail port info from neutron with a given port id """
-    api = neutron.NeutronAPI(task.context)
-    try:
-        port_info = api.client.show_port(port_id)
-    except neutron_client_exc.NeutronClientException:
-        LOG.exception(_("Failed to get port info %s."), port_id)
-        raise exception.FailedToGetInfoOnPort(port_id=port_id)
-    return port_info
-
-
-def get_ports_info_from_neutron(task):
-    """  Get neutron port info from neutron about this task """
-    vifs = neutron.get_node_vif_ids(task)
-    if not vifs:
-        LOG.warning(_("No VIFs found for node %(node)s when attempting to "
-                      "update Neutron DHCP BOOT options."),
-                      {'node': task.node.uuid})
-        return
-    failures = []
-    vif_ports_info = {}
-    for port_id, port_vif in vifs.iteritems():
-        try:
-            vif_ports_info[port_id] = get_vif_port_info(task,port_vif)
-        except xcat_exception.FailedToGetInfoOnPort(port_id=port_vif):
-            failures.append(port_vif)
-    return vif_ports_info
-
@@ -1,462 +0,0 @@
-"""
-pxe procedure for the xcat baremetal driver
-use xcat to config dhcp and tftp
-"""
-
-import os
-import time
-import paramiko
-import datetime
-from oslo.config import cfg
-from ironic.common import exception
-from ironic.common import image_service as service
-from ironic.common import keystone
-from ironic.common import states
-from ironic.common import utils
-from ironic.conductor import task_manager
-from ironic.conductor import utils as manager_utils
-from ironic.drivers import base
-from ironic.drivers import utils as driver_utils
-from ironic.openstack.common import log as logging
-from ironic.openstack.common import strutils
-from ironic.drivers.modules import xcat_neutron
-from ironic.drivers.modules import xcat_util
-from ironic.openstack.common import loopingcall
-from nova.openstack.common import timeutils
-from ironic.openstack.common import lockutils
-from ironic.drivers.modules import xcat_exception
-
-
-pxe_opts = [
-    cfg.StrOpt('pxe_append_params',
-               default='nofb nomodeset vga=normal',
-               help='Additional append parameters for baremetal PXE boot.'),
-    cfg.StrOpt('default_ephemeral_format',
-               default='ext4',
-               help='Default file system format for ephemeral partition, '
-                    'if one is created.'),
-    ]
-xcat_opts = [
-    cfg.StrOpt('network_node_ip',
-               default='127.0.0.1',
-               help='IP address of neutron network node'),
-    cfg.StrOpt('ssh_user',
-               default='root',
-               help='Username of neutron network node.'),
-    cfg.StrOpt('ssh_password',
-               default='cluster',
-               help='Password of neutron network node'),
-    cfg.IntOpt('ssh_port',
-               default=22,
-               help='ssh connection port for the neutron '),
-    cfg.StrOpt('host_filepath',
-               default='/etc/hosts',
-               help='host file of server'),
-    cfg.IntOpt('deploy_timeout',
-               default=3600,
-               help='max depolyment time(seconds) for the xcat driver'),
-    cfg.IntOpt('deploy_checking_interval',
-               default=30,
-               help='interval time(seconds) to check the xcat deploy state'),
-    ]
-
-LOG = logging.getLogger(__name__)
-
-CONF = cfg.CONF
-CONF.register_opts(pxe_opts, group='pxe')
-CONF.register_opts(xcat_opts, group='xcat')
-CONF.import_opt('use_ipv6', 'ironic.netconf')
-
-REQUIRED_PROPERTIES = {
-    'pxe_deploy_kernel': _("UUID (from Glance) of the deployment kernel. "
-                           "Required."),
-    'pxe_deploy_ramdisk': _("UUID (from Glance) of the ramdisk that is "
-                            "mounted at boot time. Required."),
-}
-COMMON_PROPERTIES = REQUIRED_PROPERTIES
-EM_SEMAPHORE = 'xcat_pxe'
-
-def _check_for_missing_params(info_dict, param_prefix=''):
-    missing_info = []
-    for label, value in info_dict.items():
-        if not value:
-            missing_info.append(param_prefix + label)
-
-    if missing_info:
-        raise exception.InvalidParameterValue(_(
-                "Can not validate PXE bootloader. The following parameters "
-                "were not passed to ironic: %s") % missing_info)
-
-def _parse_driver_info(node):
-    """Gets the driver specific Node deployment info.
-
-    This method validates whether the 'driver_info' property of the
-    supplied node contains the required information for this driver to
-    deploy images to the node.
-
-    :param node: a single Node.
-    :returns: A dict with the driver_info values.
-    """
-    info = node.driver_info
-    d_info = {}
-    d_info['xcat_node'] = info.get('xcat_node')
-    return d_info
-
-def _parse_instance_info(node):
-    """Gets the instance specific Node deployment info.
-
-    This method validates whether the 'instance_info' property of the
-    supplied node contains the required information for this driver to
-    deploy images to the node.
-
-    :param node: a single Node.
-    :returns: A dict with the instance_info values.
-    """
-
-    info = node.instance_info
-    i_info = {}
-    i_info['image_source'] = info.get('image_source')
-    i_info['root_gb'] = info.get('root_gb')
-    i_info['image_file'] = i_info['image_source']
-
-    _check_for_missing_params(i_info)
-
-    # Internal use only
-    i_info['deploy_key'] = info.get('deploy_key')
-
-    i_info['swap_mb'] = info.get('swap_mb', 0)
-    i_info['ephemeral_gb'] = info.get('ephemeral_gb', 0)
-    i_info['ephemeral_format'] = info.get('ephemeral_format')
-
-    err_msg_invalid = _("Can not validate PXE bootloader. Invalid parameter "
-                        "%(param)s. Reason: %(reason)s")
-    for param in ('root_gb', 'swap_mb', 'ephemeral_gb'):
-        try:
-            int(i_info[param])
-        except ValueError:
-            reason = _("'%s' is not an integer value.") % i_info[param]
-            raise exception.InvalidParameterValue(err_msg_invalid %
-                                            {'param': param, 'reason': reason})
-
-    if i_info['ephemeral_gb'] and not i_info['ephemeral_format']:
-        i_info['ephemeral_format'] = CONF.pxe.default_ephemeral_format
-
-    preserve_ephemeral = info.get('preserve_ephemeral', False)
-    try:
-        i_info['preserve_ephemeral'] = strutils.bool_from_string(
-                                            preserve_ephemeral, strict=True)
-    except ValueError as e:
-        raise exception.InvalidParameterValue(err_msg_invalid %
-                                  {'param': 'preserve_ephemeral', 'reason': e})
-    return i_info
-
-
-def _parse_deploy_info(node):
-    """Gets the instance and driver specific Node deployment info.
-
-    This method validates whether the 'instance_info' and 'driver_info'
-    property of the supplied node contains the required information for
-    this driver to deploy images to the node.
-
-    :param node: a single Node.
-    :returns: A dict with the instance_info and driver_info values.
-    """
-    info = {}
-    info.update(_parse_instance_info(node))
-    info.update(_parse_driver_info(node))
-    return info
-
-def _validate_glance_image(ctx, deploy_info):
-    """Validate the image in Glance.
-
-    Check if the image exist in Glance and if it contains the
-    'kernel_id' and 'ramdisk_id' properties.
-
-    :raises: InvalidParameterValue.
-    """
-    image_id = deploy_info['image_source']
-    if not image_id:
-        raise exception.ImageNotFound
-
-class PXEDeploy(base.DeployInterface):
-    """PXE Deploy Interface: just a stub until the real driver is ported."""
-    def get_properties(self):
-        return COMMON_PROPERTIES
-
-    def validate(self, task):
-        """Validate the deployment information for the task's node.
-
-        :param task: a TaskManager instance containing the node to act on.
-        :raises: InvalidParameterValue.
-        """
-        node = task.node
-        if not driver_utils.get_node_mac_addresses(task):
-            raise exception.InvalidParameterValue(_("Node %s does not have "
-                                "any port associated with it.") % node.uuid)
-
-        d_info = _parse_deploy_info(node)
-        # Try to get the URL of the Ironic API
-        try:
-            # TODO(lucasagomes): Validate the format of the URL
-            CONF.conductor.api_url or keystone.get_service_url()
-        except (exception.CatalogFailure,
-                exception.CatalogNotFound,
-                exception.CatalogUnauthorized):
-            raise exception.InvalidParameterValue(_(
-                "Couldn't get the URL of the Ironic API service from the "
-                "configuration file or keystone catalog."))
-
-        _validate_glance_image(task.context, d_info)
-
-    @task_manager.require_exclusive_lock
-    def deploy(self, task):
-        """Start deployment of the task's node'.
-
-        Config host file and xcat dhcp, generate image info for xcat
-        and issues a  reboot request to the power driver.
-        This causes the node to boot into the deployment ramdisk and triggers
-        the next phase of PXE-based deployment via
-        VendorPassthru._continue_deploy().
-
-        :param task: a TaskManager instance containing the node to act on.
-        :returns: deploy state DEPLOYDONE.
-        """
-
-        d_info = _parse_deploy_info(task.node)
-        if not task.node.instance_info.get('fixed_ip_address') or not task.node.instance_info.get('image_name'):
-            raise exception.InvalidParameterValue
-        self._config_host_file(d_info,task.node.instance_info.get('fixed_ip_address'))
-        self._make_dhcp()
-        self._nodeset_osimage(d_info,task.node.instance_info.get('image_name'))
-        manager_utils.node_set_boot_device(task, 'pxe', persistent=True)
-        manager_utils.node_power_action(task, states.REBOOT)
-        try:
-            self._wait_for_node_deploy(task)
-        except xcat_exception.xCATDeploymentFailure:
-            LOG.info(_("xcat deployment failed"))
-            return states.ERROR
-
-        return states.DEPLOYDONE
-
-    @task_manager.require_exclusive_lock
-    def tear_down(self, task):
-        """Tear down a previous deployment on the task's node.
-
-        Power off the node. All actual clean-up is done in the clean_up()
-        method which should be called separately.
-
-        :param task: a TaskManager instance containing the node to act on.
-        :returns: deploy state DELETED.
-        """
-        manager_utils.node_power_action(task, states.POWER_OFF)
-        return states.DELETED
-
-    def prepare(self, task):
-        """Prepare the deployment environment for this task's node.
-        Get the image info from glance, config the mac for the xcat
-        use ssh and iptables to disable dhcp on network node
-        :param task: a TaskManager instance containing the node to act on.
-        """
-        # TODO(deva): optimize this if rerun on existing files
-        d_info = _parse_deploy_info(task.node)
-        i_info = task.node.instance_info
-        image_id = d_info['image_source']
-        try:
-            glance_service = service.Service(version=1, context=task.context)
-            image_name = glance_service.show(image_id)['name']
-            i_info['image_name'] = image_name
-        except (exception.GlanceConnectionFailed,
-                exception.ImageNotAuthorized,
-                exception.Invalid):
-            LOG.warning(_("Failed to connect to Glance to get the properties "
-                "of the image %s") % image_id)
-
-        node_mac_addresses = driver_utils.get_node_mac_addresses(task)
-        vif_ports_info = xcat_neutron.get_ports_info_from_neutron(task)
-        try:
-            network_info = self._get_deploy_network_info(vif_ports_info, node_mac_addresses)
-        except (xcat_exception.GetNetworkFixedIPFailure,xcat_exception.GetNetworkIdFailure):
-            LOG.error(_("Failed to get network info"))
-            return
-        if not network_info:
-            LOG.error(_("Failed to get network info"))
-            return
-
-        fixed_ip_address = network_info['fixed_ip_address']
-        deploy_mac_address = network_info['mac_address']
-        network_id = network_info['network_id']
-
-        i_info['fixed_ip_address'] = fixed_ip_address
-        i_info['network_id'] = network_id
-        i_info['deploy_mac_address'] = deploy_mac_address
-
-        # use iptables to drop the dhcp mac of baremetal machine
-        self._ssh_append_dhcp_rule(CONF.xcat.network_node_ip,CONF.xcat.ssh_port,CONF.xcat.ssh_user,
-                                     CONF.xcat.ssh_password,network_id,deploy_mac_address)
-        self._chdef_node_mac_address(d_info,deploy_mac_address)
-
-    def clean_up(self, task):
-        """Clean up the deployment environment for the task's node.
-
-        Unlinks TFTP and instance images and triggers image cache cleanup.
-        Removes the TFTP configuration files for this node. As a precaution,
-        this method also ensures the keystone auth token file was removed.
-
-        :param task: a TaskManager instance containing the node to act on.
-        """
-        pass
-
-    def take_over(self, task):
-        pass
-
-    def _get_deploy_network_info(self, vif_ports_info, valid_node_mac_addrsses):
-        """Get network info from mac address of ironic node.
-        :param vif_ports_info: info collection from neutron ports
-        :param valid_node_mac_addrsses: mac address from ironic node
-        :raises: GetNetworkFixedIpFailure if search the fixed ip from mac address failure
-        :raises: GetNetworkIdFailure if search the network id from mac address failure
-        """
-        network_info = {}
-        for port_info in vif_ports_info.values():
-            if(port_info['port']['mac_address'] in valid_node_mac_addrsses ):
-                network_info['fixed_ip_address'] = port_info['port']['fixed_ips'][0]['ip_address']
-                if not network_info['fixed_ip_address']:
-                    raise xcat_exception.GetNetworkFixedIPFailure(mac_address=port_info['port']['mac_address'])
-                network_info['mac_address'] = port_info['port']['mac_address']
-                network_info['network_id'] = port_info['port']['network_id']
-                if not network_info['network_id']:
-                    raise xcat_exception.GetNetworkIdFailure(mac_address=port_info['port']['mac_address'])
-                network_info['port_id'] = port_info['port']['id']
-                return network_info
-        return network_info
-
-    def _chdef_node_mac_address(self, driver_info, deploy_mac):
-        """ run chdef command to set mac address"""
-        cmd = 'chdef'
-        args = 'mac='+ deploy_mac
-        try:
-            out_err = xcat_util.exec_xcatcmd(driver_info, cmd, args)
-            LOG.info(_("xcat chdef cmd exetute output: %(out_err)s") % {'out_err':out_err})
-        except xcat_exception.xCATCmdFailure as e:
-            LOG.warning(_("xcat chdef failed for node %(xcat_node)s with "
-                        "error: %(error)s.")
-                        % {'xcat_node': driver_info['xcat_node'], 'error': e})
-            raise exception.IPMIFailure(cmd=cmd)
-
-    @lockutils.synchronized(EM_SEMAPHORE, 'xcat-hosts-')
-    def _config_host_file(self, driver_info, deploy_ip):
-        """ append node and ip infomation to host file"""
-        with open(CONF.xcat.host_filepath,"r+") as f:
-            lines = []
-            for line in f:
-                temp = line.split('#')
-                if temp[0].strip():
-                    host_name = xcat_util._tsplit(temp[0].strip(),(' ','\t'))[1]
-                    if driver_info['xcat_node'] not in host_name:
-                        lines.append(line)
-
-            # append a new line to host file
-            line = "%s\t%s\n" %(deploy_ip,driver_info['xcat_node'])
-            lines.append(line)
-            f.seek(0)
-            f.truncate()
-            for line in lines:
-                f.write(line)
-
-    def _nodeset_osimage(self, driver_info, image_name):
-        """run nodeset command to config the image for the xcat node
-        :param driver_info: xcat node deploy info
-        :param image_name: image for the xcat deployment
-        """
-        cmd = 'nodeset'
-        args = 'osimage='+ image_name
-        try:
-            xcat_util.exec_xcatcmd(driver_info, cmd, args)
-        except xcat_exception.xCATCmdFailure as e:
-            LOG.warning(_("xcat nodeset failed for node %(xcat_node)s with "
-                        "error: %(error)s.")
-                        % {'xcat_node': driver_info['xcat_node'], 'error': e})
-
-    def _make_dhcp(self):
-        """run makedhcp command to setup dhcp environment for the xcat node"""
-        cmd = ['makedhcp',
-            '-n'
-            ]
-        try:
-            out, err = utils.execute(*cmd)
-            LOG.info(_(" excute cmd: %(cmd)s \n output: %(out)s \n. Error: %(err)s \n"),
-                      {'cmd':cmd,'out': out, 'err': err})
-        except Exception as e:
-            LOG.error(_("Unable to execute %(cmd)s. Exception: %(exception)s"),
-                      {'cmd': cmd, 'exception': e})
-        # makedhcp -a
-        cmd = ['makedhcp',
-            '-a'
-            ]
-        try:
-            out, err = utils.execute(*cmd)
-            LOG.info(_(" excute cmd: %(cmd)s \n output: %(out)s \n. Error: %(err)s \n"),
-                      {'cmd':cmd,'out': out, 'err': err})
-        except Exception as e:
-            LOG.error(_("Unable to execute %(cmd)s. Exception: %(exception)s"),
-                      {'cmd': cmd, 'exception': e})
-
-    def _ssh_append_dhcp_rule(self,ip,port,username,password,network_id,mac_address):
-        """ drop the dhcp package in network node to avoid of confilct of dhcp """
-        netns = 'qdhcp-%s' %network_id
-        append_cmd = 'sudo ip netns exec %s iptables -A INPUT -m mac --mac-source %s -j DROP' % \
-               (netns,mac_address)
-        cmd = [append_cmd]
-        xcat_util.xcat_ssh(ip,port,username,password,cmd)
-
-    def _ssh_delete_dhcp_rule(self,ip,port,username,password,network_id,mac_address):
-        """ delete the iptable rule on network node to recover the environment"""
-        netns = 'qdhcp-%s' %network_id
-        cancel_cmd = 'sudo ip netns exec %s iptables -D INPUT -m mac --mac-source %s -j DROP' % \
-               (netns,mac_address)
-        cmd = [cancel_cmd]
-        xcat_util.xcat_ssh(ip,port,username,password,cmd)
-
-    def _wait_for_node_deploy(self, task):
-        """Wait for xCAT node deployment to complete."""
-        locals = {'errstr':''}
-        driver_info = _parse_deploy_info(task.node)
-        node_mac_addrsses = driver_utils.get_node_mac_addresses(task)
-        i_info = task.node.instance_info
-
-        def _wait_for_deploy():
-            out,err = xcat_util.exec_xcatcmd(driver_info,'nodels','nodelist.status')
-            if err:
-                locals['errstr'] = _("Error returned when quering node status"
-                           " for node %s:%s") % (driver_info['xcat_node'], err)
-                LOG.warning(locals['errstr'])
-                raise loopingcall.LoopingCallDone()
-
-            if out:
-                node,status = out.split(": ")
-                status = status.strip()
-                if status == "booted":
-                    LOG.info(_("Deployment for node %s completed.")
-                             % driver_info['xcat_node'])
-                    raise loopingcall.LoopingCallDone()
-
-            if (CONF.xcat.deploy_timeout and
-                    timeutils.utcnow() > expiration):
-                locals['errstr'] = _("Timeout while waiting for"
-                           " deployment of node %s.") % driver_info['xcat_node']
-                LOG.warning(locals['errstr'])
-                raise loopingcall.LoopingCallDone()
-
-        expiration = timeutils.utcnow() + datetime.timedelta(
-                seconds=CONF.xcat.deploy_timeout)
-        timer = loopingcall.FixedIntervalLoopingCall(_wait_for_deploy)
-        # default check every 10 seconds
-        timer.start(interval=CONF.xcat.deploy_checking_interval).wait()
-
-        if locals['errstr']:
-            raise xcat_exception.xCATDeploymentFailure(locals['errstr'])
-        # deploy end, delete the dhcp rule for xcat
-        self._ssh_delete_dhcp_rule(CONF.xcat.network_node_ip,CONF.xcat.ssh_port,CONF.xcat.ssh_user,
-                                     CONF.xcat.ssh_password,i_info['network_id'],node_mac_addrsses[0])
-
-
@@ -1,444 +0,0 @@
-
-"""
-IPMI power manager driver.
-"""
-
-import contextlib
-import os
-import stat
-import tempfile
-import time
-
-from oslo.config import cfg
-
-from ironic.common import exception
-from ironic.common import states
-from ironic.common import utils
-from ironic.conductor import task_manager
-from ironic.drivers import base
-from ironic.drivers.modules import console_utils
-from ironic.openstack.common import excutils
-from ironic.openstack.common import log as logging
-from ironic.openstack.common import loopingcall
-from ironic.openstack.common import processutils
-from ironic.drivers.modules import xcat_exception
-from ironic.drivers.modules import xcat_util
-
-CONF = cfg.CONF
-CONF.import_opt('retry_timeout',
-                'ironic.drivers.modules.ipminative',
-                group='ipmi')
-CONF.import_opt('min_command_interval',
-                'ironic.drivers.modules.ipminative',
-                group='ipmi')
-
-LOG = logging.getLogger(__name__)
-
-VALID_PRIV_LEVELS = ['ADMINISTRATOR', 'CALLBACK', 'OPERATOR', 'USER']
-REQUIRED_PROPERTIES = {
-    'ipmi_address': _("IP address or hostname of the node. Required.")
-}
-OPTIONAL_PROPERTIES = {
-    'ipmi_password': _("password. Optional."),
-    'ipmi_priv_level': _("privilege level; default is ADMINISTRATOR. One of "
-                         "%s. Optional.") % ', '.join(VALID_PRIV_LEVELS),
-    'ipmi_username': _("username; default is NULL user. Optional.")
-}
-COMMON_PROPERTIES = REQUIRED_PROPERTIES.copy()
-COMMON_PROPERTIES.update(OPTIONAL_PROPERTIES)
-CONSOLE_PROPERTIES = {
-    'ipmi_terminal_port': _("node's UDP port to connect to. Only required for "
-                            "console access.")
-}
-TIMING_SUPPORT = None
-
-
-def _is_timing_supported(is_supported=None):
-    # shim to allow module variable to be mocked in unit tests
-    global TIMING_SUPPORT
-
-    if (TIMING_SUPPORT is None) and (is_supported is not None):
-        TIMING_SUPPORT = is_supported
-    return TIMING_SUPPORT
-
-
-def check_timing_support():
-    """Check the installed version of ipmitool for -N -R option support.
-
-    Support was added in 1.8.12 for the -N -R options, which enable
-    more precise control over timing of ipmi packets. Prior to this,
-    the default behavior was to retry each command up to 18 times at
-    1 to 5 second intervals.
-    http://ipmitool.cvs.sourceforge.net/viewvc/ipmitool/ipmitool/ChangeLog?revision=1.37  # noqa
-
-    This method updates the module-level TIMING_SUPPORT variable so that
-    it is accessible by any driver interface class in this module. It is
-    intended to be called from the __init__ method of such classes only.
-
-    :returns: boolean indicating whether support for -N -R is present
-    :raises: OSError
-    """
-    if _is_timing_supported() is None:
-        # Directly check ipmitool for support of -N and -R options. Because
-        # of the way ipmitool processes' command line options, if the local
-        # ipmitool does not support setting the timing options, the command
-        # below will fail.
-        try:
-            out, err = utils.execute(*['ipmitool', '-N', '0', '-R', '0', '-h'])
-        except processutils.ProcessExecutionError:
-            # the local ipmitool does not support the -N and -R options.
-            _is_timing_supported(False)
-        else:
-            # looks like ipmitool supports timing options.
-            _is_timing_supported(True)
-
-
-def _console_pwfile_path(uuid):
-    """Return the file path for storing the ipmi password for a console."""
-    file_name = "%(uuid)s.pw" % {'uuid': uuid}
-    return os.path.join(tempfile.gettempdir(), file_name)
-
-def _parse_driver_info(node):
-    """Gets the parameters required for ipmitool to access the node.
-
-    :param node: the Node of interest.
-    :returns: dictionary of parameters.
-    :raises: InvalidParameterValue if any required parameters are missing.
-
-    """
-    info = node.driver_info or {}
-    address = info.get('ipmi_address')
-    username = info.get('ipmi_username')
-    password = info.get('ipmi_password')
-    port = info.get('ipmi_terminal_port')
-    priv_level = info.get('ipmi_priv_level', 'ADMINISTRATOR')
-    xcat_node = info.get('xcat_node')
-    xcatmaster = info.get('xcatmaster')
-    netboot = info.get('netboot')
-
-    if port:
-        try:
-            port = int(port)
-        except ValueError:
-            raise exception.InvalidParameterValue(_(
-                "IPMI terminal port is not an integer."))
-
-    if not address:
-        raise exception.InvalidParameterValue(_(
-            "IPMI address not supplied to xcat driver."))
-
-    if priv_level not in VALID_PRIV_LEVELS:
-        valid_priv_lvls = ', '.join(VALID_PRIV_LEVELS)
-        raise exception.InvalidParameterValue(_(
-            "Invalid privilege level value:%(priv_level)s, the valid value"
-            " can be one of %(valid_levels)s") %
-            {'priv_level': priv_level, 'valid_levels': valid_priv_lvls})
-
-    if not xcat_node:
-        raise exception.InvalidParameterValue(_(
-            "xcat node name not supplied to xcat driver"))
-
-    if not xcatmaster:
-        raise exception.InvalidParameterValue(_(
-            "xcatmaster not supplied to xcat driver"))
-
-    if not netboot:
-        raise exception.InvalidParameterValue(_(
-            "netboot not supplied to xcat driver"))
-
-    return {
-            'address': address,
-            'username': username,
-            'password': password,
-            'port': port,
-            'uuid': node.uuid,
-            'priv_level': priv_level,
-            'xcat_node': xcat_node,
-            'xcatmaster': xcatmaster,
-            'netboot': netboot
-           }
-def chdef_node(driver_info):
-    """Run the chdef command in xcat, config the node
-    :param driver_info: driver_info for the xcat node
-    """
-    cmd = 'chdef'
-    args = 'mgt=ipmi' + \
-           ' bmc=' + driver_info['address'] + \
-           ' bmcusername=' + driver_info['username'] + \
-           ' bmcpassword=' + driver_info['password'] + \
-           ' xcatmaster='  + driver_info['xcatmaster']+ \
-           ' netboot=' + driver_info['netboot']+ \
-           ' primarynic=mac'+ \
-           ' installnic=mac'+ \
-           ' monserver=' + driver_info['xcatmaster'] + \
-           ' nfsserver=' + driver_info['xcatmaster'] + \
-           ' serialflow=hard'+ \
-           ' serialspeed=115200' + \
-           ' serialport=' + str(driver_info['port']);
-
-    try:
-        xcat_util.exec_xcatcmd(driver_info, cmd, args)
-    except xcat_exception.xCATCmdFailure as e:
-        LOG.warning(_("xcat chdef failed for node %(node_id)s with "
-                    "error: %(error)s.")
-                    % {'node_id': driver_info['uuid'], 'error': e})
-
-def _sleep_time(iter):
-    """Return the time-to-sleep for the n'th iteration of a retry loop.
-    This implementation increases exponentially.
-
-    :param iter: iteration number
-    :returns: number of seconds to sleep
-
-    """
-    if iter <= 1:
-        return 1
-    return iter ** 2
-
-
-def _set_and_wait(target_state, driver_info):
-    """Helper function for DynamicLoopingCall.
-
-    This method changes the power state and polls the BMCuntil the desired
-    power state is reached, or CONF.ipmi.retry_timeout would be exceeded by the
-    next iteration.
-
-    This method assumes the caller knows the current power state and does not
-    check it prior to changing the power state. Most BMCs should be fine, but
-    if a driver is concerned, the state should be checked prior to calling this
-    method.
-
-    :param target_state: desired power state
-    :param driver_info: the ipmitool parameters for accessing a node.
-    :returns: one of ironic.common.states
-    :raises: IPMIFailure on an error from ipmitool (from _power_status call).
-
-    """
-    if target_state == states.POWER_ON:
-        state_name = "on"
-    elif target_state == states.POWER_OFF:
-        state_name = "off"
-
-    def _wait(mutable):
-        try:
-            # Only issue power change command once
-            if mutable['iter'] < 0:
-                xcat_util.exec_xcatcmd(driver_info,'rpower',state_name)
-            else:
-                mutable['power'] = _power_status(driver_info)
-        except Exception:
-            # Log failures but keep trying
-            LOG.warning(_("xcat rpower %(state)s failed for node %(node)s."),
-                         {'state': state_name, 'node': driver_info['uuid']})
-        finally:
-            mutable['iter'] += 1
-
-        if mutable['power'] == target_state:
-            raise loopingcall.LoopingCallDone()
-
-        sleep_time = _sleep_time(mutable['iter'])
-        if (sleep_time + mutable['total_time']) > CONF.ipmi.retry_timeout:
-            # Stop if the next loop would exceed maximum retry_timeout
-            LOG.error(_('xcat rpower %(state)s timed out after '
-                        '%(tries)s retries on node %(node_id)s.'),
-                        {'state': state_name, 'tries': mutable['iter'],
-                        'node_id': driver_info['uuid']})
-            mutable['power'] = states.ERROR
-            raise loopingcall.LoopingCallDone()
-        else:
-            mutable['total_time'] += sleep_time
-            return sleep_time
-
-    # Use mutable objects so the looped method can change them.
-    # Start 'iter' from -1 so that the first two checks are one second apart.
-    status = {'power': None, 'iter': -1, 'total_time': 0}
-
-    timer = loopingcall.DynamicLoopingCall(_wait, status)
-    timer.start().wait()
-    return status['power']
-
-def _power_on(driver_info):
-    """Turn the power ON for this node.
-
-    :param driver_info: the xcat parameters for accessing a node.
-    :returns: one of ironic.common.states POWER_ON or ERROR.
-    :raises: IPMIFailure on an error from ipmitool (from _power_status call).
-
-    """
-    return _set_and_wait(states.POWER_ON, driver_info)
-
-
-def _power_off(driver_info):
-    """Turn the power OFF for this node.
-
-    :param driver_info: the xcat parameters for accessing a node.
-    :returns: one of ironic.common.states POWER_OFF or ERROR.
-    :raises: IPMIFailure on an error from ipmitool (from _power_status call).
-
-    """
-    return _set_and_wait(states.POWER_OFF, driver_info)
-
-def _power_status(driver_info):
-    """Get the power status for a node.
-
-    :param driver_info: the xcat access parameters for a node.
-    :returns: one of ironic.common.states POWER_OFF, POWER_ON or ERROR.
-    :raises: IPMIFailure on an error from ipmitool.
-
-    """
-    cmd = "rpower"
-    try:
-        out_err = xcat_util.exec_xcatcmd(driver_info,cmd,'status')
-    except Exception as e:
-        LOG.warning(_("xcat rpower status failed for node %(node_id)s with "
-                      "error: %(error)s.")
-                    % {'node_id': driver_info['uuid'], 'error': e})
-
-    if out_err[0].split(' ')[1].strip() == "on":
-        return states.POWER_ON
-    elif out_err[0].split(' ')[1].strip() == "off":
-        return states.POWER_OFF
-    else:
-        return states.ERROR
-
-
-class XcatPower(base.PowerInterface):
-
-    def __init__(self):
-        try:
-            check_timing_support()
-        except OSError:
-            raise exception.DriverLoadError(
-                    driver=self.__class__.__name__,
-                    reason="Unable to locate usable xcat command in "
-                           "the system path when checking xcat version")
-    def get_properties(self):
-        return COMMON_PROPERTIES
-
-    def validate(self, task):
-        """Validate driver_info for xcat driver.
-
-        Check that node['driver_info'] contains IPMI credentials.
-
-        :param task: a TaskManager instance containing the node to act on.
-        :raises: InvalidParameterValue if required ipmi parameters are missing.
-
-        """
-        driver_info = _parse_driver_info(task.node)
-        try:
-            chdef_node(driver_info)
-        except exception:
-            LOG.error(_("chdef xcat info error!"))
-
-    def get_power_state(self, task):
-        """Get the current power state of the task's node.
-
-        :param task: a TaskManager instance containing the node to act on.
-        :returns: one of ironic.common.states POWER_OFF, POWER_ON or ERROR.
-
-        """
-        driver_info = _parse_driver_info(task.node)
-        return _power_status(driver_info)
-
-    @task_manager.require_exclusive_lock
-    def set_power_state(self, task, pstate):
-        """Turn the power on or off.
-
-        :param task: a TaskManager instance containing the node to act on.
-        :param pstate: The desired power state, one of ironic.common.states
-            POWER_ON, POWER_OFF.
-        :raises: InvalidParameterValue if required ipmi parameters are missing
-            or if an invalid power state was specified.
-        :raises: PowerStateFailure if the power couldn't be set to pstate.
-
-        """
-        driver_info = _parse_driver_info(task.node)
-
-        if pstate == states.POWER_ON:
-            state = _power_on(driver_info)
-        elif pstate == states.POWER_OFF:
-            state = _power_off(driver_info)
-        else:
-            raise exception.InvalidParameterValue(_("set_power_state called "
-                    "with invalid power state %s.") % pstate)
-        if state != pstate:
-            raise exception.PowerStateFailure(pstate=pstate)
-
-    @task_manager.require_exclusive_lock
-    def reboot(self, task):
-        """Cycles the power to the task's node.
-
-        :param task: a TaskManager instance containing the node to act on.
-        :raises: InvalidParameterValue if required ipmi parameters are missing.
-        :raises: PowerStateFailure if the final state of the node is not
-            POWER_ON.
-
-        """
-        driver_info = _parse_driver_info(task.node)
-        _power_off(driver_info)
-        state = _power_on(driver_info)
-
-        if state != states.POWER_ON:
-            raise exception.PowerStateFailure(pstate=states.POWER_ON)
-
-class IPMIShellinaboxConsole(base.ConsoleInterface):
-    """A ConsoleInterface that uses ipmitool and shellinabox."""
-
-    def __init__(self):
-        try:
-            check_timing_support()
-        except OSError:
-            raise exception.DriverLoadError(
-                    driver=self.__class__.__name__,
-                    reason="Unable to locate usable xcat command in "
-                           "the system path when checking xcat version")
-    def get_properties(self):
-        return COMMON_PROPERTIES
-
-    def validate(self, task):
-        """Validate the Node console info.
-
-        :param task: a task from TaskManager.
-        :raises: InvalidParameterValue
-        """
-        driver_info = _parse_driver_info(task.node)
-        if not driver_info['xcat_node']:
-            raise exception.InvalidParameterValue(_(
-                "xcat node name not supplied to xcat baremetal driver."))
-        if not driver_info['port']:
-            raise exception.InvalidParameterValue(_(
-                "IPMI terminal port not supplied to IPMI driver."))
-
-    def start_console(self, task):
-        """Start a remote console for the node."""
-        driver_info = _parse_driver_info(task.node)
-
-        path = _console_pwfile_path(driver_info['uuid'])
-        pw_file = console_utils.make_persistent_password_file(
-                path, driver_info['password'])
-
-        ipmi_cmd = "/:%(uid)s:%(gid)s:HOME:ipmitool -H %(address)s" \
-                   " -I lanplus -U %(user)s -f %(pwfile)s"  \
-                   % {'uid': os.getuid(),
-                      'gid': os.getgid(),
-                      'address': driver_info['address'],
-                      'user': driver_info['username'],
-                      'pwfile': pw_file}
-        if CONF.debug:
-            ipmi_cmd += " -v"
-        ipmi_cmd += " sol activate"
-        console_utils.start_shellinabox_console(driver_info['uuid'],
-                                                driver_info['port'],
-                                                ipmi_cmd)
-
-    def stop_console(self, task):
-        """Stop the remote console session for the node."""
-        driver_info = _parse_driver_info(task.node)
-        console_utils.stop_shellinabox_console(driver_info['uuid'])
-        utils.unlink_without_raise(_console_pwfile_path(driver_info['uuid']))
-
-    def get_console(self, task):
-        """Get the type and connection information about the console."""
-        driver_info = _parse_driver_info(task.node)
-        url = console_utils.get_shellinabox_console_url(driver_info['port'])
-        return {'type': 'shellinabox', 'url': url}
@@ -1,110 +0,0 @@
-"""
-util for xcat baremetal driver
-exec_xcatcmd
-xcat_ssh  to excute remote cmd
-"""
-import paramiko
-import time
-import socket
-from ironic.openstack.common import log as logging
-from oslo.config import cfg
-from ironic.drivers.modules import xcat_exception
-from ironic.common import utils
-
-xcat_opts = [
-    cfg.IntOpt('ssh_session_timeout',
-               default=10,
-               help='ssh session time'),
-    cfg.FloatOpt('ssh_shell_wait',
-               default=0.5,
-               help='wait time for the ssh cmd excute'),
-    cfg.IntOpt('ssh_buf_size',
-               default=65535,
-               help='Maximum size (in charactor) of cache for ssh, '
-               'including those in use'),
-    cfg.StrOpt('ssh_key',
-               default=None,
-               help='ssh private key to login '),
-    cfg.StrOpt('ssh_key_pass',
-               default=None,
-               help='Maximum size (in charactor) of cache for ssh, '
-               'including those in use'),
-    ]
-
-LOG = logging.getLogger(__name__)
-
-CONF = cfg.CONF
-CONF.register_opts(xcat_opts, group='xcat')
-
-LAST_CMD_TIME = {}
-
-def xcat_ssh(ip,port,username,password,cmd):
-    """ exec remote command with ssh  """
-    key =None
-    if CONF.xcat.ssh_key:
-        try:
-            key=paramiko.RSAKey.from_private_key_file(CONF.xcat.ssh_key)
-        except paramiko.PasswordRequiredException:
-            if not CONF.ssh_key_pass:
-                raise Exception.message("no pubkey password")
-            key = paramiko.RSAKey.from_private_key_file(
-                CONF.xcat.ssh_key, CONF.xcat.ssh_key.ssh_key_pass)
-    s = paramiko.SSHClient()
-    s.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-    try:
-        s.connect(ip,port,username=username,password=password,pkey=key,
-                  timeout=CONF.xcat.ssh_session_timeout)
-    except socket.timeout as e:
-        LOG.error(_("Unable to connect to the ssh server Exception: %(exception)s"),
-                      {'exception': e})
-    chan = s.invoke_shell()
-    output = chan.recv(CONF.xcat.ssh_buf_size)
-    while not output.rstrip().endswith('#') and not output.rstrip().endswith('$'):
-        output = chan.recv(CONF.xcat.ssh_buf_size)
-    for  c in cmd :
-        _xcat_ssh_exec(chan,c,password)
-
-def _xcat_ssh_exec(chan,cmd,password):
-    """ exec ssh command """
-    chan.send(cmd + '\n')
-    time.sleep(CONF.xcat.ssh_shell_wait)
-    ret = chan.recv(CONF.xcat.ssh_buf_size)
-    if 'password' in ret and ret.rstrip().endswith(':'):
-        chan.send(password + '\n')
-        output = chan.recv(CONF.xcat.ssh_buf_size)
-        while not output.rstrip().endswith('#') and not output.rstrip().endswith('$'):
-            output = chan.recv(CONF.xcat.ssh_buf_size)
-    return output
-
-def _tsplit(string, delimiters):
-    """ Behaves str.split but supports multiple delimiters. """
-    delimiters = tuple(delimiters)
-    stack = [string,]
-    for delimiter in delimiters:
-        for i, substring in enumerate(stack):
-            substack = substring.split(delimiter)
-            stack.pop(i)
-            for j, _substring in enumerate(substack):
-                stack.insert(i+j, _substring)
-    return stack
-
-def exec_xcatcmd(driver_info, command, args):
-    """ excute xcat cmd """
-    cmd = [command,
-            driver_info['xcat_node']
-            ]
-    cmd.extend(args.split(" "))
-        # NOTE: ensure that no communications are excuted more
-        #             often than once every min_command_interval seconds.
-    time_till_next_poll = CONF.ipmi.min_command_interval - (
-                time.time() - LAST_CMD_TIME.get(driver_info['xcat_node'], 0))
-    if time_till_next_poll > 0:
-        time.sleep(time_till_next_poll)
-    try:
-        out, err = utils.execute(*cmd)
-        if err:
-            raise xcat_exception.xCATCmdFailure(cmd=cmd,node=driver_info['xcat_node'],
-                                            args=args)
-    finally:
-        LAST_CMD_TIME[driver_info['xcat_node']] = time.time()
-    return out, err
@@ -1,27 +0,0 @@
-"""
-XCATBaremetalDriver
-use xcat to deploy a baremetal machine
-"""
-
-
-from ironic.drivers import base
-from ironic.drivers.modules import ipmitool
-from ironic.drivers.modules import pxe
-from ironic.drivers.modules import xcat_pxe
-from ironic.drivers import utils
-from ironic.drivers.modules import xcat_rpower
-
-
-class XCATBaremetalDriver(base.BaseDriver):
-    """xCAT driver
-    This driver implements the `core` functionality, combinding
-    :class:`ironic.drivers.xcat_rpower.XcatPower` for power on/off and reboot with
-    :class:`ironic.driver.xcat_pxe.PXEDeploy` for image deployment. Implementations are in
-    those respective classes; this class is merely the glue between them.
-    """
-    def __init__(self):
-        self.power = xcat_rpower.XcatPower()
-        self.console = ipmitool.IPMIShellinaboxConsole()
-        self.deploy = xcat_pxe.PXEDeploy()
-        self.management = ipmitool.IPMIManagement()
-        self.vendor = pxe.VendorPassthru()
@@ -1,33 +0,0 @@
-[DEFAULT]
-
-# The list of modules to copy from oslo-incubator
-module=cliutils
-module=config.generator
-module=context
-module=db
-module=db.sqlalchemy
-module=db.sqlalchemy.migration_cli
-module=eventlet_backdoor
-module=excutils
-module=fileutils
-module=gettextutils
-module=importutils
-module=jsonutils
-module=local
-module=lockutils
-module=log
-module=loopingcall
-module=network_utils
-module=periodic_task
-module=policy
-module=processutils
-module=service
-module=strutils
-module=timeutils
-module=versionutils
-
-# Tools
-
-
-# The base module to hold the copy of openstack.common
-base=ironic
@@ -1,51 +0,0 @@
-[metadata]
-name = ironic
-version = 2014.2
-summary = OpenStack Bare Metal Provisioning
-description-file =
-    README.rst
-author = chenglch
-author-email = chenglch@cn.ibm.com
-home-page = http://xcat.sf.net/
-classifier =
-    Environment :: OpenStack
-    Intended Audience :: Information Technology
-    Intended Audience :: System Administrators
-    License :: OSI Approved :: Apache Software License
-    Operating System :: POSIX :: Linux
-    Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
-    Programming Language :: Python :: 2.6
-
-[files]
-packages =
-    ironic
-
-[entry_points]
-ironic.drivers =    
-    agent_ipmitool = ironic.drivers.agent:AgentAndIPMIToolDriver
-	agent_pyghmi = ironic.drivers.agent:AgentAndIPMINativeDriver
-	agent_ssh = ironic.drivers.agent:AgentAndSSHDriver
-	fake = ironic.drivers.fake:FakeDriver
-	fake_agent = ironic.drivers.fake:FakeAgentDriver
-	fake_iboot = ironic.drivers.fake:FakeIBootDriver
-	fake_ipminative = ironic.drivers.fake:FakeIPMINativeDriver
-	fake_ipmitool = ironic.drivers.fake:FakeIPMIToolDriver
-	fake_pxe = ironic.drivers.fake:FakePXEDriver
-	fake_seamicro = ironic.drivers.fake:FakeSeaMicroDriver
-	fake_ssh = ironic.drivers.fake:FakeSSHDriver
-	ilo = ironic.drivers.ilo:IloDriver
-	pxe_iboot = ironic.drivers.pxe:PXEAndIBootDriver
-	pxe_ipminative = ironic.drivers.pxe:PXEAndIPMINativeDriver
-	pxe_ipmitool = ironic.drivers.pxe:PXEAndIPMIToolDriver
-	pxe_seamicro = ironic.drivers.pxe:PXEAndSeaMicroDriver
-	pxe_ssh = ironic.drivers.pxe:PXEAndSSHDriver
-	pxe_xcat = ironic.drivers.xcat:XCATBaremetalDriver
-
-[pbr]
-autodoc_index_modules = True
-
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
@@ -1,22 +0,0 @@
-hacking>=0.8.0,<0.9
-coverage>=3.6
-discover
-fixtures>=0.3.14
-mock>=1.0
-Babel>=1.3
-MySQL-python
-psycopg2
-python-ironicclient
-python-subunit>=0.0.18
-testrepository>=0.0.18
-testtools>=0.9.34
-
-# Doc requirements
-sphinx>=1.1.2,!=1.2.0,<1.3
-sphinxcontrib-pecanwsme>=0.8
-oslosphinx
-
-# Required for Nova unit tests in ironic/nova/tests/ and can be removed
-# once the driver code lands in Nova.
-http://tarballs.openstack.org/nova/nova-master.tar.gz#egg=nova
-mox>=0.5.3
@@ -0,0 +1,15 @@
+AllCops:
+  Excludes:
+    - test/**
+    - vendor/**
+
+AlignParameters:
+  Enabled: false
+Encoding:
+  Enabled: false
+HashSyntax:
+  Enabled: false
+LineLength:
+  Enabled: false
+MethodLength:
+  Max: 30
@@ -0,0 +1,9 @@
+rvm:
+  - 1.9.3
+  - 2.0.0
+before_script:
+  - bundle exec berks install
+script:
+  - bundle exec foodcritic -f any . --tags ~FC007 --tags ~FC015 --tags ~FC023
+  # - bundle exec rspec --color --format progress
+  - bundle exec rubocop
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .10
 .8.4