add allowed entries for pkgdir to have http, so that we can have external repos

* This will only work though has more than one repo defined, where the first one is the local one

README

@@ -0,0 +1,14 @@
+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
+
+
+
+
+
+

Version

@@ -1 +1 @@
-2.8.4
+2.8.5

build-ubunturepo

@@ -53,7 +53,7 @@ for i in $*; do
 done
 
 # Supported distributions
-dists="maverick natty oneiric precise saucy"
+dists="maverick natty oneiric precise saucy trusty"
 
 c_flag=            # xcat-core (trunk-delvel) path
 d_flag=            # xcat-dep (trunk) path
@@ -86,7 +86,7 @@ if [ "$c_flag" -a "$d_flag" ];then
     exit 2
 fi
 
-uploader="bp-sawyers"
+uploader="ligc"
 # Find where this script is located to set some build variables
 old_pwd=`pwd`
 cd `dirname $0`
@@ -194,7 +194,7 @@ then
         if [ ! -d ../../$package_dir_name ];then
             mkdir -p "../../$package_dir_name"
         fi
-        packages="xCAT-client xCAT-genesis-scripts perl-xCAT xCAT-server xCAT-UI xCAT xCATsn xCAT-test xCAT-OpenStack"
+        packages="xCAT-client xCAT-genesis-scripts perl-xCAT xCAT-server xCAT-UI xCAT xCATsn xCAT-test xCAT-OpenStack xCAT-OpenStack-baremetal"
 
         for file in `echo $packages`
         do
@@ -279,7 +279,7 @@ __EOF__
     cat << '__EOF__' > mklocalrepo.sh
 . /etc/lsb-release
 cd `dirname $0`
-echo deb file://"`pwd`" $DISTRIB_CODENAME main > /etc/apt/sources.list.d/xcat-core.list
+echo deb [arch=amd64] file://"`pwd`" $DISTRIB_CODENAME main > /etc/apt/sources.list.d/xcat-core.list
 __EOF__
 
     chmod 775 mklocalrepo.sh
@@ -380,7 +380,7 @@ __EOF__
     cat << '__EOF__' > mklocalrepo.sh
 . /etc/lsb-release
 cd `dirname $0`
-echo deb file://"`pwd`" $DISTRIB_CODENAME main > /etc/apt/sources.list.d/xcat-dep.list
+echo deb [arch=amd64] file://"`pwd`" $DISTRIB_CODENAME main > /etc/apt/sources.list.d/xcat-dep.list
 __EOF__
 
     chmod 775 mklocalrepo.sh

buildcore.sh

@@ -41,11 +41,13 @@ 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-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts xCAT-OpenStack"
+ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts xCAT-OpenStack xCAT-SoftLayer xCAT-OpenStack-baremetal"
 ZVMBUILD="perl-xCAT xCAT-server xCAT-UI"
 ZVMLINK="xCAT-client xCAT xCATsn"
-PCMBUILD="xCAT"
-PCMLINK="perl-xCAT xCAT-client xCAT-server xCAT-buildkit xCAT-genesis-scripts-x86_64"
+# xCAT has PCM specific configuration - conserver-xcat, syslinux-xcat
+# xCAT-server has PCM specific configuration - RESTAPI(perl-JSON) 
+PCMBUILD="xCAT xCAT-server"
+PCMLINK="perl-xCAT xCAT-client 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=""
@@ -237,10 +239,11 @@ 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; do
+for rpmname in xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT-SoftLayer; 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 $GREP $rpmname $GITUP || [ "$BUILDALL" == 1 ]; then
 		UPLOAD=1
 		maker $rpmname
@@ -272,19 +275,19 @@ if [ "$OSNAME" != "AIX" ]; then
 fi
 
 # Build the xCAT and xCATsn rpms for all platforms
-for rpmname in xCAT xCATsn xCAT-OpenStack; do
+for rpmname in xCAT xCATsn xCAT-OpenStack xCAT-OpenStack-baremetal; 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" ]; then continue; fi 		# do not bld openstack on aix
+			if [ "$rpmname" = "xCAT-OpenStack" ] || [ "$rpmname" = "xCAT-OpenStack-baremetal" ]; 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 s390x; do
-				if [ "$rpmname" = "xCAT-OpenStack" -a "$arch" != "x86_64" ]; then continue; fi 		# only bld openstack for x86_64 for now
+				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
 				./makerpm $rpmname $arch "$EMBED"
 				if [ $? -ne 0 ]; then FAILEDRPMS="$FAILEDRPMS $rpmname-$arch"; fi
 			done
@@ -496,6 +499,7 @@ if [ "$OSNAME" != "AIX" -a "$REL" = "devel" -a "$PROMOTE" != 1 -a -z "$EMBED" ];
 	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'
 	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

buildlocal.sh

@@ -0,0 +1,160 @@
+#######################################################################
+#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; 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; 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" = "x64_64" ]; then 
+       $CURDIR/makerpm xCAT-genesis-scripts x86_64  
+  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/issue;
+   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/
+  else
+     rm -f /etc/zypp/repos.d/xCAT-core.repo
+     zypper ar file://$CURDIR/build xCAT-core
+  fi
+   
+fi
+
+

makerpm

@@ -53,6 +53,7 @@ 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
@@ -77,12 +78,14 @@ 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

perl-xCAT/db2man

@@ -262,6 +262,12 @@ 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/apps/mediawiki/xcat/index.php?title=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

perl-xCAT/debian/rules

@@ -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` `svn info | grep Revision | cut -d" " -f 2`
+	./modifyUtils `cat ../Version` `git log -n 1 | head -n 1 | cut -f 2 -d ' '`
 #	dh_installmenu
 #	dh_installdebconf	
 #	dh_installlogrotate

perl-xCAT/modifyUtils

@@ -1,20 +1,21 @@
 #!/bin/sh
 # Put the version, svn revision #, and build date into the Version function in Version.pm
 
-if [ -z "$1" ]
+if [ -z "$2" ]
 	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"/". ' (built $BUILDDATE)'"/ xCAT/Version.pm >xCAT/Version.pm.new
+	sed -e s/"#XCATVERSIONSUBHERE"/". '$VER'"/ -e s/"#XCATSVNBUILDSUBHERE"/". ' (${GITREF}built $BUILDDATE)'"/ xCAT/Version.pm >xCAT/Version.pm.new
 	mv xCAT/Version.pm.new xCAT/Version.pm
 else
         if [ -f "/etc/debian_version" ];then
@@ -22,5 +23,5 @@ else
         else
             FILENAME="xCAT/Version.pm"
         fi
-	sed -i -e s/"#XCATVERSIONSUBHERE"/". '$VER'"/ -e s/"#XCATSVNBUILDSUBHERE"/". ' (built $BUILDDATE)'"/ $FILENAME
+	sed -i -e s/"#XCATVERSIONSUBHERE"/". '$VER'"/ -e s/"#XCATSVNBUILDSUBHERE"/". ' (${GITREF}built $BUILDDATE)'"/ $FILENAME
 fi

perl-xCAT/perl-xCAT.spec

@@ -23,6 +23,8 @@ 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)
 
@@ -36,7 +38,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}
+./modifyUtils %{version} %{gitinfo}
 
 # 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.

perl-xCAT/xCAT/CFMUtils.pm

@@ -500,6 +500,7 @@ 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
@@ -509,13 +510,22 @@ 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) = @_;
-     
+    my ($class, $img, $ospkgs, $mode) = @_;
+    
+    if(defined($mode)){
+        # Exact Matching
+        $mode = 1;
+    }else {
+        # Fuzzy Matching
+        $mode = 0;
+    }
+    
     my @cur_selected = @$ospkgs;
     my $cfmpkglist = "/install/osimages/$img/pkglist.cfm";
 
@@ -549,6 +559,14 @@ 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);
@@ -661,6 +679,48 @@ 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
@@ -819,3 +879,66 @@ 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);  
+}

perl-xCAT/xCAT/Client.pm

@@ -27,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 | grep inet6`;
+    my $ipv6enabled = `ip addr 2> /dev/null | grep inet6`;
     if (!$ipv6enabled) {
         $inet6support = 0;
     }

perl-xCAT/xCAT/DBobjUtils.pm

@@ -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+)\.(\w+)$/)
+        if ($nodeattr =~ /^(nic\w+)\.(.*)$/)
         {       
            if ($1 && $2)
            {       

perl-xCAT/xCAT/DSHCLI.pm

@@ -598,7 +598,7 @@ sub _execute_dsh
                 }
                 else
                 {
-                    # LKV: This is where the output shows up
+                    # HERE: 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,6 +1020,7 @@ 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'}))
     {
@@ -1046,6 +1047,7 @@ 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()) {
@@ -1068,8 +1070,10 @@ sub fork_fanout_dsh
                $rsp->{error}->[0] = "File $$options{'environment'} does not exist";
                xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
             }
-            # build the xdsh command
-            push @dsh_command,
+            $firstpass=1;
+           }
+           # build the xdsh command
+           push @dsh_command,
               "$exportnode$$options{'pre-command'} . $$options{'environment'} ; $$options{'command'}$$options{'post-command'}";
         }
 
@@ -3993,8 +3997,7 @@ 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.";
@@ -4033,7 +4036,7 @@ sub parse_and_run_dsh
         {    # from sinv, discard this name
             undef @$nodes;
         }
-        if (defined(@$nodes))
+        if (@$nodes)
         {
             my $rsp = {};
             $rsp->{error}->[0] =
@@ -4405,7 +4408,7 @@ sub parse_and_run_dcp
             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.";
@@ -4502,7 +4505,7 @@ sub parse_and_run_dcp
     #
     # build list of nodes
     my @nodelist;
-    if (defined(@$nodes))
+    if (@$nodes)
     {    # there are nodes
         @nodelist = @$nodes;
         $options{'nodes'} = join(',', @nodelist);
@@ -4972,7 +4975,8 @@ 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>)
     {
@@ -5013,12 +5017,16 @@ 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
-                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 ($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
                if ($clause =~ /MERGE:/) {
                  # location of the base merge script
                  # for MERGE we have to sync the mergescript and the
@@ -5030,12 +5038,16 @@ 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
-                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);
-               }
+                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
            
            }
          } else {  # not processing EXECUTE, EXECUTEALWAYS or APPEND
@@ -5199,6 +5211,7 @@ 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;  
@@ -5227,7 +5240,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 .= $src_file;
+                      $newsrcfile .= $orig_src_file;
                       $src_file=$newsrcfile;
                     }
                     # destination file name
@@ -5310,7 +5323,8 @@ 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 arror
+            my $src_file  = $1; # merge file left of arrow
+            my $orig_src_file = $1;
             # it will be sync'd to $nodesyncfiledir/$merge_file
             my $dest_file = $nodesyncfiledir;
             $dest_file .= $src_file;  
@@ -5339,7 +5353,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 .= $src_file;
+                      $newsrcfile .= $orig_src_file; 
                       $src_file=$newsrcfile;
                     }
                     # destination file name
@@ -6029,11 +6043,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 $tmpp=$syncdir . $ps;
-         $ps=$tmpp;
+         my $tmps=$syncdir . $ps;
+         push @args, $tmps;
+        } else{
+          push @args, $ps;
         }
-        push @args, $ps;
-
         push (@nodes, @{$$dshparms{'postscripts'}{$ps}}); 
          
         $out=xCAT::Utils->runxcmd( { command => ['xdsh'],

perl-xCAT/xCAT/DSHCore.pm

@@ -253,64 +253,6 @@ 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);
-        }
-    }
-}
 
 #---------------------------------------------------------------------------
 

perl-xCAT/xCAT/FSPUtils.pm

@@ -67,7 +67,7 @@ sub getHcpAttribs
 	}
     }
     
-    my @ps = $tabs->{ppc}->getAllNodeAttribs(['node','parent','nodetype','hcp']); 
+    my @ps = $tabs->{ppc}->getAllNodeAttribs(['node','parent','nodetype','hcp','id']); 
     for my $entry ( @ps ) {
         my $tmp_parent = $entry->{parent};
         my $tmp_node = $entry->{node};
@@ -79,6 +79,9 @@ 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) ) {

perl-xCAT/xCAT/FSPvitals.pm

@@ -264,7 +264,7 @@ sub temp {
             # No frame commands for IVM 
             ################################# 
             if ( $hwtype eq "ivm" ) {
-                push @result, [$name,"$prefix Not available (No BPA)",1];
+                push @result, [$name,"$prefix Not available (No BPA)",0];
                 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,1];
+                push @result, [$name,$text,0];
                 next;
             }
             ################################# 
             # Error - No frame 
             #################################
             if ( $mtms eq "0" ) {
-                push @result, [$name,"$prefix Not available (No BPA)",1];
+                push @result, [$name,"$prefix Not available (No BPA)",0];
                 next;
             }
             #################################
@@ -352,7 +352,7 @@ sub rackenv {
             ################################# 
             if ( @$d[4] !~ /^(bpa|frame)$/ ) {
                 my $text = "$prefix Only available for BPA/Frame";
-                push @result, [$name,$text,1];
+                push @result, [$name,$text,0];
                 next;
             }
             

perl-xCAT/xCAT/FSPvm.pm

@@ -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,15 +48,26 @@ 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',
+    'vmphyslots' => 'part_get_all_io_bus_info',
+    'del_physlots' => 'part_get_all_io_bus_info',
+    'vmnics' => 'part_get_all_vio_info',
+    '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 vmphyslots vmothersetting vmstorage vmnics del_vadapter);
+    my @support_ops = qw(vmcpus vmmemory vmphyslots vmothersetting vmstorage vmnics del_vadapter del_physlots);
 	if (ref($args) ne 'ARRAY') {
 		return "$args";
 	}	
+    my %tmp_hash = ();
 	foreach (@$args) {
 		my ($cmd, $value) = split (/\=/, $_);
 		if (!defined($value)) {
@@ -75,14 +86,30 @@ 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 "vmstorage") {
@@ -103,6 +130,53 @@ 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 == "G" or $2 == '') {
+                        $mmin = $1 * 1024;
+                    } 
+                    if ($4 == "G" or $4 == '') {
+                        $mcur = $3 * 1024;
+                    }
+                    if ($6 == "G" or $6 == '') {
+                        $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 "vmphyslots") {
+                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 "vmnics") {
+                my @tmp_array = split ",", $value;
+                foreach (@tmp_array) {
+                    unless (/^vlan\d+$/i) {
+                        return "'$_' is invalid";
+                    }
+                }
             }
 
         } else {
@@ -110,6 +184,7 @@ sub chvm_parse_extra_options {
 		}
 		$opt->{$cmd} = $value;
 	}
+    @query_array = keys(%tmp_hash);
 	return undef;
 }
 
@@ -672,7 +747,7 @@ sub lsvm_parse_args {
     $Getopt::Long::ignorecase = 0;
     Getopt::Long::Configure( "bundling" );
 
-    if ( !GetOptions( \%opt, qw(V|verbose l|long p775) )) {
+    if ( !GetOptions( \%opt, qw(V|verbose l|long p775 updatedb) )) {
         return( usage() );
     }
     if (exists($opt{l}) && !exists($opt{p775})) {
@@ -711,11 +786,12 @@ 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)) {
@@ -728,7 +804,7 @@ sub do_op_extra_cmds {
 		    $action = "set_huge_page";
 	        } elsif ($op eq "vmcpus") {
                     $action = "part_set_lpar_pending_proc";
-                } elsif ($op eq "vmphyslots") {
+                } elsif ($op eq "vmphyslots" or $op eq "del_physlots") {
                     $action = "set_io_slot_owner_uber";
                 } elsif ($op eq "del_vadapter") {
                     $action = "part_clear_vslot_config";
@@ -780,17 +856,17 @@ sub do_op_extra_cmds {
                             if ($2 == "G" or $2 == '') {
                                 $min = $min * 1024;
                             } 
-                            $min = $min/$memsize;
+                            $min = int($min/$memsize);
                             my $cur = $3;
                             if ($4 == "G" or $4 == '') {
                                 $cur = $cur * 1024;
                             }
-                            $cur = $cur/$memsize;
+                            $cur = int($cur/$memsize);
                             my $max = $5;
                             if ($6 == "G" or $6 == '') {
                                 $max = $max * 1024;
                             }
-                            $max = $max/$memsize;
+                            $max = int($max/$memsize);
                             $request->{opt}->{$op} ="$min/$cur/$max";
                             $param = $request->{opt}->{$op};
                         } else {
@@ -816,15 +892,26 @@ 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 $value = xCAT::FSPUtils::fsp_api_action($request, $name, $d, $action, 0, $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);
                 if (@$value[1] && ((@$value[1] =~ /Error/i) && (@$value[2] ne '0'))) {
                     return ([[$name, @$value[1], '1']]) ;
                 } else {
                     push @values, [$name, "Success", '0'];
                 } 
             }
+            my $rethash = query_cec_info_actions($request, $name, $d, 1, \@query_array);
+            # 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 {
@@ -1605,6 +1692,7 @@ 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);
@@ -1625,9 +1713,12 @@ sub parse_part_get_info {
             $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];
@@ -1640,12 +1731,49 @@ 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 Req:[^\(]*\((\d+)\s*regions\)/) {
-            $hash->{lpar_used_regions} = $1;
+        } 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 =~ /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";
+            }
         }
     }
 }
@@ -1656,6 +1784,7 @@ 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 = ();
@@ -1670,12 +1799,16 @@ 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) {
-            return ([[@$values]]);
+            next; #return ([[@$values]]);
         }
         if (@$values[1] =~ /^$/) {
             next;
         }
-        if ($usage eq 0) {
+        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 ($lparid) {
                 if ($action eq "lpar_lhea_mac") {
                     my @output = split /\n/,@$values[1];
@@ -1730,18 +1863,72 @@ sub query_cec_info_actions {
             }
 	    #$data .= "@$values[1]\n\n";
             push @array, [$name, @$values[1], @$values[2]];
-        } else {
-            &parse_part_get_info(\%hash, @$values[1]);
-        }
+        } 
     }
-    if ($usage eq 0) {
+    if ($usage eq 0 or $usage eq 2) {
         #return $data;
+        if ($usage eq 2) {
+            %$lpar_hash = %hash;
+        }
         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;
@@ -1749,25 +1936,36 @@ 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"]);
-            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"]);
+            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);
 	        #push @result, [$name, $rethash, 0];
 	        push @result, @$rethash;
+                $lpar_hash{$name} = \%tmp_hash;
+                $lpar_hash{$name}->{parent} = @$d[3];
         }
         if (@td[0] == 0) {
-            my $rethash = query_cec_info_actions($request, @td[3],\@td, 0);
+            my $rethash = query_cec_info_actions($request, @td[3],\@td, $usage);
             #push @result, [@td[3], $rethash, 0];
             push @result, @$rethash;
         }  
     }
+    if ($args->{updatedb} and %lpar_hash) {
+        update_vm_db($request, \%lpar_hash);
+    }
     return \@result;
 }
 
@@ -1859,7 +2057,8 @@ sub deal_with_avail_mem {
             }
             #xCAT::MsgUtils->verbose_message($request, "====****====used:$used_regions,avail:$cur_avail,($min:$cur:$max)."); 
             if ($cur_avail < $min) {
-                return([$name, "Parse reserverd regions failed, no enough memory, available:$lparhash->{hyp_avail_mem}.", 1]);
+                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]);
             }           
             if ($cur > $cur_avail) {
                 my $new_cur = $cur_avail;
@@ -1883,6 +2082,19 @@ 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;
@@ -1999,12 +2211,14 @@ sub create_lpar {
     }
     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]]);
@@ -2044,6 +2258,75 @@ 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]]);
+                }
+            } else {
+                return([[$name, "Parameter for 'vmcpus' is invalid", 1]]);
+            }
+            if ($tmp_ent->{memory} =~ /^([\d|.]+)([G|M]?)\/([\d|.]+)([G|M]?)\/([\d|.]+)([G|M]?)$/i) {
+                my ($mmin, $mcur, $mmax);
+                if ($2 == "G" or $2 == '') {
+                    $mmin = $1 * 1024;
+                } 
+                if ($4 == "G" or $4 == '') {
+                    $mcur = $3 * 1024;
+                }
+                if ($6 == "G" or $6 == '') {
+                    $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}});
@@ -2060,66 +2343,59 @@ sub mkspeclpar {
                     $tmp_ent->{storage} = \@array;
                 }
             } else {
-                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"]]);
+                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]]);
                         }
-                        $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;
-                    $tmp_ent->{huge_page} = "1/".$tmp."/".$tmp;
+                    if ($tmp >= 1) {
+                        $tmp_ent->{huge_page} = "1/".$tmp."/".$tmp;
+                    }
                 }
                 if ($setting =~ /bsr:(\d+)/) {
-                    $tmp_ent->{bsr_num} = $1;
+                    if ($1 >= 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"]);
+            $lpar_hash{$name} = $rethash;     
+            $lpar_hash{$name}->{parent} = @$d[3];
+
             $name = undef;
             $d = undef;
         }
     }
+    if (%lpar_hash) {
+        update_vm_db($request, \%lpar_hash);
+    }
     return \@result;    
 }
 

perl-xCAT/xCAT/InstUtils.pm

@@ -217,14 +217,13 @@ sub is_me
     #my ($b1, $b2, $b3, $b4) = split /\./, $nameIP;
 
     # get all the possible IPs for the node I'm running on
-    my $ifcmd = "ifconfig -a | grep 'inet'";
-    my $result = xCAT::Utils->runcmd($ifcmd, -1, 1);
+    my $ipcmd = "ip addr | grep 'inet'";
+    my $result = xCAT::Utils->runcmd($ipcmd, -1, 1);
     if ($::RUNCMD_RC != 0)
     {
-        my $rsp;
-        #	push @{$rsp->{data}}, "Could not run $ifcmd.\n";
-        #    xCAT::MsgUtils->message("E", $rsp, $callback);
-		$::VERBOSE = $verb;
+        my $str="Error running ipcmd";
+        xCAT::MsgUtils->message("S", $str);
+        $::VERBOSE = $verb;
         return 0;
     }
 
@@ -232,7 +231,6 @@ 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
 
@@ -1023,7 +1021,7 @@ sub dolitesetup
         $nrange = join(',',@nodel);
     }
 
-	my @flist = xCAT::Utils->runcmd("/opt/xcat/bin/litefile $nrange", -1);
+	@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;

perl-xCAT/xCAT/LparNetbootExp.pm

@@ -1240,6 +1240,12 @@ 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
@@ -1249,9 +1255,9 @@ sub  ping_server{
         } else {
             $linklocal_ip = $client_ip;
         }
-        $cmd[3] = "ping $full_path_name:ipv6,$server_ip,$linklocal_ip,$gateway_ip\r";
+        $cmd[3] = "ping $full_path_name:ipv6,$server_ip,$linklocal_ip,$gateway_ip$to4pt\r";
     } else {
-        $cmd[3] = "ping $full_path_name:$server_ip,$client_ip,$gateway_ip\r";
+        $cmd[3] = "ping $full_path_name:$server_ip,$client_ip,$gateway_ip$to4pt\r";
     }
     $pattern[3] = ".*ping(.*)ok(.*)0 >(.*)";
 

perl-xCAT/xCAT/NetworkUtils.pm

@@ -19,6 +19,7 @@ use File::Path;
 use Math::BigInt;
 use Socket;
 use xCAT::GlobalDef;
+#use Data::Dumper;
 use strict;
 use warnings "all";
 my $socket6support = eval { require Socket6 };
@@ -642,16 +643,11 @@ 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()) {
         ##############################################################
@@ -663,6 +659,14 @@ 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)/) {
@@ -682,37 +686,39 @@ sub get_nic_ip
             }
         }
     }
-    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;
-                    }
+    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};
                 }
+                $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;
             }
         }
     }
@@ -1595,56 +1601,124 @@ 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;
-    $cmd = "ifconfig" . " -a";
-    $cmd = $cmd . "| grep \"inet\"";
-    my @result = xCAT::Utils->runcmd($cmd, 0);
-    if ($::RUNCMD_RC != 0)
+    if (xCAT::Utils->isLinux())
     {
-        xCAT::MsgUtils->message("S", "Error from $cmd\n");
-        exit $::RUNCMD_RC;
+       $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;
     }
-    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;
-            }
+    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;
+          }
 
-        }
+       }
     }
+
     my @names = @ipaddress;
     foreach my $ipaddr (@names)
     {
@@ -1655,9 +1729,9 @@ sub gethost_ips
             push @ipaddress, $shorthost[0];
         }
     }
-
     return @ipaddress;
 }
+
 #-------------------------------------------------------------------------------
 
 =head3 get_subnet_aix 
@@ -1833,102 +1907,6 @@ 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
@@ -1981,6 +1959,108 @@ 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  getNodeGateway 
+    Description:
+        Get gateway from the networks table of the node. 
+
+    Arguments:
+        ip: the ip address of the node
+    Returns:
+        Return a string, of the gateway
+        undef - Failed to get the gateway
+    Globals:
+        none
+    Error:
+        none
+    Example:
+        my $gateway = xCAT::NetworkUtils::getNodeGateway('192.168.1.0');
+    Comments:
+        none
+
+=cut
+#-------------------------------------------------------------------------------
+sub getNodeGateway
+{
+   my $ip=shift;
+   if( $ip =~ /xCAT::NetworkUtils/)
+   {
+      $ip=shift;
+   }
+   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'};
+            }
+        }
+    }
+
+
+   return $gateway;
+}
+
 #-------------------------------------------------------------------------------
 
 =head3   getNodeNetworkCfg 
@@ -2007,19 +2087,27 @@ sub isIpaddr
 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;
     for my $net (keys %$nets)
     {
         my $netname;
         ($netname,$mask) = split /\//, $net;
         last if ( xCAT::NetworkUtils::isInSameSubnet( $netname, $ip, $mask, 1));
     }
-    return ($ip, $node, undef, xCAT::NetworkUtils::formatNetmask($mask,1,0));
+    $gateway=xCAT::NetworkUtils::getNodeGateway($ip);
+    return ($ip, $node, $gateway, xCAT::NetworkUtils::formatNetmask($mask,1,0));
 }
 
