diff --git a/xCAT-test/autotest/bundle/MN_basic.bundle b/xCAT-test/autotest/bundle/MN_basic.bundle index de3e09758..5eb686d73 100644 --- a/xCAT-test/autotest/bundle/MN_basic.bundle +++ b/xCAT-test/autotest/bundle/MN_basic.bundle @@ -171,6 +171,9 @@ noderm_err_node noderm_h noderm_noderange noderm_null +nodepurge_err_node +nodepurge_h +nodepurge_null nodestat_err_node restorexCAT_h restorexCATdb_a_p_V diff --git a/xCAT-test/autotest/bundle/rhels_ppc_daily.bundle b/xCAT-test/autotest/bundle/rhels_ppc_daily.bundle index 39cd43183..0d9eed54a 100644 --- a/xCAT-test/autotest/bundle/rhels_ppc_daily.bundle +++ b/xCAT-test/autotest/bundle/rhels_ppc_daily.bundle @@ -212,6 +212,10 @@ noderm_err_node noderm_h noderm_noderange noderm_null +nodepurge_err_node +nodepurge_h +nodepurge_noderange +nodepurge_null tabdump_servicenode nodeset_check_warninginfo nodeset_errorcommand diff --git a/xCAT-test/autotest/bundle/rhels_ppcle_daily.bundle b/xCAT-test/autotest/bundle/rhels_ppcle_daily.bundle index 9184066d4..9fa8d73e0 100644 --- a/xCAT-test/autotest/bundle/rhels_ppcle_daily.bundle +++ b/xCAT-test/autotest/bundle/rhels_ppcle_daily.bundle @@ -205,6 +205,10 @@ noderm_err_node noderm_h noderm_noderange noderm_null +nodepurge_err_node +nodepurge_h +nodepurge_noderange +nodepurge_null nodeset_check_warninginfo nodeset_disjointdhcps_petitboot nodeset_errorcommand diff --git a/xCAT-test/autotest/bundle/rhels_x86_daily.bundle b/xCAT-test/autotest/bundle/rhels_x86_daily.bundle index 8da4e59e6..cd43395ed 100644 --- a/xCAT-test/autotest/bundle/rhels_x86_daily.bundle +++ b/xCAT-test/autotest/bundle/rhels_x86_daily.bundle @@ -205,6 +205,10 @@ noderm_err_node noderm_h noderm_noderange noderm_null +nodepurge_err_node +nodepurge_h +nodepurge_noderange +nodepurge_null nodeset_check_warninginfo nodeset_errorcommand nodeset_xnba diff --git a/xCAT-test/autotest/bundle/sles_ppc_daily.bundle b/xCAT-test/autotest/bundle/sles_ppc_daily.bundle index aacf5b76c..fcb5b2d5c 100644 --- a/xCAT-test/autotest/bundle/sles_ppc_daily.bundle +++ b/xCAT-test/autotest/bundle/sles_ppc_daily.bundle @@ -170,6 +170,10 @@ noderm_err_node noderm_h noderm_noderange noderm_null +nodepurge_err_node +nodepurge_h +nodepurge_noderange +nodepurge_null nodeset_check_warninginfo nodeset_errorcommand nodeset_grub2 diff --git a/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle b/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle index 1e8ed265d..57793ad92 100644 --- a/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle +++ b/xCAT-test/autotest/bundle/sles_ppcle_daily.bundle @@ -155,6 +155,10 @@ noderm_err_node noderm_h noderm_noderange noderm_null +nodepurge_err_node +nodepurge_h +nodepurge_noderange +nodepurge_null nodeset_check_warninginfo nodeset_disjointdhcps_petitboot nodeset_errorcommand diff --git a/xCAT-test/autotest/bundle/sles_x86_daily.bundle b/xCAT-test/autotest/bundle/sles_x86_daily.bundle index fb00734d3..94d0afa29 100644 --- a/xCAT-test/autotest/bundle/sles_x86_daily.bundle +++ b/xCAT-test/autotest/bundle/sles_x86_daily.bundle @@ -155,6 +155,10 @@ noderm_err_node noderm_h noderm_noderange noderm_null +nodepurge_err_node +nodepurge_h +nodepurge_noderange +nodepurge_null nodeset_check_warninginfo nodeset_errorcommand nodeset_noderange diff --git a/xCAT-test/autotest/bundle/ubuntu_ppcle_daily.bundle b/xCAT-test/autotest/bundle/ubuntu_ppcle_daily.bundle index f9dff496b..5da3ac5fe 100644 --- a/xCAT-test/autotest/bundle/ubuntu_ppcle_daily.bundle +++ b/xCAT-test/autotest/bundle/ubuntu_ppcle_daily.bundle @@ -125,6 +125,10 @@ noderm_err_node noderm_h noderm_noderange noderm_null +nodepurge_err_node +nodepurge_h +nodepurge_noderange +nodepurge_null nodeset_errorcommand nodeset_check_warninginfo nodeset_grub2 diff --git a/xCAT-test/autotest/bundle/ubuntu_x86_daily.bundle b/xCAT-test/autotest/bundle/ubuntu_x86_daily.bundle index 280fb0f6e..46ff09f19 100644 --- a/xCAT-test/autotest/bundle/ubuntu_x86_daily.bundle +++ b/xCAT-test/autotest/bundle/ubuntu_x86_daily.bundle @@ -125,6 +125,10 @@ noderm_err_node noderm_h noderm_noderange noderm_null +nodepurge_err_node +nodepurge_h +nodepurge_noderange +nodepurge_null nodeset_errorcommand nodeset_check_warninginfo nodeset_noderange diff --git a/xCAT-test/autotest/testcase/nodepurge/cases0 b/xCAT-test/autotest/testcase/nodepurge/cases0 new file mode 100644 index 000000000..2109d0521 --- /dev/null +++ b/xCAT-test/autotest/testcase/nodepurge/cases0 @@ -0,0 +1,59 @@ +start:nodepurge_noderange +description:nodepurge testnode1,testnode2 +label:mn_only,db +cmd:mkdef -t node -o testnode1 arch=ppc64le cons=ipmi groups=pbmc mgt=ipmi ip=10.1.1.200 mac=e6:d4:d2:3a:ad:01 monserver=10.1.1.1 nameservers=10.1.1.1 nodetype=ppc,osi profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1 os=rhels7.7 netboot=petitboot +check:rc==0 +cmd:mkdef -t node -o testnode2 arch=ppc64le cons=ipmi groups=pbmc mgt=ipmi ip=10.1.1.201 mac=e6:d4:d2:3a:ad:02 monserver=10.1.1.1 nameservers=10.1.1.1 nodetype=ppc,osi profile=compute tftpserver=10.1.1.1 xcatmaster=10.1.1.1 os=rhels7.7 netboot=petitboot +check:rc==0 +cmd:lsdef -t node testnode1,testnode2 +check:output=~testnode1 +check:output=~testnode2 +cmd:makehosts testnode1,testnode2 +check:rc==0 +cmd:nodeset testnode1,testnode2 osimage=rhels7.7-ppc64le-install-compute +check:rc==0 +cmd:nodepurge testnode1,testnode2 +check:rc==0 +cmd:lsdef -t node testnode1,testnode2 +check:output=~Could not find an object named 'testnode1' of type 'node'. +check:output=~Could not find an object named 'testnode2' of type 'node'. +cmd:ls /install/autoinst/testnode1* +check:output=~No such file or directory +cmd:ls /install/autoinst/testnode2* +check:output=~No such file or directory +cmd:ping testnode1 +check:output=~Name or service not known +cmd:ping testnode2 +check:output=~Name or service not known +end + +start:nodepurge_h +description:nodepurge -h +label:mn_only,ci_test,db +cmd:nodepurge -h +check:output=~Usage +cmd:nodepurge --help +check:output=~Usage +end + +start:nodepurge_null +description:nodepurge +label:mn_only,ci_test,db +cmd:nodepurge +check:output=~Usage +end + +start:nodepurge_err_node +description:nodepurge err +label:mn_only,ci_test,db +cmd:rmdef -t node testnode +cmd:nodepurge testnode +check:rc!=0 +check:output=~Invalid nodes and/or groups in noderange: testnode +end + + + + + +