diff --git a/xCAT-test/autotest/testcase/chkosimage/cases0 b/xCAT-test/autotest/testcase/chkosimage/cases0
deleted file mode 100644
index a5f312a6f..000000000
--- a/xCAT-test/autotest/testcase/chkosimage/cases0
+++ /dev/null
@@ -1,44 +0,0 @@
-start:chkosimage_h
-description:chkosimage -h and --help
-os:AIX
-cmd:chkosimage -h
-check:output=~usage|Usage
-cmd:chkosimage --help
-check:output=~usage|Usage
-end
-
-
-start:chkosimage_imagename
-description: chkosimage autotest
-os:AIX
-cmd:mknimimage -V -s $$SOURCE autotest
-check:rc==0
-cmd:lsnim | grep autotest
-check:rc==0
-check:output=~lpp_source
-check:output=~spot
-check:output=~bosinst_data
-cmd:nim -o update -a packages=all -a source=$$SSHPKG autotest_lpp_source
-check:rc==0
-cmd:mkdir -p /install/nim/installp_bundle
-cmd:cp $$SSHPKG/xCATaixCN71.bnd /install/nim/installp_bundle/
-check:rc==0
-cmd:nim -o define -t installp_bundle -a server=master -a location=/install/nim/installp_bundle/xCATaixCN71.bnd xCATaixCN71
-cmd:chdef -t osimage -o autotest installp_bundle="xCATaixCN71"
-check:rc==0
-cmd:chkosimage autotest
-check:rc==0
-end
-
-start:chkosimage_V_c_imagename
-description:chkosimage -V -c autotest
-os:AIX
-cmd:lsnim | grep autotest
-check:rc==0
-check:output=~lpp_source
-check:output=~spot
-check:output=~bosinst_data
-cmd:chkosimage -V -c autotest
-check:rc==0
-end
-
diff --git a/xCAT-test/autotest/testcase/installation/Diskless_installation_flat_p8_le b/xCAT-test/autotest/testcase/installation/Diskless_installation_flat_p8_le
deleted file mode 100644
index 95cfd0751..000000000
--- a/xCAT-test/autotest/testcase/installation/Diskless_installation_flat_p8_le
+++ /dev/null
@@ -1,60 +0,0 @@
-start:Diskless_installation_flat_p8_le
-os:Linux
-
-cmd:copycds $$ISO
-check:rc==0
-cmd:makedns -n
-check:rc==0
-cmd:makedhcp -n
-check:rc==0
-cmd:makedhcp -a
-check:rc==0
-cmd:makeconservercf $$CN
-check:rc==0
-cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then mv $rootimgdir $rootimgdir.regbak -f;fi
-check:rc==0
-
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then if [ ! -d /install/custom/netboot/sles ]; then mkdir -p /install/custom/netboot/sles; fi; elif cat /etc/*release |grep "Red Hat" >/dev/null;then if [ ! -d /install/custom/netboot/rh ]; then mkdir -p /install/custom/netboot/rh; fi; elif cat /etc/*release |grep "Ubuntu"  >/dev/null;then if   [ ! -d /install/custom/netboot/ubuntu ]; then mkdir -p /install/custom/netboot/ubuntu; fi; fi
-check:rc==0
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then if [ ! -e /install/custom/netboot/sles/compute.synclist ]; then echo "/etc/resolv.conf -> /etc/resolv.conf" > /install/custom/netboot/sles/compute.synclist; fi; elif cat /etc/*release |grep "Red Hat" >/dev/null;then if [ ! -e /install/custom/netboot/rh/compute.synclist ]; then echo "/etc/resolv.conf -> /etc/resolv.conf" > /install/custom/netboot/rh/compute.synclist; fi; elif cat /etc/*release |grep "Ubuntu"  >/dev/null;then if  [ ! -e /install/custom/netboot/ubuntu/compute.synclist ]; then echo "/etc/resolv.conf -> /etc/resolv.conf" > /install/custom/netboot/ubuntu/compute.synclist;fi; fi
-check:rc==0
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute synclists=/install/custom/netboot/sles/compute.synclist; elif cat /etc/*release |grep "Red Hat" >/dev/null;then chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute synclists=/install/custom/netboot/rh/compute.synclist;elif  cat /etc/*release |grep "Ubuntu"  >/dev/null; then chdef -t osimage -o __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute synclists=/install/custom/netboot/ubuntu/compute.synclist;fi
-check:rc==0
-cmd:if [ ! -d /tmp/mountoutput ]; then mkdir -p /tmp/mountoutput; fi
-cmd:mount |sort > /tmp/mountoutput/file.org
-cmd:cat /tmp/mountoutput/file.org
-cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
-check:rc==0
-cmd:mount |sort > /tmp/mountoutput/file.new
-cmd:cat /tmp/mountoutput/file.new
-cmd:diff /tmp/mountoutput/file.org /tmp/mountoutput/file.new
-check:rc==0
-cmd:rm -rf /tmp/mountoutput
-cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
-check:rc==0
-cmd:chdef $$CN status=
-check:rc==0
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
-check:rc==0
-check:output=~Provision node\(s\)\: $$CN
-cmd:sleep 200 
-cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 100 ];then break;fi done
-cmd:lsdef -l $$CN | grep status
-check:output=~booted
-cmd:xdsh $$CN date
-check:rc==0
-check:output=~\d\d:\d\d:\d\d
-cmd:xdsh $$CN  "cat /var/log/xcat/xcat.log"
-cmd:rinstall $$CN osimage
-check:rc==0
-cmd:sleep 200
-cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 100 ];then break;fi done
-cmd:lsdef -l $$CN | grep status
-check:output=~booted
-cmd:xdsh $$CN date
-check:rc==0
-check:output=~\d\d:\d\d:\d\d
-cmd:xdsh $$CN  "cat /var/log/xcat/xcat.log"
-cmd:rootimgdir=`lsdef -t osimage  __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi
-check:rc==0
-end
diff --git a/xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le b/xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le
deleted file mode 100644
index c7d72b166..000000000
--- a/xCAT-test/autotest/testcase/installation/Full_installation_flat_p8_le
+++ /dev/null
@@ -1,46 +0,0 @@
-start:Full_installation_flat_p8_le
-os:Linux
-
-cmd:copycds $$ISO
-check:rc==0
-cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]];then mkdir /tmp/iso; mount -o loop $$MINIISO /tmp/iso ;  mkdir -p  /install/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/install/netboot; cp  /tmp/iso/install/initrd.gz  /install/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/install/netboot;umount /tmp/iso; rmdir /tmp/iso; fi
-check:rc==0
-cmd:chtab key=extntpservers site.value=""
-check:rc==0
-cmd:chtab key=ntpservers site.value="<xcatmaster>"
-check:rc==0
-cmd:makentp
-check:rc==0
-cmd:makedhcp -n
-check:rc==0
-cmd:makedhcp -a
-check:rc==0
-cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
-check:rc==0
-cmd:makedns -n
-check:rc==0
-cmd:makeconservercf $$CN
-check:rc==0
-cmd:cat /etc/conserver.cf | grep $$CN
-check:output=~$$CN
-cmd:if [ "__GETNODEATTR($$CN,os)__" != "sles12.1" ];then chdef -t node -o $$CN postscripts=setupntp; fi
-cmd:lsdef -l $$CN
-check:rc==0
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
-check:rc==0
-check:output=~Provision node\(s\)\: $$CN
-cmd:sleep 600
-cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 60;((a++));if [ $a -gt 50 ];then break;fi done
-cmd:ping $$CN -c 3
-check:output=~64 bytes from $$CN
-cmd:lsdef -l $$CN | grep status
-check:output=~booted
-cmd:xdsh $$CN date
-check:rc==0
-check:output=~\d\d:\d\d:\d\d
-#comment for futher discussion.
-#cmd:xdsh $$CN service ntpd status
-#check:rc==0
-#check:output=~running
-cmd:xdsh $$CN  "cat /var/log/xcat/xcat.log"
-end
diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy b/xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy
deleted file mode 100644
index b79e4e9fd..000000000
--- a/xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy
+++ /dev/null
@@ -1,99 +0,0 @@
-start:reg_linux_SN_installation_hierarchy
-os:Linux
-
-cmd:chtab key=nameservers site.value="<xcatmaster>"
-check:rc==0
-cmd:makedns -n
-check:rc==0
-cmd:makeconservercf 
-check:rc==0
-cmd:cat /etc/conserver.cf | grep $$SN
-check:output=~$$SN
-cmd:sleep 20
-cmd:if [[ "__GETNODEATTR($$SN,arch)__" =~ "ppc64" ]]; then getmacs -D $$SN; fi
-check:rc==0
-cmd:makedhcp -n
-check:rc==0
-cmd:makedhcp -a
-check:rc==0
-cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$SN);[ $? -ne 0 ] && exit 1;echo $output|grep $$SN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
-check:rc==0
-cmd:chdef -t node $$SN groups=service,all
-check:rc==0
-cmd:chdef -t group -o service profile=service  primarynic=mac installnic=mac
-check:rc==0
-cmd:chdef -t group -o service setupnfs=1 setupdhcp=1 setuptftp=1 setupnameserver=1 setupconserver=1
-check:rc==0
-cmd:chdef -t group -o service nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN monserver=$$MN
-check:rc==0
-cmd:chtab node=service postscripts.postscripts="servicenode"
-check:rc==0
-
-cmd:copycds $$ISO
-check:rc==0
-
-cmd:chdef -t site clustersite installloc="/install"
-check:rc==0
-
-cmd:cd /install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/xcat/xcat-core && createrepo .  
-check:rc==0
-#cmd:if cat /etc/*release |grep SUSE >/dev/null;then ver=`cat /etc/*release |grep "VERSION = " | sed 's:VERSION = \(.*\):\1:g'`; cd /install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/xcat/xcat-dep/sles$ver/__GETNODEATTR($$SN,arch)__ && createrepo . ;elif cat /etc/*release |grep "Red Hat" >/dev/null;then ver=`cat /etc/*release |awk '{print $7}' |awk -F"." '{print $1}'|head -n 1`;cd /install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__/xcat/xcat-dep/rh$ver/__GETNODEATTR($$SN,arch)__ && createrepo . ;fi
-#check:rc==0
-
-cmd:chdef -t osimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-install-service otherpkgdir=/install/post/otherpkgs/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__
-check:rc==0
-#cmd:if cat /etc/*release |grep SUSE >/dev/null;then ver=`cat /etc/*release |grep "VERSION = " | sed 's:VERSION = \(.*\):\1:g'`; chdef -t osimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-install-service otherpkglist=/opt/xcat/share/xcat/install/sles/service.sles$ver.__GETNODEATTR($$SN,arch)__.otherpkgs.pkglist; elif cat /etc/*release |grep "Red Hat" >/dev/null;then ver=`cat /etc/*release |awk '{print $7}' |awk -F"." '{print $1}'|head -n 1`;chdef -t osimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-install-service otherpkglist=/opt/xcat/share/xcat/install/rh/service.rhels$ver.__GETNODEATTR($$SN,arch)__.otherpkgs.pkglist;fi
-#cmd:if cat /etc/*release |grep SUSE >/dev/null;then ver=`cat /etc/*release |grep "VERSION = " | sed 's:VERSION = \(.*\):\1:g'`; chdef -t osimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-install-service otherpkglist=/opt/xcat/share/xcat/install/sles/service.sles$ver.__GETNODEATTR($$SN,arch)__.otherpkgs.pkglist; elif cat /etc/*release |grep "Red Hat" >/dev/null;then chdef -t osimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-install-service otherpkglist=/opt/xcat/share/xcat/install/rh/service.__GETNODEATTR($$SN,os).__GETNODEATTR($$SN,arch)__.otherpkgs.pkglist;fi
-#check:rc==0
-
-cmd:if cat /etc/*release |grep SUSE >/dev/null;then ver=`cat /etc/*release |grep "VERSION = " | sed 's:VERSION = \(.*\):\1:g'`; chdef -t osimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-install-service otherpkglist=/opt/xcat/share/xcat/install/sles/service.sles$ver.__GETNODEATTR($$SN,arch)__.otherpkgs.pkglist; elif cat /etc/*release |grep "7.0" |grep "Red Hat">/dev/null;then chdef -t osimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-install-service otherpkglist=/opt/xcat/share/xcat/install/rh/service.__GETNODEATTR($$SN,os)__.ppc64.otherpkgs.pkglist;elif cat /etc/*release |grep "Red Hat" |grep "6.5">/dev/null;then ver=`cat /etc/*release |awk '{print $7}' |awk -F"." '{print $1}'|head -n 1`;chdef -t osimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-install-service otherpkglist=/opt/xcat/share/xcat/install/rh/service.rhels$ver.__GETNODEATTR($$SN,arch)__.otherpkgs.pkglist;fi
-
-check:rc==0
-
-#cmd:if cat /etc/*release |grep SUSE >/dev/null;then ver=`cat /etc/*release |grep "VERSION = " | sed 's:VERSION = \(.*\):\1:g'`;for i in mysql-client libmysqlclient_r15 libqt4-sql-mysql libmysqlclient15 perl-DBD-mysql mysql; do  cat /opt/xcat/share/xcat/install/sles/service.sles$ver.pkglist|grep "$i$";if [ $? -ne 0 ] ; then echo "$i" >> /opt/xcat/share/xcat/install/sles/service.sles$ver.pkglist; fi done; elif cat /etc/*release |grep "Red Hat" >/dev/null;then ver=`cat /etc/*release |awk '{print $7}' |awk -F"." '{print $1}'|head -n 1`;for i in mysql; do cat /opt/xcat/share/xcat/install/rh/service.rhels$ver.ppc64.pkglist|grep "$i$";if [ $? -ne 0 ] ; then echo "$i" >> /opt/xcat/share/xcat/install/rh/service.rhels$ver.ppc64.pkglist; fi done;fi
-#cmd:if cat /etc/*release |grep SUSE >/dev/null;then ver=`cat /etc/*release |grep "VERSION = " | sed 's:VERSION = \(.*\):\1:g'`;for i in  mariadb-devel-5.5.35-3.el7  mariadb-libs-5.5.35-3.el7  mariadb-server-5.5.35-3.el7 mariadb-bench-5.5.35-3.el7 mariadb-5.5.35-3.el7  perl-DBD-MySQL  mysql-connector-odbc unixODBC; do  cat /opt/xcat/share/xcat/install/sles/service.sles$ver.pkglist|grep "$i$";if [ $? -ne 0 ] ; then echo "$i" >> /opt/xcat/share/xcat/install/sles/service.sles$ver.pkglist; fi done; elif cat /etc/*release |grep "Red Hat" >/dev/null;then ver=__GETNODEATTR($$SN,os)__;for i in mysql; do cat /opt/xcat/share/xcat/install/rh/service.$ver.ppc64.pkglist|grep "$i$";if [ $? -ne 0 ] ; then echo "$i" >> /opt/xcat/share/xcat/install/rh/service.$ver.ppc64.pkglist; fi done;fi
-check:rc==0
-#cmd:if cat /etc/*release |grep SUSE >/dev/null;then ver=`cat /etc/*release |grep "VERSION = " | sed 's:VERSION = \(.*\):\1:g'`;chdef -t osimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-install-service pkglist=/opt/xcat/share/xcat/install/sles/service.sles$ver.pkglist; elif cat /etc/*release |grep "Red Hat" >/dev/null;then ver=`cat /etc/*release |awk '{print $7}' |awk -F"." '{print $1}'|head -n 1`;chdef -t osimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-install-service pkglist=/opt/xcat/share/xcat/install/rh/service.rhels$ver.__GETNODEATTR($$SN,arch)__.pkglist;fi
-check:rc==0
-cmd:chdef -t osimage __GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-install-service pkgdir="/install/__GETNODEATTR($$SN,os)__/__GETNODEATTR($$SN,arch)__"
-check:rc==0
-
-cmd:rinstall $$SN osimage=__GETNODEATTR($$SN,os)__-__GETNODEATTR($$SN,arch)__-install-service
-check:rc==0
-check:output=~Provision node\(s\)\: $$SN
-
-cmd:sleep 600
-cmd:a=0;while ! `lsdef -l $$SN|grep status|grep booted >/dev/null`; do sleep 60;((a++));if [ $a -gt 70 ];then break;fi done
-
-cmd:ping $$SN -c 3
-check:rc==0
-check:output=~64 bytes from $$SN
-cmd:lsdef -l $$SN | grep status
-check:rc==0
-check:output=~booted
-cmd:xdsh $$SN date
-check:rc==0
-check:output=~\d\d:\d\d:\d\d
-cmd:xdsh $$SN "ps -ef |grep xcatd"
-check:rc==0
-check:output=~xcatd:
-cmd:xdsh $$SN "lsdef"
-check:rc==0
-check:output=~$$SN: $$SN
-cmd:xdsh $$SN "tabdump site"
-check:rc==0
-check:output=~tftpdir 
-cmd:xdsh $$SN "mount"
-check:rc==0
-check:output=~/install on /install
-cmd:xdsh $$SN "mount"
-check:rc==0
-check:output=~/tftpboot on /tftpboot
-#cmd:xdsh $$SN "nslookup $$CN"
-#check:rc==0
-#check:output!~server can't find $$CN
-
-cmd:if [[ "__GETNODEATTR($$SN,arch)__" =~ "x86_64" ]]; then if cat /etc/*release |grep SUSE >/dev/null;then xdsh $$SN "zypper -n install perl-Sys-Virt"; elif cat /etc/*release |grep "Red Hat" >/dev/null;then xdsh $$SN "yum install -y perl-Sys-Virt";fi;fi
-check:rc==0
-cmd:xdsh $$CN  "cat /var/log/xcat/xcat.log"
-end
diff --git a/xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_vm b/xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_vm
deleted file mode 100644
index 107cca3dc..000000000
--- a/xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_vm
+++ /dev/null
@@ -1,50 +0,0 @@
-start:Ubuntu_diskless_installation_flat_x86_vm
-os:Linux
-
-cmd:copycds $$ISO
-check:rc==0
-cmd:if [[ "__GETNODEATTR($$CN,arch)__" != "ppc64" ]]; then tabdump -w node==$$CN kvm_nodedata; fi
-check:rc=0
-#comment for vm debug
-#cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64"  -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [[ "__GETNODEATTR($$CN,vmstorage)__" =~ "phy" ]]; then rmvm $$CN -f -p; mkvm $$CN; else rmvm $$CN -f -p ;mkvm $$CN -s 20G; fi;fi
-cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64"  -a  "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then if [[ "__GETNODEATTR($$CN,vmstorage)__" =~ "phy" ]]; then rmvm $$CN -f -p; mkvm $$CN; else rmvm $$CN -f -p;mkvm $$CN;rmvm $$CN -f -p;mkvm $$CN -s 20G; fi;fi
-check:rc=0
-cmd:makedns -n
-check:rc==0
-cmd:makedhcp -n
-check:rc==0
-cmd:makedhcp -a
-check:rc==0
-cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
-check:rc==0
-cmd:makeconservercf $$CN
-check:rc==0
-cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then mv $rootimgdir $rootimgdir.regbak -f;fi
-check:rc==0
-cmd:genimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
-check:rc==0
-cmd:packimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
-check:rc==0
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute
-check:rc==0
-check:output=~Provision node\(s\)\: $$CN
-cmd:sleep 200 
-cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 300 ];then break;fi done
-cmd:lsdef -l $$CN | grep status
-check:output=~booted
-cmd:xdsh $$CN date
-check:rc==0
-check:output=~\d\d:\d\d:\d\d
-cmd:xdsh $$CN  "cat /var/log/xcat/xcat.log"
-cmd:rinstall $$CN osimage
-check:rc==0
-cmd:sleep 200
-cmd:lsdef -l $$CN | grep status
-check:output=~booted
-cmd:xdsh $$CN date
-check:rc==0
-check:output=~\d\d:\d\d:\d\d
-cmd:xdsh $$CN  "cat /var/log/xcat/xcat.log"
-cmd:rootimgdir=`lsdef -t osimage  __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir.regbak ]; then rm -rf $rootimgdir; mv $rootimgdir.regbak $rootimgdir; fi
-check:rc==0
-end
diff --git a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm
deleted file mode 100644
index 35f0dd22b..000000000
--- a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm
+++ /dev/null
@@ -1,32 +0,0 @@
-start:Ubuntu_full_installation_flat_x86_vm
-os:Linux
-
-cmd:copycds $$ISO
-check:rc==0
-cmd:makedns -n
-check:rc==0
-cmd:sleep 60
-cmd:makedhcp -n
-check:rc==0
-cmd:makedhcp -a
-check:rc==0
-cmd:a=0;while true; do [ $a -eq 100 ] && exit 1;output=$(makedhcp -q $$CN);[ $? -ne 0 ] && exit 1;echo $output|grep $$CN 2>/dev/null && exit 0;a=$[$a+1];sleep 1;done
-check:rc==0
-cmd:makeconservercf $$CN
-check:rc==0
-cmd:cat /etc/conserver.cf | grep $$CN
-check:output=~$$CN
-cmd:rinstall $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
-check:rc==0
-check:output=~Provision node\(s\)\: $$CN
-cmd:sleep 300
-cmd:a=0;while ! `lsdef -l $$CN|grep status|grep booted >/dev/null`; do sleep 10;((a++));if [ $a -gt 300 ];then break;fi done
-cmd:ping $$CN -c 3
-check:output=~64 bytes from $$CN
-cmd:lsdef -l $$CN | grep status
-check:output=~booted
-cmd:xdsh $$CN date
-check:rc==0
-check:output=~\d\d:\d\d:\d\d
-cmd:xdsh $$CN  "cat /var/log/xcat/xcat.log"
-end
diff --git a/xCAT-test/autotest/testcase/makedhcp/cases0 b/xCAT-test/autotest/testcase/makedhcp/cases0
index d676640ba..91535b814 100644
--- a/xCAT-test/autotest/testcase/makedhcp/cases0
+++ b/xCAT-test/autotest/testcase/makedhcp/cases0
@@ -42,19 +42,6 @@ check:output=~dhcpd
 cmd:if [ -f "/etc/dhcp/dhcpd.conf" ];then mv -f /etc/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf.bak ; elif [ -f "/etc/dhcpd.conf" ]; then mv -f /etc/dhcpd.conf /etc/dhcpd.conf.bak; fi
 end
 
-start:makedhcp_n_aix
-description:Create a new dhcp configuration file with a network statement for each network the dhcp daemon should listen on
-os:Aix
-cmd:mv -f /etc/dhcpsd.cnf /etc/dhcpsd.conf.bak
-cmd:makedhcp -n
-check:rc==0
-cmd:ls /etc/dhcpsd.cnf
-check:rc==0
-cmd:ps -e | grep dhcpd
-check:rc==0
-check:output=~dhcpd
-end
-
 start:makedhcp_a_linux
 description:Define all nodes to the DHCP server. (Will only add nodes that can be reached, network-wise, by this DHCP server.) The dhcp daemon does not have to be restarted after this.
 os:Linux
diff --git a/xCAT-test/autotest/testcase/makenetworks/cases0 b/xCAT-test/autotest/testcase/makenetworks/cases0
index 11d24da82..def304fe6 100644
--- a/xCAT-test/autotest/testcase/makenetworks/cases0
+++ b/xCAT-test/autotest/testcase/makenetworks/cases0
@@ -19,19 +19,6 @@ check:rc==0
 check:output=~Version
 end
 
-start:makenetworks_d
-os:AIX
-cmd:makenetworks -d > /tmp/mynetworksstanzas
-check:rc==0
-cmd:echo  "auto-testnetworks:\n objtype=network\n gateway=1.2.3.0\n mask=255.255.255.0\n net=1.2.3.1\n" >> /tmp/mynetworksstanzas 
-cmd:cat /tmp/mynetworksstanzas | chdef -z
-check:rc==0
-cmd:tabdump networks
-check:output=~("auto-testnetworks","1.2.3.1","255.255.255.0",,"1.2.3.0",,,,,,,,,,,,)
-cmd:chtab -d netname=auto-testnetworks networks
-cmd:rm -f /tmp/mynetworksstanzas
-end
-
 start:makenetworks_d
 os:Linux
 cmd:makenetworks -d > /tmp/mynetworksstanzas
diff --git a/xCAT-test/autotest/testcase/mkdsklsnode/cases0 b/xCAT-test/autotest/testcase/mkdsklsnode/cases0
deleted file mode 100644
index 5aee012b6..000000000
--- a/xCAT-test/autotest/testcase/mkdsklsnode/cases0
+++ /dev/null
@@ -1,114 +0,0 @@
-start:mkdsklsnode_h
-os:AIX
-cmd:mkdsklsnode -h
-check:rc==0
-check:output=~Usage
-end
-
-start:mkdsklsnode_i_f
-os:AIX
-cmd:mknimimage -r -t diskless -s $$SOURCE autotestdsklsimage 
-check:rc==0
-cmd:mkdsklsnode -i autotestdsklsimage $$CN -f
-check:rc==0
-check:output=~Initializing NIM machine '$$CN'
-check:output=~AIX/NIM diskless nodes were initialized
-cmd:lsnim -l $$CN
-check:rc==0
-cmd:rmdsklsnode $$CN
-cmd:nim -o remove autotestdsklsimage
-cmd:nim -o remove autotestdsklsimage_lpp_source
-cmd:nim -o remove autotestdsklsimage_shared_root
-cmd:nim -o remove autotestdsklsimage_paging
-cmd:chtab -d imagename=autotestdsklsimage osimage
-cmd:rm -rf /install/nim/lpp_source/autotestdsklsimage_lpp_source
-cmd:rm -rf /install/nim/paging/autotestdsklsimage_paging
-cmd:rm -rf /install/nim/spot/autotestdsklsimage
-cmd:rm -rf /install/nim/shared_root/autotestdsklsimage_shared_root
-end
-
-start:mkdsklsnode_i_f_V
-os:AIX
-cmd:mknimimage -r -t diskless -s $$SOURCE autotestdsklsimage
-check:rc==0
-cmd:mkdsklsnode -i autotestdsklsimage $$CN -f
-check:rc==0
-check:output=~$$MN: AIX/NIM diskless nodes were initialized
-check:output=~Initializing NIM machine '$$CN'
-check:output=~AIX/NIM diskless nodes were initialized
-cmd:lsnim -l $$CN
-check:rc==0
-cmd:rmdsklsnode $$CN
-cmd:nim -o remove autotestdsklsimage
-cmd:nim -o remove autotestdsklsimage_lpp_source
-cmd:nim -o remove autotestdsklsimage_shared_root
-cmd:nim -o remove autotestdsklsimage_paging
-cmd:chtab -d imagename=autotestdsklsimage osimage
-cmd:rm -rf /install/nim/lpp_source/autotestdsklsimage_lpp_source
-cmd:rm -rf /install/nim/paging/autotestdsklsimage_paging
-cmd:rm -rf /install/nim/spot/autotestdsklsimage
-cmd:rm -rf /install/nim/shared_root/autotestdsklsimage_shared_root
-end
-
-
-start:mkdsklsnode_n_i
-os:AIX
-cmd:mknimimage -r -t diskless -s $$SOURCE autotestdsklsimage
-check:rc==0
-cmd:mkdsklsnode -n -i autotestdsklsimage $$CN
-check:rc==0
-cmd:lsnim |grep $$CN|sed -e 's/_/ /g'|cut -d" " -f2 |grep ^autotestdsklsimage$ 
-check:rc==0
-cmd:rmdsklsnode -i autotestdsklsimage $$CN 
-cmd:nim -o remove autotestdsklsimage
-cmd:nim -o remove autotestdsklsimage_lpp_source
-cmd:nim -o remove autotestdsklsimage_shared_root
-cmd:nim -o remove autotestdsklsimage_paging
-cmd:chtab -d imagename=autotestdsklsimage osimage
-cmd:rm -rf /install/nim/lpp_source/autotestdsklsimage_lpp_source
-cmd:rm -rf /install/nim/paging/autotestdsklsimage_paging
-cmd:rm -rf /install/nim/spot/autotestdsklsimage
-cmd:rm -rf /install/nim/shared_root/autotestdsklsimage_shared_root
-end
-
-start:mkdsklsnode_node
-os:AIX
-cmd:mknimimage -r -t diskless -s $$SOURCE autotestdsklsimage
-check:rc==0
-cmd:mkdsklsnode $$CN
-check:rc==0
-check:output=~Initializing NIM machine '$$CN'
-cmd:lsnim -l $$CN
-check:rc==0
-cmd:rmdsklsnode $$CN
-cmd:nim -o remove autotestdsklsimage
-cmd:nim -o remove autotestdsklsimage_lpp_source
-cmd:nim -o remove autotestdsklsimage_shared_root
-cmd:nim -o remove autotestdsklsimage_paging
-cmd:chtab -d imagename=autotestdsklsimage osimage
-cmd:rm -rf /install/nim/lpp_source/autotestdsklsimage_lpp_source
-cmd:rm -rf /install/nim/paging/autotestdsklsimage_paging
-cmd:rm -rf /install/nim/shared_root/autotestdsklsimage_shared_root
-cmd:rm -rf /install/nim/spot/autotestdsklsimage
-end
-
-start:mkdsklsnode_i_psize_sparse_paging
-os:AIX
-cmd:mknimimage -r -t diskless -s $$SOURCE autotestdsklsimage
-check:rc==0
-cmd:mkdsklsnode -i autotestdsklsimage $$CN psize=128 sparse_paging=yes
-check:rc==0
-cmd:lsnim -l $$CN
-check:rc==0
-cmd:rmdsklsnode $$CN
-cmd:nim -o remove autotestdsklsimage
-cmd:nim -o remove autotestdsklsimage_lpp_source
-cmd:nim -o remove autotestdsklsimage_shared_root
-cmd:nim -o remove autotestdsklsimage_paging
-cmd:chtab -d imagename=autotestdsklsimage osimage
-cmd:rm -rf /install/nim/lpp_source/autotestdsklsimage_lpp_source
-cmd:rm -rf /install/nim/paging/autotestdsklsimage_paging
-cmd:rm -rf /install/nim/spot/autotestdsklsimage
-cmd:rm -rf /install/nim/shared_root/autotestdsklsimage_shared_root
-end
-
diff --git a/xCAT-test/autotest/testcase/mknimimage/cases0 b/xCAT-test/autotest/testcase/mknimimage/cases0
deleted file mode 100644
index f3400ef1a..000000000
--- a/xCAT-test/autotest/testcase/mknimimage/cases0
+++ /dev/null
@@ -1,113 +0,0 @@
-start:mknimimage_h
-description:mknimimage -h and --help
-os:AIX
-cmd:mknimimage -h
-check:output=~Usage|usage
-cmd:mknimimage --help
-check:output=~Usage|usage
-end
-
-start:mknimimage_s
-description:mknimimage -s source imagename
-os:AIX
-cmd:mknimimage -s $$SOURCE testimage
-check:rc==0
-check:output=~lpp_source=testimage_lpp_source
-check:output=~bosinst_data=testimage_bosinst_data
-check:output=~testimage
-cmd:lsnim |grep testimage
-check:rc==0
-check:output=~testimage
-check:output=~testimage_lpp_source
-check:output=~testimage_bosinst_data
-cmd:nim -o remove testimage
-cmd:nim -o remove testimage_lpp_source
-cmd:nim -o remove testimage_bosinst_data
-cmd:chtab -d imagename=testimage osimage
-cmd:rm -rf /install/nim/lpp_source/testimage_lpp_source
-cmd:rm -rf /install/nim/bosinst_data/testimage_bosinst_data
-cmd:rm -rf /install/nim/spot/testimage
-end
-
-start:mknimimage_s_iamgename_attr
-description:mknimimage -s source imagename attr=val
-os:AIX
-cmd:mknimimage -s $$SOURCE testimage installp_bundle=mybndlres
-check:rc==0
-check:output=~installp_bundle=mybndlres
-check:output=~lpp_source=testimage_lpp_source
-check:output=~bosinst_data=testimage_bosinst_data
-check:output=~testimage
-cmd:lsnim |grep testimage
-check:rc==0
-check:output=~testimage
-check:output=~testimage_lpp_source
-check:output=~testimage_bosinst_data
-cmd:nim -o remove testimage
-cmd:nim -o remove testimage_lpp_source
-cmd:nim -o remove testimage_bosinst_data
-cmd:chtab -d imagename=testimage osimage
-cmd:rm -rf /install/nim/lpp_source/testimage_lpp_source
-cmd:rm -rf /install/nim/bosinst_data/testimage_bosinst_data
-cmd:rm -rf /install/nim/spot/testimage
-end
-
-start:mknimimage_t_s
-description:mknimimage -t diskless -s source imagename
-os:AIX
-cmd:mknimimage -t diskless -s $$SOURCE testimage 
-check:rc==0
-check:output=~lpp_source=testimage_lpp_source
-check:ouput=~nimtype=diskless
-check:output=~testimage
-cmd:lsnim |grep testimage
-check:rc==0
-check:output=~testimage
-check:output=~testimage_lpp_source
-cmd:nim -o remove testimage
-cmd:nim -o remove testimage_lpp_source
-cmd:nim -o remove testimage_bosinst_data
-cmd:nim -o remove testimage_paging 
-cmd:chtab -d imagename=testimage osimage
-cmd:rm -rf /install/nim/lpp_source/testimage_lpp_source
-cmd:rm -rf /install/nim/paging/testimage_paging
-cmd:rm -rf /install/nim/spot/testimage
-end
-
-
-start:mknimimage_t_i
-description:mknimimage -t diskless -i imagename imagename
-os:AIX
-cmd:mknimimage -s $$SOURCE testimage
-check:rc==0
-check:output=~lpp_source=testimage_lpp_source
-check:output=~bosinst_data=testimage_bosinst_data
-check:output=~testimage
-cmd:mknimimage -t diskless -i testimage testimage_updt
-check:rc==0
-check:output=~spot=testimage_updt
-check:output=~root=testimage_updt_root
-check:output=~testimage_updt
-cmd:lsnim |grep testimage_updt
-ckeck:rc==0
-check:output=~testimage_updt
-check:output=~testimage_updt_root
-cmd:nim -o remove testimage
-cmd:nim -o remove testimage_lpp_source
-cmd:nim -o remove testimage_bosinst_data
-cmd:nim -o remove testimage_updt
-cmd:nim -o remove testimage_root
-cmd:nim -o remove testimage_updt_root
-cmd:chtab -d imagename=testimage osimage
-cmd:chtab -d imagename=testimage_updt osimage 
-cmd:rm -rf /install/nim/lpp_source/testimage_lpp_source
-cmd:rm -rf /install/nim/paging/testimage_paging
-cmd:rm -rf /install/nim/spot/testimage
-cmd:rm -rf /install/nim/lpp_source/testimage_updt_lpp_source
-cmd:rm -rf /install/nim/paging/testimage_updt_paging
-cmd:rm -rf /install/nim/spot/testimage_updt
-cmd:rm -rf /install/nim/bosinst_data/testimage_bosinst_data
-end
-
-
-
diff --git a/xCAT-test/autotest/testcase/renergy/case_8233-E8B b/xCAT-test/autotest/testcase/renergy/case_8233-E8B
deleted file mode 100644
index 9dfddf719..000000000
--- a/xCAT-test/autotest/testcase/renergy/case_8233-E8B
+++ /dev/null
@@ -1,405 +0,0 @@
-
-start:query_8233-E8B_reset
-description:Reset the value of power saving and capping to a default one
-type:8233-E8B-E8B
-cmd:renergy $$CN savingstatus=off
-check:rc==0
-check:output=~Set savingstatus succeeded
-cmd:renergy $$CN dsavingstatus=off
-check:rc==0
-check:output=~Set dsavingstatus succeeded
-cmd:renergy $$CN cappingstatus=off
-check:rc==0
-check:output=~Set cappingstatus succeeded
-cmd:renergy $$CN cappingwatt=2000
-check:rc==0
-end
-
-start:query_8233-E8B_all
-description:query all the attributes of the node
-type:8233-E8B
-cmd:renergy $$CN all
-check:rc==0
-check:output=~savingstatus: off
-check:output=~cappingstatus: off
-check:output=~dsavingstatus: off
-check:output=~cappingmin: 1716
-check:output=~cappingmax: 2121
-check:output=~cappingvalue: 2000
-check:output=~cappingsoftmin: 304
-check:output=~averageAC: na
-check:output~~averageDC: 681
-check:output~~ambienttemp: 22
-check:output~~ exhausttemp: 38
-check:output~~CPUspeed: 3556
-check:output=~syssbpower: na
-check:output~~sysIPLtime: 900
-end
-
-start:query_8233-E8B_savingstatus
-description:
-type:8233-E8B
-cmd:renergy $$CN savingstatus
-check:rc==0
-check:output=~savingstatus: off
-check:output!~dsavingstatus
-check:output!~cappingstatus
-end
-
-start:query_8233-E8B_dsavingstatus
-description:
-type:8233-E8B
-cmd:renergy $$CN dsavingstatus
-check:rc==0
-check:output=~dsavingstatus: off
-check:output!~: savingstatus
-check:output!~cappingstatus
-end
-
-start:query_8233-E8B_cappingstatus
-description:
-type:8233-E8B
-cmd:renergy $$CN cappingstatus
-check:rc==0
-check:output=~cappingstatus: off
-check:output!~dsavingstatus
-check:output!~savingstatus
-end
-
-start:query_8233-E8B_cappingmaxmin
-description:
-type:8233-E8B
-cmd:renergy $$CN cappingmaxmin
-check:rc==0
-check:output=~cappingmin: 1716
-check:output=~cappingmax: 2121
-check:output!~cappingvalue
-check:output!~cappingsoftmin
-end
-
-start:query_8233-E8B_cappingvalue
-description:
-type:8233-E8B
-cmd:renergy $$CN cappingvalue
-check:rc==0
-check:output=~cappingvalue: 2000
-check:output!~cappingmin
-check:output!~cappingmax
-check:output!~cappingsoftmin
-end
-
-start:query_8233-E8B_cappingsoftmin
-description:
-type:8233-E8B
-cmd:renergy $$CN cappingsoftmin
-check:rc==0
-check:output=~cappingsoftmin: 304
-check:output!~cappingmin
-check:output!~cappingmax
-check:output!~cappingvalue
-end
-
-start:query_8233-E8B_averageAC
-description:
-type:8233-E8B
-cmd:renergy $$CN averageAC
-check:rc==0
-check:output=~averageAC: na
-check:output!~averageDC
-check:output!~ambienttemp
-check:output!~exhausttemp
-check:output!~CPUspeed
-end
-
-start:query_8233-E8B_averageDC
-description:
-type:8233-E8B
-cmd:renergy $$CN averageDC
-check:rc==0
-check:output~~averageDC: 620
-check:output!~averageAC
-check:output!~ambienttemp
-check:output!~exhausttemp
-check:output!~CPUspeed
-end
-
-start:query_8233-E8B_ambienttemp
-description:
-type:8233-E8B
-cmd:renergy $$CN ambienttemp
-check:rc==0
-check:output~~ambienttemp: 22
-check:output!~averageAC
-check:output!~averageDC
-check:output!~exhausttemp
-check:output!~CPUspeed
-end
-
-start:query_8233-E8B_exhausttemp
-description:
-type:8233-E8B
-cmd:renergy $$CN exhausttemp
-check:rc==0
-check:output~~exhausttemp: 38
-check:output!~averageAC
-check:output!~ambienttemp
-check:output!~averageDC
-check:output!~CPUspeed
-end
-
-start:query_8233-E8B_CPUspeed
-description:
-type:8233-E8B
-cmd:renergy $$CN CPUspeed
-check:rc==0
-check:output~~CPUspeed: 3556
-check:output!~averageAC
-check:output!~ambienttemp
-check:output!~exhausttemp
-check:output!~averageDC
-end
-
-start:query_8233-E8B_syssbpower
-description:
-type:8233-E8B
-cmd:renergy $$CN syssbpower
-check:rc==0
-check:output=~syssbpower: na
-check:output!~averageAC
-check:output!~ambienttemp
-check:output!~exhausttemp
-check:output!~averageDC
-check:output!~sysIPLtime
-end
-
-start:query_8233-E8B_sysIPLtime
-description:
-type:8233-E8B
-cmd:renergy $$CN sysIPLtime
-check:rc==0
-check:output=~sysIPLtime: 900
-check:output!~averageAC
-check:output!~ambienttemp
-check:output!~exhausttemp
-check:output!~averageDC
-check:output!~syssbpower
-end
-
-start:set_8233-E8B_savingstatus
-description:
-type:8233-E8B
-cmd:renergy $$CN savingstatus=on
-check:rc==0
-check:output=~Set savingstatus succeeded
-check:output=~This setting may need several minutes to take effect.
-check:output!~Set savingstatus failed.
-cmd:sleep 60
-
-cmd:renergy $$CN savingstatus
-check:rc==0
-check:output=~savingstatus: on
-
-cmd:renergy $$CN CPUspeed
-check:rc==0
-check:output~~CPUspeed: 2492
-
-cmd:renergy $$CN savingstatus=onxx
-check:rc!=0
-check:output=~Usage:
-
-cmd:renergy $$CN dsavingstatus=on-norm
-check:rc!=0
-check:output=~Cannot enable static and dynamic power
-check:output=~Set dsavingstatus failed.
-
-cmd:renergy $$CN savingstatus=off
-check:rc==0
-check:output=~Set savingstatus succeeded.
-check:output=~This setting may need several minutes to take effect.
-check:output!~Set savingstatus failed.
-
-cmd:sleep 60
-
-cmd:renergy $$CN savingstatus
-check:rc==0
-check:output=~savingstatus: off
-
-cmd:renergy $$CN CPUspeed
-check:rc==0
-check:output~~CPUspeed: 3556
-end
-
-
-start:set_8233-E8B_dsavingstatus
-description:
-type:8233-E8B
-cmd:renergy $$CN dsavingstatus=on
-check:rc!=0
-check:output=~ Usage:
-
-cmd:renergy $$CN dsavingstatus=on-norm
-check:rc==0
-check:output=~Set dsavingstatus succeeded.
-check:output=~This setting may need several minutes to take effect.
-check:output!~Set dsavingstatus failed.
-
-cmd:sleep 60
-
-cmd:renergy $$CN dsavingstatus
-check:rc==0
-check:output=~dsavingstatus: on-norm
-
-cmd:renergy $$CN CPUspeed
-check:rc==0
-check:output~~CPUspeed: 1652
-
-cmd:renergy $$CN savingstatus=on
-check:rc!=0
-check:output=~Cannot enable static and dynamic power
-check:output=~Set savingstatus failed.
-
-cmd:renergy $$CN dsavingstatus=onxx
-check:rc!=0
-check:output=~ Usage:
-
-cmd:renergy $$CN dsavingstatus=on-maxp
-check:rc==0
-check:output=~Set dsavingstatus succeeded.
-check:output=~This setting may need several minutes to take effect.
-check:output!~Set dsavingstatus failed.
-
-cmd:renergy $$CN dsavingstatus
-check:rc==0
-check:output=~dsavingstatus: on-maxp
-
-cmd:renergy $$CN CPUspeed
-check:rc==0
-check:output~~CPUspeed: 3864
-
-cmd:renergy $$CN  dsavingstatus=off
-check:rc==0
-check:output=~Set dsavingstatus succeeded.
-check:output=~This setting may need several minutes to take effect.
-check:output!~Set dsavingstatus failed.
-
-cmd:sleep 60
-
-cmd:renergy $$CN dsavingstatus
-check:rc==0
-check:output=~dsavingstatus: off
-
-cmd:renergy $$CN CPUspeed
-check:rc==0
-check:output~~CPUspeed: 3556
-end
-
-start:set_8233-E8B_cappingstatus
-description:
-type:8233-E8B
-cmd:renergy $$CN cappingstatus=on
-check:rc==0
-check:output=~Set cappingstatus succeeded.
-check:output=~This setting may need several minutes to take effect.
-check:output!~Set cappingstatus failed.
-
-cmd:sleep 60
-
-cmd:renergy $$CN cappingstatus
-check:rc==0
-check:output=~cappingstatus: on
-
-cmd:renergy $$CN cappingstatus=onxx
-check:rc!=0
-check:output=~Usage:
-
-cmd:renergy $$CN cappingstatus=off
-check:rc==0
-check:output=~Set cappingstatus succeeded.
-check:output=~This setting may need several minutes to take effect.
-check:output!~Set cappingstatus failed.
-
-cmd:sleep 60
-
-cmd:renergy $$CN cappingstatus
-check:rc==0
-check:output=~cappingstatus: off
-end
-
-start:set_8233-E8B_cappingwatt
-description:
-type:8233-E8B
-cmd:renergy $$CN cappingwatt=2050
-check:rc==0
-check:output=~Set cappingwatt succeeded.
-check:output=~cappingvalue: 2050 
-check:output!~Set cappingwatt failed.
-
-cmd:renergy $$CN cappingvalue
-check:rc==0
-check:output=~cappingvalue: 2050
-
-cmd:renergy $$CN cappingwatt=100
-check:rc!=0
-check:output!~Set cappingwatt succeeded.
-check:output=~Set cappingwatt failed.
-check:output=~Invalid value for cappingwatt.
-
-cmd:renergy $$CN cappingwatt=3000
-check:rc!=0
-check:output!~Set cappingwatt succeeded.
-check:output=~Set cappingwatt failed.
-check:output=~Invalid value for cappingwatt.
-
-cmd:renergy $$CN cappingvalue
-check:rc==0
-check:output=~cappingvalue: 2050
-
-cmd:renergy $$CN cappingwatt=2000
-check:rc==0
-check:output=~Set cappingwatt succeeded.
-check:output=~cappingvalue: 2000
-check:output!~Set cappingwatt failed.
-
-cmd:renergy $$CN cappingvalue
-check:rc==0
-check:output=~cappingvalue: 2000
-end
-
-start:set_8233-E8B_cappingperc
-description:
-type:8233-E8B
-cmd:renergy $$CN cappingperc=0
-check:rc==0
-check:output=~Set cappingperc succeeded.
-check:output=~cappingvalue: 1716
-check:output!~Set cappingperc failed.
-
-cmd:renergy $$CN cappingperc=50
-check:rc==0
-check:output=~Set cappingperc succeeded.
-check:output=~cappingvalue: 1918 
-check:output!~Set cappingperc failed.
-
-cmd:renergy $$CN cappingperc=100
-check:rc==0
-check:output=~Set cappingperc succeeded.
-check:output=~cappingvalue: 2121
-check:output!~Set cappingperc failed.
-
-cmd:renergy $$CN cappingperc=110
-check:rc!=0
-check:output!~Set cappingperc succeeded.
-check:output=~Invalid value for cappingperc.
-check:output=~Set cappingperc failed.
-
-cmd:renergy $$CN cappingwatt=2000
-check:rc==0
-check:output=~Set cappingwatt succeeded.
-check:output=~cappingvalue: 2000 
-check:output!~Set cappingwatt failed.
-
-cmd:renergy $$CN cappingvalue
-check:rc==0
-check:output=~cappingvalue: 2000
-
-end
diff --git a/xCAT-test/autotest/testcase/renergy/case_9125-F2C b/xCAT-test/autotest/testcase/renergy/case_9125-F2C
deleted file mode 100644
index f82300796..000000000
--- a/xCAT-test/autotest/testcase/renergy/case_9125-F2C
+++ /dev/null
@@ -1,534 +0,0 @@
-
-start:query_9125-F2C_reset
-description:Reset the value of power saving and capping to a default one
-type:9125-F2C
-cmd:renergy $$CN savingstatus=off
-check:rc==0
-check:output=~Set savingstatus succeeded
-cmd:renergy $$CN dsavingstatus=off
-check:rc==0
-check:output=~Set dsavingstatus succeeded
-cmd:renergy $$CN cappingstatus=off
-check:rc==0
-check:output=~Set cappingstatus succeeded
-cmd:renergy $$CN fsavingstatus=off
-check:rc==0
-check:output=~Set fsavingstatus succeeded
-cmd:renergy $$CN ffovalue=3000
-check:rc==0
-cmd:renergy $$CN cappingwatt=14555
-check:rc==0
-end
-
-start:query_9125-F2C_all
-description:query all the attributes of the node
-type:9125-F2C
-cmd:renergy $$CN all
-check:rc==0
-check:output=~savingstatus: off
-check:output=~cappingstatus: off
-check:output=~dsavingstatus: off
-check:output=~cappingmin: 14505
-check:output=~cappingmax: 14585
-check:output=~cappingvalue: 14555
-check:output=~cappingsoftmin: 5556
-check:output=~averageAC: na
-check:output~~averageDC: 6976
-check:output~~ambienttemp: 24
-check:output~~ exhausttemp: 24
-check:output~~CPUspeed: 3836
-check:output=~syssbpower: na
-check:output~~sysIPLtime: 900
-check:output=~fsavingstatus: off
-check:output=~ffoMin: 2856 MHz
-check:output=~ffoVmin: 2856 MHz
-check:output=~ffoTurbo: 3836 MHz
-check:output=~ffoNorm: 3836 MHz
-check:output=~ffovalue: 3000 MHz
-end
-
-start:query_9125-F2C_savingstatus
-description:
-type:9125-F2C
-cmd:renergy $$CN savingstatus
-check:rc==0
-check:output=~savingstatus: off
-check:output!~dsavingstatus
-check:output!~cappingstatus
-end
-
-start:query_9125-F2C_dsavingstatus
-description:
-type:9125-F2C
-cmd:renergy $$CN dsavingstatus
-check:rc==0
-check:output=~dsavingstatus: off
-check:output!~: savingstatus
-check:output!~cappingstatus
-end
-
-start:query_9125-F2C_cappingstatus
-description:
-type:9125-F2C
-cmd:renergy $$CN cappingstatus
-check:rc==0
-check:output=~cappingstatus: off
-check:output!~dsavingstatus
-check:output!~savingstatus
-end
-
-start:query_9125-F2C_cappingmaxmin
-description:
-type:9125-F2C
-cmd:renergy $$CN cappingmaxmin
-check:rc==0
-check:output=~cappingmin: 14505
-check:output=~cappingmax: 14585
-check:output!~cappingvalue
-check:output!~cappingsoftmin
-end
-
-start:query_9125-F2C_cappingvalue
-description:
-type:9125-F2C
-cmd:renergy $$CN cappingvalue
-check:rc==0
-check:output=~cappingvalue: 14555
-check:output!~cappingmin
-check:output!~cappingmax
-check:output!~cappingsoftmin
-end
-
-start:query_9125-F2C_cappingsoftmin
-description:
-type:9125-F2C
-cmd:renergy $$CN cappingsoftmin
-check:rc==0
-check:output=~cappingsoftmin: 5556
-check:output!~cappingmin
-check:output!~cappingmax
-check:output!~cappingvalue
-end
-
-start:query_9125-F2C_averageAC
-description:
-type:9125-F2C
-cmd:renergy $$CN averageAC
-check:rc==0
-check:output=~averageAC: na
-check:output!~averageDC
-check:output!~ambienttemp
-check:output!~exhausttemp
-check:output!~CPUspeed
-end
-
-start:query_9125-F2C_averageDC
-description:
-type:9125-F2C
-cmd:renergy $$CN averageDC
-check:rc==0
-check:output~~averageDC: 6976
-check:output!~averageAC
-check:output!~ambienttemp
-check:output!~exhausttemp
-check:output!~CPUspeed
-end
-
-start:query_9125-F2C_ambienttemp
-description:
-type:9125-F2C
-cmd:renergy $$CN ambienttemp
-check:rc==0
-check:output~~ambienttemp: 24
-check:output!~averageAC
-check:output!~averageDC
-check:output!~exhausttemp
-check:output!~CPUspeed
-end
-
-start:query_9125-F2C_exhausttemp
-description:
-type:9125-F2C
-cmd:renergy $$CN exhausttemp
-check:rc==0
-check:output~~exhausttemp: 24
-check:output!~averageAC
-check:output!~ambienttemp
-check:output!~averageDC
-check:output!~CPUspeed
-end
-
-start:query_9125-F2C_CPUspeed
-description:
-type:9125-F2C
-cmd:renergy $$CN CPUspeed
-check:rc==0
-check:output~~CPUspeed: 3836
-check:output!~averageAC
-check:output!~ambienttemp
-check:output!~exhausttemp
-check:output!~averageDC
-end
-
-start:query_9125-F2C_syssbpower
-description:
-type:9125-F2C
-cmd:renergy $$CN syssbpower
-check:rc==0
-check:output=~syssbpower: 20 W
-check:output!~averageAC
-check:output!~ambienttemp
-check:output!~exhausttemp
-check:output!~averageDC
-check:output!~sysIPLtime
-end
-
-start:query_9125-F2C_sysIPLtime
-description:
-type:9125-F2C
-cmd:renergy $$CN sysIPLtime
-check:rc==0
-check:output=~sysIPLtime: 900
-check:output!~averageAC
-check:output!~ambienttemp
-check:output!~exhausttemp
-check:output!~averageDC
-check:output!~syssbpower
-end
-
-start:query_9125-F2C_fsavingstatus
-description:
-type:9125-F2C
-cmd:renergy $$CN fsavingstatus
-check:rc==0
-check:output=~fsavingstatus: off
-check:output!~dsavingstatus
-check:output!~cappingstatus
-end
-
-start:query_9125-F2C_ffoMin
-description:
-type:9125-F2C
-cmd:renergy $$CN ffoMin
-check:rc==0
-check:output=~ffoMin: 2856 MHz
-check:output!~ffoVmin
-check:output!~ffoTurbo
-check:output!~ffoNorm
-check:output!~ffovalue
-end
-
-start:query_9125-F2C_ffoVmin
-description:
-type:9125-F2C
-cmd:renergy $$CN ffoVmin
-check:rc==0
-check:output=~ffoVmin: 2856 MHz
-check:output!~ffomin
-check:output!~ffoTurbo
-check:output!~ffoNorm
-check:output!~ffovalue
-end
-
-start:query_9125-F2C_ffoTurbo
-description:
-type:9125-F2C
-cmd:renergy $$CN ffoTurbo
-check:rc==0
-check:output=~ffoTurbo: 3836 MHz
-check:output!~ffomin
-check:output!~ffoVmin
-check:output!~ffoNorm
-check:output!~ffovalue
-end
-
-start:query_9125-F2C_ffoNorm
-description:
-type:9125-F2C
-cmd:renergy $$CN ffoNorm
-check:rc==0
-check:output=~ffoNorm: 3836 MHz
-check:output!~ffomin
-check:output!~ffoVmin
-check:output!~ffoTurbo
-check:output!~ffovalue
-end
-
-start:query_9125-F2C_ffovalue
-description:
-type:9125-F2C
-cmd:renergy $$CN ffovalue
-check:rc==0
-check:output=~ffovalue: 3000 MHz
-check:output!~ffomin
-check:output!~ffoVmin
-check:output!~ffoTurbo
-check:output!~ffoNorm
-end
-
-start:set_9125-F2C_savingstatus
-description:
-type:9125-F2C
-cmd:renergy $$CN savingstatus=on
-check:rc==0
-check:output=~Set savingstatus succeeded
-check:output=~This setting may need several minutes to take effect.
-check:output!~Set savingstatus failed.
-cmd:sleep 60
-
-cmd:renergy $$CN savingstatus
-check:rc==0
-check:output=~savingstatus: on
-
-cmd:renergy $$CN CPUspeed
-check:rc==0
-check:output~~CPUspeed: 2856
-
-cmd:renergy $$CN savingstatus=onxx
-check:rc!=0
-check:output=~Usage:
-
-cmd:renergy $$CN dsavingstatus=on-norm
-check:rc!=0
-check:output=~Cannot enable static and dynamic power
-check:output=~Set dsavingstatus failed.
-
-cmd:renergy $$CN savingstatus=off
-check:rc==0
-check:output=~Set savingstatus succeeded.
-check:output=~This setting may need several minutes to take effect.
-check:output!~Set savingstatus failed.
-
-cmd:sleep 60
-
-cmd:renergy $$CN savingstatus
-check:rc==0
-check:output=~savingstatus: off
-
-cmd:renergy $$CN CPUspeed
-check:rc==0
-check:output~~CPUspeed: 3836
-end
-
-
-start:set_9125-F2C_dsavingstatus
-description:
-type:9125-F2C
-cmd:renergy $$CN dsavingstatus=on
-check:rc!=0
-check:output=~ Usage:
-
-cmd:renergy $$CN dsavingstatus=on-norm
-check:rc==0
-check:output=~Set dsavingstatus succeeded.
-check:output=~This setting may need several minutes to take effect.
-check:output!~Set dsavingstatus failed.
-
-cmd:sleep 60
-
-cmd:renergy $$CN dsavingstatus
-check:rc==0
-check:output=~dsavingstatus: on-norm
-
-cmd:renergy $$CN CPUspeed
-check:rc==0
-check:output~~CPUspeed: 3836
-
-cmd:renergy $$CN savingstatus=on
-check:rc!=0
-check:output=~Cannot enable static and dynamic power
-check:output=~Set savingstatus failed.
-
-cmd:renergy $$CN dsavingstatus=onxx
-check:rc!=0
-check:output=~ Usage:
-
-cmd:renergy $$CN dsavingstatus=on-maxp
-check:rc==0
-check:output=~Set dsavingstatus succeeded.
-check:output=~This setting may need several minutes to take effect.
-check:output!~Set dsavingstatus failed.
-
-cmd:renergy $$CN dsavingstatus
-check:rc==0
-check:output=~dsavingstatus: on-maxp
-
-cmd:renergy $$CN CPUspeed
-check:rc==0
-check:output~~CPUspeed: 3836
-
-cmd:renergy $$CN  dsavingstatus=off
-check:rc==0
-check:output=~Set dsavingstatus succeeded.
-check:output=~This setting may need several minutes to take effect.
-check:output!~Set dsavingstatus failed.
-
-cmd:sleep 60
-
-cmd:renergy $$CN dsavingstatus
-check:rc==0
-check:output=~dsavingstatus: off
-
-cmd:renergy $$CN CPUspeed
-check:rc==0
-check:output~~CPUspeed: 3836
-end
-
-start:set_9125-F2C_cappingstatus
-description:
-type:9125-F2C
-cmd:renergy $$CN cappingstatus=on
-check:rc==0
-check:output=~Set cappingstatus succeeded.
-check:output=~This setting may need several minutes to take effect.
-check:output!~Set cappingstatus failed.
-
-cmd:sleep 60
-
-cmd:renergy $$CN cappingstatus
-check:rc==0
-check:output=~cappingstatus: on
-
-cmd:renergy $$CN cappingstatus=onxx
-check:rc!=0
-check:output=~Usage:
-
-cmd:renergy $$CN cappingstatus=off
-check:rc==0
-check:output=~Set cappingstatus succeeded.
-check:output=~This setting may need several minutes to take effect.
-check:output!~Set cappingstatus failed.
-
-cmd:sleep 60
-
-cmd:renergy $$CN cappingstatus
-check:rc==0
-check:output=~cappingstatus: off
-end
-
-start:set_9125-F2C_cappingwatt
-description:
-type:9125-F2C
-cmd:renergy $$CN cappingwatt=14560
-check:rc==0
-check:output=~Set cappingwatt succeeded.
-check:output=~cappingvalue: 14560
-check:output!~Set cappingwatt failed.
-
-cmd:renergy $$CN cappingvalue
-check:rc==0
-check:output=~cappingvalue: 14560
-
-cmd:renergy $$CN cappingwatt=100
-check:rc!=0
-check:output!~Set cappingwatt succeeded.
-check:output=~Set cappingwatt failed.
-check:output=~Invalid value for cappingwatt.
-
-cmd:renergy $$CN cappingwatt=15000
-check:rc!=0
-check:output!~Set cappingwatt succeeded.
-check:output=~Set cappingwatt failed.
-check:output=~Invalid value for cappingwatt.
-
-cmd:renergy $$CN cappingvalue
-check:rc==0
-check:output=~cappingvalue: 14560
-
-cmd:renergy $$CN cappingwatt=14555
-check:rc==0
-check:output=~Set cappingwatt succeeded.
-check:output=~cappingvalue: 14555
-check:output!~Set cappingwatt failed.
-
-cmd:renergy $$CN cappingvalue
-check:rc==0
-check:output=~cappingvalue: 14555
-end
-
-start:set_9125-F2C_cappingperc
-description:
-type:9125-F2C
-cmd:renergy $$CN cappingperc=0
-check:rc==0
-check:output=~Set cappingperc succeeded.
-check:output=~cappingvalue: 14505
-check:output!~Set cappingperc failed.
-
-cmd:renergy $$CN cappingperc=50
-check:rc==0
-check:output=~Set cappingperc succeeded.
-check:output=~cappingvalue: 14545
-check:output!~Set cappingperc failed.
-
-cmd:renergy $$CN cappingperc=100
-check:rc==0
-check:output=~Set cappingperc succeeded.
-check:output=~cappingvalue: 14585
-check:output!~Set cappingperc failed.
-
-cmd:renergy $$CN cappingperc=110
-check:rc!=0
-check:output!~Set cappingperc succeeded.
-check:output=~Invalid value for cappingperc.
-check:output=~Set cappingperc failed.
-
-cmd:renergy $$CN cappingwatt=14555
-check:rc==0
-check:output=~Set cappingwatt succeeded.
-check:output=~cappingvalue: 14555
-check:output!~Set cappingwatt failed.
-
-cmd:renergy $$CN cappingvalue
-check:rc==0
-check:output=~cappingvalue: 14555
-
-end
-
-
-start:set_9125-F2C_fsavingstatus
-description:
-type:9125-F2C
-cmd:renergy $$CN fsavingstatus=on
-check:rc==0
-check:output=~Set fsavingstatus succeeded.
-check:output!~Set fsavingstatus failed.
-
-cmd:renergy $$CN fsavingstatus
-check:rc==0
-check:output=~fsavingstatus: on
-
-cmd:renergy $$CN fsavingstatus=onxx
-check:rc!=0
-check:output=~ Usage:
-
-cmd:renergy $$CN ffovalue=3100
-check:rc==0
-check:output=~Set ffovalue succeeded.
-check:output=~This setting may need several minutes to take effect.
-check:output!~Set ffovalue failed.
-
-cmd:sleep 90
-
-cmd:renergy $$CN CPUspeed
-check:rc==0
-check:output~~CPUspeed: 3100
-
-cmd:renergy $$CN ffovalue=2000
-check:rc!=0
-check:output=~Set ffovalue failed.
-check:output=~Invalid value for ffovalue
-check:output!~Set ffovalue succeeded.
-
-cmd:renergy $$CN fsavingstatus=off
-check:rc==0
-check:output=~Set fsavingstatus succeeded.
-check:output!~Set fsavingstatus failed.
-
-cmd:renergy $$CN fsavingstatus
-check:rc==0
-check:output=~fsavingstatus: off
-
-end
-
-
diff --git a/xCAT-test/autotest/testcase/restartxcatd/cases0 b/xCAT-test/autotest/testcase/restartxcatd/cases0
deleted file mode 100644
index 83dd70a6a..000000000
--- a/xCAT-test/autotest/testcase/restartxcatd/cases0
+++ /dev/null
@@ -1,32 +0,0 @@
-start:restartxcatd_v
-os:AIX
-cmd:restartxcatd -v
-check:rc==0
-check:output=~Version
-end
-
-start:restartxcatd_h
-os:AIX
-cmd:restartxcatd -h
-check:rc==0
-cmd:restartxcatd --help
-check:rc==0
-end
-
-start:restartxcatd
-os:AIX
-cmd:restartxcatd
-check:rc==0
-check:output=~The xcatd Subsystem was requested to stop
-check:output=~The xcatd Subsystem has been started. Subsystem PID is \d+
-end
-
-start:restartxcatd_V
-os:AIX
-cmd:restartxcatd -V
-check:output=~Stopped the xcatd subsystem
-check:output=~The xcatd Subsystem has been started
-check:output=~Running command on 
-check:output=~Started the xcatd subsystem
-end
-
diff --git a/xCAT-test/autotest/testcase/rmdsklsnode/cases0 b/xCAT-test/autotest/testcase/rmdsklsnode/cases0
deleted file mode 100644
index ea1abf740..000000000
--- a/xCAT-test/autotest/testcase/rmdsklsnode/cases0
+++ /dev/null
@@ -1,57 +0,0 @@
-start:rmdsklsnode_h
-os:AIX
-cmd:rmdsklsnode -h
-check:rc==0
-check:output=~Usage
-end
-
-start:rmdsklsnode_node
-os:AIX
-cmd:mknimimage -r -t diskless -s $$SOURCE autotestdsklsimage 
-check:rc==0
-cmd:mkdsklsnode -i autotestdsklsimage $$CN -f
-check:rc==0
-check:output=~Initializing NIM machine '$$CN'
-check:output=~AIX/NIM diskless nodes were initialized
-cmd:lsnim -l $$CN
-check:rc==0
-cmd:rmdsklsnode $$CN
-check:rc==0
-cmd:lsnim |grep $$CN
-check:rc!=0
-check:output!~$$CN
-cmd:nim -o remove autotestdsklsimage
-cmd:nim -o remove autotestdsklsimage_lpp_source
-cmd:nim -o remove autotestdsklsimage_shared_root
-cmd:nim -o remove autotestdsklsimage_paging
-cmd:chtab -d imagename=autotestdsklsimage osimage
-cmd:rm -rf /install/nim/lpp_source/autotestdsklsimage_lpp_source
-cmd:rm -rf /install/nim/paging/autotestdsklsimage_paging
-cmd:rm -rf /install/nim/spot/autotestdsklsimage
-cmd:rm -rf /install/nim/shared_root/autotestdsklsimage_shared_root
-end
-
-
-start:rmdsklsnode_i
-os:AIX
-cmd:mknimimage -r -t diskless -s $$SOURCE autotestdsklsimage
-check:rc==0
-cmd:mkdsklsnode -n -i autotestdsklsimage $$CN
-check:rc==0
-cmd:lsnim |grep $$CN|sed -e 's/_/ /g'|cut -d" " -f2 |grep ^autotestdsklsimage$ 
-check:rc==0
-cmd:rmdsklsnode -i autotestdsklsimage $$CN -V 
-check:rc==0
-cmd:lsnim |grep $$CN|sed -e 's/_/ /g'|cut -d" " -f2 |grep ^autotestdsklsimage$
-check:rc!=0
-cmd:nim -o remove autotestdsklsimage
-cmd:nim -o remove autotestdsklsimage_lpp_source
-cmd:nim -o remove autotestdsklsimage_shared_root
-cmd:nim -o remove autotestdsklsimage_paging
-cmd:chtab -d imagename=autotestdsklsimage osimage
-cmd:rm -rf /install/nim/lpp_source/autotestdsklsimage_lpp_source
-cmd:rm -rf /install/nim/paging/autotestdsklsimage_paging
-cmd:rm -rf /install/nim/spot/autotestdsklsimage
-cmd:rm -rf /install/nim/shared_root/autotestdsklsimage_shared_root
-end
-
diff --git a/xCAT-test/autotest/testcase/rmnimimage/cases0 b/xCAT-test/autotest/testcase/rmnimimage/cases0
deleted file mode 100644
index 1bfa1de20..000000000
--- a/xCAT-test/autotest/testcase/rmnimimage/cases0
+++ /dev/null
@@ -1,59 +0,0 @@
-start:rmnimimage_imagename
-description:rmnimimage testimage
-os:AIX
-cmd:mknimimage -s $$SOURCE testimage
-check:rc==0
-check:output=~lpp_source=testimage_lpp_source
-check:output=~bosinst_data=testimage_bosinst_data
-check:output=~testimage
-cmd:rmnimimage testimage
-check:rc==0
-cmd:lsnim 
-check:output!~testimage_bosinst_data
-check:output=~testimage_lpp_source
-cmd:rmdef -t osimage -o testimage
-end
-
-start:rmnimimage_d_imagename
-description:rmnimimage -d imagename
-os:AIX
-cmd:mknimimage -s $$SOURCE testimage
-check:rc==0
-check:output=~lpp_source=testimage_lpp_source
-check:output=~bosinst_data=testimage_bosinst_data
-check:output=~testimage
-cmd:rmnimimage -d testimage
-check:rc==0
-cmd:lsnim
-check:output!~testimage
-cmd:tabdump osimage
-check:output=~testimage
-cmd:rmdef -t osimage -o testimage
-end
-
-start:rmnimimage_x_imagename
-os:AIX
-cmd:mknimimage -s $$SOURCE testimage
-check:rc==0
-check:output=~lpp_source=testimage_lpp_source
-check:output=~bosinst_data=testimage_bosinst_data
-check:output=~testimage
-cmd:rmnimimage testimage
-check:rc==0
-cmd:tabdump osimage
-check:output=~testimage
-cmd:rmnimimage -x testimage
-ckeck:rc==0
-cmd:tabdump osimage
-ckeck:output!~testimage
-end
-
-start:rmnimimage_h
-description:rmnimimage -h and --help
-os:AIX
-cmd:rmnimimage -h
-check:output=~usage|Usage
-cmd:rmnimimage --help
-check:output=~usage|Usage
-end
-
diff --git a/xCAT-test/autotest/testcase/xcat2nim/cases0 b/xCAT-test/autotest/testcase/xcat2nim/cases0
deleted file mode 100644
index 42875b943..000000000
--- a/xCAT-test/autotest/testcase/xcat2nim/cases0
+++ /dev/null
@@ -1,48 +0,0 @@
-start:xcat2nim_h
-description:xcat2nim -h and --help
-os:AIX
-cmd:xcat2nim -h 
-check:output=~usage|Usage
-cmd:xcat2nim --help
-check:output=~usage|Usage
-end
-
-
-start:xcat2nim_t_f_o_V_att
-description:xcat2nim -f -t node -o CN -V att=
-os:AIX
-cmd:xcat2nim -t node -f -o $$CN -V netboot_kernel=mp
-check:rc==0
-cmd:lsnim -l $$CN
-check:output=~netboot_kernel = mp
-cmd:xcat2nim -t node -f -o $$CN -V 
-end
-
-
-start:xcat2nim_l
-description:xcat2nim -l CN
-os:AIX
-cmd:xcat2nim -l $$CN
-check:rc==0
-check:output=~$$CN:
-end
-
-start:xcat2nim_r
-description:xcat2nim -r CN
-os:AIX
-cmd:xcat2nim -r $$CN
-check:rc==0
-cmd:lsnim
-check:output!~$$CN
-cmd:xcat2nim -t node -o $$CN
-end
-
-start:xcat2nim_u
-description:xcat2nim -u CN
-os:AIX
-cmd:lsnim
-check:output=~$$CN
-cmd:xcat2nim -u $$CN
-check:rc==0
-end
-