+
+
 #-------------------------------------------------------------------------------
 
 =head3   get_hdwr_ip 

perl-xCAT/xCAT/PPCcfg.pm

@@ -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;
 
     #####################################

perl-xCAT/xCAT/PPCcli.pm

@@ -156,7 +156,7 @@ sub connect {
     # Shell prompt regexp based on HW Type 
     ##################################################
     my %prompt = (
-        hmc => "~> \$",
+        hmc => "~>\\s*\$",
         ivm => "\\\$ \$"
     );
     ##################################################

perl-xCAT/xCAT/PPCinv.pm

@@ -347,7 +347,7 @@ sub bus {
             #################################
             # Output header 
             #################################
-            push @result, [$name,"I/O Bus Information"];
+            push @result, [$name,"I/O Bus Information", 0];
 
             #################################
             # Output error 
@@ -532,7 +532,7 @@ sub config {
             #################################
             # Output header
             #################################
-            push @result, [$name,"Machine Configuration Info"];
+            push @result, [$name,"Machine Configuration Info", 0];
             my $i;
 
             foreach ( @prefix ) {

perl-xCAT/xCAT/PPCvitals.pm

@@ -203,7 +203,7 @@ sub voltage {
             # Voltages available in frame
             ################################# 
             if ( @$d[4] ne "bpa" ) {
-                push @result, [$name,"$text Only available for BPA",1];
+                push @result, [$name,"$text Only available for BPA",0];
                 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)",1];
+                push @result, [$name,"$prefix Not available (No BPA)",0];
                 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,1];
+                push @result, [$name,$text,0];
                 next;
             }
             ################################# 
             # Error - No frame 
             #################################
             if ( $mtms eq "0" ) {
-                push @result, [$name,"$prefix Not available (No BPA)",1];
+                push @result, [$name,"$prefix Not available (No BPA)",0];
                 next;
             }
             #################################

perl-xCAT/xCAT/RemoteShellExp.pm

@@ -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,18 +154,19 @@ 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
-  my $key="$home/.ssh/id_rsa";
-  my $key2="$home/.ssh/id_rsa.pub";
-  # Check to see if empty
-  if (-z $key) {
+  # 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 $rsp = {};
          $rsp->{error}->[0] = 
          "The $key file is empty. Remove it and rerun the command.";
@@ -183,8 +184,7 @@ sub remoteshellexp
   } 
   if (($flag eq "k") && (!(-e $key))) 
   {
-     # if the file size of the id_rsa key is 0, tell them to remove it
-     # and run the command again
+     # updating keys and the key file does not exist 
      $rc=xCAT::RemoteShellExp->gensshkeys($expecttimeout);
   }
   # send ssh keys to the nodes/devices, to setup passwordless ssh 
@@ -200,6 +200,9 @@ 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);
     } 
   }
@@ -495,11 +498,15 @@ 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;
@@ -607,11 +614,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/copy.sh $home/.ssh/tmp/authorized_keys $to_userid\@$node:/tmp/$to_userid/.ssh "; 
+        "$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 "; 
           
       } else {    # no node to node ssh ( don't send private key)
          $spawncopyfiles=
-        "$remotecopy $home/.ssh/copy.sh $home/.ssh/tmp/authorized_keys $to_userid\@$node:/tmp/$to_userid/.ssh "; 
+        "$remotecopy $home/.ssh/id_rsa.pub $home/.ssh/copy.sh $home/.ssh/tmp/authorized_keys $to_userid\@$node:/tmp/$to_userid/.ssh "; 
       }
       # send copy command 
       unless ($sendkeys->spawn($spawncopyfiles))
@@ -803,6 +810,10 @@ 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) {

perl-xCAT/xCAT/Schema.pm

@@ -389,7 +389,46 @@ 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',
+  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',
   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.',
@@ -599,7 +638,7 @@ 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.',
+  netboot => 'The type of network booting to use for this node.  Valid values:  pxe or xnba for x86* architecture, yaboot for POWER architecture, grub2 for RHEL7 on Power. Notice: yaboot is not supported from rhels7 on Power,use grub2 instead',
   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).',
@@ -708,7 +747,7 @@ 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 is used to create the kick start file for diskful installation.',
+  template => 'The fully qualified name of the template file that will be used to create the OS installer configuration file for stateful installations (e.g.  kickstart for RedHat, autoyast for SLES).',
   boottarget => 'The name of the boottarget definition.  When this attribute is set, xCAT will use the kernel, initrd and kernel params defined in the boottarget definition instead of the default.',
    addkcmdline=> 'User specified arguments to be passed to the kernel.  The user arguments are appended to xCAT.s default kernel arguments.   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',
@@ -727,7 +766,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 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.',
+  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.',
   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.",
@@ -742,7 +781,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 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',
+  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',
   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.",
@@ -916,6 +955,11 @@ 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".
@@ -936,6 +980,12 @@ 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".
    " -------------------------\n".
    "HARDWARE CONTROL ATTRIBUTES\n".
    " -------------------------\n".
@@ -1052,7 +1102,8 @@ 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\n".
+   "                   passwordless root access to nodes and other SN.\n".
+   "                   If using the zone table, this attribute in not used.\n\n".
    " -----------------\n".
    "SERVICES ATTRIBUTES\n".
    " -----------------\n".
