From 55a8ad96abb3125ba47d143d289c2cf31d755dd2 Mon Sep 17 00:00:00 2001 From: litingt Date: Mon, 5 Nov 2018 01:19:21 -0500 Subject: [PATCH] update according to comments --- xCAT-test/autotest/testcase/confignics/cases0 | 18 +++++++++--------- xCAT-test/autotest/testcase/genimage/cases0 | 8 ++++---- .../autotest/testcase/makeconservercf/cases0 | 6 +++--- .../autotest/testcase/makeknownhosts/cases0 | 9 +++++---- xCAT-test/autotest/testcase/packimg/cases0 | 6 +++--- xCAT-test/autotest/testcase/passwd/case0 | 16 ++++++++-------- xCAT-test/autotest/testcase/pdu/case0 | 16 ++++++++-------- .../testcase/simulator/clear_simulator | 8 ++++---- 8 files changed, 44 insertions(+), 43 deletions(-) diff --git a/xCAT-test/autotest/testcase/confignics/cases0 b/xCAT-test/autotest/testcase/confignics/cases0 index 173e582ea..029532f12 100644 --- a/xCAT-test/autotest/testcase/confignics/cases0 +++ b/xCAT-test/autotest/testcase/confignics/cases0 @@ -1,6 +1,6 @@ start:confignics_config_one_port_single_value description:confignics -label:others,network,confignics,updatenode +label:others,network,updatenode cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi check:rc==0 cmd:mkdef -t network -o 100_1_0_0-255_255_0_0 net=100.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1501 @@ -20,7 +20,7 @@ end start:confignics_config_multiple_ports_single_value description:confignics -label:others,network,confignics,updatenode +label:others,network,updatenode cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi check:rc==0 cmd:mkdef -t network -o 100_1_0_0-255_255_0_0 net=100.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1501 @@ -51,7 +51,7 @@ end start:confignics_config_multiple_ports_multiple_value description:confignics -label:others,network,confignics,updatenode +label:others,network,updatenode cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi check:rc==0 cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1501 @@ -96,7 +96,7 @@ end start:confignics_config_multiple_port_withnichostnamesuffixes_multiple_value description:confignics -label:others,network,confignics,updatenode +label:others,network,updatenode cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi check:rc==0 cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC mtu=1501 @@ -151,7 +151,7 @@ end start:confignics_config_multiple_port_withnicaliases_multiple_value description:confignics -label:others,network,confignics,updatenode +label:others,network,updatenode cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi check:rc==0 cmd:mkdef -t network -o 11_1_0_0-255_255_0_0 net=11.1.0.0 mask=255.255.0.0 mgtifname=$$SECONDNIC @@ -205,7 +205,7 @@ end start:confignics_disable_set_to_yes description:confignics -label:others,network,confignics,updatenode +label:others,network,updatenode cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi check:rc==0 cmd:xdsh $$CN ifdown $$SECONDNIC @@ -228,7 +228,7 @@ end start:confignics_disable_set_to_1 description:confignics -label:others,network,confignics,updatenode +label:others,network,updatenode cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi check:rc==0 cmd:xdsh $$CN ifdown $$SECONDNIC @@ -251,7 +251,7 @@ end start:confignics_s description:confignics_s -label:others,network,confignics,updatenode +label:others,network,updatenode cmd:tabdump networks > /opt/xcat/share/xcat/tools/autotest/testcase/confignics/networks.csv check:rc==0 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/confignics/mtu_set_clean S 1496 @@ -276,7 +276,7 @@ check:rc==0 end start:chdef_nicips description:nicip could be set to null -label:others,network,confignics,updatenode +label:others,network,updatenode Attribute: $$CN-The operation object of chdef command cmd:lsdef $$CN;if [ $? -eq 0 ]; then lsdef -l $$CN -z >/tmp/CN.standa ;fi check:rc==0 diff --git a/xCAT-test/autotest/testcase/genimage/cases0 b/xCAT-test/autotest/testcase/genimage/cases0 index 559773020..e2b023e6e 100644 --- a/xCAT-test/autotest/testcase/genimage/cases0 +++ b/xCAT-test/autotest/testcase/genimage/cases0 @@ -1,5 +1,5 @@ start:genimage_h -label:others +label:others,image os:Linux cmd:genimage -h check:output=~Usage @@ -7,7 +7,7 @@ check:rc==0 end start:genimage_help -label:others +label:others,image os:Linux cmd:genimage --help check:output=~Usage @@ -15,7 +15,7 @@ check:rc==0 end start:genimage_stateless -label:others +label:others,image os:Linux cmd:copycds $$ISO check:rc==0 @@ -28,7 +28,7 @@ cmd:mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/c end start:genimage_statelite -label:others +label:others,image os:Linux cmd:copycds $$ISO check:rc==0 diff --git a/xCAT-test/autotest/testcase/makeconservercf/cases0 b/xCAT-test/autotest/testcase/makeconservercf/cases0 index 95b9ba502..678aa4947 100644 --- a/xCAT-test/autotest/testcase/makeconservercf/cases0 +++ b/xCAT-test/autotest/testcase/makeconservercf/cases0 @@ -1,5 +1,5 @@ start:makeconservercf_null -label:others,conserver +label:others cmd:chdef -t node -o testnodetmp cons=hmc groups=all cmd:makeconservercf testnodetmp check:rc==0 @@ -11,7 +11,7 @@ cmd:rmdef -t node testnodetmp end start:makeconservercf_noderange -label:others,conserver +label:others cmd:chdef -t node -o testnodetmp cons=hmc groups=all cmd:makeconservercf testnodetmp check:rc==0 @@ -23,7 +23,7 @@ cmd:rmdef -t node testnodetmp end start:makeconservercf_d -label:others,conserver +label:others cmd:chdef -t node -o testnodetmp cons=hmc groups=all cmd:makeconservercf testnodetmp check:rc==0 diff --git a/xCAT-test/autotest/testcase/makeknownhosts/cases0 b/xCAT-test/autotest/testcase/makeknownhosts/cases0 index 69f7bf3ef..7978d7dcc 100644 --- a/xCAT-test/autotest/testcase/makeknownhosts/cases0 +++ b/xCAT-test/autotest/testcase/makeknownhosts/cases0 @@ -1,4 +1,5 @@ start:makeknownhosts_h +label:others,hosts cmd:makeknownhosts -h check:output=~Usage cmd:makeknownhosts --help @@ -7,7 +8,7 @@ end start:makeknownhosts_node description:Make a known_hosts file under $ROOTHOME/.ssh for input noderange -label:others +label:others,hosts cmd:makeknownhosts $$CN -r cmd:makeknownhosts $$CN check:rc==0 @@ -19,7 +20,7 @@ end start:makeknownhosts_node_r description:remove known node in $ROOTHOME/.ssh -label:others +label:others,hosts cmd:makeknownhosts $$CN cmd:cat ~/.ssh/known_hosts|grep $$CN check:output=~$$CN @@ -32,7 +33,7 @@ end start:makeknownhosts_node_d description:delete known node entry from $ROOTHOME/.ssh -label:others +label:others,hosts cmd:makeknownhosts $$CN cmd:cat ~/.ssh/known_hosts|grep $$CN check:output=~$$CN @@ -47,7 +48,7 @@ end start:makeknownhosts_node_v description:verbose -label:others +label:others,hosts cmd:makeknownhosts $$CN -V check:rc==0 check:output=~$$CN diff --git a/xCAT-test/autotest/testcase/packimg/cases0 b/xCAT-test/autotest/testcase/packimg/cases0 index b9f5b1721..a8d51ba00 100644 --- a/xCAT-test/autotest/testcase/packimg/cases0 +++ b/xCAT-test/autotest/testcase/packimg/cases0 @@ -188,7 +188,7 @@ end start:packimage_m_tar_c_pigz os:Linux description:test packimage -m tar -c pigz -label:others,packaging +label:others,packaging,invoke_provision #cmd:copycds $$ISO cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz /rootimg.tar.gz.bak;fi @@ -243,7 +243,7 @@ end start:packimage_m_tar_c_gzip os:Linux description:test packimage -m tar -c gzip -label:others,packaging +label:others,packaging,invoke_provision #cmd:copycds $$ISO cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.gz /rootimg.tar.gz.bak;fi @@ -294,7 +294,7 @@ end start:packimage_m_tar_c_xz os:Linux description:test packimage -m tar -c xz -label:others,packaging +label:others,packaging,invoke_provision #cmd:copycds $$ISO cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg /rootimg.bak;fi cmd:ls /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.xz;if [ $? -eq 0 ];then mv -f /install/netboot/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/compute/rootimg.tar.xz /rootimg.tar.xz.bak;fi diff --git a/xCAT-test/autotest/testcase/passwd/case0 b/xCAT-test/autotest/testcase/passwd/case0 index 91350e546..8cf5869ec 100644 --- a/xCAT-test/autotest/testcase/passwd/case0 +++ b/xCAT-test/autotest/testcase/passwd/case0 @@ -1,6 +1,6 @@ start:encrypted_passwd_md5_diskfull description: this case is to test when cryptmethod=md5 in passwd table, the password is encryped with the md5 method. When compute node is diskfull provisioned, users can login node with correct password. This case should be run when node is correctly defined. -label:others +label:others,security cmd:gettab key=system passwd.cryptmethod > /tmp/tmpcryptmethod check:rc==0 cmd:chtab key=system passwd.cryptmethod=md5 @@ -19,7 +19,7 @@ end start:encrypted_passwd_md5_diskless description: this case is to test when cryptmethod=md5 in passwd table, the password is encryped with the md5 method. When compute node is diskless provisioned, users can login node with correct password. This case should be run when node is correctly defined. -label:others +label:others,security cmd:gettab key=system passwd.cryptmethod > /tmp/tmpcryptmethod check:rc==0 cmd:chtab key=system passwd.cryptmethod=md5 @@ -75,7 +75,7 @@ end start:encrypted_passwd_sha256_diskfull description: this case is to test when cryptmethod=sha256 in passwd table, the password is encryped with the sha256 method. When compute node is diskfull provisioned, users can login node with correct password. This case should be run when node is correctly defined. -label:others +label:others,security cmd:gettab key=system passwd.cryptmethod > /tmp/tmpcryptmethod check:rc==0 cmd:chtab key=system passwd.cryptmethod=sha256 @@ -94,7 +94,7 @@ end start:encrypted_passwd_sha256_diskless description: this case is to test when cryptmethod=sha256 in passwd table, the password is encryped with the sha256 method. When compute node is diskless provisioned, users can login node with correct password. This case should be run when node is correctly defined. -label:others +label:others,security cmd:gettab key=system passwd.cryptmethod > /tmp/tmpcryptmethod check:rc==0 cmd:chtab key=system passwd.cryptmethod=sha256 @@ -150,7 +150,7 @@ end start:encrypted_passwd_sha512_diskfull description: this case is to test when cryptmethod=sha512 in passwd table, the password is encryped with the sha512 method. When compute node is diskfull provisioned, users can login node with correct password. This case should be run when node is correctly defined. -label:others +label:others,security cmd:gettab key=system passwd.cryptmethod > /tmp/tmpcryptmethod check:rc==0 cmd:chtab key=system passwd.cryptmethod=sha512 @@ -169,7 +169,7 @@ end start:encrypted_passwd_sha512_diskless description: this case is to test when cryptmethod=sha512 in passwd table, the password is encryped with the sha512 method. When compute node is diskless provisioned, users can login node with correct password. This case should be run when node is correctly defined. -label:others +label:others,security cmd:gettab key=system passwd.cryptmethod > /tmp/tmpcryptmethod check:rc==0 cmd:chtab key=system passwd.cryptmethod=sha512 @@ -226,7 +226,7 @@ end start:encrypted_passwd_openssl_diskfull description: this case is to test when password is encrypted with openssl, the password is encryped in password table. When compute node is diskfull provisioned, users can login node with correct password. This case should be run when node is correctly defined. -label:others +label:others,security cmd:gettab key=system passwd.cryptmethod > /tmp/tmpcryptmethod check:rc==0 cmd:gettab key=system passwd.password > /tmp/tmppassword @@ -252,7 +252,7 @@ end start:encrypted_passwd_openssl_diskless description: this case is to test when password is encrypted with openssl, the password is encryped in password table. When compute node is diskless provisioned, users can login node with correct password. This case should be run when node is correctly defined. -label:others +label:others,security cmd:gettab key=system passwd.cryptmethod > /tmp/tmpcryptmethod check:rc==0 cmd:gettab key=system passwd.password > /tmp/tmppassword diff --git a/xCAT-test/autotest/testcase/pdu/case0 b/xCAT-test/autotest/testcase/pdu/case0 index 952021ef8..a03ff973c 100644 --- a/xCAT-test/autotest/testcase/pdu/case0 +++ b/xCAT-test/autotest/testcase/pdu/case0 @@ -1,6 +1,6 @@ start:lsdef_pdu_object description:list pdu object and it's attribute -label:others +label:others,PDU cmd:lsdef -h check:output=~pdu cmd:mkdef $$PDU mgt=pdu nodetype=pdu groups=pdu @@ -18,7 +18,7 @@ end start:mkdef_pdu_object description:create a pdu object and list it's attribute -label:others +label:others,PDU cmd:mkdef $$PDU groups=pdu ip=$$PDUIP mgt=pdu nodetype=pdu check:rc==0 cmd:lsdef -t pdu @@ -42,7 +42,7 @@ end start:noderm_pdu_object description:create a pdu object and use noderm to remove it -label:others +label:others,PDU cmd:mkdef $$PDU groups=pdu ip=$$PDUIP mgt=pdu nodetype=pdu check:rc==0 cmd:lsdef -t pdu @@ -62,7 +62,7 @@ end start:pdu_communication description:Verify a pdu snmp communication -label:others +label:others,PDU cmd:mkdef $$PDU groups=pdu ip=$$PDUIP mgt=pdu nodetype=pdu check:rc==0 cmd:lsdef -t pdu @@ -81,7 +81,7 @@ end start:pdu_rinv description:Verify rinv works for pdu object -label:others +label:others,PDU cmd:mkdef $$PDU groups=pdu ip=$$PDUIP mgt=pdu nodetype=pdu check:rc==0 cmd:makehosts $$PDU @@ -99,7 +99,7 @@ end start:pdu_rpower description:Verify rpower works for pdu object -label:others +label:others,PDU cmd:mkdef $$PDU groups=pdu ip=$$PDUIP mgt=pdu nodetype=pdu check:rc==0 cmd:makehosts $$PDU @@ -129,7 +129,7 @@ end start:pdu_node_operation description:Verify operate node's pdu attribute could operate pdu -label:others +label:others,PDU cmd:mkdef $$PDU groups=pdu ip=$$PDUIP mgt=pdu nodetype=pdu check:rc==0 cmd:makehosts $$PDU @@ -165,7 +165,7 @@ end start:pdu_bad_config description:test bad config with pdu -label:others +label:others,PDU cmd:mkdef $$PDU groups=pdu ip=$$PDUIP mgt=pdu nodetype=pdu check:rc==0 cmd:makehosts $$PDU diff --git a/xCAT-test/autotest/testcase/simulator/clear_simulator b/xCAT-test/autotest/testcase/simulator/clear_simulator index e16821451..c1536f178 100644 --- a/xCAT-test/autotest/testcase/simulator/clear_simulator +++ b/xCAT-test/autotest/testcase/simulator/clear_simulator @@ -1,27 +1,27 @@ start:clear_openbmc_simulator description:clear evironment -label:others,hctrl_openbmc +label:others cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -c $$MN $$CN check:rc==0 end start:clear_openbmc_simulator_multiple_100 description:clear evironment that simulate 100 OpenBMCs -label:others,hctrl_openbmc +label:others cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -c $$MN $$CN $$bmcusername $$bmcpasswd 100 check:rc==0 end start:clear_openbmc_simulator_multiple_1000 description:clear evironment that simulate 1000 OpenBMCs -label:others,hctrl_openbmc +label:others cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -c $$MN $$CN $$bmcusername $$bmcpasswd 1000 check:rc==0 end start:clear_openbmc_simulator_multiple_5000 description:clear evironment that simulate 5000 OpenBMCs -label:others,hctrl_openbmc +label:others cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -c $$MN $$CN $$bmcusername $$bmcpasswd 5000 check:rc==0 end