From b5e5efa62a5bae386cfb66cad5ba4f7b6630e7d4 Mon Sep 17 00:00:00 2001
From: huweihua <huweihua@cn.ibm.com>
Date: Wed, 27 Jun 2018 05:43:11 -0400
Subject: [PATCH] delete test cases of AIX

---
 xCAT-test/autotest/testcase/makedhcp/cases0   |  13 --
 .../autotest/testcase/makenetworks/cases0     |  13 --
 .../autotest/testcase/mkdsklsnode/cases0      | 114 ------------------
 xCAT-test/autotest/testcase/mknimimage/cases0 | 113 -----------------
 .../autotest/testcase/rmdsklsnode/cases0      |  57 ---------
 xCAT-test/autotest/testcase/rmnimimage/cases0 |  59 ---------
 xCAT-test/autotest/testcase/xcat2nim/cases0   |  48 --------
 7 files changed, 417 deletions(-)
 delete mode 100644 xCAT-test/autotest/testcase/mkdsklsnode/cases0
 delete mode 100644 xCAT-test/autotest/testcase/mknimimage/cases0
 delete mode 100644 xCAT-test/autotest/testcase/rmdsklsnode/cases0
 delete mode 100644 xCAT-test/autotest/testcase/rmnimimage/cases0
 delete mode 100644 xCAT-test/autotest/testcase/xcat2nim/cases0

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/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
-