@@ -1090,6 +1141,10 @@ 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".
@@ -1191,12 +1246,13 @@ performance => {
  },
   },
 zone => {
-    cols => [qw(zonename sshkeydir defaultzone comments disable)],
+    cols => [qw(zonename sshkeydir sshbetweennodes 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.",
@@ -1555,8 +1611,20 @@ hwinv => {
         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.',
-        disksize => 'The size of the disks 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.',
         comments => 'Any user-provided notes.',
         disable =>  "Set to 'yes' or '1' to comment out this row.",
     },
@@ -3083,6 +3151,10 @@ 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',

perl-xCAT/xCAT/TableUtils.pm

@@ -19,6 +19,7 @@ if ($^O =~ /^aix/i) {
 use lib "$::XCATROOT/lib/perl";
 use strict;
 require xCAT::Table;
+require xCAT::Zone;
 use File::Path;
 #-----------------------------------------------------------------------
 
@@ -271,7 +272,7 @@ sub bldnonrootSSHFiles
         Error:
              0=good,  1=error
         Example:
-                xCAT::TableUtils->setupSSH(@target_nodes);
+                xCAT::TableUtils->setupSSH(@target_nodes,$expecttimeout);
         Comments:
 			Does not setup known_hosts.  Assumes automatically
 			setup by SSH  ( ssh config option StrictHostKeyChecking no should
@@ -335,21 +336,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
+        # generates new keys for root, if they do not already exist ~/.ssh
+
         # nodes not used on this option but in there to preserve the interface
         my $rc=
           xCAT::RemoteShellExp->remoteshellexp("k",$::CALLBACK,$::REMOTE_SHELL,$n_str,$expecttimeout);
@@ -374,7 +375,10 @@ 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\"
@@ -386,6 +390,7 @@ 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
@@ -418,50 +423,46 @@ rmdir \"/tmp/$to_userid\" \n";
             xCAT::TableUtils->bldnonrootSSHFiles($from_userid);
     }
 
-    # 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
+    # send the keys 
     # For root user and not to devices only to nodes 
     if (($from_userid eq "root") && (!($ENV{'DEVICETYPE'}))) {
-      my $enablenodes;
-      my $disablenodes;
-      my @nodelist=  split(",", $n_str);
-      foreach my $n (@nodelist)
+      # Need to check if nodes are in a zone.  
+      my @zones;
+      my $tab = xCAT::Table->new("zone"); 
+      if ($tab) 
       {
-         my $enablessh=xCAT::TableUtils->enablessh($n);
-         if ($enablessh == 1) {
-           $enablenodes .= $n;
-           $enablenodes .= ","; 
-         } else {
-           $disablenodes .= $n;
-           $disablenodes .= ","; 
+          # 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 $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);
+      } 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);
          if ($rc != 0)
-         {
-          $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);
+         {   
+            $rsp->{data}->[0] = "Error sending ssh keys to the nodes.\n";
+            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);
@@ -503,6 +504,235 @@ 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 
@@ -947,7 +1177,9 @@ sub getAppStatus
     my ($class, $nodes_ref, $application) = @_;
     my @nodes = @$nodes_ref;
 
-    my $nltab = xCAT::Table->new('nodelist');
+    # 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 $nodeappstat = $nltab->getNodesAttribs(\@nodes,['appstatus']);
 
     my $ret_nodeappstat;
@@ -1594,8 +1826,8 @@ sub enableSSH
        
     } else { 
         # if not a service node we need to check, before enabling
-        if (defined($groups_hash)) {
-            if ($groups_hash->{ALLGROUPS} == 1)
+          if (keys %$groups_hash) {   # not empty
+            if  ($groups_hash->{ALLGROUPS} == 1)
             {
               $enablessh=1;
             }
@@ -1769,7 +2001,7 @@ sub updatenodegroups {
         }
     }
     my ($ent) = $tabhd->getNodeAttribs($node, ['groups']);
-    my @list = qw(all);
+    my @list = ();
     if (defined($ent) and $ent->{groups}) {
         push @list, split(/,/,$ent->{groups});
     }   
@@ -1783,5 +2015,54 @@ 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;

perl-xCAT/xCAT/Usage.pm

@@ -222,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
@@ -243,6 +243,7 @@ my %usage = (
        chvm <noderange> [vmcpus=min/req/max] [vmmemory=min/req/max]
                         [vmphyslots=drc_index1,drc_index2...] [vmothersetting=hugepage:N,bsr:N]
                         [vmnics=vlan1,vlan2] [vmstorage=<N|viosnode:slotid>] [--vios]
+       chvm <noderange> [del_physlots=drc_index1,drc_index2...]
        chvm <noderange> [del_vadapter=slotid]
    VMware specific:
        chvm <noderange> [-a size][-d disk][-p disk][--resize disk=size][--cpus count][--mem memory]

perl-xCAT/xCAT/Utils.pm

@@ -1339,11 +1339,30 @@ sub runxcmd_output
                 }
             }
         }
+        if (defined($node->{error}))
+        {
+            if (ref(\($node->{error}->[0])) eq 'SCALAR')
+            {
+                $desc = $desc . ": " . $node->{error}->[0];
+            }
+        }
+        if (defined($node->{errorcode}))
+        { 
+            if (ref(\($node->{errorcode}->[0])) eq 'SCALAR')
+            {
+                $::RUNCMD_RC |=  $node->{errorcode}->[0];
+            }
+        }
         push @$::xcmd_outref, $desc;
     }
     if (defined($resp->{error}))
     {
-        push @$::xcmd_outref, @{$resp->{error}};
+        if (ref($resp->{error}) eq 'ARRAY')
+        { 
+          push @$::xcmd_outref, @{$resp->{error}};
+        } else {
+          push @$::xcmd_outref, $resp->{error};
+        }
     }
     if (defined($resp->{errorcode}))
     {
@@ -1829,8 +1848,7 @@ sub get_image_name
 #-------------------------------------------------------------------------------
 
 =head3   StartService
-	Supports AIX and Linux as long as the service is registered with
-	lssrc or startsrc.  
+	Supports AIX only, for Linux use startservice 
 	Used by the service node plugin (AAsn.pm) to start requested services. 
     Checks to see if the input service is already started. If it is started
 	it stops and  starts the service. Otherwise
@@ -1850,7 +1868,9 @@ sub get_image_name
     Example:
          if (xCAT::Utils->startService("named") { ...}
     Comments:
-        none
+         this subroutine is deprecated,
+         will be used as an internal function to process AIX service,
+         for linux, use xCAT::Utils->startservice instead
 
 =cut
 
@@ -3416,4 +3436,610 @@ sub version_cmp {
     return ( $len_a <=> $len_b )
 }
 
+
+#--------------------------------------------------------------------------------
+
+=head3    fullpathbin
+    returns the full path of a specified binary executable file
+    Arguments:
+      string of the bin file name
+    Returns:
+      string of the full path name of the binary executable file
+      string of the bin file name in the argument if failed
+    Globals:
+        none
+    Error:
+        none
+    Example:
+         my $CHKCONFIG = xCAT::Utils->fullpathbin("chkconfig");
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub fullpathbin
+{
+  my $bin=shift;
+  if( $bin =~ /xCAT::Utils/)
+  {
+     $bin=shift;
+  }
+
+  my @paths= ("/bin","/usr/bin","/sbin","/usr/sbin");
+  my $fullpath=$bin;
+
+  foreach my $path (@paths)
+  {
+     if (-x $path.'/'.$bin)
+     {
+        $fullpath= $path.'/'.$bin;
+        last;
+     }
+  }
+
+  return $fullpath;
+}
+
+#--------------------------------------------------------------------------------
+
+=head3   gettimezone 
+    returns the name of the timezone defined on the Linux distro. 
+    This routine was written to replace the use of /etc/sysconfig/clock which in no
+    longer supported on future Linux releases such as RHEL7.  It is suppose to be a routine
+    that can find the timezone on any Linux OS or AIX. 
+    Arguments:
+      none 
+    Returns:
+      Name of timezone,  for example US/Eastern 
+    Globals:
+        none
+    Error:
+      None 
+    Example:
+         my $timezone = xCAT::Utils->gettimezone();
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub gettimezone 
+{
+  my ($class) = @_;
+
+  my $tz;
+  if (xCAT::Utils->isAIX()) {
+    $tz= $ENV{'TZ'};
+  } else {   # all linux 
+        my $localtime = "/etc/localtime";
+        my $zoneinfo = "/usr/share/zoneinfo";
+        my $cmd = "find $zoneinfo -xtype f -exec cmp -s $localtime {} \\; -print | grep -v posix | grep -v SystemV | grep -v right | grep -v localtime ";
+        my $zone_result = xCAT::Utils->runcmd("$cmd", 0);
+        if ($::RUNCMD_RC != 0)
+        {
+           $tz="Could not determine timezone checksum"; 
+            return $tz;
+        }
+        my @zones = split /\n/, $zone_result;
+
+        $zones[0] =~ s/$zoneinfo\///;
+        if (!$zones[0]) {  # if we still did not get one, then default
+                $tz = `cat /etc/timezone`;
+                chomp $tz;
+        } else {
+             $tz=$zones[0];
+        }
+
+
+  }
+  return $tz;
+
+
+}
+
+
+#--------------------------------------------------------------------------------
+
+=head3   servicemap 
+    returns the name of service unit(for systemd) or service daemon(for SYSVinit). 
+    Arguments:
+      $svcname: the name of the service
+      $svcmgrtype: the service manager type:
+                   0: SYSVinit
+                   1: systemd
+                   2: upstart  
+    Returns:
+      the name of service unit or service daemon
+      undef on fail
+    Globals:
+        none
+    Error:
+      None 
+    Example:
+         my $svc = xCAT::Utils->servicemap($svcname,1);
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub servicemap{
+  my $svcname=shift;
+  if( $svcname =~ /xCAT::Utils/)
+  {
+     $svcname=shift;
+  }
+  
+  my $svcmgrtype=shift;
+
+
+  #hash structure: 
+  #"service name $svcname" =>{
+  #"service manager name(SYSVinit/systemd) $svcmgrtype" 
+  #=> ["list of possible service file names for the specified $svcname under the specified $svcmgrtype "]
+  # }
+  my %svchash=(
+     "dhcp"  =>    ["dhcp3-server","dhcpd","isc-dhcp-server"],
+     "nfs"   =>    ["nfsserver","nfs-server","nfs","nfs-kernel-server"],
+     "named" =>    ["named","bind9"],
+     "syslog" =>   ["syslog","syslogd","rsyslog"],
+     "firewall" => ["iptables","firewalld","SuSEfirewall2_setup","ufw"],
+     "http" =>     ["apache2","httpd"],
+     "ntpserver" =>["ntpd","ntp"],
+     "mysql" =>    ["mysqld","mysql"],
+  );
+
+  my $path=undef;
+  my $postfix="";
+  my $retdefault=$svcname;
+  if($svcmgrtype == 0){
+     $path="/etc/init.d/";
+  }elsif ($svcmgrtype == 1){
+     $path="/usr/lib/systemd/system/";
+     $postfix=".service";
+     $retdefault=$svcname.".service";
+  }elsif ($svcmgrtype == 2){
+     $path="/etc/init/";
+     $postfix=".conf";
+  }
+
+  
+  my $ret=undef;
+  if($svchash{$svcname}){
+    foreach my $file (@{$svchash{$svcname}}){
+       if(-e $path.$file.$postfix ){
+             $ret=$file;
+             last;
+          }
+    }      
+  }else{
+    if(-e $path.$retdefault.$postfix){
+        $ret=$retdefault;
+    } 
+ }
+ 
+ return $ret;  
+
+}
+
+
+#--------------------------------------------------------------------------------
+
+=head3  startservice  
+    start a service
+    Arguments:
+      service name
+    Returns:
+      0 on success
+      nonzero otherwise
+    Globals:
+        none
+    Error:
+        none
+    Example:
+        xCAT::Utils->startservice("nfs");
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub startservice{
+  my $svcname=shift;
+  if( $svcname =~ /xCAT::Utils/)
+  {
+     $svcname=shift;
+  }
+
+  my $cmd="";
+  #for Systemd
+  my $svcunit=undef;
+  #for sysVinit
+  my $svcd=undef;
+  #for upstart
+  my $svcjob=undef;
+
+  $svcunit=servicemap($svcname,1);
+  $svcjob=servicemap($svcname,2);
+  $svcd=servicemap($svcname,0);
+  if($svcunit)
+  {
+      $cmd="systemctl start $svcunit";
+  }
+  elsif( $svcjob )
+  {
+      $cmd="initctl start $svcjob";
+  }
+  elsif( $svcd )
+  {
+      $cmd="service $svcd start";
+  }
+
+  #print "$cmd\n"; 
+  if( $cmd eq "" )
+  {
+     return -1;
+  }
+ 
+  #xCAT::Utils->runcmd($cmd, -1);   # do not use runcmd (backtics), must use system to not fork
+  system($cmd);
+  $::RUNCMD_RC=$?;
+  return $::RUNCMD_RC;
+}
+
+
+#--------------------------------------------------------------------------------
+
+=head3  stopservice  
+    stop a service
+    Arguments:
+      service name
+    Returns:
+      0 on success
+      nonzero otherwise
+    Globals:
+        none
+    Error:
+        none
+    Example:
+        xCAT::Utils->stopservice("nfs");
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub stopservice{
+  my $svcname=shift;
+  if( $svcname =~ /xCAT::Utils/)
+  {
+     $svcname=shift;
+  }
+
+  my $cmd="";
+  my $svcunit=undef;
+  my $svcd=undef;
+  my $svcjob=undef; 
+
+  $svcunit=servicemap($svcname,1);
+  $svcjob=servicemap($svcname,2);
+  $svcd=servicemap($svcname,0);
+  if($svcunit)
+  {
+      $cmd="systemctl stop $svcunit";
+  }
+  elsif( $svcjob )
+  {
+      $cmd="initctl status $svcjob |grep stop; if [ \"\$?\" != \"0\"  ]; then initctl  stop $svcjob ; fi";
+  }
+  elsif( $svcd )
+  {
+      $cmd="service $svcd stop";
+  }
+
+
+  #print "$cmd\n"; 
+  if( $cmd eq "" )
+  {
+     return -1;
+  }
+ 
+  #xCAT::Utils->runcmd($cmd, -1);   # do not use runcmd (backtics), must use system to not fork
+  system($cmd);
+  $::RUNCMD_RC=$?;
+  return $::RUNCMD_RC;
+}
+
+
+#--------------------------------------------------------------------------------
+
+=head3  restartservice  
+    restart a service
+    Arguments:
+      service name
+    Returns:
+      0 on success
+      nonzero otherwise
+    Globals:
+        none
+    Error:
+        none
+    Example:
+        xCAT::Utils->restartservice("nfs");
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub restartservice{
+  my $svcname=shift;
+  if( $svcname =~ /xCAT::Utils/)
+  {
+     $svcname=shift;
+  }
+
+  my $cmd="";
+  my $svcunit=undef;
+  my $svcd=undef;
+  my $svcjob=undef; 
+
+  $svcunit=servicemap($svcname,1);
+  $svcjob=servicemap($svcname,2);
+  $svcd=servicemap($svcname,0);
+  if($svcunit)
+  {
+      $cmd="systemctl restart $svcunit";
+  }
+  elsif( $svcd )
+  {
+      $cmd="service $svcd restart";
+  }
+  elsif( $svcjob )
+  {
+      $cmd="initctl status $svcjob |grep stop; if [ \"\$?\" != \"0\"  ]; then initctl restart $svcjob ; else initctl start $svcjob; fi";
+  }
+
+  #print "$cmd\n"; 
+  if( $cmd eq "" )
+  {
+     return -1;
+  }
+ 
+  xCAT::Utils->runcmd($cmd, -1);
+  return $::RUNCMD_RC;
+}
+
+#--------------------------------------------------------------------------------
+
+=head3   checkservicestatus 
+    returns theservice status. 
+    Arguments:
+      $svcname: the name of the service
+      $outputoption[optional]:
+                   the output option
+                   1: return a hashref with the keys:"retcode","retmsg"
+           otherwise: return retcode only
+    Returns:
+      undef on fail
+      a hashref if $outputoption is 1,the hash structure is:
+                  {"retcode"=>(status code, 0 for running/active,1 for stopped/inactive,2 for failed)
+                   "retmsg" =>(status string, running/active/stopped/inactive/failed)
+                  }
+      the status code otherwise
+
+    Globals:
+        none
+    Error:
+      None 
+    Example:
+         my $ret = xCAT::Utils-checkservicestatus($svcname,1);
+         my $retcode = xCAT::Utils-checkservicestatus($svcname);
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub checkservicestatus{
+  my $svcname=shift;
+  if( $svcname =~ /xCAT::Utils/)
+  {
+     $svcname=shift;
+  }
+
+  my $outputoption=shift;
+
+  my $cmd="";
+  my $svcunit=undef;
+  my $svcd=undef;
+  my $svcjob=undef;
+  my %ret;
+
+  $svcunit=servicemap($svcname,1);
+  $svcjob=servicemap($svcname,2);
+  $svcd=servicemap($svcname,0);
+  my $output=undef;
+
+  if($svcunit)
+  {
+      #for systemd, parse the output since it is formatted
+      $cmd="systemctl show --property=ActiveState $svcunit|awk -F '=' '{print \$2}'";
+      $output=xCAT::Utils->runcmd($cmd, -1);
+      if($output =~ /^active$/i){
+         $ret{retcode}=0;
+      }elsif($output =~ /^failed$/i){
+         $ret{retcode}=2;
+       
+      }elsif($output =~ /^inactive$/i){
+         $ret{retcode}=1;
+      }
+  }
+  elsif ( $svcjob  )
+  {
+      #for upstart, parse the output 
+      $cmd="initctl status $svcjob";
+      $output=xCAT::Utils->runcmd($cmd, -1);
+      if($output =~ /waiting/i){
+         $ret{retcode}=2;
+      }elsif($output =~ /running/i){
+         $ret{retcode}=0;
+      }
+      
+  }
+  elsif( $svcd )
+  {
+      #for SYSVinit, check the return value since the "service" command output is confused
+      $cmd="service $svcd status";
+      $output=xCAT::Utils->runcmd($cmd, -1);
+      $ret{retcode}=$::RUNCMD_RC; 
+#      if($output =~ /stopped|not running/i){
+#        $ret{retcode}=1;
+#      }elsif($output =~ /running/i){
+#        $ret{retcode}=0;
+#      }
+  }
+  if($output)
+  {
+     $ret{retmsg}=$output;
+  }
+  
+
+  if(defined $outputoption and $outputoption == 1 ){
+     return \%ret;
+  }elsif(exists $ret{retcode}){
+     return $ret{retcode};
+  }
+
+   return undef;
+
+}
+
+
+#--------------------------------------------------------------------------------
+
+=head3  enableservice 
+   enable a service to start it on the system bootup
+    Arguments:
+      service name
+    Returns:
+      0 on success
+      nonzero otherwise
+    Globals:
+        none
+    Error:
+        none
+    Example:
+        xCAT::Utils->enableservice("nfs");
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub enableservice{
+  my $svcname=shift;
+  if( $svcname =~ /xCAT::Utils/)
+  {
+     $svcname=shift;
+
+  }
+  my $cmd="";
+  my $svcunit=undef;
+  my $svcd=undef;
+  my $svcjob=undef;
+
+  $svcunit=servicemap($svcname,1);
+  $svcjob=servicemap($svcname,2);
+  $svcd=servicemap($svcname,0);
+  if($svcunit)
+  {
+      $cmd="systemctl enable $svcunit";
+  }
+  elsif($svcjob)
+  {
+      $cmd="update-rc.d $svcjob defaults";
+  
+  }
+  elsif( $svcd )
+  {
+      my $CHKCONFIG = xCAT::Utils->fullpathbin("chkconfig");
+      if($CHKCONFIG ne "chkconfig"){
+          $cmd="$CHKCONFIG $svcd on";
+      }else{
+        $CHKCONFIG = xCAT::Utils->fullpathbin("update-rc.d");
+        if($CHKCONFIG ne "update-rc.d"){
+            $cmd="$CHKCONFIG $svcd defaults";
+        }
+      }
+  }
+  if( $cmd eq "" )
+  {
+     return -1;
+  }
+
+  xCAT::Utils->runcmd($cmd, -1);
+  return $::RUNCMD_RC;
+}
+
+
+#--------------------------------------------------------------------------------
+
+=head3  disableservice  
+    disable a service to prevent it from starting on system bootup
+    Arguments:
+      service name
+    Returns:
+      0 on success
+      nonzero otherwise
+    Globals:
+        none
+    Error:
+        none
+    Example:
+        xCAT::Utils->disableservice("nfs");
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub disableservice{
+  my $svcname=shift;
+  if( $svcname =~ /xCAT::Utils/)
+  {
+     $svcname=shift;
+
+  }
+  my $cmd="";
+  my $svcunit=undef;
+  my $svcjob=undef;
+  my $svcd=undef;
+
+  $svcunit=servicemap($svcname,1);
+  $svcjob=servicemap($svcname,2);
+  $svcd=servicemap($svcname,0);
+  if($svcunit)
+  {
+      $cmd="systemctl disable $svcunit";
+  }
+  elsif($svcjob)
+  {
+      $cmd="update-rc.d -f $svcjob remove";
+    
+  }
+  elsif( $svcd )
+  {
+      my $CHKCONFIG = xCAT::Utils->fullpathbin("chkconfig");
+      if($CHKCONFIG ne "chkconfig"){
+          $cmd="$CHKCONFIG $svcd off";
+      }else{
+        $CHKCONFIG = xCAT::Utils->fullpathbin("update-rc.d");
+        if($CHKCONFIG ne "update-rc.d"){
+            $cmd="$CHKCONFIG -f $svcd remove";
+        }
+      }
+  }
+
+#  print "$cmd\n";
+  if( $cmd eq "" )
+  {
+     return -1;
+  }
+
+  xCAT::Utils->runcmd($cmd, -1);
+  return $::RUNCMD_RC;
+}
 1;

perl-xCAT/xCAT/Zone.pm

@@ -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,22 +71,6 @@ 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";
@@ -152,29 +136,6 @@ 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);
-    }
 }
 #--------------------------------------------------------------------------------
 
@@ -184,11 +145,11 @@ sub  genSSHRootKeys
     Returns:
     Name of the current default  zone from the zone table
     Example:
-     my $defaultzone =xCAT::Zone->getdefaultzone(); 
+     my $defaultzone =xCAT::Zone->getdefaultzone($callback); 
 =cut
 
 #--------------------------------------------------------------------------------
-sub  getdefaultzone 
+sub getdefaultzone 
 {
  my ($class, $callback) = @_;
  my $defaultzone;
@@ -199,7 +160,8 @@ sub  getdefaultzone
    foreach my $zone (@zones) {
     # Look for the  defaultzone=yes/1 entry
     if ((defined($zone->{defaultzone})) && 
-          (($zone->{defaultzone} =~ "yes") || ($zone->{defaultzone} = "1"))) {
+          (($zone->{defaultzone} =~ /^yes$/i )
+           || ($zone->{defaultzone} eq "1"))) {
        $defaultzone = $zone->{zonename};
     }
     $tab->close();
@@ -230,9 +192,133 @@ 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();
- if (defined($zone)) {
+ 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) {
     return 1;
  }else{
     return 0;
@@ -242,44 +328,48 @@ sub iszonedefined
 
 =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->getNodeZones($nodelist); 
+     my %zonehash =xCAT::Zone->getzoneinfo($callback,@nodearray); 
     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) = @_;
- 
- # make the list into an array
-# $nodelist=~ s/\s*//g; # remove blanks
-# my @nodes = split ',', $nodelist;
+ $::GETZONEINFO_RC=0; 
  my $zonehash;
  my $defaultzone;
  # read all the zone table 
  my $zonetab = xCAT::Table->new("zone");
+ my @zones;
  if ($zonetab){
-    my @zones = $zonetab->getAllAttribs('zonename','sshkeydir','defaultzone');
+    @zones = $zonetab->getAllAttribs('zonename','sshkeydir','sshbetweennodes','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") || ($zone->{defaultzone} = "1"))) {
+          if ((defined($zone->{defaultzone})) &&
+          (($zone->{defaultzone} =~ /^yes$/i ) 
+              || ($zone->{defaultzone} eq "1"))) {
               $defaultzone = $zone->{zonename};
           }
        }
@@ -289,41 +379,74 @@ 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 in the zone table, the node is assigned to the ~.ssh keydir
+ #         If there is no defaultzone error out 
  
 
- 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;
-    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};
-    }
+    $zonename=$nodehash->{$node}->[0]->{zonename};
     if (defined($zonename)) {  # zonename explicitly defined in nodelist.zonename
-       push @{$zonehash->{$zonename}->{nodes}},$node;
+     # 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;
     } 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 then use the ~/.ssh keys as the default, put them in the __xcatzone
-          push @{$zonehash->{$xcatzone}->{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;
        
       }   
     }   
  }
- return;
+ 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;
 }
 1;

perl-xCAT/xCAT/data/discinfo.pm

@@ -14,9 +14,10 @@ require Exporter;
 
 %distnames = (
                  "1310229985.226287" => "centos6",
-		 "1323560292.885204" => "centos6.2",
-		 "1341569670.539525" => "centos6.3",#x86
-		 "1362445555.957609" => "centos6.4",#x86_64
+                 "1323560292.885204" => "centos6.2",
+                 "1341569670.539525" => "centos6.3",#x86
+                 "1362445555.957609" => "centos6.4",#x86_64
+                 "1385726732.061157" => "centos6.5",#x86_64
                  "1176234647.982657" => "centos5",
                  "1156364963.862322" => "centos4.4",
                  "1178480581.024704" => "centos4.5",
@@ -28,6 +29,7 @@ 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",
@@ -69,6 +71,8 @@ require Exporter;
 		 "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
+		 "1399449226.140088" => "rhelhpc7.0",#x86_64, RHEL ComputeNode
                  "1194015916.783841" => "fedora8",
                  "1194015385.299901" => "fedora8",
                  "1210112435.291709" => "fedora9",

perl-xCAT/xCAT/zvmUtils.pm

@@ -2405,7 +2405,7 @@ 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`;
-        $out =~ s/\h+/ /g;
+        # causing problems on other platforms $out =~ s/\h+/ /g;
         my @results = split(' ', $out);
         if ( $results[3] eq "0" ) {
             $results[3] = "0M";

xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_xlf15_xlc13.bnd

@@ -0,0 +1,10 @@
+# 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

xCAT-IBMhpc/share/xcat/IBMhpc/gpfs/gpfs_updates

@@ -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://$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
+#        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
         if [ -n "`ls *.rpm 2> /dev/null`" ] ; then
             rpm -Uvh *.rpm
         fi

xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/ping_all

@@ -62,7 +62,8 @@ else
    file=$1
 fi
 
-ifconfig -a  | grep 'inet ' | awk ' { print $2 } ' | grep -v 127.0.0.1 | 
+#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}'|
 while read my_address ; do
     ##print "checking $my_address"
     grep -q " ${my_address}$" $file

xCAT-OpenStack-baremetal/debian/README.Debian

@@ -0,0 +1,6 @@
+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

xCAT-OpenStack-baremetal/debian/README.source

@@ -0,0 +1,9 @@
+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>
+
+
+
+

xCAT-OpenStack-baremetal/debian/changelog

@@ -0,0 +1,5 @@
+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

xCAT-OpenStack-baremetal/debian/compat

@@ -0,0 +1 @@
+8

xCAT-OpenStack-baremetal/debian/control

@@ -0,0 +1,14 @@
+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

xCAT-OpenStack-baremetal/debian/copyright

@@ -0,0 +1,38 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: xcat-openstack-baremetal
+Source: <url://example.com>
+
+Files: *
+Copyright: <years> <put author's name and email here>
+           <years> <likewise for another author>
+License: <special license>
+ <Put the license of the package here indented by 1 space>
+ <This follows the format of Description: lines in control file>
+ .
+ <Including paragraphs>
+
+# If you want to use GPL v2 or later for the /debian/* files use 
+# the following clauses, or change it to suit. Delete these two lines
+Files: debian/*
+Copyright: 2014 root <root@unknown>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
+# Please avoid to pick license terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.

xCAT-OpenStack-baremetal/debian/dirs

@@ -0,0 +1,7 @@
+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

xCAT-OpenStack-baremetal/debian/files

@@ -0,0 +1,2 @@
+xcat-openstack-baremetal_2.8.4-1_all.deb admin extra
+xcat-openstack-baremetal_2.8.4-1_all.deb admin extra

xCAT-OpenStack-baremetal/debian/install

@@ -0,0 +1,6 @@
+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/
+
+

xCAT-OpenStack-baremetal/debian/postinst

@@ -0,0 +1,43 @@
+#!/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

xCAT-OpenStack-baremetal/debian/prerm

@@ -0,0 +1,46 @@
+#!/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

xCAT-OpenStack-baremetal/debian/rules

@@ -0,0 +1,44 @@
+#!/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

xCAT-OpenStack-baremetal/debian/source/format

@@ -0,0 +1 @@
+1.0

xCAT-OpenStack-baremetal/debian/xcat-openstack-baremetal.debhelper.log

@@ -0,0 +1,201 @@
+dh_installdirs
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb
+dh_installdirs
+dh_install
+dh_link
+dh_installman
+dh_compress
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb
+dh_builddeb

xCAT-OpenStack-baremetal/debian/xcat-openstack-baremetal.links

@@ -0,0 +1,4 @@
+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

xCAT-OpenStack-baremetal/debian/xcat-openstack-baremetal.substvars

@@ -0,0 +1 @@
+misc:Depends=

xCAT-OpenStack-baremetal/lib/perl/xCAT_plugin/openstack.pm

@@ -0,0 +1,965 @@
+# 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;

xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/__init__.py

@@ -0,0 +1,17 @@
+# 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

xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/driver.py

@@ -0,0 +1,256 @@
+# 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}

xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/exception.py

@@ -0,0 +1,41 @@
+# 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")

xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/power_states.py

@@ -0,0 +1,9 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+"""
+Possible xCAT node power states.
+"""
+
+OFF = 'off'
+ON = 'on'
+ERROR = 'error'

xCAT-OpenStack-baremetal/lib/python/xcat/openstack/baremetal/xcat_driver.py

@@ -0,0 +1,260 @@
+# 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'])

xCAT-OpenStack-baremetal/pods/man1/opsaddbmnode.1.pod

@@ -0,0 +1,92 @@
+=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>
+

xCAT-OpenStack-baremetal/pods/man1/opsaddimage.1.pod

@@ -0,0 +1,67 @@
+=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>
+

xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/config_ops_bm_node

@@ -0,0 +1,215 @@
+#!/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
+
+
+
+

xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/deconfig_ops_bm_node

@@ -0,0 +1,94 @@
+#!/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
+
+
+
+

xCAT-OpenStack-baremetal/xCAT-OpenStack-baremetal.spec

@@ -0,0 +1,102 @@
+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
+
+

xCAT-OpenStack-baremetal/xpod2man

@@ -0,0 +1,214 @@
+#!/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 "Error running:  $cmd\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);
+}

xCAT-OpenStack/xCAT-OpenStack.spec

@@ -92,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 %ifos linux
   if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
     if [ -f $RPM_INSTALL_PREFIX0/sbin/xcatd  ]; then
-      /etc/init.d/xcatd reload
+      /etc/init.d/xcatd restart
     fi
   fi
 %endif

xCAT-SoftLayer/LICENSE.html

@@ -0,0 +1,326 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 9">
+<meta name=Originator content="Microsoft Word 9">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+@font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+@page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang=EN-US style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; 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. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>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.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>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. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>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.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>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. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>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 (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) 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.</span> </p>
+
+<p><span style='font-size:10.0pt'>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.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; 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. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>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.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>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.</span> </p>
+
+<p><span style='font-size:10.0pt'>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. </span></p>
+
+<p><span style='font-size:10.0pt'>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. </span></p>
+
+<p><span style='font-size:10.0pt'>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.</span> </p>
+
+<p><span style='font-size:10.0pt'>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.</span> </p>
+
+<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>

xCAT-SoftLayer/bin/getslnodes

@@ -0,0 +1,129 @@
+#!/usr/bin/perl
+
+# Query the softlayer account for info about all of the bare metal servers and
+# put the info in mkdef stanza format, so the node can be defined in the xcat db
+# so that xcat can manage/deploy them.
+
+use strict;
+use Getopt::Long;
+use Data::Dumper;
+#$Data::Dumper::Maxdepth=2;
+
+# Globals - these are set once and then only read.
+my $HELP;
+my $VERBOSE;
+my %CONFIG;		# attributes read from config file
+
+my $usage = sub {
+   	my $exitcode = shift @_;
+   	print "Usage: getslnodes [-?|-h|--help] [-v|--verbose] [<hostname-match>]\n\n";
+   	if (!$exitcode) {
+   		print "getslnodes queries your SoftLayer account and gets attributes for each\n";
+   		print "server.  The attributes can be piped to 'mkdef -z' to define the nodes\n";
+   		print "in the xCAT DB so that xCAT can manage them.  getslnodes\n";
+   		print "requires a .slconfig file in your home directory that contains your\n";
+   		print "SoftLayer userid, API key, and location of API perl module, in attr=val format.\n";
+   	}
+	exit $exitcode;
+};
+
+# Process the cmd line args
+Getopt::Long::Configure("bundling");
+#Getopt::Long::Configure("pass_through");
+Getopt::Long::Configure("no_pass_through");
+if (!GetOptions('h|?|help'  => \$HELP, 'v|verbose' => \$VERBOSE)) { $usage->(1); }
+
+if ($HELP) { $usage->(0); }
+if (scalar(@ARGV)>1) { $usage->(1); }
+my $hnmatch = $ARGV[0];		# if they specified a hostname match, only show svrs that start with that
+
+readconf("$ENV{HOME}/.slconfig");		# get the userid and api key from the config file
+
+my $slinstalled = eval { push @INC, $CONFIG{apidir}; require SoftLayer::API::SOAP; };
+if (!$slinstalled) { die "$@\nError: either the SoftLayer::API::SOAP perl module is not installed, or some dependencies are missing.  Download it using 'git clone https://github.com/softlayer/softlayer-api-perl-client', put the directory in ~/.slconfig , and ensure its dependencies are installed."; }
+
+my $client = SoftLayer::API::SOAP->new('SoftLayer_Account', undef, $CONFIG{userid}, $CONFIG{apikey});
+
+my $mask = "mask[operatingSystem.passwords,remoteManagementAccounts,remoteManagementComponent,backendNetworkComponents]";
+$client->setObjectMask($mask);
+
+#print $client->fault;
+#print $client->faultstring;
+#print "\n";
+	
+my $hw = $client->getHardware();
+my $servers = $hw->result;
+foreach my $server (@$servers) {
+	if ($server->{fullyQualifiedDomainName} =~ m/$hnmatch/) {
+		print "\n".$server->{hostname}.":\n";
+		print "\tobjtype=node\n";
+		print "\tgroups=slnode,ipmi,all\n";
+		print "\tmgt=ipmi\n";
+		print "\tbmc=".$server->{remoteManagementComponent}->{ipmiIpAddress}."\n";
+		print "\tbmcusername=".$server->{remoteManagementAccounts}->[0]->{username}."\n";
+		print "\tbmcpassword=".$server->{remoteManagementAccounts}->[0]->{password}."\n";
+
+		# find the 1st active private nic that is not the bmc
+		foreach my $nic (@{$server->{backendNetworkComponents}}) {
+			#print "nic:\n"; foreach my $key (keys(%$nic)) { print "  $key = ", $nic->{$key}, "\n"; }
+			if ($nic->{status} eq 'ACTIVE' && $nic->{name} eq 'eth' && $nic->{macAddress} && $nic->{primaryIpAddress}) {
+				# found it
+				print "\tmac=".$nic->{macAddress}."\n";
+				print "\tip=".$nic->{primaryIpAddress}."\n";
+			}
+		}
+		#print "\tip=".$server->{privateIpAddress}."\n";	# getting this from the backendNetworkComponents instead
+		print "\tserial=".$server->{manufacturerSerialNumber}."\n";
+		print "\tnetboot=xnba\n";
+		print "\tarch=x86_64\n";
+		print "\tusercomment=hostname:".$server->{fullyQualifiedDomainName}.", user:".$server->{operatingSystem}->{passwords}->[0]->{username}.", pw:".$server->{operatingSystem}->{passwords}->[0]->{password}."\n";
+
+		verbose('SoftLayer API bare metal server entry: ' . Dumper($server));
+		#print Dumper($server->{remoteManagementAccounts});
+		#print "#Softlayer_account_info_for ".$server->{fullyQualifiedDomainName} . " Username: ";
+		#print $server->{operatingSystem}->{passwords}->[0]->{username} . " Password: ";
+		#print $server->{operatingSystem}->{passwords}->[0]->{password}. "\n";
+		#print "nodeadd ".$server->{hostname}." groups=saptest ipmi.password=".$server->{remoteManagementAccounts}->[0]->{password}." ipmi.bmc=".$server->{remoteManagementComponent}->{ipmiIpAddress};
+		#print " mac.mac=".$server->{backendNetworkComponents}->[0]->{macAddress};
+		#print " hosts.ip=".$server->{privateIpAddress} ."\n";
+	}
+}
+exit(0);
+
+
+# Pring msg only if -v was specified
+sub verbose { if ($VERBOSE) { print shift, "\n"; } }
+
+
+# Read the config file.  Format is attr=val on each line.  Should contain at leas the userid and apikey.
+# This function fills in the global %CONFIG hash.
+sub readconf {
+	my $conffile = shift @_;
+	open(FILE, $conffile) || die "Error: can not open config file $conffile: $!\n";
+	while (<FILE>) {
+		my $line = $_;
+		chomp($line);
+		if ($line =~ /^#/ || $line =~/^\s*$/) { next; }	# skip comment lines
+		my ($key, $value) = split(/\s*=\s*/, $line, 2);
+		if (!defined($value)) { die "Error: line '$line' does not have format attribute=value\n"; }
+		$CONFIG{$key} = $value;
+	}
+	close FILE;
+	verbose('%CONFIG hash: ' . Dumper(\%CONFIG));
+
+	# the config file needs to contain at least the userid and api key
+	if (!defined($CONFIG{userid}) || !defined($CONFIG{apikey}) || !defined($CONFIG{apidir})) {
+		die "Error: the config file must contain values for userid, apikey, and apidir.\n";
+	}
+}
+
+#$mask = "mask[operatingSystem.passwords]";
+#$client->setObjectMask($mask);
+#my $vs = $client->getVirtualGuests();
+#my $servers = $vs->result;
+#foreach my $server (@$servers) {
+#	if ($server->{fullyQualifiedDomainName} eq "xcat1-sap.saptest.ibm.com") {
+#		print $server->{primaryIpAddress}."\n";
+#		print $server->{operatingSystem}->{passwords}->[0]->{password}."\n";
+#	}
+#}

xCAT-SoftLayer/bin/khrem

@@ -0,0 +1,88 @@
+#!/usr/bin/perl
+
+# remove entries from the .ssh/known_hosts file for a node
+
+use strict;
+use Getopt::Long;
+use Data::Dumper;
+#$Data::Dumper::Maxdepth=2;
+
+# Globals - these are set once and then only read.
+my $HELP;
+my $VERBOSE;
+my $file = '~/.ssh/known_hosts';
+
+my $usage = sub {
+   	my $exitcode = shift @_;
+   	print "Usage: khrem <node>\n";
+    print "       Removes the entries in the .ssh/known_hosts file associated with this node.\n";
+	exit $exitcode;
+};
+
+# Process the cmd line args
+Getopt::Long::Configure("bundling");
+#Getopt::Long::Configure("pass_through");
+Getopt::Long::Configure("no_pass_through");
+if (!GetOptions('h|?|help'  => \$HELP, 'v|verbose' => \$VERBOSE)) { $usage->(1); }
+
+if ($HELP) { $usage->(0); }
+if (scalar(@ARGV)!=1) { $usage->(1); }
+my $node = $ARGV[0];		# if they specified a hostname match, only show svrs that start with that
+
+my @output = runcmd("host $node");
+my $hostname;
+my $line = shift @output;
+#print "line=$line\n";
+if ($line =~ m/is an alias for /) {
+    ($hostname) = $line =~ m/is an alias for ([^\.]+)/;
+    #print "hostname=$hostname\n";
+    $line = shift @output;
+  }
+#print "line=$line\n";
+my ($ip) = $line =~ m/has address (.+)$/;
+if (defined($hostname)) {
+    print "Removing entries from $file for: $node, $hostname, $ip\n";
+    runcmd("sed -i '/^$node/d;/^$hostname/d;/^$ip/d' $file");
+  }
+else {
+    print "Removing entries from $file for: $node, $ip\n";
+    runcmd("sed -i '/^$node/d;/^$ip/d' $file");
+}
+
+exit(0);
+
+
+# Pring msg only if -v was specified
+sub verbose { if ($VERBOSE) { print shift, "\n"; } }
+
+
+
+
+# Run a command.  If called in the context of return an array, it will capture the output
+# of the cmd and return it.  Otherwise, it will display the output to stdout.
+# If the cmd has a non-zero rc, this function will die with a msg.
+sub runcmd
+{
+    my ($cmd) = @_;
+    my $rc;
+
+    $cmd .= ' 2>&1' ;
+    verbose($cmd);
+
+   	my @output;
+   	if (wantarray) {
+		@output = `$cmd`;
+		$rc = $?;
+	}
+	else {
+		system($cmd);
+		$rc = $?;
+	}
+
+    if ($rc) {
+        $rc = $rc >> 8;
+        if ($rc > 0) { die "Error: rc $rc return from cmd: $cmd\n"; }
+        else { die "Error: system error returned from cmd: $cmd\n"; }
+    }
+    elsif (wantarray) { return @output; }
+}

xCAT-SoftLayer/bin/modifygrub

@@ -0,0 +1,343 @@
+#!/usr/bin/perl
+
+# Modify the grub config file on the node to boot the specified kernel and initrd.
+# This script is meant to be run on the node via xdsh -e.
+# Currently requires that dns on the mn be configured and working to resolve the short node names.
+
+use strict;
+use Getopt::Long;
+use Data::Dumper;
+use Socket;
+
+# Globals - these are set once and then only read.
+my $HELP;
+my $VERBOSE;
+my $DRYRUN;
+my $WAITTIME;
+my $PROVMETHOD;
+my $XCATNETBOOTTITLE = 'xCAT network boot kernel and initrd';
+
+my $usage = sub {
+   	my $exitcode = shift @_;
+   	print "Usage: modifygrub [-?|-h|--help] [-v|--verbose] [--dryrun] [-w <waittime>] [-p <provmethod] <kernel-path> <initrd-path> <kernel-parms> <mn-ip>\n\n";
+   	if (!$exitcode) {
+   		print "Modify the grub config file on the node to boot the specified kernel and initrd.\n";
+   	}
+	exit $exitcode;
+};
+
+if (-f '/etc/os-release') { die "This script doesn't support ubuntu yet.\n"; }
+
+# Process the cmd line args
+Getopt::Long::Configure("bundling");
+#Getopt::Long::Configure("pass_through");
+Getopt::Long::Configure("no_pass_through");
+if (!GetOptions('h|?|help'  => \$HELP, 'v|verbose' => \$VERBOSE, 'dryrun' => \$DRYRUN, 'w|waittime=s' => \$WAITTIME, 'p|provmethod=s' => \$PROVMETHOD)) { $usage->(1); }
+
+if ($HELP) { $usage->(0); }
+if (scalar(@ARGV) != 4) { $usage->(1); }
+if (!defined($WAITTIME)) { $WAITTIME = 60; }	# seconds to wait after configuring the nic (to let the switch handle the state change)
+my %args;
+$args{kernelpath} = $ARGV[0];
+$args{initrdpath} = $ARGV[1];
+$args{kernelparms} = $ARGV[2];
+$args{mnip} = $ARGV[3];
+
+addKernelParms(\%args);		# replace and add some parms to args{kernelparms}
+updateGrub(\%args);			# update the grub config with an entry filled with the info in args
+	
+exit(0);
+
+
+# Add ip and net info to the kernel parms.  Modifies the kernelparms value of the args hash passed in.
+sub addKernelParms {
+	my $args = shift @_;
+
+	# replace '!myipfn!' with the mn ip
+	my $mnip = $args->{mnip};
+	$args->{kernelparms} =~ s/!myipfn!/$mnip/g;
+
+	# replace <nodename> with the nodename
+	my $nodename = $ENV{NODE};			# this env var is set by xdsh
+	$args->{kernelparms} =~ s/<nodename>/$nodename/g;
+	# get node ip and add it to the kernel parms
+	my ($nic, $ip, $netmask, $network, $broadcast, $gateway, $mac) = getNodeIpInfo($args);
+	if (!$ip) { die "Error: could not find the NIC that would connect to the xCAT mgmt node's IP (".$args->{mnip}.").\n"; }
+	# if we are booting genesis, need to add the BOOTIF parm
+	my $bootif;
+	if ($args->{kernelpath} =~ m/genesis\.kernel\.x86_64/) {
+		$bootif = $mac;
+		$bootif =~ s/:/-/g;
+		$bootif = "BOOTIF=01-$bootif";
+	}
+
+	#todo: if you are running genesis shell (nodeset <node> shell), this if-else will depend on the nodeset done before that.
+	#		really should check for currstate=shell, or something like that
+	if (defined($PROVMETHOD) && $PROVMETHOD eq 'sysclone') {
+		# add additional parms for sysclone
+		# DEVICE=eth0 IPADDR=10.0.0.99 NETMASK=255.255.255.0 NETWORK=10.0.0.0 BROADCAST=10.0.0.255 GATEWAY=10.0.0.1 GATEWAYDEV=eth0
+		#todo:  should we also add ETHER_SLEEP=$WAITTIME textmode=1 dns=$mnip ?
+		$args->{kernelparms} .= " $bootif IPADDR=$ip NETMASK=$netmask NETWORK=$network BROADCAST=$broadcast GATEWAY=$gateway HOSTNAME=$nodename DEVICE=$nic GATEWAYDEV=$nic";
+	}
+	else {			# scripted install
+		#todo: the parameters for kickstart are likely different
+		$args->{kernelparms} .= " $bootif hostip=$ip netmask=$netmask gateway=$gateway dns=$mnip hostname=$nodename netdevice=$nic netwait=$WAITTIME textmode=1";
+              # print Dumper($args->{kernelparms})
+	}
+}
+
+
+# get this nodes nic, ip, netmask, gateway, and mac.  Returns them in a 5 element array.
+sub getNodeIpInfo {
+	my $args = shift @_;
+	my ($ipprefix) = $args->{mnip}=~m/^(\d+)\./;		#todo: this is a hack, just using the 1st octet of the mn ip addr
+	verbose("using IP prefix $ipprefix");
+
+	# parse ip addr show output, looking for ipprefix, to determine nic, ip, mac
+	my @output = runcmd("/sbin/ip addr show");
+	my ($nic, $mac, $ipandmask);
+	foreach my $line (@output) {
+		my ($nictmp, $mactmp, $iptmp);
+		if (($nictmp) = $line=~m/^\d+:\s+(\S+): /) { $nic = $nictmp; }		# new stanza, remember it
+		if (($mactmp) = $line=~m|^\s+link/ether\s+(\S+) |) { $mac = $mactmp; }		# got mac, remember it
+		if (($iptmp) = $line=~m/^\s+inet\s+($ipprefix\S+) /) { $ipandmask = $iptmp; last; }		# got ip, we are done
+	}
+	if (!defined($ipandmask)) { die "Error: can't find a NIC with a prefix $ipprefix that communicates with".$args->{mnip}.".\n"; }
+	my ($ip, $netmask, $network, $broadcast) = convertIpAndMask($ipandmask);
+
+	# if the nic is a bonded nic (common on sl), then find the 1st real nic that is up that is part of it.
+	# also find that real nics real mac
+	my $realnic;
+	if ($nic =~ /^bond/) {
+		my @nics = grep(m/\s+master\s+$nic\s+/, @output);
+		if (!scalar(@nics)) { die "Error: can't find the NICs that are part of $nic.\n"; }
+		foreach my $line (@nics) {
+			my ($nictmp, $state) = $line=~m/^\d+:\s+(\S+): .* state\s+(\S+)/;
+			if (defined($nictmp) && defined($state) && $state eq 'UP') { $realnic = $nictmp; last; }		# got ip, we are done
+		}
+		if (!defined($realnic)) { die "Error: can't find a physical NIC that is up and part of $nic.\n"; }
+
+		# now get the real mac of this real nic (when 2 nics are bonded, ip addr show displays one of the nics
+		# macs for both nics and the bond).  So we have to depend on /proc/net/bonding/$bond instead.
+		my @bondout = runcmd("cat /proc/net/bonding/$nic");
+		my $foundnic;
+		foreach my $line (@bondout) {
+			my $mactmp;
+			if ($line=~m/^Slave Interface:\s+$realnic/) { $foundnic = 1; }		# found the stanza for this nic, remember it
+			if ($foundnic && (($mactmp) = $line=~m/^Permanent HW addr:\s+(\S+)/)) { $mac = $mactmp; last; }
+		}
+	}
+	else { $realnic = $nic; }
+
+	# centos/redhat seems to name the nic in a different order than sles on some svrs.
+	# sles seems to name them in the same order as 'ip addr show' displays them, centos does not.
+	# so if we are on centos right now, we need to count down to determine the number that sles
+	# will give the nic that we have selected, because it is the sles naming that we care about,
+	# because that is the initrd that will be running in the scripted install case.
+	# For the sysclone case, genesis doxcat should be changed to use the mac to find the nic.
+	if (isRedhat()) {
+		my @nics = grep(m/^\d+:\s+eth/, @output);
+		my $i = 0;
+		foreach my $line (@nics) {
+			my ($nictmp) = $line=~m/^\d+:\s+(\S+):/;
+			if (defined($nictmp) && $nictmp eq $realnic) { $realnic = "eth$i"; last; }		# got ip, we are done
+			$i++;
+		}
+	}
+	print "Determined that SLES will call the install NIC $realnic (it has mac $mac)\n";
+
+	# finally, find the gateway
+	my $gateway;
+	my @output = runcmd("/sbin/ip route");
+	# we are looking for a line like: 10.0.0.0/8 via 10.54.51.1 dev bond0
+	my @networks = grep(m/ via .* $nic\s*$/, @output);
+	if (scalar(@networks)) { ($gateway) = $networks[0]=~m/ via\s+(\S+)/; }
+	else {
+		# use the mn ip as a fall back
+		$gateway = $args->{mnip};
+		verbose("using xCAT mgmt node IP as the fall back gateway.");
+	}
+
+	verbose("IP info: realnic=$realnic, ip=$ip, netmask=$netmask, gateway=$gateway, mac=$mac");
+	return ($realnic, $ip, $netmask, $network, $broadcast, $gateway, $mac);
+}
+
+
+# Convert an ip/mask in slash notation (like 10.1.1.1/26) to separate ip, netmask, network, and broadcast values,
+# like: 10.1.1.1, 255.255.255.192, 10.1.1.0, 10.1.1.63
+sub convertIpAndMask {
+	my $ipandmask = shift @_;
+	my ($ip, $masknum) = split('/', $ipandmask);
+
+	# build the netmask
+	my $nmbin = oct("0b" . '1' x $masknum . '0' x (32-$masknum));	# create a str like '1111100', then convert to binary
+	my @nmarr=unpack('C4',pack('N',$nmbin));		# separate into the 4 octets
+	my $netmask=join('.',@nmarr);			# put them together into the normal looking netmask
+
+	# create binary form of ip
+	my @iparr=split(/\./,$ip);
+	my ( $ipbin ) = unpack('N', pack('C4',@iparr ) );
+
+	# Calculate network address by logical AND operation of ip & netmask and convert network address to IP address format
+	my $netbin = ( $ipbin & $nmbin );
+	my @netarr=unpack('C4', pack('N',$netbin ) );
+	my $network=join(".",@netarr);
+
+	# Calculate broadcast address by inverting the netmask and adding it to the network address
+	my $bcbin = ( $ipbin & $nmbin ) + ( ~ $nmbin );
+	my @bcarr=unpack('C4', pack('N',$bcbin ) ) ;
+	my $broadcast=join(".",@bcarr);
+
+	return ($ip, $netmask, $network, $broadcast);
+}
+
+
+# not used - resolve the hostname to an ip addr
+sub getipaddr {
+	my $hostname = shift @_;
+	my $packed_ip;
+    $packed_ip = inet_aton($hostname);
+    if (!$packed_ip) { return undef; }
+    return inet_ntoa($packed_ip);
+}
+
+
+# Update the grub config file with a new stanza for booting our kernel and initrd
+sub updateGrub {
+	my $args = shift @_;
+
+	# how we specify the path for the kernel and initrd is different on redhat and suse
+	my $fileprefix;
+	if (isRedhat()) { $fileprefix = '/'; }
+	elsif (isSuse()) { $fileprefix = '/boot/'; }
+	else { die "Error: currently only support red hat or suse distros.\n"; }
+
+	# open the grub file and see if it is in there or if we have to add it
+	my $grubfile = findGrubPath();
+	verbose("reading $grubfile");
+	open(FILE, $grubfile) || die "Error: can not open config file $grubfile for reading: $!\n";
+	my @lines = <FILE>;
+	close FILE;
+
+	# this is the entry we want in the grub file
+	my @rootlines = grep(/^\s+root\s+/, @lines);		# copy one of the existing root lines
+	if (!scalar(@rootlines)) { die "Error: can't find an existing line for 'root' in the grub config file\n"; }
+	my ($rootline) = $rootlines[0] =~ m/^\s*(.*?)\s*$/;
+	my @entry = (
+		"title $XCATNETBOOTTITLE\n",
+		"\t$rootline\n",
+		"\tkernel " . $fileprefix . $args->{kernelpath} . ' ' . $args->{kernelparms} . "\n",
+		"\tinitrd " . $fileprefix . $args->{initrdpath} . "\n",
+		);
+	if ($DRYRUN) {
+		print "Dry run:  would add this stanza to $grubfile:\n";
+		foreach my $l (@entry) { print $l; }
+		return;
+	}
+
+	my $needtowritefile = 1;
+	if (grep(/^title\s+$XCATNETBOOTTITLE/, @lines)) { $needtowritefile = updateGrubEntry(\@lines, \@entry); }		# there is already an entry in there
+	else { addGrubEntry (\@lines, \@entry); }
+
+	# write the file with the new/updated xcat entry
+	if ($needtowritefile) {
+		verbose("updating $grubfile");
+		open(FILE, '>', $grubfile) || die "Error: can not open config file $grubfile for writing: $!\n";
+		print FILE @lines;
+		close FILE;
+	}
+	else { print "Info: $grubfile did not need modifying. It was already up to date.\n"; }
+}
+
+
+# add our entry as the 1st one in the grub file
+sub addGrubEntry {
+	my ($lines, $entry) = @_;
+	# find the index of the 1st stanza (it starts with 'title')
+	my $i;
+	for ($i=0; $i<scalar(@$lines); $i++) {
+		if ($lines->[$i] =~ m/^title\s+/) { verbose('adding xcat entry before:'.$lines->[$i]); last; }		# found it
+	}
+	
+	# splice the entry right before the i-th line (which may also be 1 past the end)
+	splice(@$lines, $i, 0, @$entry);
+}
+
+
+# check the xcat entry in the grub file and see if it needs to be updated.  Return 1 if it does.
+sub updateGrubEntry {
+	my ($lines, $entry) = @_;
+	#print Dumper($lines), Dumper($entry);
+	# find the index of the xcat stanza
+	my $i;
+	for ($i=0; $i<scalar(@$lines); $i++) {
+		if ($lines->[$i] =~ m/^title\s+$XCATNETBOOTTITLE/) { last; }		# found it
+	}
+
+	# compare the next few lines with the corresponding line in @$entries and replace if different
+	my $replaced = 0;
+	for (my $j=0; $j<scalar(@$entry); $j++) {
+		#print "comparing:\n  ", $lines->[$i+$j], "\n  ", $entry->[$j], "\n";
+		if ($lines->[$i+$j] ne $entry->[$j]) {		# this line was different
+			$lines->[$i+$j] = $entry->[$j];
+			$replaced = 1;
+		}
+	}
+	
+	return $replaced;
+}
+
+
+# depending on the distro, find the correct grub file and return its path
+sub findGrubPath {
+	# for rhel/centos it is /boot/grub/grub.conf, for sles it is /boot/grub/menu.lst
+	my @paths = qw(/boot/grub/grub.conf /boot/grub/menu.lst);
+	foreach my $p (@paths) {
+		if (-f $p) { return $p; }
+	}
+	
+	die "Error: Can't find grub config file.\n";
+
+	#todo: support ubuntu: you add an executable file in /etc/grub.d named 06_xcatnetboot that prints out the
+	#		entry to add.  Then run grub-mkconfig.
+}
+
+
+# Pring msg only if -v was specified
+sub verbose { if ($VERBOSE) { print shift, "\n"; } }
+
+# Check the distro we are running on
+sub isSuse { return (-e '/etc/SuSE-release'); }
+sub isRedhat { return (-e '/etc/redhat-release' || -e '/etc/centos-release' || -e '/etc/fedora-release'); }		# add chk for fedora
+
+
+
+# Run a command.  If called in the context of return an array, it will capture the output
+# of the cmd and return it.  Otherwise, it will display the output to stdout.
+# If the cmd has a non-zero rc, this function will die with a msg.
+sub runcmd
+{
+    my ($cmd) = @_;
+    my $rc;
+
+    $cmd .= ' 2>&1' ;
+    verbose($cmd);
+
+   	my @output;
+   	if (wantarray) {
+		@output = `$cmd`;
+		$rc = $?;
+	}
+	else {
+		system($cmd);
+		$rc = $?;
+	}
+
+    if ($rc) {
+        $rc = $rc >> 8;
+        if ($rc > 0) { die "Error: rc $rc return from cmd: $cmd\n"; }
+        else { die "Error: system error returned from cmd: $cmd\n"; }
+    }
+    elsif (wantarray) { return @output; }
+}
+

xCAT-SoftLayer/bin/pushinitrd

@@ -0,0 +1,370 @@
+#!/usr/bin/perl
+
+# Copy the initrd, kernel, params, and static IP info to nodes, so they can net install
+# even across vlans (w/o setting up pxe/dhcp broadcast relay).  This assumes a working
+# OS is on the node.  This script is primarily meant to be used in the softlayer environment.
+
+#todo: site attr for using static ip?
+
+use strict;
+use Getopt::Long;
+use Data::Dumper;
+
+# Globals - these are set once and then only read.
+my $HELP;
+my $VERBOSE;
+my $DRYRUN;
+my $WAITTIME;
+my $NOAUTOINST;
+
+my $usage = sub {
+   	my $exitcode = shift @_;
+   	print "Usage: pushinitrd [-?|-h|--help] [-v|--verbose] [--dryrun] [-w <waittime>] <noderange>\n\n";
+   	if (!$exitcode) {
+   		print "Copy the initrd, kernel, params, and static IP info to nodes, so they can net install\n";
+		print "even across vlans (w/o setting up pxe/dhcp broadcast relay).  This assumes a working\n";
+		print "OS is on the node, that you've run nodeset for these nodes, and that all of the nodes\n";
+		print "are using the same osimage.\n";
+   	}
+	exit $exitcode;
+};
+
+# Process the cmd line args
+Getopt::Long::Configure("bundling");
+#Getopt::Long::Configure("pass_through");
+Getopt::Long::Configure("no_pass_through");
+if (!GetOptions('h|?|help'  => \$HELP, 'v|verbose' => \$VERBOSE, 'dryrun' => \$DRYRUN, 'w|waittime=s' => \$WAITTIME, 'a|noautoinst' => \$NOAUTOINST)) { $usage->(1); }
+
+if ($HELP) { $usage->(0); }
+if (scalar(@ARGV) != 1) { $usage->(1); }
+if (!defined($WAITTIME)) { $WAITTIME = 75; }	# seconds to wait after configuring the nic (to let the switch handle the state change)
+my $noderange = $ARGV[0];
+
+my %bootparms = getBootParms($noderange);
+
+copyFilesToNodes($noderange, \%bootparms);
+
+updateGrubOnNodes($noderange, \%bootparms);
+
+if ($DRYRUN) { exit(0); }
+
+if ($bootparms{osimageprovmethod} eq 'install' && !$NOAUTOINST) { modifyAutoinstFiles($noderange, \%bootparms); }
+
+if ($bootparms{osimageprovmethod} eq 'sysclone') { copySyscloneFiles(); }
+
+exit(0);
+
+sub isRedhat { return (-e '/etc/redhat-release' || -e '/etc/centos-release' || -e '/etc/fedora-release'); } 
+
+# Query the db for the kernel, initrd, and kcmdline attributes of the 1st node in the noderange
+sub getBootParms {
+	my $nr = shift @_;
+	my %bootparms;
+	my @output = runcmd("nodels $nr bootparams.kernel bootparams.initrd bootparams.kcmdline nodetype.provmethod");
+
+	# the attributes can be displayed in a different order than requested, so need to grep for them
+	foreach my $attr (qw(bootparams.kernel bootparams.initrd bootparams.kcmdline nodetype.provmethod)) {
+		my ($a) = $attr =~ m/\.(.*)$/;
+		my @gresults = grep(/^\S+:\s+$attr:/, @output);
+		if (!scalar(@gresults)) { die "Error: attribute $attr not defined for the noderange. Did you run 'nodeset <noderange> osimage=<osimage>' ?\n"; }
+		# for now just pick the 1st one. They should all be the same, except for the node name in kcmdline
+		chomp($gresults[0]);
+		$gresults[0] =~ s/^\S+:\s+$attr:\s*//;
+		#print "gresults='$gresults[0]'\n";
+		if ($gresults[0] !~ m/\S/) { die "Error: attribute $attr not defined for the noderange. Did you run 'nodeset <noderange> osimage=<osimage>' ?\n"; }
+		$bootparms{$a} = $gresults[0];
+	}
+	$bootparms{kcmdline} =~ s|/install/autoinst/\S+|/install/autoinst/<nodename>|;
+
+	# from the nodes provmethod, get the osimage provmethod, so we know the type of install
+	@output = runcmd("lsdef -t osimage $bootparms{provmethod} -ci provmethod");
+	chomp($output[0]);
+	if ($output[0] =~ m/^Could not find/) { die "Error: provmethod $bootparms{provmethod} is set for the node, but there is no osimage definition by that name."; }
+	my ($junk, $provmethod) = split(/=/, $output[0]);
+	$bootparms{osimageprovmethod} = $provmethod;
+
+	# get the mgmt node cluster-facing ip addr
+	@output = runcmd('lsdef -t site -ci master');
+	chomp($output[0]);
+	my ($junk, $ip) = split(/=/, $output[0]);
+	$bootparms{mnip} = $ip;
+
+	verbose(Dumper(\%bootparms));
+	return %bootparms;
+}
+
+
+# Copy the kernel and initrd to the nodes
+# Args: noderange, reference to the bootparms hash
+sub copyFilesToNodes {
+	my $nr = shift @_;
+	my $bootparms = shift @_;
+	foreach my $a (qw(kernel initrd)) {
+		my $file = $bootparms->{$a};
+		my $localfile = "/tftpboot/$file";
+		# for the 
+		my $remotefile = '/boot/' . remoteFilename($file);
+		if ($DRYRUN) {
+			print "Dry run: would copy $localfile to $nr:$remotefile\n";
+		}
+		else {
+			print "Copying $localfile to $nr:$remotefile\n";
+			runcmd("xdcp $nr -p $localfile $remotefile");
+		}
+	}
+}
+
+
+# Form the remote file name, using the last 2 parts of the path, separated by "-"
+sub remoteFilename {
+	my $f = shift @_;
+	$f =~ s|^.*?([^/]+)/([^/]+)$|$1-$2|;
+	return $f;
+}
+
+
+# Run the modifygrub script on the nodes to update the grub config file
+# Args: noderange, reference to the bootparms hash
+sub updateGrubOnNodes {
+	my $nr = shift @_;
+	my $bootparms = shift @_;
+	my $vtxt = ($VERBOSE ? '-v' : '');
+	my $dtxt = ($DRYRUN ? '--dryrun' : '');
+	my @output = runcmd('which modifygrub');
+	my $modifygrub = $output[0];
+	chomp($modifygrub);
+        my $euser ="root";
+	my $cmd = "xdsh $nr -l $euser -e $modifygrub $vtxt $dtxt -w $WAITTIME -p " . $bootparms->{osimageprovmethod} . ' ' . remoteFilename($bootparms->{kernel}) . ' ' . remoteFilename($bootparms->{initrd}) . ' ';
+	# we need to quote the kernel parms, both here when passing it to xdsh, and on the node
+	# when xdsh is passing it to modifygrub. The way to get single quotes inside single quotes
+	# is to quote each of the outer single quotes with double quotes.
+	$cmd .= q("'"') . $bootparms->{kcmdline} . q('"'");
+	$cmd .= ' ' . $bootparms->{mnip};
+	print "Running modifygrub on $nr to update the grub configuration.\n";
+	runcmd($cmd);
+}
+
+
+# Hack the autoinst files to overcome the nic coming up delay.
+#todo: this has only been tested with SLES nodes
+sub modifyAutoinstFiles {
+	my $nr = shift @_;
+	my $bootparms = shift @_;
+
+	# expand the noderange into a list of nodes
+	my @nodes = runcmd("nodels $nr");
+	chomp(@nodes);
+
+	# Modify chroot.sles to insert a wait in the /etc/init.d/network of each node.  This is
+	# necessary because even tho compute.sles11.softlayer.tmpl configures bonding, when autoyast
+	# reboots the node after installing the rpms, it does not bring up the network in the normal way
+	# at first and seems to skip any bonding and the if-up.d scripts.  So we are left doing this.
+	# (After autoyast is done with all of its post-configuration, it brings up the network in the
+	# normal way, so bonding gets done then, which is good at least.)
+
+	# Edit each file to have chroot.sles insert a wait at the end of /etc/init.d/network
+	# this finds the end of boot.sh script (which is chroot.sles)
+	my $search = '\n\]\]>\s*</source>\s*</script>\s*</chroot-scripts>';
+	# hack the /etc/init.d/network script to put a wait in it
+	my $file = '/mnt/etc/init.d/network';			# at this point in the installation, the permanent file system is just mounted
+	# this is the string to insert in the nodes /etc/init.d/network script.  It is a while loop pinging the mn, but some of the chars need to be escaped for sed
+	my $waitstring = 'echo -n Waiting to reach xCAT mgmt node ' . $bootparms->{mnip} . '.;xcatretries=60;while \[ \$\(\(xcati+=1\)\) -le \$xcatretries \] \&\& ! ping -c2 -w3 ' . $bootparms->{mnip} .' \>\/dev\/null 2\>\&1; do echo -n .; done; if \[ \$xcati -le \$xcatretries \]; then echo success; else echo failed; fi';
+	# this crazy sed string is from google.  It gathers up the whole file into the hold buffer, and then the substitution is done on the whole file
+	my $sedstring = q|sed -n '1h;1!H;${;g;s/\(\t\treload_firewall\n\)\n/\1\t\t| . $waitstring . q(\n\n/g;p;}') . " $file  > $file.new";
+	# finally create the perl replace string that will be used to modify the autoinst file
+	my $replace = "$sedstring\nchmod 755 $file.new; mv -f $file.new $file";
+
+	# Add a script that gets invoked by the OS after the nic is brought up
+    # Note: this does not work, because midway thru the autoyast process, the if-up.d scripts do not seem to get invoked
+    # so autoyast fails to get the media
+    # these are specific to SLES
+    #my $netdir = '/etc/sysconfig/network';
+    #my $filename = '/etc/sysconfig/network/if-up.d/xcat-sl-wait';
+    #my $mnip = $bootparms->{mnip};
+    #todo: to support rhel, use these values instead
+    #my $netdir='/etc/sysconfig/network-scripts';
+    #my $filename='/sbin/ifup-local';
+	#my $replace = qq(
+#FILENAME=$filename
+#NETDIR=$netdir
+#MNIP=$mnip
+#);
+#	$replace .= q(
+#cat >$FILENAME << EOF1
+#MNIP=$MNIP
+#NETDIR=$NETDIR
+#EOF1
+#
+# this part of the file we do NOT want to expand the variables in the content
+#cat >>$FILENAME << 'EOF2'
+#NIC="$1"
+# look in this ifcfg script to get the nics ip to see if this is the one we should be waiting on
+#NICIP=`awk -F= '/^IPADDR/ {print $2}' $NETDIR/ifcfg-$NIC | tr -d \' `
+#if [ "${NICIP%.*.*}" != "${MNIP%.*.*}" ]; then exit; fi     # hack: compare the 1st 2 octets
+#echo -n Waiting to reach xCAT mgmt node $MNIP.
+#xcatretries=60
+#while [ $((xcati+=1)) -le $xcatretries ] && ! ping -c2 -w3 $MNIP >/dev/null 2>&1; do echo -n .; done
+#if [ $xcati -le $xcatretries ]; then echo " success"; else echo " failed"; fi
+#sleep 3
+#EOF2
+#
+#chmod +x $FILENAME
+#);
+
+	# The compute.sles11.softlayer.tmpl file contains 2 variables (node ip and netmask) that are
+	# not replaced by Template.pm.  Substitute those in the autoinst files now.
+	# Also use our own multiline sed to put the network script hack in.
+	print "Updating /install/autoinst files.\n";
+	foreach my $n (@nodes) {
+		my $f = "/install/autoinst/$n";
+		my ($ip, $netmask, $gateway) = getNodeIpInfo($n);
+		runcmd("sudo sed -i 's/#NODEIPADDR#/$ip/;s/#NODENETMASK#/$netmask/;s/#NODEGATEWAY#/$gateway/' $f");
+		my $matches = sed($f, $search, $replace, mode=>'insertbefore');
+		if (!$matches) { die "Error: could not find the right place in $f to insert the sed of the network wait.\n"; }
+	}
+}
+
+
+# Copy softlayer specific systemimager post-install scripts to the systemimager location.
+# These cause si to use static ip and insert a wait into the bring up of the network.
+sub copySyscloneFiles {
+	my $cmd = "cp -f /opt/xcat/share/xcat/sysclone/post-install/* /install/sysclone/scripts/post-install";
+	print "Copying SoftLayer-specific post scripts to the SystemImager post-install directory.\n";
+	runcmd($cmd);
+}
+
+
+# Get IP and network of a node
+sub getNodeIpInfo {
+	my $node = shift;
+
+	# get ip for the node
+	my @output = runcmd("nodels $node hosts.ip");
+	chomp($output[0]);
+	my ($junk, $ip) = split(/\s+/, $output[0]);
+	#todo: also support getting the ip from name resolution
+	if (!$ip) { die "Error: the ip attribute must be set for $node.\n"; }
+
+	# find relevant network in the networks table
+	# first get the networks in a hash
+	my %networks;
+	@output = runcmd("lsdef -t network -ci net,mask,gateway");
+	foreach my $line (@output) {
+		chomp($line);
+		my ($netname, $attr, $val) = $line =~ m/^(.+):\s+(.+?)=(.+)$/;
+		$networks{$netname}->{$attr} = $val;
+	}
+	# now go thru the networks looking for the correct one
+	my ($netmask, $gateway);
+	foreach my $key (keys %networks) {
+		if (isIPinNet($ip, $networks{$key}->{net}, $networks{$key}->{mask})) {		# found it
+			$netmask = $networks{$key}->{mask};
+			$gateway = $networks{$key}->{gateway};
+			last;
+		}
+	}
+	if (!$netmask) { die "Error: could not find a network in the networks table that $node $ip is part of.\n"; }
+	if (!$gateway) { die "Error: gateway not specified in the networks table for the network that $node $ip is part of.\n"; }
+
+	verbose("IP info for $node: ip=$ip, netmask=$netmask, gateway=$gateway");
+	return ($ip, $netmask, $gateway);
+}
+
+
+# Is the IP in the network/netmask combo
+sub isIPinNet {
+	my ($ip, $net, $mask) = @_;
+	my $ipbin = convert2bin($ip);
+	my $netbin = convert2bin($net);
+	my $maskbin = convert2bin($mask);
+    $ipbin &= $maskbin;
+    if ($ipbin && $netbin && ($ipbin == $netbin)) { return 1; } 
+    else { return 0; }
+}
+
+
+# Convert dotted decimal format (1.2.3.4) to a binary number
+sub convert2bin {
+	my @arr=split(/\./, shift);
+	my ($bin) = unpack('N', pack('C4',@arr ) );
+	return $bin;
+}
+
+
+# this is like multi-line sed replace function
+# Args: filename, search-string, replace-string, options (mode=>{insertbefore,insertafter,replace})
+sub sed {
+	my ($file, $search, $replace, %options) = @_;
+	#my $opts = 's';
+	#if ($options{global}) { $opts .= 'g'; }
+
+	# open the file for reading
+	verbose("reading $file");
+	open(FILE, $file) || die "Error: can not open file $file for reading: $!\n";
+	my $lines;
+	while (<FILE>) { $lines .= $_; }
+	#verbose('file length is '.length($lines));
+	close FILE;
+
+	# we also need to look for this string 1st
+	my $replacecopy = $replace;				# a search string can't have special chars in it
+	$replacecopy =~ s/(\W)/\\$1/g;			# so escape all of the meta characters
+	#print "replacecopy=$replacecopy\n";
+	# check to see if the replace string is already in the file
+	if ($lines =~ m/$replacecopy/s) {
+		print "$file did not need updating.\n";
+		return 1;
+	}
+
+	# search/replace and see if there were any matches
+	my $matches;
+	if ($options{mode} eq 'insertbefore') { $matches = $lines =~ s/($search)/\n$replace\n$1/s; }
+	elsif ($options{mode} eq 'insertafter') { $matches = $lines =~ s/($search)/$1\n$replace\n/s; }
+	elsif ($options{mode} eq 'replace') { $matches = $lines =~ s/$search/$replace/s; }
+	else { die "Internal error: don't suppor sed mode of $options{mode}.\n"; }
+
+
+	# write file if necessary
+	if ($matches) {
+		verbose("updating $file");
+		open(FILE, '>', $file) || die "Error: can not open file $file for writing: $!\n";
+		print FILE $lines;
+		close FILE;
+	}
+	return $matches;
+}
+
+
+# Pring msg only if -v was specified
+sub verbose { if ($VERBOSE) { print shift, "\n"; } }
+
+
+
+# Run a command.  If called in the context of return an array, it will capture the output
+# of the cmd and return it.  Otherwise, it will display the output to stdout.
+# If the cmd has a non-zero rc, this function will die with a msg.
+sub runcmd
+{
+    my ($cmd) = @_;
+    my $rc;
+
+    $cmd .= ' 2>&1' ;
+    verbose($cmd);
+
+   	my @output;
+   	if (wantarray) {
+		@output = `$cmd`;
+		$rc = $?;
+	}
+	else {
+		system($cmd);
+		$rc = $?;
+	}
+
+    if ($rc) {
+        $rc = $rc >> 8;
+        if ($rc > 0) { die "Error: rc $rc return from cmd: $cmd\n"; }
+        else { die "Error: system error returned from cmd: $cmd\n"; }
+    }
+    elsif (wantarray) { return @output; }
+}

xCAT-SoftLayer/pods/man1/getslnodes.1.pod

@@ -0,0 +1,84 @@
+=head1 NAME
+
+B<getslnodes> - queries your SoftLayer account and gets attributes for each server.
+
+=head1 SYNOPSIS
+
+B<getslnodes> [B<-v>|B<--verbose>] [I<hostname-match>]  
+
+B<getslnodes> [B<-?> | B<-h> | B<--help>]
+
+=head1 DESCRIPTION
+
+The B<getslnodes> command queries your SoftLayer account and gets attributes for each
+server.  The attributes can be piped to 'mkdef -z' to define the nodes
+in the xCAT DB so that xCAT can manage them.
+
+Before using this command, you must download and install the SoftLayer API perl module.
+For example: 
+
+   cd /usr/local/lib
+   git clone https://github.com/softlayer/softlayer-api-perl-client.git
+
+You also need to follow these directions to get your SoftLayer API key: http://knowledgelayer.softlayer.com/procedure/retrieve-your-api-key
+
+B<getslnodes> requires a .slconfig file in your home directory that contains your
+SoftLayer userid, API key, and location of the SoftLayer API perl module, in attr=val format.
+For example:
+
+   # Config file used by the xcat cmd getslnodes
+   userid = joe_smith
+   apikey = 1234567890abcdef1234567890abcdef1234567890abcdef
+   apidir = /usr/local/lib/softlayer-api-perl-client
+
+=head1 OPTIONS
+
+=over 10
+
+=item B<-?|-h|--help>
+
+Display usage message.
+
+=item B<-v|--version>
+
+Command Version.
+
+=back
+
+=head1 RETURN VALUE
+
+0  The command completed successfully.
+
+1  An error has occurred.
+
+=head1 EXAMPLES
+
+=over 3
+
+=item 1.
+
+Display information about all of the nodes in your SoftLayer account:
+
+ getslnodes
+
+=item 2.
+
+Display information about all of the nodes whose hostname starts with foo:
+
+ getslnodes foo
+
+=item 3.
+
+Create xCAT node defintions in the xCAT DB for all of the nodes in your SoftLayer account:
+
+ getslnodes | mkdef -z
+
+=back
+
+=head1 FILES
+
+/opt/xcat/bin/getslnodes
+
+=head1 SEE ALSO
+
+L<pushinitrd(1)|pushinitrd.1>

xCAT-SoftLayer/pods/man1/pushinitrd.1.pod

@@ -0,0 +1,66 @@
+=head1 NAME
+
+B<pushinitrd> - queries your SoftLayer account and gets attributes for each server.
+
+=head1 SYNOPSIS
+
+B<pushinitrd> [B<-v>|B<--verbose>]  [B<-w> I<waittime>] [I<noderange>]  
+
+B<pushinitrd> [B<-?> | B<-h> | B<--help>]
+
+=head1 DESCRIPTION
+
+The B<pushinitrd> command copies the initrd, kernel, params, and static IP info to nodes, so they can be net installed
+even across vlans (w/o setting up pxe/dhcp broadcast relay).  This assumes a working
+OS is on the nodes.  Before running this command, you must run nodeset for these nodes.
+All of the nodes given to one invocation of B<pushinitrd> must be using the same osimage.
+
+Before using this command, if will be most convenient if you exchange the ssh keys using:
+
+   xdsh <noderange> -K
+
+=head1 OPTIONS
+
+=over 10
+
+=item B<-w> I<waittime>
+
+The number of seconds the initrd should wait before trying to communicate over the network.
+The default is 75.  This translates into the netwait kernel parameter and is usually needed
+in a SoftLayer environment because it can take a while for a NIC to be active after changing state.
+
+=item B<-?|-h|--help>
+
+Display usage message.
+
+=item B<-v|--version>
+
+Command Version.
+
+=back
+
+=head1 RETURN VALUE
+
+0  The command completed successfully.
+
+1  An error has occurred.
+
+=head1 EXAMPLES
+
+=over 3
+
+=item 1.
+
+Configure nodes for net installing in a SoftLayer environment:
+
+ pushinitrd <noderange>
+
+=back
+
+=head1 FILES
+
+/opt/xcat/bin/pushinitrd
+
+=head1 SEE ALSO
+
+L<getslnodes(1)|getslnodes.1>

xCAT-SoftLayer/postscripts/configbond

@@ -0,0 +1,248 @@
+#!/usr/bin/perl
+
+# xCAT postscript for configuring bonding of nics.
+#  Usage:  configbond bond1 eth1 [eth3]
+#
+# Note: this postscript currently has some assumptions that are specific to the softlayer environment.
+#       We only use this to configure bond1, because bond0 gets configured by the node provisioning process.
+#       (altho this script would work for bond0)
+
+use strict;
+# Check number of args
+
+my $nargs = $#ARGV + 1;
+if (scalar(@ARGV) < 2 || scalar(@ARGV) > 3) {
+   system("logger -t xcat -p local4.err  'Usage: configbond <bond> <dev0> [<dev1>]'");
+   exit 1;
+}
+
+my $bond = shift(@ARGV);
+my $nic = $ARGV[0];  
+my @devs;
+foreach my $a (@ARGV) { push(@devs,split('@',$a)); }    # support the new syntax in the xcat configbond postscript
+my $nicips = $ENV{NICIPS};
+my $nicnetworks = $ENV{NICNETWORKS};
+my $net_cnt = $ENV{NETWORKS_LINES};
+
+#todo: change this script so they dont need to specify nicnetworks
+if (!$nicips || !$nicnetworks) { system("logger -t xcat -p local4.err 'configbond: must specify attributes nicips and nicnetworks in the xcat db for this node.'"); exit 1; }
+
+#todo: these are specific to softlayer.  They should be another attribute or argument
+my $bondingopts = 'mode=4 miimon=100 downdelay=0 updelay=0 lacp_rate=fast xmit_hash_policy=1';
+
+my $netmask ='';
+my $ipaddr = '';
+my $nic_num = '';
+my $subnet = '';
+my $nic_net = '';
+my $net_name = '';
+my @nic_nets = (); # array of networks for this nic
+my @nic_ips =();   # array of ipaddresses for this nic
+my @networks = (); # array of all networks from networks table.
+                   # { network_name, subnet, netmask }
+
+system("logger -t xcat -p local4.err  'configbond: Master: $bond'");
+system("logger -t xcat -p local4.err  'configbond: Slaves: @devs'");
+#system("logger -t xcat -p local4.err  'configbond: NIC:           $nic'");
+system("logger -t xcat -p local4.err  'configbond: NICNETWORKS:   $nicnetworks'");
+system("logger -t xcat -p local4.err  'configbond: NICIPS:        $nicips'");
+
+# Update modprobe
+my $file = "/etc/modprobe.d/$bond.conf";
+if (!open(FILE, ">$file")) { system("logger -t xcat -p local4.err 'configbond: cannot open $file.'"); exit 1; }
+
+print FILE "alias $bond bonding\n";
+# the bonding options are put in the ifcfg file instead
+#print FILE "options $bond mode=balance-rr miimon=100\n";
+close FILE;
+
+# create array of network info. Needed in case where there are 
+# more than one ip address per nic and shouldn't be many networks.
+my $net_info;
+my $cnt = 1;
+
+while ( $cnt <= $net_cnt ) {
+    $net_info = $ENV{"NETWORKS_LINE$cnt"};
+    $net_info =~ /^netname=([^\|]*)\|\|/; 
+    $net_name = $1;
+    $net_info =~ /net=([^\|]*)\|\|/;
+    $subnet = $1;
+    $net_info =~ /mask=([^\|]*)\|\|/;
+    $netmask = $1;
+    push @{ $networks[$cnt-1] }, ($net_name, $subnet, $netmask);
+    $cnt +=1; 
+}
+
+# get network or networks for this nic from NICNETWORKS: 
+# eth0:1_0_0_0-255_255_0_0|network2,eth1:1_1_0_0
+# create array of networks for this nic
+foreach my $nic_networks (split(/,/,$nicnetworks)) {
+    my @net = ();
+    if ( $nic_networks =~ /!/ ) {
+        @net = split(/!/,$nic_networks);
+    } else {
+        @net = split(/:/,$nic_networks);
+    }
+    if ($net[0] eq $nic) {
+        @nic_nets = split(/\|/,$net[1]);
+        last;
+    }
+}
+
+# get all nic ipaddress from $nicips: i.e. eth0:1.0.0.1|2.0.0.1,eth1:1.1.1.1
+# Then get all ips for this specific nic, i.e. eth0.
+foreach my $ips (split(/,/,$nicips)) {
+    my @ip = ();
+    if ( $ips =~ /!/ ) {
+        @ip = split(/!/,$ips);
+    } else {
+        @ip = split(/:/,$ips);
+    }
+    if ($ip[0] eq $nic ) {
+        @nic_ips = split(/\|/,$ip[1]);
+    }
+}
+
+
+my $i;
+for ($i=0; $i < (scalar @nic_ips) ; $i++ ) {
+
+    # Time to create the interfaces.
+    # loop through the nic networks, find the matching networks to get the
+    # subnet and netmask and then create the appropriate ifcfg file for linux
+    my $specific_nic = $nic;
+    if ($i > 0) {
+       $specific_nic = $nic . ":" . ($i);
+    }
+
+    #todo: support case in which nicnetworks is not specified, find the correct network by calculation
+    $cnt = 0;
+    $subnet = "";
+    $netmask = "";
+    $net_name = "";
+    while ( $cnt < $net_cnt ) {
+        if ( $networks[$cnt][0] eq $nic_nets[$i] ) {
+        
+            $subnet = $networks[$cnt][1];
+            $netmask = $networks[$cnt][2];
+            $cnt = $net_cnt; # found match - get out.
+        } 
+        else {
+            $cnt++; 
+        }
+    }
+
+    # check that there is a subnet and netmask set
+    if ( !(length($subnet) > 0) || !(length($netmask) > 0) ) {
+        system("logger -t xcat -p local4.err  'configbond: network subnet or netmask not set.'");
+        exit 1;
+    }
+        system("logger -t xcat -p local4.err  'configbond: network subnet and netmask: $subnet, $netmask'");
+        system("logger -t xcat -p local4.err  'configbond: $specific_nic, $nic_ips[$i]'");
+
+    # Write the master info to the ifcfg file
+    if (-d "/etc/sysconfig/network-scripts") {
+        # rhel/centos/fedora
+        my $dir = "/etc/sysconfig/network-scripts";
+        if (!open(FILE, ">$dir/ifcfg-$bond")) { system("logger -t xcat -p local4.err 'configbond: cannot open $dir/ifcfg-$bond.'"); exit 1; }
+
+        print FILE "DEVICE=$bond\n";
+        print FILE "BOOTPROTO=none\n";
+        print FILE "IPADDR=$nic_ips[$i]\n";
+        print FILE "NETMASK=$netmask\n";
+        print FILE "ONBOOT=yes\n";
+        print FILE "USERCTL=no\n";
+        print FILE qq(BONDING_OPTS="$bondingopts"\n);
+        close FILE;
+
+        # Configure slaves
+        my @output = `ip addr show 2>&1`;       # to check for existance of the device later
+        foreach my $dev (@devs) {
+            # as a convenience, make sure the device exists before adding it to the bond
+            if (!grep(m/^\d+:\s+$dev:/, @output)) {
+                system("logger -t xcat -p local4.err  'configbond: not configuring $dev because it does not exist.'");
+                unlink("$dir/ifcfg-$dev");          # in case it was left over in the image we are cloning
+                next;
+            }
+
+            system("logger -t xcat -p local4.err  'configbond: slave dev: $dev'");
+            if (!open(FILE, ">$dir/ifcfg-$dev")) { system("logger -t xcat -p local4.err 'configbond: cannot open $dir/ifcfg-$dev'"); exit 1; }
+            print FILE "DEVICE=$dev\n";
+            print FILE "BOOTPROTO=none\n";
+            print FILE "MASTER=$bond\n";
+            print FILE "ONBOOT=yes\n";
+            print FILE "SLAVE=yes\n";
+            print FILE "USERCTL=no\n";
+            close FILE;
+        }
+        }
+    elsif (-d "/etc/sysconfig/network") {
+        # sles
+        my $dir = "/etc/sysconfig/network";
+        if (!open(FILE, ">$dir/ifcfg-$bond")) { system("logger -t xcat -p local4.err 'configbond: cannot open $dir/ifcfg-$bond.'"); exit 1; }
+
+        print FILE "BOOTPROTO=static\n";
+        print FILE "BONDING_MASTER=yes\n";
+        print FILE "BONDING_MODULE_OPTS='$bondingopts'\n";
+        print FILE "NAME='Bonded Interface'\n";
+        print FILE "IPADDR=$nic_ips[$i]\n";
+        print FILE "NETMASK=$netmask\n";
+        print FILE "STARTMODE=onboot\n";
+        print FILE "USERCONTROL=no\n";
+        my $devnum = 0;
+        my @output = `ip addr show 2>&1`;       # to check for existance of the device later
+        foreach my $dev (@devs) {
+            if (!grep(m/^\d+:\s+$dev:/, @output)) { next; }
+            print FILE "BONDING_SLAVE_$devnum=$dev\n";
+            $devnum++;
+        }
+        close FILE;
+
+        # Configure slaves
+        foreach my $dev (@devs) {
+            # as a convenience, make sure the device exists before adding it to the bond
+            if (!grep(m/^\d+:\s+$dev:/, @output)) {
+                system("logger -t xcat -p local4.err  'configbond: not configuring $dev because it does not exist.'");
+                unlink("$dir/ifcfg-$dev");          # in case it was left over in the image we are cloning
+                next;
+            }
+            
+            system("logger -t xcat -p local4.err  'configbond: slave dev: $dev'");
+            if (!open(FILE, ">$dir/ifcfg-$dev")) { system("logger -t xcat -p local4.err 'configbond: cannot open $dir/ifcfg-$dev'"); exit 1; }
+            print FILE "BOOTPROTO=none\n";
+            print FILE "STARTMODE=hotplug\n";
+            close FILE;
+        }
+        }
+    else {
+        # do not recognize this distro
+        system("logger -t xcat -p local4.err 'configbond: network directory is not either the Red Hat or SuSE format.'");
+        exit 1;
+    }
+
+    # Apply the changes.  Since we are only doing bond1 right now, lets not restart the whole network
+    # so we dont disrupt the installnic connection.  Instead we just need to bring down the slave nics,
+    # and then bring up the bond nic.
+    #runcmd("service network restart");
+    foreach my $dev (@devs) {
+        runcmd("ifdown $dev");
+    }
+    runcmd("ifdown $bond");     # in case it was already up
+    runcmd("ifup $bond");       # note: this wont reload the bonding kernel module, so we are depending on the provisioning process to already have set the correct bonding options
+    system("logger -t xcat -p local4.info 'configbond: successfully configured $specific_nic.'");
+
+}
+exit 0;
+
+sub runcmd {
+	my $cmd = shift @_;
+	$cmd .= ' 2>&1';
+	my @output = `$cmd`;
+	my $rc = $? >> 8;
+	if ($rc) {
+		system("logger -t xcat -p local4.err 'configeth: command $cmd failed with rc $rc: " . join('',@output) . "'");
+		my $errout= "configeth: command $cmd failed with rc $rc.";
+                `echo $errout`;
+		exit $rc;
+	}
+}

xCAT-SoftLayer/postscripts/setdefaultroute

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# set the default route of the node to the ip address and nic passed in
+# this should be added to the postbootscripts, NOT postscripts
+
+gateway="$1"
+nic="$2"
+
+# set it temporarily
+echo "ip route replace to default via $gateway dev $nic"
+ip route replace to default via $gateway dev $nic
+
+# set it permanently
+#todo: this is only for sles right now
+file=/etc/sysconfig/network/routes
+if grep -q -E '^default ' $file; then
+	# replace the default route that is already in there
+	sed -i 's/^default .*$/default '$gateway' - -/' $file
+else
+	# no default route yet, append to file
+	echo "default $gateway - -" >>$file
+fi
+
+# While we are here, clean up the network wait hack, if it is still there.
+# (It was added during scripted install, because autoyast will not use the bond
+# configuration for 1 part of the process.)  Do not know a better place to clean
+# this up.
+sed -i '/Waiting to reach xCAT mgmt node/d' /etc/init.d/network

xCAT-SoftLayer/share/xcat/install/scripts/post.sles.softlayer.common

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# This is modified from the standard xcat post.sles.common in that it does not set up
+# the ifcfg-eth0 file to do dhcp and it does not restart the network.  It just leaves
+# ifcfg-eth0 the way autoyast configured it, assuming we set it statically.
+
+# save what autoyast set network config to, to help with debugging
+cp /etc/sysconfig/network/ifcfg-eth0 /tmp/ifcfg-eth0.orig
+cp /etc/hosts /tmp/hosts.orig
+cp /etc/resolv.conf /tmp/resolv.conf.orig
+cp /etc/HOSTNAME /tmp/HOSTNAME.orig
+
+#cd /etc/sysconfig/network
+perl -pi -e 's/^FIREWALL="yes"/FIREWALL="no"/' /etc/sysconfig/network/config
+
+# autoyast already set hostname correctly
+
+HOSTNAME=$(hostname -s)
+echo $HOSTNAME
+

xCAT-SoftLayer/share/xcat/install/sles/compute.sles11.softlayer.tmpl

@@ -0,0 +1,147 @@
+<?xml version="1.0"?>
+<!DOCTYPE profile SYSTEM "/usr/share/YaST2/include/autoinstall/profile.dtd">
+<!-- The 2 main differences from the standard xcat compute.sles11.tmpl are:
+      1. instead of dhcp settings in the networking section it puts static info there
+      2. it includes post.sles.softlayer.common instead of post.sles11 and post.sles.common -->
+<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
+  <install>
+    <bootloader>
+      <write_bootloader config:type="boolean">true</write_bootloader>
+      <activate config:type="boolean">true</activate>
+      <kernel_parameters></kernel_parameters>
+      <lba_support config:type="boolean">false</lba_support>
+      <linear config:type="boolean">false</linear>
+      <location>mbr</location>
+    </bootloader>
+    <general>
+      <clock>
+        <hwclock>GMT</hwclock>
+        <timezone>#TABLE:site:key=timezone:value#</timezone>
+      </clock>
+      <keyboard>
+        <keymap>english-us</keymap>
+      </keyboard>
+      <language>en_US</language>
+      <mode>
+        <confirm config:type="boolean">false</confirm>
+        <forceboot config:type="boolean">false</forceboot>
+        <interactive_boot config:type="boolean">false</interactive_boot>
+        <reboot config:type="boolean">true</reboot>
+      </mode>
+      <mouse>
+        <id>non</id>
+      </mouse>
+      <signature-handling>
+         <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key>
+         <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key>
+         <accept_unsigned_file config:type="boolean">true</accept_unsigned_file>
+      </signature-handling>
+
+    </general>
+    <partitioning config:type="list">
+      <!-- XCAT-PARTITION-START -->
+      <drive>
+        <device>XCATPARTITIONHOOK</device>
+        <initialize config:type="boolean">true</initialize>
+        <use>all</use>
+      </drive>
+      <!-- XCAT-PARTITION-END -->
+    </partitioning>
+    <software>
+      <patterns config:type="list">
+        #INCLUDE_DEFAULT_PTRNLIST_S#
+      </patterns>
+      <packages config:type="list">
+        #INCLUDE_DEFAULT_PKGLIST_S#
+      </packages>
+    </software>
+  </install>
+  <configure>
+    <users config:type="list">
+      <user>
+        <username>root</username>
+        <user_password>#CRYPT:passwd:key=system,username=root:password#</user_password>
+        <encrypted config:type="boolean">true</encrypted>
+        <forename/>
+        <surname/>
+      </user>
+    </users>
+    <networking>
+      <dns>
+        <domain>#TABLE:site:key=domain:value#</domain>
+        <hostname>#TABLE:nodelist:$NODE:node#</hostname>
+        <nameservers config:type="list">
+          <nameserver>#XCATVAR:XCATMASTER#</nameserver>
+        </nameservers>
+        <searchlist config:type="list">
+          <search>#TABLE:site:key=domain:value#</search>
+        </searchlist>
+      </dns>
+      <interfaces config:type="list">
+        <interface>
+          <bonding_master>yes</bonding_master>
+          <bonding_module_opts>mode=4 miimon=100 downdelay=0 updelay=0 lacp_rate=fast xmit_hash_policy=1</bonding_module_opts>
+          <bonding_slave0>eth0</bonding_slave0>
+          <bonding_slave1>eth2</bonding_slave1>
+          <device>bond0</device>
+          <bootproto>static</bootproto>
+          <startmode>auto</startmode>
+          <ipaddr>#NODEIPADDR#</ipaddr>
+          <netmask>#NODENETMASK#</netmask>
+          <usercontrol>no</usercontrol>
+        </interface>
+        <interface>
+          <bootproto>none</bootproto>
+          <device>eth0</device>
+          <name>Ethernet Card 0</name>
+          <startmode>off</startmode>
+        </interface>
+        <interface>
+          <bootproto>none</bootproto>
+          <device>eth2</device>
+          <name>Ethernet Card 2</name>
+          <startmode>off</startmode>
+        </interface>
+      </interfaces>
+      <routing>
+        <ip_forward config:type="boolean">false</ip_forward>
+        <routes config:type="list">
+          <route>
+            <destination>default</destination>
+            <device>-</device>
+            <gateway>#NODEGATEWAY#</gateway>
+            <netmask>-</netmask>
+          </route>
+        </routes>
+      </routing>
+    </networking>
+    <files config:type="list">
+      <file>
+        <file_contents><![CDATA[alias bond0 bonding
+]]></file_contents>
+        <file_owner>root</file_owner>
+        <file_path>/etc/modprobe.d/bond0.conf</file_path>
+        <file_permissions>644</file_permissions>
+      </file>
+    </files>
+    <scripts>
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/chroot.sles#
+      <post-scripts config:type="list">
+        <script>
+          <filename>xcat.sh</filename>
+          <interpreter>shell</interpreter>
+          <source>
+
+<![CDATA[
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.sles.softlayer.common#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat#
+
+]]>
+
+          </source>
+        </script>
+      </post-scripts>
+    </scripts>
+  </configure>
+</profile>

xCAT-SoftLayer/si-post-install/15all.configefi

@@ -0,0 +1,82 @@
+#!/bin/bash
+
+# SI post-install script to configure the efi boot mgr or grub after SI has installed the OS
+# SI post-install scripts run in a chroot environment of the final OS image
+
+if [ -d /sys/firmware/efi ]; then
+    echo "Setting Boot Manager for the next boot."
+    echo "delete all sysclone boot list"
+    str_bootnums=`efibootmgr | grep 'syscloneLinux' | awk '{print $1}' | sed 's/boot//i' | sed 's/*//'`
+    for str_num in $str_bootnums
+    do
+        efibootmgr -b $str_num -B -q
+    done
+
+    if [ -f "/boot/efi/EFI/redhat/grub.efi" ];then
+        efibootmgr -c -l \\EFI\\redhat\\grub.efi -L syscloneLinux
+    elif [ -f "/boot/efi/efi/SuSE/elilo.efi" ];then
+        efibootmgr -c -l \\efi\\SuSE\\elilo.efi -L syscloneLinux
+    else
+        echo "Can not find the boot loader."
+        exit 1
+    fi
+else
+    echo "run grub-install to configure the MBR."
+    if [ -e /etc/mtab ];then
+        mv /etc/mtab /etc/mtab.bak
+    fi
+    grep -v rootfs /proc/mounts > /etc/mtab
+    boot_device=''
+    if [ -f "/etc/systemconfig/systemconfig.conf" ];then
+        boot_device=`cat /etc/systemconfig/systemconfig.conf | grep BOOTDEV | awk '{print $3}'`
+    else
+        boot_root=`mount | grep -E ' on\s+/ type ' | awk '{print $1}'`
+        boot_device=`echo $boot_root | sed -e 's/[0-9]*$//'`
+
+        #str_temp=`mount | awk '{print $1","$3}'`
+        #for line in $str_temp
+        #do
+        #    mp=`echo $line | awk -F, '{print $2}'`
+        #    if [ "$mp" = "/" ];then
+        #        boot_device=`echo $line | awk -F, '{print $1}' | sed -e 's/[0-9]*$//'`
+        #        break
+        #    fi
+        #done
+    fi
+
+    if [ -n "$boot_device" ];then
+        echo "The boot device is $boot_device"
+        echo "The boot root device is $boot_root"
+    else
+        echo "Can not find the boot device, return error"
+        exit 1
+    fi
+    
+    # set grub to use this boot device
+    if grep -qe '^VERSION\s*=\s*11' /etc/SuSE-release; then
+        #sles11, run grub-install.unsupported directly
+        echo "grub-install.unsupported --no-floppy --recheck $boot_device"
+        grub-install.unsupported --no-floppy --recheck $boot_device
+        # note: the error about grub-set-default not existing is harmless, because we want the default to be 0 anyway
+    else
+        #for sles10, should run grub-install with parameters
+        echo "grub-install --no-floppy --recheck $boot_device"
+        grub-install --no-floppy --recheck $boot_device
+    fi
+
+    # change the entries in the grub conf file to use the correct boot root device
+    # (not the one leftover from the golden image)
+    if [ -f "/boot/grub/grub.conf" ];then
+        conffile="/boot/grub/grub.conf"
+    else
+        conffile="/boot/grub/menu.lst"
+    fi
+    sed -i 's| root=\S*| root='$boot_root'|' $conffile
+    sed -i 's| resume=\S*| noresume|' $conffile
+
+    if [ -e /etc/mtab.bak ];then
+        mv -f /etc/mtab.bak /etc/mtab
+    else
+        rm -f /etc/mtab
+    fi
+fi

xCAT-SoftLayer/si-post-install/16all.updatenetwork

@@ -0,0 +1,209 @@
+#!/bin/bash
+
+# SI post-install script to configure network settings after SI has installed the OS
+# SI post-install scripts run in a chroot environment of the final OS image
+
+. /tmp/post-install/variables.txt
+
+bondingopts='mode=4 miimon=100 downdelay=0 updelay=0 lacp_rate=fast xmit_hash_policy=1'
+
+# determine if we should be using a static ip or dhcp
+staticIP () {
+    # Eventually we should use the SI variable IP_ASSIGNMENT_METHOD below to determine this.
+    # But this requires a patch in both xcat/sysclone (to set si_getimage -ip-assignment method)
+    # and SI (to set IP_ASSIGNMENT_METHOD as a result of that).  Until both of those patches
+    # are in the main releases, assume that if we have set the IPADDR kernel parm for the boot
+    # kernel to use static ip, that the final OS should use static ip too.
+    # Note: the IPADDR environment variable will be set by SI, even if it got it thru dhcp, so
+    #       that is not a reliable way to decide.
+    str=`cat /proc/cmdline`
+    #str='netmask=255.255.255.192 IPADDR=10.54.51.11 GATEWAY=10.54.51.1 dns=10.54.51.2 hostname=sap64-4 DEVICE=eth0'
+    for parm in $str; do
+        key=`echo $parm|awk -F= '{print $1}'`
+        value=`echo $parm|awk -F= '{print $2}'`
+        if [[ $key == "IPADDR" || $key == "ipaddr" ]]; then
+            return 0    # yes, we should use static ip
+        fi
+    done
+    if [[ -n $IP_ASSIGNMENT_METHOD && ${IP_ASSIGNMENT_METHOD,,} == "static" ]]; then
+        return 0    # this means yes/true
+    fi
+    return 1
+}
+
+#delete the udev rule in the image
+rule_file=`ls /etc/udev/rules.d/*net_persistent_names.rules 2>/dev/null`
+if [ -n "$rule_file" ];then
+    rm -f $rule_file
+fi
+
+hostname $HOSTNAME
+bond=bond0
+# this is a softlayer assumption that the two devices on the private net will be eth0 and eth2
+if [[ $DEVICE == "eth0" ]]; then
+    DEVICE2=eth2
+elif [[ $DEVICE == "eth2" ]]; then
+    DEVICE2=eth0
+fi
+ip addr show|grep -q -E "^[0-9]+:\s+$DEVICE2:"          # make sure it exists on the system
+if [[ $? == 0 ]]; then
+    DEVICE2EXISTS="yes"
+fi
+
+device_names=`ifconfig -a | grep -i hwaddr | grep -i 'Ethernet' | grep -v usb| awk '{print $1}'`
+str_cfg_file=''
+if [ -d "/etc/sysconfig/network-scripts/" ];then
+    #redhat
+    dir="/etc/sysconfig/network-scripts"
+    grep -i HOSTNAME /etc/sysconfig/network
+    if [ $? -eq 0 ];then
+        sed -i "s/HOSTNAME=.*/HOSTNAME=$HOSTNAME/g" /etc/sysconfig/network
+    else
+        echo "HOSTNAME=$HOSTNAME" >> /etc/sysconfig/network
+    fi
+    if staticIP; then
+        # delete all nic cfg files left over from the golden node
+        for i in $device_names;do
+            rm -f "$dir/ifcfg-$i"
+        done
+
+        # set static ip from variables in variables.txt
+        # write ifcfg-bond0.  For now we assume the installnic should be part of bond0,
+        # because in SL i think that is always the case.
+        i="$bond"
+        str_cfg_file="$dir/ifcfg-$i"
+        echo "DEVICE=$i" > $str_cfg_file
+        echo "BOOTPROTO=none" >> $str_cfg_file
+        echo "ONBOOT=yes" >> $str_cfg_file
+        echo "USERCTL=no" >> $str_cfg_file
+        echo 'BONDING_OPTS="'$bondingopts'"' >> $str_cfg_file
+        echo "IPADDR=$IPADDR" >> $str_cfg_file
+        echo "NETMASK=$NETMASK" >> $str_cfg_file
+        echo "NETWORK=$NETWORK" >> $str_cfg_file
+        echo "BROADCAST=$BROADCAST" >> $str_cfg_file
+        #todo: add gateway config?  Not sure, because the boot kernels gateway might not be the final OS gateway
+
+        # write ifcfg-eth0
+        i="$DEVICE"
+        str_cfg_file="$dir/ifcfg-$i"
+        echo "DEVICE=$i" > $str_cfg_file
+        echo "BOOTPROTO=none" >> $str_cfg_file
+        echo "MASTER=$bond" >> $str_cfg_file
+        echo "ONBOOT=yes" >> $str_cfg_file
+        echo "SLAVE=yes" >> $str_cfg_file
+        echo "USERCTL=no" >> $str_cfg_file
+
+        i="$DEVICE2"
+        str_cfg_file="$dir/ifcfg-$i"
+        if [[ $DEVICE2EXISTS == "yes" ]]; then
+            # write ifcfg-eth2
+            echo "DEVICE=$i" > $str_cfg_file
+            echo "BOOTPROTO=none" >> $str_cfg_file
+            echo "MASTER=$bond" >> $str_cfg_file
+            echo "ONBOOT=yes" >> $str_cfg_file
+            echo "SLAVE=yes" >> $str_cfg_file
+            echo "USERCTL=no" >> $str_cfg_file
+        else
+            rm -f $str_cfg_file         # in case it was left over in the image that was captured
+        fi
+
+        # write modprobe alias config
+        str_cfg_file="/etc/modprobe.d/$bond.conf"
+        echo "alias $bond bonding" > $str_cfg_file
+
+        #todo: figure out how to set the default gateway in rhel
+    else
+        # use dhcp for all nics
+        for i in $device_names;do
+            str_cfg_file="$dir/ifcfg-$i"
+            echo "DEVICE=$i" > $str_cfg_file
+            echo "BOOTPROTO=dhcp" >> $str_cfg_file
+            echo "NM_CONTROLLED=yes" >> $str_cfg_file
+            echo "ONBOOT=yes" >> $str_cfg_file
+        done
+    fi
+elif [ -d "/etc/sysconfig/network/" ];then
+    #suse
+    dir="/etc/sysconfig/network"
+    echo "$HOSTNAME" > /etc/HOSTNAME
+    if staticIP; then
+        # delete all nic cfg files left over from the golden node
+        for i in $device_names;do
+            rm -f "$dir/ifcfg-$i"
+        done
+
+        # set static ip from variables in variables.txt
+        # write ifcfg-bond0.  For now we assume the installnic should be part of bond0,
+        # because in SL i think that is always the case.
+        i="$bond"
+        str_cfg_file="$dir/ifcfg-$i"
+        echo "BOOTPROTO=static" > $str_cfg_file
+        echo "STARTMODE=onboot" >> $str_cfg_file
+        echo "BONDING_MASTER=yes" >> $str_cfg_file
+        echo "BONDING_MODULE_OPTS='$bondingopts'" >> $str_cfg_file
+        echo "NAME='Bonded Interface'" >> $str_cfg_file
+        echo "IPADDR=$IPADDR" >> $str_cfg_file
+        echo "NETMASK=$NETMASK" >> $str_cfg_file
+        echo "NETWORK=$NETWORK" >> $str_cfg_file
+        echo "BROADCAST=$BROADCAST" >> $str_cfg_file
+        echo "USERCONTROL=no" >> $str_cfg_file
+        echo "BONDING_SLAVE_0=$DEVICE" >> $str_cfg_file
+        if [[ $DEVICE2EXISTS == "yes" ]]; then
+            echo "BONDING_SLAVE_1=$DEVICE2" >> $str_cfg_file
+        fi
+
+        # write ifcfg-eth0
+        i="$DEVICE"
+        str_cfg_file="$dir/ifcfg-$i"
+        echo "BOOTPROTO=none" > $str_cfg_file
+        echo "STARTMODE=hotplug" >> $str_cfg_file
+
+        i="$DEVICE2"
+        str_cfg_file="$dir/ifcfg-$i"
+        if [[ $DEVICE2EXISTS == "yes" ]]; then
+            # write ifcfg-eth2
+            echo "BOOTPROTO=none" > $str_cfg_file
+            echo "STARTMODE=hotplug" >> $str_cfg_file
+        else
+            rm -f $str_cfg_file         # in case it was left over in the image that was captured
+        fi
+
+        # write modprobe alias config
+        str_cfg_file="/etc/modprobe.d/$bond.conf"
+        echo "alias $bond bonding" > $str_cfg_file
+
+        # set the default gateway (at this point this is the private nic gateway, to handle provision across vlans)
+        file=/etc/sysconfig/network/routes
+        if grep -q -E '^default ' $file; then
+            # replace the default route that is already in there
+            sed -i 's/^default .*$/default '$GATEWAY' - -/' $file
+        else
+            # no default route yet, append to file
+            echo "default $GATEWAY - -" >>$file
+        fi
+
+        # this was the original config of the eth0 nic (without bonding)
+        #echo "DEVICE=$i" > $str_cfg_file
+        #echo "BOOTPROTO=static" >> $str_cfg_file
+        #echo "STARTMODE=onboot" >> $str_cfg_file
+        #echo "IPADDR=$IPADDR" >> $str_cfg_file
+        #echo "NETMASK=$NETMASK" >> $str_cfg_file
+        #echo "NETWORK=$NETWORK" >> $str_cfg_file
+        #echo "BROADCAST=$BROADCAST" >> $str_cfg_file
+        #todo: add gateway config?  Not sure, because the boot kernels gateway might not be the final OS gateway
+    else
+        # use dhcp for all nics
+        for i in $device_names;do
+            str_cfg_file="$dir/ifcfg-$i"
+            echo "DEVICE=$i" > $str_cfg_file
+            echo "BOOTPROTO=dhcp" >> $str_cfg_file
+            echo "STARTMODE=onboot" >> $str_cfg_file
+            echo "DHCLIENT_PRIMARY_DEVICE=yes" >> $str_cfg_file
+        done
+    fi
+else
+    #ubuntu
+    echo "Does not support ubuntu."
+    exit 1
+fi
+

xCAT-SoftLayer/si-post-install/20all.makeinitrd

@@ -0,0 +1,20 @@
+#!/bin/bash
+#Used only by sysclone
+
+# This SI post-install script is needed because the initrd that autoyast/kickstart/ubuntu builds when installing
+# sles/rh/ubuntu on the golden node may not have the drivers when that initrd runs on the node that is
+# being deployed with this image (specifically, drivers to be able to mount the disk).
+# So rebuild the initrd on the to-node after putting the image on the disk, but before rebooting.
+
+#todo: Make this script work on red hat by checking for dracut and using that if it exists.
+#		And do whatever is necessary on ubuntu.
+
+if [[ -f /sbin/dracut ]]; then
+    # redhat/centos
+    echo "Running dracut to regenerate the initrd with the drivers needed by this node:"
+    dracut  --force
+else
+    # suse/sles
+    echo "Running mkinitrd to regenerate the initrd with the drivers needed by this node:"
+    mkinitrd
+fi

xCAT-SoftLayer/si-post-install/99all.killsyslog

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# SI post-install script, run after SI has installed the OS, to kill processes SI does not kill
+# (so /a can be umounted cleanly)
+# SI post-install scripts run in a chroot environment of the final OS image
+
+if [ -f "/etc/SuSE-release" ];then
+    str_out=`ps -ef | grep -v grep | grep syslog-ng`
+    if [ $? -eq 0 ];then
+        str_id=`echo $str_out | awk '{print $2}'`
+        kill -9 $str_id
+    fi
+fi
+
+# SI starts klogd in the chroot, but does not kill it.  Remove this line when SI fixes their bug.
+killall klogd
+
+# flush all write buffers, just in case SI can not umount /a
+echo "Syncing file systems"
+sync
+
+#todo: remove
+#echo "Processes still using /:"
+#fuser -v /
+#sleep 30

xCAT-SoftLayer/xCAT-SoftLayer.spec

@@ -0,0 +1,92 @@
+Summary: Utilities to make xCAT work in a SoftLayer environment
+Name: xCAT-SoftLayer
+Version: %(cat Version)
+Release: snap%(date +"%Y%m%d%H%M")
+Epoch: 4
+License: EPL
+Group: Applications/System
+Source: xCAT-SoftLayer-%(cat 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
+Requires: xCAT-server
+#Requires: xCAT-server  >= %{epoch}:%(cat Version|cut -d. -f 1,2)
+
+# perl-ExtUtils-MakeMaker, perl-CPAN, perl-Test-Harness are only available in rhel.
+# When this rpm supports being installed in sles, need to add these to xcat-dep.
+# perl-SOAP-Lite is already in xcat-dep
+Requires: perl-ExtUtils-MakeMaker perl-CPAN perl-Test-Harness perl-SOAP-Lite
+
+Provides: xCAT-SoftLayer = %{epoch}:%{version}
+
+%description
+xCAT-SoftLayer provides Utilities to make xCAT work in a SoftLayer environment.  This package should be installed on your management server
+
+# %define VERBOSE %(if [ "$VERBOSE" = "1" -o "$VERBOSE" = "yes" ];then echo 1; else echo 0; fi)
+# %define NOVERBOSE %(if [ "$VERBOSE" = "1" -o "$VERBOSE" = "yes" ];then echo 0; else echo 1; fi)
+# %define NOVERBOSE %{?VERBOSE:1}%{!?VERBOSE:0}
+
+%prep
+# %if %NOVERBOSE
+# echo NOVERBOSE is on
+# set +x
+# %elseif
+# set -x
+# %endif
+
+%setup -q -n xCAT-SoftLayer
+%build
+# Convert pods to man pages and html pages
+./xpod2man
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/bin
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/install
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/sysclone/postscripts
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT-SoftLayer
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/man/man1
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/man1
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/sysclone/post-install
+
+cp -p -R share/xcat/install/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/install/
+
+cp -d bin/* $RPM_BUILD_ROOT/%{prefix}/bin
+chmod 755 $RPM_BUILD_ROOT/%{prefix}/bin/*
+
+cp -d postscripts/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/sysclone/postscripts
+chmod 755 $RPM_BUILD_ROOT/%{prefix}/share/xcat/sysclone/postscripts/*
+
+cp -d si-post-install/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/sysclone/post-install
+chmod 755 $RPM_BUILD_ROOT/%{prefix}/share/xcat/sysclone/post-install/*
+
+cp LICENSE.html $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT-SoftLayer
+chmod 644 $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT-SoftLayer/*
+
+cp share/man/man1/* $RPM_BUILD_ROOT/%{prefix}/share/man/man1
+chmod 444 $RPM_BUILD_ROOT/%{prefix}/share/man/man1/*
+cp share/doc/man1/* $RPM_BUILD_ROOT/%{prefix}/share/doc/man1
+chmod 644 $RPM_BUILD_ROOT/%{prefix}/share/doc/man1/*
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+#%doc LICENSE.html
+%{prefix}
+
+%post
+# We are shipping the postscripts in a sysclone dir and then copying them to /install/postscripts here,
+# because we want to allow base xcat to eventually ship them and not conflict on the file name/path
+# But base xcat now has a newer/better configbond written in bash, so if that is there do not overwrite it.
+head /install/postscripts/configbond | grep -q -E '^#! */bin/bash'
+if [[ $? != 0 ]]; then
+    # the new configbond from xcat 2.8.5 is not there, so copy ours
+	cp -f /%{prefix}/share/xcat/sysclone/postscripts/* /install/postscripts
+fi

xCAT-SoftLayer/xpod2man

@@ -0,0 +1,214 @@
+#!/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 "Error running:  $cmd\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);
+}

xCAT-client/bin/db2sqlsetup

@@ -590,13 +590,16 @@ sub startxcatd
       } else {
         $xcmd = "$::XCATROOT/sbin/restartxcatd";
       }
+      system($xcmd);
 
    }
    else
    {
-     $xcmd = "service xcatd restart";
+     #$xcmd = "service xcatd restart";
+     my $ret=xCAT::Utils->restartservice("xcatd");
+     return $ret;
    }
-   system($xcmd);
+
 }
 
 #-----------------------------------------------------------------------------
@@ -618,13 +621,16 @@ sub shutdownxcatd
     if ($::osname eq 'AIX')
     {
         $xcmd = "stopsrc -s xcatd";
+        system($xcmd);
 
     }
     else
     {
-        $xcmd = "service xcatd stop";
+        #$xcmd = "service xcatd stop";
+        my $ret=xCAT::Utils->stopservice("xcatd");
+        return $ret;
     }
-    system($xcmd);
+
 }
 
 #-----------------------------------------------------------------------------
@@ -2073,11 +2079,12 @@ sub adddb2paths
 #-----------------------------------------------------------------------------
 sub remove
 {
-	my $cmd;
-	my @output;
-	my $error = 0;
-	#see if DB2 is installed
-	if (!(-e ($::installdb2dir)))
+    my $cmd; 
+    my @output;
+    my $error = 0;
+    my $retcode=0;
+    #see if DB2 is installed
+    if (!(-e ($::installdb2dir)))
     {
         my $message =
           "\nDB2 is not installed.";
@@ -2120,18 +2127,23 @@ sub remove
             	
             	my $cmd = "ps -elf|grep xcatd";
                 my @output = xCAT::Utils->runcmd($cmd, 0);
+
                 if ($::RUNCMD_RC == 0)
                 {      
                     if ($::osname eq 'AIX')
                     {
                     	my $cmd = "startsrc -s xcatd";
+                        xCAT::Utils->runcmd($cmd, -1);
+                        $retcode=$::RUNCMD_RC;
                     }
                     else
                     {           
-                    	my $cmd = "service xcatd start";
+                    	#my $cmd = "service xcatd start";
+                    	$retcode=xCAT::Utils->startservice("xcatd");
                     }
-                    xCAT::Utils->runcmd($cmd, -1);
-            	    if ($::RUNCMD_RC !=0)
+                    #xCAT::Utils->runcmd($cmd, -1);
+            	    #if ($::RUNCMD_RC !=0)
+            	    if($retcode!=0)
             	    {
             	    	my $message = "can't start xcatd";
             	    	$error += 1;
@@ -2155,13 +2167,17 @@ sub remove
             if ($::osname eq 'AIX')
             {
             	my $cmd = "stopsrc -s xcatd";
+                xCAT::Utils->runcmd($cmd, -1);
+                $retcode=$::RUNCMD_RC;
             }
             else
             {           
-            	my $cmd = "service xcatd stop";
+            	#my $cmd = "service xcatd stop";
+            	$retcode=xCAT::Utils->stopservice("xcatd");
             }
-            xCAT::Utils->runcmd($cmd, -1);
-            if ($::RUNCMD_RC !=0)
+            #xCAT::Utils->runcmd($cmd, -1);
+            #if ($::RUNCMD_RC !=0)
+            if($retcode!=0)
             {
             	my $message = "can't stop xcatd";
             	xCAT::MsgUtils->message("E", "$message");
@@ -2198,13 +2214,17 @@ sub remove
             if ($::osname eq 'AIX')
             {
             	my $cmd = "startsrc -s xcatd";
+                xCAT::Utils->runcmd($cmd, -1);
+                $retcode=$::RUNCMD_RC; 
             }
             else
             {           
-            	my $cmd = "service xcatd start";
+            	#my $cmd = "service xcatd start";
+            	$retcode=xCAT::Utils->startservice("xcatd");
             }
-            xCAT::Utils->runcmd($cmd, -1);
-            if ($::RUNCMD_RC !=0)
+            #xCAT::Utils->runcmd($cmd, -1);
+            #if ($::RUNCMD_RC !=0)
+            if($retcode!=0)
             {
             	my $message = "can't start xcatd";
             	xCAT::MsgUtils->message("E", "$message");

xCAT-client/bin/genimage

@@ -117,7 +117,7 @@ if ((!$imagename) && (!$profile) && (!$os) && (!$arch)) {
     if ($? == 0) {
 	if (($tmpimgs) && ($tmpimgs !~ /^Could/)) { #Could is returned when the osimage table is empty
 	    my @images=split('\n', $tmpimgs);
-	    print "Do you want to re-genarate an existing image from the osimage table? ";
+	    print "Do you want to re-generate an existing image from the osimage table? ";
 	    print "[y/n] ";
 	    my $conf = <stdin>;
 	    chomp($conf);
@@ -128,7 +128,7 @@ if ((!$imagename) && (!$profile) && (!$os) && (!$arch)) {
 		    foreach(sort @images){
 			print  "   $_\n";
 		    } 
-		    # default is the first image cause in many cases
+		    # default is the first image 
 		    print "Which image do you want to re-generate? [";
 		    print $images[0];
 		    print "] ";
@@ -294,13 +294,10 @@ if ($profile) { print  "  Profile: $profile\n"; }
 # get the interface
 if ((!$imagename) && (!$interface)){
     while(1){
-	print "Which network interface do you want the image to boot from? [";
-	print "eth0";
-	print "] ";
+	print "OPTIONAL: Which specific network interface will the image boot from? [<blank>]";
 	$interface = <stdin>;
 	chomp($interface);
 	if($interface eq ""){
-	    $interface = "eth0";
 	    last;
 	}else{
 	    print "You want your stateless machines to boot off of ";
@@ -317,8 +314,9 @@ if ((!$imagename) && (!$interface)){
 	    }	
 	}
     }
+    if ($interface) { print "  Interface: $interface\n"; }
+              else  { print "  No interface specified.  The interface will be determined at network boot time.\n"; }
 }
-if ($interface) { print "  Interface: $interface\n"; }
 
     
 

xCAT-client/bin/mysqlsetup

@@ -8,10 +8,9 @@
 
 
 
- This is script is called after the installation or upgrade of MySQL 
-   on xCAT.  It will automate the setup of the MySQL and xCAT to run
-   xCAT on the MySQL DB.
-   Note: if will setup an xcatdb,a xcatadmin, and a MySQL root password. 
+ This script  automates the setup of the MySQL/MariaDB server  and creates the xCAT database to run
+  xCAT on MySQL/MariaDB.
+   Note: it will setup an xcat database (xcatdb),a xcatadmin id , and a MySQL root password. 
    It will interact for the
    password to assign, unless the XCATMYSQLADMIN_PW and the XCATMYSQLROOT_PW 
    env variables are set to the admin and mysql root password, resp.   
@@ -150,8 +149,8 @@ $::linuxos = xCAT::Utils->osver();
 
 #
 # check to see if mysql is installed
-#
-my $cmd = "rpm -qa | grep mysql";
+ #
+my $cmd = "rpm -qa | grep -i perl-DBD-mysql";
 if ( $::debianflag ){
     $cmd = "dpkg -l | grep mysql-server";
 }
@@ -159,10 +158,17 @@ xCAT::Utils->runcmd($cmd, 0);
 if ($::RUNCMD_RC != 0)
 {
     my $message =
-      "\nMySQL is not installed.  If on AIX, it should be first obtained from the xcat dependency tarballs and installed before running this command.\n If on Linux, install from the OS CDs.";
+      "\nMySQL perl DBD is not installed.  If on AIX, it should be first obtained from the xcat dependency tarballs and installed before running this command.\n If on Linux, install from the OS CDs.";
     xCAT::MsgUtils->message("E", " $cmd failed. $message");
     exit(1);
 }
+# is this MariaDB or MySQL
+$::MariaDB=0;
+$cmd = "rpm -qa | grep -i mariadb";  # check this is MariaDB not MySQL
+xCAT::Utils->runcmd($cmd, -1);
+if ($::RUNCMD_RC == 0) {
+   $::MariaDB=1;
+}
 
 # check to see if  MySQL  is running
 $::mysqlrunning     = 0;
@@ -205,10 +211,10 @@ if ($::osname eq 'AIX')
     &setulimits;
 }
 
-#  if not just odbc update  and not already running mysql or mysqlsetup -u
+#  if not just odbc update  and not already running mysql or mysqlsetup -u  or -L
 #  Get root and admin passwords
 #
-if ((($odbconly == 0) && ( $::xcatrunningmysql == 0)) || $::UPDATE )
+if ((($odbconly == 0) && ( $::xcatrunningmysql == 0)) || $::UPDATE || $::SETUPLL )
 {    # not just updating the odbc
     if ($ENV{'XCATMYSQLADMIN_PW'})    # input env sets the password
     {
@@ -328,7 +334,6 @@ if (($::INIT) && ($::xcatrunningmysql == 0))
     # MySQL not running, then initialize the database
     if ($::mysqlrunning == 0)
     {
-
         # Add mysql user and group for AIX
         # Correct directory permissions
         #
@@ -436,7 +441,7 @@ sub usage
 {
     xCAT::MsgUtils->message(
         'I',
-        "Usage:\nmysqlsetup - Performs the setup of MySQL for xCAT to use as its database. See man mysqlsetup for more information."
+        "Usage:\nmysqlsetup - Performs the setup of MySQL or MariaDB for xCAT to use as its database. See man mysqlsetup for more information."
         );
     my $msg =
       "mysqlsetup <-h|--help>\n           <-v|--version>\n           <-i|--init> [-f|hostfile] [-o|--odbc] [-L|--LL] [-V|--verbose]\n           <-u|--update> <-f|hostfile> [-o|--odbc] [-L|--LL] [-V|--verbose]\n           <-o|--odbc> [-V|--verbose]\n           <-L|--LL> [-V|--verbose]";
@@ -603,13 +608,16 @@ sub shutdownxcatd
     if ($::osname eq 'AIX')
     {
         $xcmd = "stopsrc -s xcatd";
+        system($xcmd);
 
     }
     else
     {
-        $xcmd = "service xcatd stop";
+        #$xcmd = "service xcatd stop";
+        my $ret=xCAT::Utils->stopservice("xcatd");
+        return $ret; 
     }
-    system($xcmd);
+
 }
 
 #-----------------------------------------------------------------------------
@@ -856,6 +864,7 @@ sub initmysqldb
 sub mysqlstart
 {
     my $cmd;
+    my $ret=0;
     if ($::osname eq 'AIX')
     {
         my $hostname = `hostname`;
@@ -867,22 +876,32 @@ sub mysqlstart
         $cmd = $cmd2;
         $cmd .=
           "$::installdir/bin/mysqld --user=mysql --basedir=$::installdir --datadir=/var/lib/mysql --user=mysql --log-error=/var/lib/mysql/$hostname.err --pid-file=/var/lib/mysql/$hostname.pid --socket=/tmp/mysql.sock --port=3306 &";
+        $ret=xCAT::Utils->runcmd($cmd, 0);
+        
+        
     }
     else
     {
-        if ($::linuxos =~ /rh.*/)
-        {
-            $cmd = "service mysqld start";
-        }
-        else
-        {    # sles
-            $cmd = "service mysql start";
-        }
+        if ($::MariaDB==1) {    # running MariaDB
+            #$cmd = "service mariadb start";
+            $ret=xCAT::Utils->startservice("mariadb");
+           
+        } else {   # it is mysql
+
+          #if ($::linuxos =~ /rh.*/)
+          #{
+          #  $cmd = "service mysqld start";
+          #}
+          #else
+          #{    # sles
+          #  $cmd = "service mysql start";
+          #}
+          $ret=xCAT::Utils->startservice("mysql");
+       }
     }
