From 5e186ce1b0b79984e10ce451be68387d2c656cb8 Mon Sep 17 00:00:00 2001 From: litingt Date: Mon, 24 Dec 2018 00:14:02 -0500 Subject: [PATCH 1/4] add more lsvm cases --- xCAT-test/autotest/testcase/lsvm/cases0 | 114 ++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/xCAT-test/autotest/testcase/lsvm/cases0 b/xCAT-test/autotest/testcase/lsvm/cases0 index 9929a5ea1..4a795e9f9 100644 --- a/xCAT-test/autotest/testcase/lsvm/cases0 +++ b/xCAT-test/autotest/testcase/lsvm/cases0 @@ -18,3 +18,117 @@ cmd:lsvm testnode check:rc!=0 check:output=~Error end + +start:lsvm +description:lsvm without any flag +label:mn_only,ci_test +cmd:lsvm +check:output=~Usage +end + +start:lsvm_h +description:lsvm help information +label:mn_only,ci_test +cmd:lsvm -h +check:output=~Usage +cmd:lsvm --help +check:output=~Usage +end + +start:lsvm_a +description:lsvm -a/--all could work as design, to display all the information for the vm +label:others,hctrl_kvm +cmd:rpower $$CN on +cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done +check:ouptut=~Running|on +cmd:lsvm $$CN +check:rc==0 +check:output=~$$CN: Id:\s*\w+ +check:output=~$$CN: Host:\s*\w+ +check:output=~$$CN: OS:\s*\w+ +check:output=~$$CN: Memory:\s*\w+ +check:output=~$$CN: CPU:\s*\w+ +check:output=~$$CN: State:\s*\w+ +check:output=~$$CN: Disk\s*\w+ +cmd:lsvm $$CN -a +check:rc==0 +check:output=~$$CN: Id:\s*\w+ +check:output=~$$CN: Host:\s*\w+ +check:output=~$$CN: OS:\s*\w+ +check:output=~$$CN: Memory:\s*\w+ +check:output=~$$CN: CPU:\s*\w+ +check:output=~$$CN: State:\s*\w+ +check:output=~$$CN: Disk\s*\w+ +cmd:lsvm $$CN --all +check:rc==0 +check:output=~$$CN: Id:\s*\w+ +check:output=~$$CN: Host:\s*\w+ +check:output=~$$CN: OS:\s*\w+ +check:output=~$$CN: Memory:\s*\w+ +check:output=~$$CN: CPU:\s*\w+ +check:output=~$$CN: State:\s*\w+ +check:output=~$$CN: Disk\s*\w+ +end + +start:lsvm_noderange +description:lsvm noderagen could work as design, to display the information for all nodes in noderange +label:others,hctrl_kvm +cmd:rpower $$CN on +cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done +check:ouptut=~Running|on +cmd:rpower $$SN on +cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done +check:ouptut=~Running|on +cmd:lsvm $$CN,$$SN +check:rc==0 +check:output=~$$CN: Id:\s*\w+ +check:output=~$$CN: Host:\s*\w+ +check:output=~$$CN: OS:\s*\w+ +check:output=~$$CN: Memory:\s*\w+ +check:output=~$$CN: CPU:\s*\w+ +check:output=~$$CN: State:\s*\w+ +check:output=~$$CN: Disk\s*\w+ +check:output=~$$SN: Id:\s*\w+ +check:output=~$$SN: Host:\s*\w+ +check:output=~$$SN: OS:\s*\w+ +check:output=~$$SN: Memory:\s*\w+ +check:output=~$$SN: CPU:\s*\w+ +check:output=~$$SN: State:\s*\w+ +check:output=~$$SN: Disk\s*\w+ +end + +start:lsvm_kvmhost +description:lsvm could give out the kvm host information. This case should be run on a mn which has kvm host defined.In this case, $$CN should be a kvm host. +label:others,hctrl_kvm +cmd:lsvm $$CN +check:output=~$$CN:\s*\w+ +end + +start:lsvm_mixed_vm_defined_and_not +description:lsvm could give out the defined vm information.In this case, $$CN is a defined vm, vmnode is not defined in database. +label:others,hctrl_kvm +cmd:lsvm $$CN,vmnode +check:output=~Error: Invalid nodes and/or groups in noderange: vmnode +check:rc!=0 +end + +start:lsvm_mixed_vm_running_and_off +description:lsvm noderagen could work as design, to display the information for all nodes in noderange +label:others,hctrl_kvm +cmd:rpower $$CN off +cmd:a=0;while ! `rpower $$CN stat|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done +check:ouptut=~Not Activated|off +cmd:rpower $$SN on +cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done +check:ouptut=~Running|on +cmd:lsvm $$CN,$$SN +check:output=~$$SN: Id:\s*\w+ +check:output=~$$SN: Host:\s*\w+ +check:output=~$$SN: OS:\s*\w+ +check:output=~$$SN: Memory:\s*\w+ +check:output=~$$SN: CPU:\s*\w+ +check:output=~$$SN: State:\s*\w+ +check:output=~$$SN: Disk\s*\w+ +check:output=~$$CN: \s*Could not get any information about specified object +check:rc==0 + From 4c243442e7eb7004b2d07c944ef81c62fa7132c7 Mon Sep 17 00:00:00 2001 From: litingt Date: Wed, 2 Jan 2019 20:55:11 -0500 Subject: [PATCH 2/4] update according to comments to update output of lsvm_kvmhost --- xCAT-test/autotest/testcase/lsvm/cases0 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/xCAT-test/autotest/testcase/lsvm/cases0 b/xCAT-test/autotest/testcase/lsvm/cases0 index 4a795e9f9..6605c4f93 100644 --- a/xCAT-test/autotest/testcase/lsvm/cases0 +++ b/xCAT-test/autotest/testcase/lsvm/cases0 @@ -5,13 +5,6 @@ #check:rc!=0 #check:output=~Usage #end -start:lsvm_node -label:others,hctrl_hmc -hcp:hmc,ivm -cmd:lsvm $$CN -check:rc==0 -check:output=~name=$$CN -end start:lsvm_err_node label:others,hctrl_hmc cmd:lsvm testnode @@ -101,7 +94,7 @@ start:lsvm_kvmhost description:lsvm could give out the kvm host information. This case should be run on a mn which has kvm host defined.In this case, $$CN should be a kvm host. label:others,hctrl_kvm cmd:lsvm $$CN -check:output=~$$CN:\s*\w+ +check:output=~$$CN end start:lsvm_mixed_vm_defined_and_not From 90d82b649201aa4df417e336ba8e6df978d80442 Mon Sep 17 00:00:00 2001 From: litingt Date: Wed, 2 Jan 2019 21:07:55 -0500 Subject: [PATCH 3/4] update case lsvm_mixed_vm_running_and_off --- xCAT-test/autotest/testcase/lsvm/cases0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xCAT-test/autotest/testcase/lsvm/cases0 b/xCAT-test/autotest/testcase/lsvm/cases0 index 6605c4f93..14af32071 100644 --- a/xCAT-test/autotest/testcase/lsvm/cases0 +++ b/xCAT-test/autotest/testcase/lsvm/cases0 @@ -108,11 +108,13 @@ end start:lsvm_mixed_vm_running_and_off description:lsvm noderagen could work as design, to display the information for all nodes in noderange label:others,hctrl_kvm -cmd:rpower $$CN off +cmd:rpower $$CN off cmd:a=0;while ! `rpower $$CN stat|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done +cmd:rpower $$CN stat check:ouptut=~Not Activated|off cmd:rpower $$SN on -cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done +cmd:a=0;while ! `rpower $$SN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done +cmd:rpower $$SN stat check:ouptut=~Running|on cmd:lsvm $$CN,$$SN check:output=~$$SN: Id:\s*\w+ @@ -124,4 +126,3 @@ check:output=~$$SN: State:\s*\w+ check:output=~$$SN: Disk\s*\w+ check:output=~$$CN: \s*Could not get any information about specified object check:rc==0 - From d6f80070a7e578393958e7e0f914fe92463dafdc Mon Sep 17 00:00:00 2001 From: litingt Date: Wed, 2 Jan 2019 21:13:30 -0500 Subject: [PATCH 4/4] update case lsvm_noderange --- xCAT-test/autotest/testcase/lsvm/cases0 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/lsvm/cases0 b/xCAT-test/autotest/testcase/lsvm/cases0 index 14af32071..b29b2fc7b 100644 --- a/xCAT-test/autotest/testcase/lsvm/cases0 +++ b/xCAT-test/autotest/testcase/lsvm/cases0 @@ -68,9 +68,11 @@ description:lsvm noderagen could work as design, to display the information for label:others,hctrl_kvm cmd:rpower $$CN on cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done +cmd:rpower $$CN stat check:ouptut=~Running|on cmd:rpower $$SN on -cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done +cmd:a=0;while ! `rpower $$SN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done +cmd:rpower $$SN stat check:ouptut=~Running|on cmd:lsvm $$CN,$$SN check:rc==0