-    xCAT::Utils->runcmd($cmd, 0);
-    if ($::RUNCMD_RC != 0)
+    if ($ret != 0)
     {
-        xCAT::MsgUtils->message("E", " $cmd failed.");
+        xCAT::MsgUtils->message("E", " failed to start mysql/mariadb.");
         exit(1);
     }
 
@@ -973,16 +992,21 @@ sub mysqlreboot
     }
     else    # linux
     {
-        if ($::linuxos =~ /rh.*/)
-        {
-            $cmd = "chkconfig mysqld on";
-        }
-        else
-        {    # sles
-            $cmd = "chkconfig mysql on";
-            if ( $::debianflag ){
-                $cmd = "update-rc.d mysql defaults";
-            }
+        if ($::MariaDB==1 ) {  # MariaDB not MySQL
+         
+            $cmd = "chkconfig mariadb on";
+        } else { # mysql
+           if ($::linuxos =~ /rh.*/)
+           {
+              $cmd = "chkconfig mysqld on";
+           }
+           else
+           {    # sles
+              $cmd = "chkconfig mysql on";
+              if ( $::debianflag ){
+                  $cmd = "update-rc.d mysql defaults";
+              }
+           }
         }
         xCAT::Utils->runcmd($cmd, 0);
         if ($::RUNCMD_RC != 0)
@@ -1058,7 +1082,12 @@ sub setupxcatdb
     my $timeout  = 10;    # sets Expect default timeout, 0 accepts immediately
     my $pwd_sent = 0;
     my $pwd_prompt   = 'Enter password: ';
-    my $mysql_prompt = 'mysql> ';
+    my $mysql_prompt;
+    if ($::MariaDB == 1) {  # setup MariaDB
+     $mysql_prompt = 'MariaDB \[\(none\)\]> ';
+    } else {
+     $mysql_prompt = 'mysql> ';
+    }
     my $expect_log   = undef;
     my $debug        = 0;
     #if ($::VERBOSE)
@@ -1178,7 +1207,12 @@ sub setupLL
     my $timeout  = 10;    # sets Expect default timeout, 0 accepts immediately
     my $pwd_sent = 0;
     my $pwd_prompt   = 'Enter password: ';
-    my $mysql_prompt = 'mysql> ';
+    my $mysql_prompt;
+    if ($::MariaDB == 1) {  # setup MariaDB
+     $mysql_prompt = 'MariaDB \[\(none\)\]> ';
+    } else {
+     $mysql_prompt = 'mysql> ';
+    }
     my $expect_log   = undef;
     my $debug        = 0;
     #if ($::VERBOSE)
@@ -1308,7 +1342,12 @@ sub addhosts
     my $timeout  = 10;    # sets Expect default timeout, 0 accepts immediately
     my $pwd_sent = 0;
     my $pwd_prompt   = 'Enter password: ';
-    my $mysql_prompt = 'mysql> ';
+    my $mysql_prompt;
+    if ($::MariaDB == 1) {  # setup MariaDB
+     $mysql_prompt = 'MariaDB \[\(none\)\]> ';
+    } else {
+     $mysql_prompt = 'mysql> ';
+    }
     my $expect_log   = undef;
 
     foreach my $host (@hosts)
@@ -1778,12 +1817,14 @@ sub restorexcatdb
     if ($::osname eq 'AIX')
     {
         $xcmd = "$::XCATROOT/sbin/restartxcatd";
-
+        system($xcmd);
     }
     else
     {
-        $xcmd = "service xcatd restart";
+        #$xcmd = "service xcatd restart";
+        my $ret=xCAT::Utils->restartservice("xcatd");
+        return $ret;
     }
-    system($xcmd);
+
 }
 

xCAT-client/bin/pgsqlsetup

@@ -444,13 +444,16 @@ sub shutdownxcatd
     if ($::osname eq 'AIX')
     {
         $xcmd = "stopsrc -s xcatd";
+        system($xcmd);
 
     }
     else
     {
-        $xcmd = "service xcatd stop";
+       # $xcmd = "service xcatd stop";
+       my $ret=xCAT::Utils->stopservice("xcatd");
+       return $ret;
     }
-    system($xcmd);
+
 }
 
 #-----------------------------------------------------------------------------
@@ -832,6 +835,7 @@ sub initpgdb
 sub pgstart
 {
     my $cmd;
+    my $ret=0;
     xCAT::MsgUtils->message("I", "Starting the PosgreSQL Server");
     if ($::osname eq 'AIX')
     {
@@ -843,27 +847,35 @@ sub pgstart
     else    # linux
     {
         if (defined($::postgres9)) { # set to the PTF level of postgresql 9.X
-          $cmd = "service postgresql-9.$::postgres9 start";
+          #$cmd = "service postgresql-9.$::postgres9 start";
+          $cmd = "postgresql-9.$::postgres9";
         } else {
-          $cmd = "service postgresql start";
+          #$cmd = "service postgresql start";
+          $cmd = "postgresql";
         }
-        system($cmd);
-        if ($? > 0) {
-            xCAT::MsgUtils->message("E", " $cmd failed.");
+        #system($cmd)
+        #if ($? > 0) {
+        $ret=xCAT::Utils->startservice($cmd);
+        if ($ret != 0) {
+            xCAT::MsgUtils->message("E", " failed to start $cmd.");
             exit(1);
         }
         # check to see if running before continuing
         my $retries =0;
         my $pgstarted =0;
-        if (defined($::postgres9)) { # set to the PTF level of postgresql 9.X
-            $cmd = "service postgresql-9.$::postgres9 status";
-        } else {
-            $cmd = "service postgresql status";
-        }
+        #if (defined($::postgres9)) { # set to the PTF level of postgresql 9.X
+        #    #$cmd = "service postgresql-9.$::postgres9 status";
+        #    $ret=xCAT::Utils->checkservicestatus("postgresql-9.$::postgres9");
+        #} else {
+        #    #$cmd = "service postgresql status";
+        #    $ret=xCAT::Utils->checkservicestatus("postgresql");
+        #}
         while ($retries < 30) {
           $retries++;
-          my @status=xCAT::Utils->runcmd($cmd, -1);
-          if (grep(/[r|R]unning/, @status)) {
+          #my @status=xCAT::Utils->runcmd($cmd, -1);
+          #if (grep(/[r|R]unning/, @status)) {
+          $ret=xCAT::Utils->checkservicestatus($cmd);
+          if($ret == 0){ 
             $pgstarted=1;
             last;
           }
@@ -903,18 +915,22 @@ sub pgreboot
     else    # linux
     {
         if (defined($::postgres9)) { # set to the postgresql ptf level
-            $cmd = "chkconfig postgresql-9.$::postgres9 on";
+        #    $cmd = "chkconfig postgresql-9.$::postgres9 on";
+            $cmd = "postgresql-9.$::postgres9";
         } else {
-            $cmd = "chkconfig postgresql on";
+            #$cmd = "chkconfig postgresql on";
+            $cmd = "postgresql";
         }
-        if ($debianflag){
-            $cmd = "update-rc.d postgresql defaults";
-        }
-        xCAT::Utils->runcmd($cmd, 0);
-        if ($::RUNCMD_RC != 0)
+        #if ($debianflag){
+            #$cmd = "update-rc.d postgresql defaults";
+        #}
+        #xCAT::Utils->runcmd($cmd, 0);
+        #if ($::RUNCMD_RC != 0)
+        my $ret=xCAT::Utils->enableservice($cmd);
+        if($cmd !=0 )
         {
             xCAT::MsgUtils->message("E",
-                        " $cmd failed. PostgreSQL will not restart on reboot.");
+                        "enable service $cmd failed. PostgreSQL will not restart on reboot.");
         }
     }
 
@@ -1347,12 +1363,15 @@ sub restorexcatdb
     if ($::osname eq 'AIX')
     {
         $xcmd = "startsrc -s xcatd";
+        system($xcmd);
 
     }
     else
     {
-        $xcmd = "service xcatd start";
+        #$xcmd = "service xcatd start";
+        my $ret=xCAT::Utils->startservice("xcatd");
+        return $ret;
     }
-    system($xcmd);
+
 }
 

xCAT-client/bin/pping

@@ -66,7 +66,7 @@ else { 		# the normal case of the user running the cmd - expand the noderange us
                 SSL_cert_file=> xCAT::Utils->getHomeDir()."/.xcat/client-cred.pem",
                 SSL_ca_file =>  xCAT::Utils->getHomeDir()."/.xcat/ca.pem",
                 SSL_use_cert => 1,
-                #SSL_verify_mode => 1,
+                SSL_verify_mode => 1,
              );
 	die "Connection failure: $!\n" unless ($client);
 	my %cmdref = (command => 'noderange', noderange => $noderange);

xCAT-client/bin/prsync

@@ -69,7 +69,7 @@ my $client = IO::Socket::SSL->new(
                 SSL_cert_file=>$homedir."/.xcat/client-cred.pem",
                 SSL_ca_file => $homedir."/.xcat/ca.pem",
                 SSL_use_cert => 1,
-                #SSL_verify_mode => 1,
+                SSL_verify_mode => 1,
              );
 die "Connection failure: $!\n" unless ($client);
 my %cmdref = (command => 'noderange', noderange => $noderange);

xCAT-client/bin/rcons

@@ -115,7 +115,11 @@ else
         length=`expr $index2 - $index1`
         length=`expr $length - 1`
         cons_ip=`expr substr "$result" $pos $length`
-        ifconfig |grep "$cons_ip"
+        if [ "$os" == "AIX" ]; then
+          ifconfig |grep "$cons_ip"
+        else
+          ip addr |grep "$cons_ip"
+        fi
         if [ $? -eq 0 ]; then
            CONSERVER=""
         fi

xCAT-client/bin/rinstall

@@ -1,12 +1,11 @@
 #!/usr/bin/env perl 
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 
-# Used as a convience command combined of [nodech]-nodeset-rpower-[rcons/wcons] 
+# Used as a convience command combined of [nodech]-nodeset-rsetboot-rpower-[rcons/wcons] 
 # to make ease of node OS provision
 
-# To use this, sym link your cmd name to this script.
+# This is the client front-end to rinstall/winstall commands
 
-use strict;
 
 BEGIN
 {
@@ -20,180 +19,69 @@ use lib "$::XCATROOT/lib/perl";
 use File::Basename;
 use Getopt::Long;
 use xCAT::MsgUtils;
-use xCAT::Table;
-use xCAT::NodeRange;
+use xCAT::Utils;
+use xCAT::Client;
+use Cwd;
+use strict;
 
-
-sub usage {
-    print basename($0)." usage:\n";
-    print " ".basename($0)." [-o|--osver] [-p|--profile] [-a|--arch] [-O|--osimage] [-c|--console] <noderange>\n"
-}
-
-
-
-my $OSVER;
-my $PROFILE;
-my $ARCH;
-my $CONSOLE;
-my $OSIMAGE;
-
-Getopt::Long::Configure("bundling");
-unless (GetOptions(
-    'o|osver=s' => \$OSVER,
-    'p|profile=s' => \$PROFILE,
-    'a|arch=s' => \$ARCH,
-    'O|osimage=s' => \$OSIMAGE,
-    'c|console' => \$CONSOLE
-    )) {
-    usage;
-    exit 1;
-}
-my $arraysize=@ARGV;
-if ($arraysize > 1) {
-    print "noderange invalid\n";
-    usage;
-    exit 1;
-}
-if ($arraysize == 0) {
-    print "noderange not supplied\n";
-    usage;
-    exit 1;
-}
-
-my $noderange=@ARGV[0];
-my $rc=0;
-my %pnhash;
-my @allnodes;
-#use Data::Dumper;
-
-# check and complain about the invalid combination of the options,
-# called when -O is specified or nodetype.provmethod=<osimage>,
-# ignore -o,-p and -a options and prompt a warning message 
-sub checkoption{
-    my $optstring=shift;
-    if($OSVER)   {print 'warning: "'.$optstring.'" specified, "[-o|--osver] '.$OSVER."\" ignored\n"};
-    if($PROFILE) {print 'warning: "'.$optstring.'" specified, "[-p|--profile] '.$PROFILE."\" ignored\n"};
-    if($ARCH)    {print 'warning: "'.$optstring.'" specified, "[-a|--arch] '.$OSVER."\" ignored\n"};
-}
-
-
-@allnodes=noderange($noderange); 
-if($OSIMAGE){
-
-# -O|--osimage is specified, ignore any -a,-p,-o options,
-# call "nodeset ... osimage= ..." to set the boot state of the noderange to the specified osimage,
-# "nodeset" will handle the updating of node attributes such as os,arch,profile,provmethod
-
-   &checkoption("[-O|--osimage] $OSIMAGE");   
-   $rc=system("nodeset $noderange osimage=$OSIMAGE");
-   if ($rc) { 
-      xCAT::MsgUtils->message("E","nodeset failure");
-      exit 1;
-   };
-}else
+# build a request to go the rinstall plugin
+my $bname = basename($0);
+my $cmdref;
+$cmdref->{command}->[0] = $bname;
+$cmdref->{cwd}->[0] = cwd();
+# allows our plugins to get the stdin of the cmd that invoked the plugin
+my $data;
+if ( (($^O =~ /^linux/i) && ($ENV{'SHELL'} =~ /\/ksh$/))  || !defined($ENV{'TERM'}) )
 {
-
-# no osimage specified, update the node attributes specified by -a,-p,-o options thru "nodech",
-# then set the boot state of each node based on the nodetype.provmethod:
-# 1) if nodetype.provmethod = <osimage>, ignore any -p,-o,-a option, then call "nodeset ... osimage" 
-# 2) if nodetype.provmethod = [install/netboot/statelite], update the node attributes specified by -a,-p,-o options thru "nodech", call "nodeset ... [install/netboot/statelite]"
-# 3) if nodetype.provmethod is not set, use 'install' as the default value
-
-# group the nodes according to the nodetype.provmethod
-
-   foreach(@allnodes){
-      my $tab=xCAT::Table->new("nodetype");
-      my $nthash=$tab->getNodeAttribs($_,['provmethod']);
-      $tab->close();
-      if(defined($nthash) and defined($nthash->{'provmethod'}))
-      {
-        push(@{$pnhash{$nthash->{'provmethod'}}},$_);
-      }
-      else
-      {
-        #if nodetype.provmethod is not specified,
-        push(@{$pnhash{'install'}},$_);
-      }
-   }
-
-   
-   foreach  my $key (keys %pnhash)
-   {
-      my $rclocal=0;
-      my $nodes=join(',',@{$pnhash{$key}});
-      if($key =~ /^(install|netboot|statelite)$/)
-      {
-
-         # nodetype.provmethod = [install|netboot|statelite]
-         my $nodechline = "";
-         if ($OSVER) {
-            $nodechline = "nodetype.os=$OSVER";
-         }
-         if ($PROFILE) {
-            $nodechline .= " nodetype.profile=$PROFILE";
-         }
-         if ($ARCH) {
-            $nodechline .= " nodetype.arch=$ARCH";
-         }
-         if ($nodechline) {
-            $rclocal=system("nodech $nodes $nodechline");
-            if ($rclocal) { 
-               print "nodech failure\n";
-               $rc=$rclocal;
-            }
-         }
-
-         unless($rc){ 
-            $rclocal=system("nodeset $nodes $key");
-            if ($rclocal) { 
-               print "nodeset $nodes failure\n";
-               $rc=$rclocal;
-            }
-         }
-      }
-      else
-      {   
-
-         # nodetype.provmethod = <osimage>
-         &checkoption("nodetype.provmethod=$key");   
-         $rclocal=system("nodeset $nodes osimage");
-         if ($rclocal) { 
-            print "nodeset $nodes failure\n";
-            $rc=$rclocal;
-         }
-      }
-      
-   }
+    my $rin="";
+    my $rout;
+    vec($rin,fileno(STDIN),1)=1;
+    my $nfound=select($rout=$rin,"","",1);
+    if ($nfound)
+    {
+        while ( <STDIN> ) { $data.=$_; }
+        $cmdref->{stdin}->[0]=$data;
+    }
 }
-
-if($rc){
-      xCAT::MsgUtils->message("E","nodeset failure");
-      exit 1;
+else
+{
+    if (-p STDIN) {
+        while ( <STDIN> ) { $data.=$_; }
+        $cmdref->{stdin}->[0]=$data;
+    }
 }
+my $arg;
+my @tmpargv = @ARGV;
+# first
+$arg=shift(@ARGV);
+# first  1st non-hyphen arg is the noderange
+while ($arg =~ /^-/) {
+        push (@{$cmdref->{arg}}, $arg);
+        $arg=shift(@ARGV);
+}
+$cmdref->{noderange}->[0]=$arg;
+push (@{$cmdref->{arg}}, @ARGV);
 
-# call "rsetboot" to set the boot order of the nodehm.mgt=ipmi nodes,for others, assume user has set the correct boot order before "rinstall"
-system("rsetboot $noderange net");
+my $noderange=$cmdref->{noderange}->[0];  # save the noderange
 
-# call "rpower" to start the node provision process
-$rc=system("rpower $noderange boot");
-if ($rc) {
-    xCAT::MsgUtils->message("E","rpower failure");
-    exit 1;
-};
+# ok call Client to run the plugin rinstall.pm
+xCAT::Client::submit_request($cmdref,\&xCAT::Client::handle_response);
 
+if ($xCAT::Client::EXITCODE == 0)  # no errors
+{
+ my $startconsole=$cmdref->{startconsole}->[0];
+ # if startconsole requested ( -c flag) for rinstall always for winstall
+ # This is set in the rinstall plugin
+ if ($startconsole == 1) {
+   if (basename($0) =~ /rinstall/) {
 
-if (basename($0) =~ /rinstall/) {
-
-# for rinstall, the -c|--console option can provide the remote console for only 1 node
-    if ($CONSOLE) {
-        if(scalar @allnodes ne 1){
-	    xCAT::MsgUtils->message("E","rinstall [-c|--console] will only work if there is only one node in the noderange. See winstall(8) for consoles on multiple systems");
-            exit 1;
-        }
         exec("rcons $noderange");
     }
-} elsif (basename($0) =~ /winstall/) {
-# winstall can commence a wcons command to the noderange for monitoring the provision cycle
+    elsif (basename($0) =~ /winstall/) {
+       # winstall can commence a wcons command to the noderange for monitoring the provision cycle
 
-    exec("wcons $noderange");
+       exec("wcons $noderange");
+    }
+ }
 }
+exit $xCAT::Client::EXITCODE;

xCAT-client/podchecker

@@ -0,0 +1,145 @@
+#!/usr/bin/perl
+    eval 'exec perl -S $0 "$@"'
+        if 0;
+#############################################################################
+# podchecker -- command to invoke the podchecker function in Pod::Checker
+#
+# Copyright (c) 1998-2000 by Bradford Appleton. All rights reserved.
+# This file is part of "PodParser". PodParser is free software;
+# you can redistribute it and/or modify it under the same terms
+# as Perl itself.
+#############################################################################
+
+use strict;
+#use diagnostics;
+
+=head1 NAME
+
+podchecker - check the syntax of POD format documentation files
+
+=head1 SYNOPSIS
+
+B<podchecker> [B<-help>] [B<-man>] [B<-(no)warnings>] [I<file>S< >...]
+
+=head1 OPTIONS AND ARGUMENTS
+
+=over 8
+
+=item B<-help>
+
+Print a brief help message and exit.
+
+=item B<-man>
+
+Print the manual page and exit.
+
+=item B<-warnings> B<-nowarnings>
+
+Turn on/off printing of warnings. Repeating B<-warnings> increases the
+warning level, i.e. more warnings are printed. Currently increasing to
+level two causes flagging of unescaped "E<lt>,E<gt>" characters.
+
+=item I<file>
+
+The pathname of a POD file to syntax-check (defaults to standard input).
+
+=back
+
+=head1 DESCRIPTION
+
+B<podchecker> will read the given input files looking for POD
+syntax errors in the POD documentation and will print any errors
+it find to STDERR. At the end, it will print a status message
+indicating the number of errors found.
+
+Directories are ignored, an appropriate warning message is printed.
+
+B<podchecker> invokes the B<podchecker()> function exported by B<Pod::Checker>
+Please see L<Pod::Checker/podchecker()> for more details.
+
+=head1 RETURN VALUE
+
+B<podchecker> returns a 0 (zero) exit status if all specified
+POD files are ok.
+
+=head1 ERRORS
+
+B<podchecker> returns the exit status 1 if at least one of
+the given POD files has syntax errors.
+
+The status 2 indicates that at least one of the specified 
+files does not contain I<any> POD commands.
+
+Status 1 overrides status 2. If you want unambiguous
+results, call B<podchecker> with one single argument only.
+
+=head1 SEE ALSO
+
+L<Pod::Parser> and L<Pod::Checker>
+
+=head1 AUTHORS
+
+Please report bugs using L<http://rt.cpan.org>.
+
+Brad Appleton E<lt>bradapp@enteract.comE<gt>,
+Marek Rouchal E<lt>marekr@cpan.orgE<gt>
+
+Based on code for B<Pod::Text::pod2text(1)> written by
+Tom Christiansen E<lt>tchrist@mox.perl.comE<gt>
+
+=cut
+
+
+use Pod::Checker;
+use Pod::Usage;
+use Getopt::Long;
+
+## Define options
+my %options;
+
+## Parse options
+GetOptions(\%options, qw(help man warnings+ nowarnings))  ||  pod2usage(2);
+pod2usage(1)  if ($options{help});
+pod2usage(-verbose => 2)  if ($options{man});
+
+if($options{nowarnings}) {
+  $options{warnings} = 0;
+}
+elsif(!defined $options{warnings}) {
+  $options{warnings} = 1; # default is warnings on
+}
+
+## Dont default to STDIN if connected to a terminal
+pod2usage(2) if ((@ARGV == 0) && (-t STDIN));
+
+## Invoke podchecker()
+my $status = 0;
+@ARGV = qw(-) unless(@ARGV);
+for my $podfile (@ARGV) {
+    if($podfile eq '-') {
+      $podfile = '<&STDIN';
+    }
+    elsif(-d $podfile) {
+      warn "podchecker: Warning: Ignoring directory '$podfile'\n";
+      next;
+    }
+    my $errors =
+      podchecker($podfile, undef, '-warnings' => $options{warnings});
+    if($errors > 0) {
+        # errors occurred
+        $status = 1;
+        printf STDERR ("%s has %d pod syntax %s.\n",
+          $podfile, $errors,
+          ($errors == 1) ? 'error' : 'errors');
+    }
+    elsif($errors < 0) {
+        # no pod found
+        $status = 2 unless($status);
+        print STDERR "$podfile does not contain any pod commands.\n";
+    }
+    else {
+        print STDERR "$podfile pod syntax OK.\n";
+    }
+}
+exit $status;
+

xCAT-client/pods/man1/chvm.1.pod

@@ -24,7 +24,10 @@ B<chvm> I<noderange> [B<lparname>={B<*>|B<name>}]
 
 B<chvm> I<noderange> [B<vmcpus=min/req/max>] [B<vmmemory=min/req/max>]
                [B<vmphyslots=drc_index1,drc_index2...>] [B<vmothersetting=hugepage:N,bsr:N>]
-
+               [B<vmnics=vlan1[,vlan2..]]> [B<vmstorage=<N|viosnode:slotid>>] [B<--vios>]
+               [B<del_physlots=drc_index1,drc_index2...>]
+               [B<del_vadapter=slotid>]
+               
 =head2 VMware/KVM specific:
 
 B<chvm> I<noderange> [B<-a> I<size>] [B<-d> I<disk>] [B<-p> I<disk>] [B<--resize> B<disk>=I<size>] [B<--cpus> I<count>] [B<--mem> I<memory>]
@@ -111,7 +114,7 @@ The administrator should use lsvm to get the profile content, and then edit the
 
 For normal power machine:
 
-chvm could be used to modify the resources assigned to partitions. The admin shall specify the attributes with options I<vmcpus>, I<vmmemory>, I<vmphyslots> and/or I<vmothersetting>. If nothing specified, nothing will be returned. 
+chvm could be used to modify the resources assigned to partitions. The admin shall specify the attributes with options I<vmcpus>, I<vmmemory>, I<vmphyslots>, I<vmothersetting>, I<vmnics> and/or I<vmstorage>. If nothing specified, nothing will be returned. 
 
 =head2 VMware/KVM specific:
 
@@ -199,6 +202,18 @@ Set LPAR name for the specified lpars. If '*' specified, it means to get names f
 
 To specify the parameters that will be modified.
 
+=item B<vmnics=value> B<vmstorage=value> [B<--vios>]
+
+To create new virtual adapter for the specified node. 
+
+=item B<del_physlots=drc_index1,drc_index2...>
+
+To delete physical slots which are specified by the I<drc_index1,drc_index2...>.
+
+=item B<del_vadapter=slotid>
+
+To delete a virtual adapter specified by the I<slotid>.
+
 =back
 
 =head2 VMware/KVM specific:

xCAT-client/pods/man1/chzone.1.pod

@@ -0,0 +1,138 @@
+=head1 B<NAME>
+
+B<chzone> - Changes a zone defined  in the cluster. 
+
+=head1 B<SYNOPSIS>
+
+B<chzone> <zonename>  [B<--defaultzone>] [-K] [B<-k> I<full path to the ssh RSA private key>] [B<-a> I<noderange> | B<-r> I<noderange>] [B<-g>] [B<-f>] [B<-s> I<yes|no>] [-V] 
+
+B<chzone> [B<-h> | B<-v>]
+
+
+=head1 B<DESCRIPTION>
+
+The B<chzone> command is designed to change the definition of a zone previous defined in the cluster.
+The chzone command is only supported on Linux ( No AIX support).
+The nodes are not updated with the new root ssh keys by chzone. You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster.   
+Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur.
+
+=head1 B<OPTIONS>
+
+=over 5
+
+=item B<-h>|B<--help> 
+
+Displays usage information. 
+
+=item B<-v>|B<--version> 
+
+Displays command version and build date. 
+
+=item B<-k | --sshkeypath> I<full path to the ssh RSA private key>
+
+This is the path to the id_rsa key that will be used to build new root's ssh keys for the zone. If -k is used, it will generate the ssh public key from the input ssh RSA private key, and store both in /etc/xcat/sshkeys/<zonename>/.ssh directory.
+
+=item B<-K | --genkeys>
+
+Using this flag, will  generate new ssh RSA private and public keys for the zone into the /etc/xcat/sshkeys/<zonename>/.ssh directory.
+The nodes are not automatically updated with the new root ssh keys by chzone. You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster.
+
+=item B<--default>
+
+if --defaultzone is input, then it will set the zone defaultzone attribute to yes.
+if --defaultzone is input and another zone is currently the default,
+then the -f flag must be used to force a change to the new defaultzone.
+If -f flag is not use an error will be returned and no change made. 
+Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur.
+
+=item B<-a | --addnoderange> I<noderange>
+
+For each node in the noderange, it will set the zonename attribute for that node to the input zonename.
+If the -g flag is also on the command, then
+it will add the group name "zonename" to each node in the noderange.
+
+=item B<-r | --rmnoderange> I<noderange>
+
+For each node in the noderange, if the node is a member of the input zone, it will remove the zonename attribute for that node.
+If any of the nodes in the noderange is not a member of the zone, you will get an error and nothing will be changed.
+If the -g flag is also on the command, then
+it will remove the group name "zonename" from each node in the noderange.
+
+
+=item B<-s| --sshbetweennodes> B<yes|no>
+
+If -s entered, the zone sshbetweennodes attribute will be set to yes or no based on the input. When this is set to yes, then ssh will be setup to allow passwordless root access between nodes.  If no, then root will be prompted for a password when running ssh between the nodes in the zone. 
+
+=item B<-f | --force> 
+
+Used with the (--defaultzone) flag to override the current default zone.
+
+=item B<-g | --assigngroup> 
+
+Used with the (-a or -r ) flag to add or remove the group zonename for all nodes in the input noderange.
+
+=item B<-V>|B<--Verbose>
+
+Verbose mode.
+
+
+=back
+
+
+=head1 B<Examples>
+
+=over 3
+
+=item *
+
+To chzone zone1 to the default zone, enter:
+
+B<chzone> I<zone1> --default -f
+
+=item *
+
+To generate new root ssh keys for zone2A using the ssh id_rsa private key in /root/.ssh:
+
+B<chzone> I<zone2A> -k /root/.ssh
+
+Note: you must use xdsh -K or updatenode -k to update the nodes with the new keys 
+
+=item *
+
+To generate new root ssh keys for zone2A, enter :
+
+B<chzone> I<zone2A> -K  
+
+Note: you must use xdsh -K or updatenode -k to update the nodes with the new keys 
+
+=item *
+
+To add a new group of nodes (compute3) to zone3 and add zone3 group to the nodes,  enter:
+
+B<chzone> I<zone3>  -a compute3 -g
+
+=item *
+
+To remove a group of nodes (compute4) from zone4 and remove zone4 group from the nodes,  enter:
+
+B<chzone> I<zone4>  -r compute4 -g
+
+=item *
+
+To change the sshbetweennodes setting on the zone to not allow passwordless ssh between nodes,  enter:
+
+B<chzone> I<zone5> -s no 
+
+Note: you must use xdsh -K or updatenode -k to update the nodes with this new setting.
+
+=back
+
+B<Files>
+
+B</opt/xcat/bin/chzone/>
+
+Location of the chzone command.
+
+=head1 B<SEE ALSO>
+
+L <mkzone(1)|mkzone.1>,L <rmzone(1)|rmzone.1>,L <xdsh(1)|xdsh.1>, L<updatenode(1)|updatenode.1>

xCAT-client/pods/man1/genimage.1.pod

@@ -6,10 +6,10 @@ B<genimage> - Generates a stateless image to be used for a diskless install.
 
 B<genimage>
 
-B<genimage>  B<-o> I<osver> [B<-a> I<arch>] B<-p> I<profile> B<-i> I<nodebootif> B<-n> I<nodenetdrivers> [B<--onlyinitrd>]  [B<-r> I<otherifaces>] [B<-k> I<kernelver>] [B<-g> I<krpmver>] [B<-m> I<statelite>] [B<-l> I<rootlimitsize>] [B<--permission> I<permission>] [B<--interactive>] [B<--dryrun>]
-
 B<genimage> [B<-o> I<osver>] [B<-a> I<arch>] [B<-p> I<profile>] [B<-i> I<nodebootif>] [B<-n> I<nodenetdrivers>] [B<--onlyinitrd>] [B<-r> I<otherifaces>] [B<-k> I<kernelver>] [B<-g> I<krpmver>] [B<-m> I<statelite>] [B<-l> I<rootlimitsize>] [B<--permission> I<permission>] [B<--interactive>] [B<--dryrun>] [B<--ignorekernelchk>] I<imagename>
 
+B<genimage>  B<-o> I<osver> [B<-a> I<arch>] B<-p> I<profile> B<-i> I<nodebootif> B<-n> I<nodenetdrivers> [B<--onlyinitrd>]  [B<-r> I<otherifaces>] [B<-k> I<kernelver>] [B<-g> I<krpmver>] [B<-m> I<statelite>] [B<-l> I<rootlimitsize>] [B<--permission> I<permission>] [B<--interactive>] [B<--dryrun>]
+
 
 B<genimage> [B<-h> | B<--help> | B<-v> | B<--version>]
 
@@ -17,43 +17,43 @@ B<genimage> [B<-h> | B<--help> | B<-v> | B<--version>]
 =head1 DESCRIPTION
 
 Generates a stateless and a statelite image that can be used to boot xCAT nodes in a diskless mode.  
-If I<imagename> is not specified, the default packages included
-(and excluded) in the image are specified by 
 
+The I<imagename> format of the command is recommended.  When specified, genimage will use the osimage definition for information to generate this image.  Additional options specified on the command line will override any corresponding previous osimage settings, and will be written back to the osimage definition.
+
+If I<imagename> is not specified (old method):
+   -  the default packages included (and excluded) in the image are specified by 
 /opt/xcat/share/xcat/netboot/<os>/<profile>[.<osver>][.<arch>].pkglist and
 
 /opt/xcat/share/xcat/netboot/<os>/<profile>[.<osver>][.<arch>].exlist. 
 
-Additional packages that are not from the os distro can be specified in a 
+   - Additional packages that are not from the os distro can be specified in a 
 
 /opt/xcat/share/xcat/netboot/<os>/<profile>[.<osver>][.<arch>].otherpkgs.pkglist file.
 
-Customized package list files can be specified under /install/custom/netboot/<os> directory. The generated image will be put in /install/netboot/<osver>/<arch>/<profile> directory.
+   - Customized package list files will override these files and can be specified under /install/custom/netboot/<os> directory. 
+   - The generated image will be put in /install/netboot/<osver>/<arch>/<profile> directory.
 
-The newly generated image names will have the following format:
+   - osimage definitions will be created in the I<linuximage> and I<osimage> tables.  The newly generated image names will have the following format:
 
- for stateless: <osver>-<arch>-netboot-<profile>
+       for stateless: <osver>-<arch>-netboot-<profile>
 
- for statelite: <osver>-<arch>-statelite-<profile>
+       for statelite: <osver>-<arch>-statelite-<profile>
 
-B<genimage> command will create them into I<linuximage> and I<osimage> tables.
-
-If I<imagename> is specified, the package list file names are read from the I<osimage> table and I<linuximage> tables. 
 
 If B<genimage> runs on the management node, both the I<osimage> table and I<linuximage> table will be updated with the given values from the options.
 
 The B<genimage> command will generate two initial ramdisks for B<stateless> and B<statelite>, one is B<initrd-stateless.gz>, the other one is B<initrd-statelite.gz>.
 
-After your image is created, you can chroot to the
+After your image is generated, you can chroot to the
 image, install any additional software you would like, or make modifications to files, and then run the following command to prepare the image for deployment.
 
 for stateless: B<packimage>
 
 for statelite: B<liteimg>
 
-Becides prompting for the input for some paramters, the B<genimage> command takes default quesses for the parameters not specified or not defined in the I<osimage> and I<linuximage> tables. It also makes default answers for questions from yum/zypper command when installing rpms into the image. Please use --interactive flag if you want yum/zypper command to prompt you for the answers.  
+Besides prompting for some paramter values, the B<genimage> command takes default guesses for the parameters not specified or not defined in the I<osimage> and I<linuximage> tables. It also assumes default answers for questions from the yum/zypper command when installing rpms into the image. Please use --interactive flag if you want the yum/zypper command to prompt you for the answers.  
 
-If B<--onlyinitrd> is specified, only regenerates the initrd for a stateless image to be used for a diskless install.
+If B<--onlyinitrd> is specified, genimage only regenerates the initrd for a stateless image to be used for a diskless install.
 
 The B<genimage> command must be run on a system that is the same architecture and same distro with same major release version as the nodes it will be
 used on.  If the management node is not the same architecture or same distro level, copy the contents of
@@ -61,10 +61,9 @@ used on.  If the management node is not the same architecture or same distro lev
 the management node to that system. Then change directory to /opt/xcat/share/xcat/netboot/<os> and run ./genimage.
 
 
- 
 =head1 Parameters
 
-I<imagename> specifies the name of a os image definition to be used. The specification for the image is storted in the I<osimage> table and I<linuximage> table.
+I<imagename> specifies the name of an os image definition to be used. The specification for the image is stored in the I<osimage> table and I<linuximage> table.
 
 
 =head1 OPTIONS
@@ -88,7 +87,7 @@ the nodes' nodetype.profile attribute must be set to this same value.
 
 =item B<-i> I<nodebootif>
 
-The network interface the diskless node will boot over (e.g. eth0).
+This argument is now optional, and allows you to specify the network boot interface to be configured in the image (e.g. eth0). If not specified, the interface will be determined and configured during the network boot process.
 
 =item B<-n> I<nodenetdrivers>
 
@@ -183,46 +182,53 @@ To prompt the user for inputs:
   genimage
 
 =item 2
+To generate an image using information from an osimage definition:
 
-To generate a fedora8 image for a compute node architecture
+  genimage myimagename
+
+=item 3
+To run genimage in test mode without actually generating an image:
+
+  genimage --dryrun  myimagename
+
+=item 4
+To generate an image and have yum/zypper prompt for responses:
+
+  genimage myimagename --interactive
+
+=item 5
+To generate an image, replacing some values in the osimage definition:
+
+  genimage -i eth0 -n tg3 myimagename
+
+=item 6
+(old method) To generate a fedora8 image for a compute node architecture
 x86_64 and place it in the
 /install/netboot/fedora8/x86_64/compute/rootimg directory:
 
   genimage -i eth0 -o fedora8 -p compute
 
-=item 3
+=item 7
+(old method)
 
   genimage -i eth0 -r eth1,eth2 -n tg3,bnx2 -o centos5.1 -p compute
 
-=item 4
+=item 8
+(old method)
 
   genimage -i eth0 -n tg3,bnx2 -o sles11 -p compute --interactive
 
-=item 5
+=item 9
+(old method)
 
   genimage -i eth0 -n igb,e1000e,e1000,bnx2,tg3 -o centos5.4 -p nfsroot --permission 777
 
-=item 6
-
-  genimage -i eth0 -n tg3 myimagename
-
-=item 7
-
-  genimage myimagename
-
-=item 8
-
-  genimage myimagename --interactive
-
-=item 9
-
-To regenerate the initrd for a fedora8 image for a compute node architecture x86_64 and place it in the /install/netboot/fedora8/x86_64/compute/rootimg directory:  change directory to /opt/xcat/share/xcat/netboot/fedora and run:
-
-  genimage --onlyinitrd -i eth0 -n tg3,bnx2 -o fedora8 -p compute
-
 =item 10
+(old method)
+To regenerate the initrd for a fedora8 image for a compute node architecture x86_64 and place it in the /install/netboot/fedora8/x86_64/compute/rootimg directory:  
 
-  genimage --dryrun  myimagename
+  cd /opt/xcat/share/xcat/netboot/fedora 
+  ./genimage --onlyinitrd -i eth0 -n tg3,bnx2 -o fedora8 -p compute
 
 
 =back

xCAT-client/pods/man1/mkvm.1.pod

@@ -24,6 +24,7 @@ B<mkvm> I<noderange> [B<--full>]
 
 B<mkvm> I<noderange> [B<vmcpus=min/req/max>] [B<vmmemory=min/req/max>]
                [B<vmphyslots=drc_index1,drc_index2...>] [B<vmothersetting=hugepage:N,bsr:N>]
+               [B<vmnics=vlan1[,vlan2..]]> [B<vmstorage=<N|viosnode:slotid>>] [B<--vios>]
 
 =head2 For KVM:
 
@@ -55,7 +56,7 @@ Please note that the mkvm command currently only supports creating standard LPAR
 
 With option I<full>, a partition using all the resources on a normal power machine will be created.
 
-If no option is specified, a partition using the parameters specified with attributes such as 'vmcpus', 'vmmory', 'vmphyslots', 'vmothersetting' will be created. Those attributes can either be specified with '*def' commands running before or be specified with this command.
+If no option is specified, a partition using the parameters specified with attributes such as 'vmcpus', 'vmmory', 'vmphyslots', 'vmothersetting', 'vmnics', 'vmstorage' will be created. Those attributes can either be specified with '*def' commands running before or be specified with this command.
 
 =head2 For KVM and Vmware:
 
@@ -89,9 +90,11 @@ The cpu count which will be created for the kvm/vmware virtual machine.
 
 Request to create a new full system partition for each CEC.
 
-=item B<vmcpus=value> B<vmmemory=value> B<vmphyslots=value> B<vmothersetting=value>
+=item B<vmcpus=value> B<vmmemory=value> B<vmphyslots=value> B<vmothersetting=value> B<vmnics=value> B<vmstorage=value> [B<--vios>]
 
-To specify the parameters which are used to create a partition. The I<vmcpus>, I<vmmemory> and I<vmphyslots> are necessay, and the value specified with this command have a more high priority. If the value of any of the three options is not specified, the corresponding value specified for the node object will be used. If any of the three attributes is neither specified with this command nor specified with the node object, error information will be returned. To reference to L<lsvm(1)|lsvm.1> for more information about 'drc_index' for I<vmphyslots>.  
+To specify the parameters which are used to create a partition. The I<vmcpus>, I<vmmemory> are necessay, and the value specified with this command have a more high priority. If the value of any of the three options is not specified, the corresponding value specified for the node object will be used. If any of the three attributes is neither specified with this command nor specified with the node object, error information will be returned. To reference to L<lsvm(1)|lsvm.1> for more information about 'drc_index' for I<vmphyslots>.  
+
+The option I<vios> is used to specify the partition that will be created is a VIOS partition. If specified, the value for I<vmstorage> shall be number which indicate the number of vSCSI server adapter will be created, and if no value specified for I<vmphyslots>, all the physical slot of the power machine will be asigned to VIOS partition. If not specified, it shall be in form of I<vios_name:server_slotid> to specify the vios and the virtual slot id of the vSCSI server adapter that will be connected from the Logical partition.
 
 =item B<-f|--force>
 
@@ -318,6 +321,32 @@ The output is similar to:
  lpar1: 1/2/2
  lpar1: 128.
 
+10. To create a vios partition using some of the resources on normal power machine.
+
+ mkvm viosnode vmcpus=1/4/16 vmmemory=1G/4G/32G vmphyslots=0x21010201,0x21010200 vmnics=vlan1 vmstorage=5 --vios
+
+The resouces for the node is similar to:
+
+ viosnode: Lpar Processor Info:
+ Curr Processor Min: 1.
+ Curr Processor Req: 4.
+ Curr Processor Max: 16.
+ viosnode: Lpar Memory Info:
+ Curr Memory Min: 1.00 GB(4 regions).
+ Curr Memory Req: 4.00 GB(16 regions).
+ Curr Memory Max: 32.00 GB(128 regions).
+ viosnode: 1,513,U78AA.001.WZSGVU7-P1-T7,0x21010201,0xc03(USB Controller)
+ viosnode: 1,512,U78AA.001.WZSGVU7-P1-T9,0x21010200,0x104(RAID Controller)
+ viosnode: 1,0,U8205.E6B.0612BAR-V1-C,0x30000000,vSerial Server
+ viosnode: 1,1,U8205.E6B.0612BAR-V1-C1,0x30000001,vSerial Server
+ viosnode: 1,3,U8205.E6B.0612BAR-V1-C3,0x30000003,vEth (port_vlanid=1,mac_addr=4211509276a7)
+ viosnode: 1,5,U8205.E6B.0612BAR-V1-C5,0x30000005,vSCSI Server
+ viosnode: 1,6,U8205.E6B.0612BAR-V1-C6,0x30000006,vSCSI Server
+ viosnode: 1,7,U8205.E6B.0612BAR-V1-C7,0x30000007,vSCSI Server
+ viosnode: 1,8,U8205.E6B.0612BAR-V1-C8,0x30000008,vSCSI Server
+ viosnode: 1,9,U8205.E6B.0612BAR-V1-C9,0x30000009,vSCSI Server
+ viosnode: 0/0/0
+ viosnode: 0.
 
 =head1 FILES
 

xCAT-client/pods/man1/mkzone.1.pod

@@ -0,0 +1,121 @@
+=head1 B<NAME>
+
+B<mkzone> - Defines a new zone in the cluster. 
+
+=head1 B<SYNOPSIS>
+
+B<mkzone> <zonename>  [B<--defaultzone>] [B<-k> I<full path to the ssh RSA private key>] [B<-a> I<noderange>] [B<-g>] [B<-f>] [B<-s> I<yes|no>] [-V] 
+
+B<mkzone> [B<-h> | B<-v>]
+
+=head1 B<DESCRIPTION>
+
+The B<mkzone> command is designed to divide the xCAT cluster into multiple zones. The nodes in each zone will share common root ssh keys. This allows the nodes in a zone to be able to as root ssh to each other without password, but cannot do the same to any node in another zone. All zones share a common xCAT Management Node and database including the site table, which defines the attributes of the entire cluster.
+The mkzone command is only supported on Linux ( No AIX support).
+The nodes are not updated with the new root ssh keys by mkzone.  You must run updatenode -k  or xdsh -K to the nodes to update the root ssh keys to the new generated zone keys. This will also sync any service nodes with the zone keys, if you have a hierarchical cluster.   
+Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur.
+
+=head1 B<OPTIONS>
+
+=over 5
+
+=item B<-h>|B<--help> 
+
+Displays usage information. 
+
+=item B<-v>|B<--version> 
+
+Displays command version and build date. 
+
+=item B<-k | --sshkeypath> I<full path to the ssh RSA private key>
+
+This is the path to the id_rsa key that will be used to build root's ssh keys for the zone. If -k is used, it will generate the ssh public key from the input ssh RSA private key and store both in /etc/xcat/sshkeys/<zonename>/.ssh directory.
+If -f is not used,  then it will generate a set of root ssh keys for the zone and store them in /etc/xcat/sshkeys/<zonename>/.ssh.
+
+=item B<--default>
+
+if --defaultzone is input, then it will set the zone defaultzone attribute to yes; otherwise it will set to no.
+if --defaultzone is input and another zone is currently the default,
+then the -f flag must be used to force a change to the new defaultzone.
+If -f flag is not use an error will be returned and no change made. 
+Note: if any zones in the zone table, there must be one and only one defaultzone. Otherwise, errors will occur.
+
+=item B<-a | --addnoderange> I<noderange>
+
+For each node in the noderange, it will set the zonename attribute for that node to the input zonename.
+If the -g flag is also on the command, then
+it will add the group name "zonename" to each node in the noderange.
+
+=item B<-s| --sshbetweennodes> B<yes|no>
+
+If -s entered, the zone sshbetweennodes attribute will be set to yes or no. It defaults to yes. When this is set to yes, then ssh will be setup
+to allow passwordless root access between nodes.  If no, then root will be prompted for a password when running ssh between the nodes in the zone. 
+
+=item B<-f | --force> 
+
+Used with the (--defaultzone) flag to override the current default zone.
+
+=item B<-g | --assigngroup> 
+
+Used with the (-a) flag to create the group zonename for all nodes in the input noderange.
+
+=item B<-V>|B<--Verbose>
+
+Verbose mode.
+
+=back
+
+=head1 B<Examples>
+
+=over 3
+
+=item *
+
+To make a new zone1 using defaults , enter:
+
+B<mkzone> I<zone1>
+
+Note: with the first mkzone, you will automatically get the xcatdefault zone created as the default zone.  This zone uses ssh keys from
+      <roothome>/.ssh directory.  
+
+=item *
+
+To make a new zone2 using defaults and make it the default zone enter:
+
+B<mkzone> I<zone2> --defaultzone -f
+
+=item *
+
+To make a new zone2A using the ssh id_rsa private key in /root/.ssh:
+
+B<mkzone> I<zone2A> -k /root/.ssh 
+
+=item *
+
+To make a new zone3 and assign the noderange compute3 to the zone  enter:
+
+B<mkzone> I<zone3>  -a compute3
+
+=item *
+
+To make a new zone4 and assign the noderange compute4 to the zone and add zone4 as a group to each node  enter:
+
+B<mkzone> I<zone4>  -a compute4  -g
+
+=item *
+
+To make a new zone5 and assign the noderange compute5 to the zone and add zone5 as a group to each node but not allow passwordless ssh between the nodes  enter:
+
+B<mkzone> I<zone5>  -a compute5  -g -s no
+
+=back
+
+B<Files>
+
+B</opt/xcat/bin/mkzone/>
+
+Location of the mkzone command.
+
+=head1 B<SEE ALSO>
+
+L<chzone(1)|chzone.1>, L<rmzone(1)|rmzone.1>, L<xdsh(1)|xdsh.1>, L<updatenode(1)|updatenode.1>