From 9836e6ec0f3d9bc832e0c6a46c9b4373eba14d33 Mon Sep 17 00:00:00 2001
From: huweihua <huweihua@cn.ibm.com>
Date: Tue, 26 Jun 2018 01:38:34 -0400
Subject: [PATCH] replace hctrl_gen by hctrl_general and tag usage check test
 cases as  mn_only

---
 xCAT-test/autotest/testcase/rbeacon/cases0    |  6 +++---
 xCAT-test/autotest/testcase/reventlog/cases0  |  8 ++++----
 .../autotest/testcase/rflash/rflash_openbmc.0 | 14 ++++++-------
 xCAT-test/autotest/testcase/rinv/cases0       | 20 +++++++++----------
 xCAT-test/autotest/testcase/rpower/cases0     | 20 +++++++++----------
 xCAT-test/autotest/testcase/rsetboot/cases0   |  8 ++++----
 xCAT-test/autotest/testcase/rvitals/cases0    | 16 +++++++--------
 xCAT-test/autotest/testcase/rvitals/cases1    |  2 +-
 8 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/xCAT-test/autotest/testcase/rbeacon/cases0 b/xCAT-test/autotest/testcase/rbeacon/cases0
index 229722014..6b007bfe1 100644
--- a/xCAT-test/autotest/testcase/rbeacon/cases0
+++ b/xCAT-test/autotest/testcase/rbeacon/cases0
@@ -2,7 +2,7 @@ start:rbeacon_null
 description: this case is to test rbeacon usage
 os:Linux
 hcp:openbmc
-label:cn_bmc_ready,hctrl_openbmc
+label:mn_only,hctrl_openbmc
 cmd:rbeacon
 check:rc==0
 check:output=~Usage
@@ -22,7 +22,7 @@ start:rbeacon_help
 description: this case is to test rbeacon -h and --help output 
 os:Linux
 hcp:openbmc
-label:cn_bmc_ready,hctrl_openbmc
+label:mn_only,hctrl_openbmc
 cmd:rbeacon -h
 check:rc==0
 check:output=~Usage
@@ -37,7 +37,7 @@ start:rbeacon_version
 description: this case is to test rbeacon -v and --version output
 os:Linux
 hcp:openbmc
-label:cn_bmc_ready,hctrl_openbmc
+label:mn_only,hctrl_openbmc
 cmd:rbeacon -v
 check:rc==0
 check:output=~Version
diff --git a/xCAT-test/autotest/testcase/reventlog/cases0 b/xCAT-test/autotest/testcase/reventlog/cases0
index 102cd238e..b07293b9d 100644
--- a/xCAT-test/autotest/testcase/reventlog/cases0
+++ b/xCAT-test/autotest/testcase/reventlog/cases0
@@ -1,26 +1,26 @@
 start:reventlog_null
-label:cn_bmc_ready,hctrl_gen
+label:mn_only,hctrl_general
 cmd:reventlog
 check:rc==0
 check:output=~Usage
 end
 
 start:reventlog_all
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:reventlog $$CN all
 check:rc==0
 check:output=~$$CN\s*:\s*.*\d\d/\d\d/\d\d\s*\S+|No attributes returned from the BMC
 end
 
 start:reventlog_clear
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:reventlog $$CN clear
 check:rc==0
 check:output=~$$CN\s*:\s*Logs cleared|SEL cleared
 end
 
 start:reventlog_numofentries
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:reventlog $$CN 5
 check:rc==0
 check:output=~$$CN\s*:\s*.*\d\d/\d\d/\d\d\s*\S+|$$CN: no SEL entries|Entry|No attributes returned from the BMC 
diff --git a/xCAT-test/autotest/testcase/rflash/rflash_openbmc.0 b/xCAT-test/autotest/testcase/rflash/rflash_openbmc.0
index 96dac873e..4853e8dfa 100644
--- a/xCAT-test/autotest/testcase/rflash/rflash_openbmc.0
+++ b/xCAT-test/autotest/testcase/rflash/rflash_openbmc.0
@@ -2,7 +2,7 @@ start:rflash_option_c_without_specify_noderange
 description: basic usage check for option c. if without specify noderange for rflash command, should offer usage message
 os:Linux
 hcp:openbmc
-label:cn_bmc_ready,hctrl_openbmc
+label:mn_only,hctrl_openbmc
 cmd:rflash -c
 check:output=~Usage:
 cmd:rflash -c 1.tar
@@ -14,7 +14,7 @@ start:rflash_option_l_without_specify_noderange
 description: basic usage check for option l. if without specify noderange for rflash command, should offer usage message
 os:Linux
 hcp:openbmc
-label:cn_bmc_ready,hctrl_openbmc
+label:mn_only,hctrl_openbmc
 cmd:rflash -l
 check:output=~Usage:
 end
@@ -23,7 +23,7 @@ start:rflash_option_a_without_specify_noderange
 description: basic usage check for option a. if without specify noderange for rflash command, should offer usage message
 os:Linux
 hcp:openbmc
-label:cn_bmc_ready,hctrl_openbmc
+label:mn_only,hctrl_openbmc
 cmd:rflash -a
 check:output=~Usage:
 cmd:rflash -a 1.tar
@@ -38,7 +38,7 @@ start:rflash_option_u_without_specify_noderange
 description: basic usage check for option u. if without specify noderange for rflash command, should offer usage message
 os:Linux
 hcp:openbmc
-label:cn_bmc_ready,hctrl_openbmc
+label:mn_only,hctrl_openbmc
 cmd:rflash -u
 check:output=~Usage:
 cmd:rflash -u  1.tar
@@ -50,11 +50,11 @@ start:rflash_option_d_without_specify_noderange
 description: basic usage check for option d. if without specify noderange for rflash command, should offer usage message
 os:Linux
 hcp:openbmc
-label:cn_bmc_ready,hctrl_openbmc
+label:mn_only,hctrl_openbmc
 cmd:rflash -d
 check:output=~Usage:
 cmd:rflash -d /1234
-check:Usage:
+check:output=~Usage:
 cmd:rflash --delete 1234abc
 check:rc != 0
 check:output=~Error: (\[.*?\]: )?Invalid nodes and/or groups in noderange
@@ -502,7 +502,7 @@ start:rflash_usage
 description:checke the usage of rflash for openbmc
 os:Linux
 hcp:openbmc
-label:cn_bmc_ready,hctrl_openbmc
+label:mn_only,hctrl_openbmc
 cmd:rflash -h
 check:output =~Usage:
 check:output =~OpenPOWER OpenBMC specific:
diff --git a/xCAT-test/autotest/testcase/rinv/cases0 b/xCAT-test/autotest/testcase/rinv/cases0
index 4ac186909..38634c382 100644
--- a/xCAT-test/autotest/testcase/rinv/cases0
+++ b/xCAT-test/autotest/testcase/rinv/cases0
@@ -7,7 +7,7 @@
 
 start:rinv_h
 description:show help information for rinv
-label:cn_bmc_ready,hctrl_gen
+label:mn_only,hctrl_general
 cmd:rinv -h
 check:rc==0
 check:output=~Usage
@@ -16,7 +16,7 @@ end
 
 start:rinv_help
 description:show help information for rinv
-label:cn_bmc_ready,hctrl_gen
+label:mn_only,hctrl_general
 cmd:rinv --help
 check:rc==0
 check:output=~Usage
@@ -25,7 +25,7 @@ end
 
 start:rinv_v
 description:show version for Version
-label:cn_bmc_ready,hctrl_gen
+label:mn_only,hctrl_general
 cmd:rinv -v
 check:rc==0
 check:output=~Version
@@ -54,7 +54,7 @@ end
 start:rinv_serial
 description:Retrieves serial number.
 Attribute: $$CN-The operation object of rinv command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rvitals/openbmctest.sh rinv $$CN serial
 check:rc==0
 end
@@ -62,7 +62,7 @@ end
 start:rinv_model
 description:Retrieves serial number.
 Attribute: $$CN-The operation object of rinv command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rvitals/openbmctest.sh rinv $$CN model
 check:rc==0
 end
@@ -70,7 +70,7 @@ end
 start:rinv_firm
 description:Retrieves firmware versions.
 Attribute: $$CN-The operation object of rinv command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rvitals/openbmctest.sh rinv $$CN firm
 check:rc==0
 end
@@ -78,7 +78,7 @@ end
 start:rinv_all
 description:get serial,model
 Attribute: $$CN-The operation object of rinv command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rvitals/openbmctest.sh rinv $$CN all
 check:rc==0
 end
@@ -118,7 +118,7 @@ check:rc==0
 end
 
 start:rinv_noderange_err
-label:cn_bmc_ready,hctrl_gen
+label:mn_only,hctrl_general
 cmd:rinv testnode
 check:rc!=0
 check:output=~Error
@@ -127,7 +127,7 @@ end
 start:rinv_mixnode
 description:get mixnode information,one is invalid node
 Attribute: $$CN-The operation object of rinv command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:test=$(lsdef testnode);if [[ $? -eq 0 ]]; then lsdef -l testnode -z >/tmp/testnode.stanza ;rmdef testnode;fi
 check:rc==0
 cmd:chdef testnode groups=test mgt=__GETNODEATTR($$CN,mgt)__
@@ -160,7 +160,7 @@ end
 
 start:rinv_errorcommand
 description:get right return if input error command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:rinv $$CN dafds
 check:rc==1
 check:output=~Unsupported command|Error: (\[.*?\]: )?Usage:
diff --git a/xCAT-test/autotest/testcase/rpower/cases0 b/xCAT-test/autotest/testcase/rpower/cases0
index 01c6cdfc6..243d8a6fb 100644
--- a/xCAT-test/autotest/testcase/rpower/cases0
+++ b/xCAT-test/autotest/testcase/rpower/cases0
@@ -1,7 +1,7 @@
 start:rpower_off
 description:This case is to test off option could remote power off nodes 
 Attribute: $$CN-The operation object of rpower command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 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
@@ -15,7 +15,7 @@ end
 start:rpower_stat
 description:This case is to test stat option could show the power status of nodes
 Attribute: $$CN-The operation object of rpower command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:rpower $$CN on
 cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 5 ];then break;fi done
 cmd:rpower $$CN stat
@@ -37,7 +37,7 @@ end
 start:rpower_boot
 description:This case is to test boot option could power on the nodes if nodes in off state.  Or could  hard reset the nodes if they are on. 
 Attribute: $$CN-The operation object of rpower command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 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
@@ -52,7 +52,7 @@ end
 start:rpower_status
 description:This case is to test status option could show the power status of nodes
 Attribute: $$CN-The operation object of rpower command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:rpower $$CN off
 cmd:a=0;while ! `rpower $$CN status|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 cmd:rpower $$CN status
@@ -67,7 +67,7 @@ end
 start:rpower_state
 description:This case is to test state option could show the power status of nodes
 Attribute: $$CN-The operation object of rpower command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:rpower $$CN off
 cmd:a=0;while ! `rpower $$CN state|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
 cmd:rpower $$CN state
@@ -82,7 +82,7 @@ end
 start:rpower_on
 description:This case is to test on option could remote power on nodes
 Attribute: $$CN-The operation object of rpower command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 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
@@ -97,7 +97,7 @@ end
 start:rpower_reset
 description:This case is to test reset option could hard reset nodes when nodes are in on state.
 Attribute: $$CN-The operation object of rpower command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:stat=`rpower $$CN stat`;if ([[ $stat =~ on ]] || [[ $stat =~ Running ]]) ;then rpower $$CN reset;sleep 300;stat1=`rpower $$CN stat`;if ([[ $stat1 =~ on ]] || [[ $stat1 =~ Running ]]);then exit 0;else exit 1;fi;else rpower $$CN reset;sleep 300;stat1=`rpower $$CN stat`;if ([[ $stat1 =~ off ]] || [[ $stat1 =~ "Not Activated" ]]);then exit 0;else exit 1;fi;fi
 check:rc==0
 end
@@ -105,7 +105,7 @@ end
 start:rpower_noderange
 description:This case is to test rpower could process error usage and return help information.
 Attribute: $$CN-The operation object of rpower command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:rpower $$CN
 check:rc!=0
 check:output=~Unsupported|Usage|Please enter an action
@@ -114,7 +114,7 @@ end
 start:rpower_noderange_nodeps
 description:This case is to test rpower could process error usage and return help information.
 Attribute: $$CN-The operation object of rpower command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:rpower $$CN --nodeps
 check:rc!=0
 check:output=~Unsupported|Usage
@@ -123,7 +123,7 @@ end
 start:rpower_err_noderange
 description:This case is to test rpower could process error usage and return help information.
 Attribute:N/A 
-label:cn_bmc_ready,hctrl_gen
+label:mn_only,hctrl_general
 cmd:rpower testnode stat
 check:rc!=0
 check:output=~Error
diff --git a/xCAT-test/autotest/testcase/rsetboot/cases0 b/xCAT-test/autotest/testcase/rsetboot/cases0
index 2240669ac..20e563ee5 100644
--- a/xCAT-test/autotest/testcase/rsetboot/cases0
+++ b/xCAT-test/autotest/testcase/rsetboot/cases0
@@ -72,7 +72,7 @@ end
 
 start:rsetboot_h
 description:get rsetboot help information
-label:cn_bmc_ready,hctrl_gen
+label:mn_only,hctrl_general
 cmd:rsetboot -h
 check:rc==0
 check:output=~Usage: rsetboot
@@ -80,7 +80,7 @@ end
 
 start:rsetboot_help
 description:get rsetboot help information using rsetboot help
-label:cn_bmc_ready,hctrl_gen
+label:mn_only,hctrl_general
 cmd:rsetboot -help
 check:rc==0
 check:output=~Usage: rsetboot
@@ -88,7 +88,7 @@ end
 
 start:rsetboot_v
 desription:get rsetboot version
-label:cn_bmc_ready,hctrl_gen
+label:mn_only,hctrl_general
 cmd:rsetboot -v
 check:rc==0
 check:output=~Version
@@ -96,7 +96,7 @@ end
 
 start:rsetboot_node_invalidnode
 desription:rsetboot using invalidenode
-label:cn_bmc_ready,hctrl_gen
+label:mn_only,hctrl_general
 cmd:rsetboot testnode boot
 check:rc!=0
 end
diff --git a/xCAT-test/autotest/testcase/rvitals/cases0 b/xCAT-test/autotest/testcase/rvitals/cases0
index 4d904a98d..ecc4276ff 100644
--- a/xCAT-test/autotest/testcase/rvitals/cases0
+++ b/xCAT-test/autotest/testcase/rvitals/cases0
@@ -1,7 +1,6 @@
 start:rvitals_h
 description:get rvitals's usage
-Attribute: $$CN-The operation object of rvitals command
-label:cn_bmc_ready,hctrl_gen
+label:mn_only,hctrl_general
 cmd:rvitals -h 
 check:rc==0
 check:output=~Usage:
@@ -10,8 +9,7 @@ end
 
 start:rvitals_v
 description:get rvitals's version
-Attribute: $$CN-The operation object of rvitals command
-label:cn_bmc_ready,hctrl_gen
+label:mn_only,hctrl_general
 cmd:rvitals -v
 check:rc==0
 check:output=~Version
@@ -20,7 +18,7 @@ end
 start:rvitals_temp
 description:Retrieves temperatures
 Attribute: $$CN-The operation object of rvitals command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rvitals/openbmctest.sh rvitals $$CN temp
 check:rc==0
 end
@@ -50,7 +48,7 @@ end
 start:rvitals_voltage
 description:Retrieves power supply and VRM voltage readings
 Attribute: $$CN-The operation object of rvitals command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rvitals/openbmctest.sh rvitals $$CN voltage
 check:rc==0
 end
@@ -85,7 +83,7 @@ end
 start:rvitals_all
 description:Retrieves all status
 Attribute: $$CN-The operation object of rvitals command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rvitals/openbmctest.sh rvitals $$CN all
 check:rc==0
 end
@@ -125,14 +123,14 @@ end
 
 start:rvitals_noderange_err
 description:using not defined node
-label:cn_bmc_ready,hctrl_gen
+label:mn_only,hctrl_general
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rvitals/openbmctest.sh rvitals testnode 
 check:rc!=0
 end
 
 start:rvitals_errorcommand
 description:using wrong command
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/rvitals/openbmctest.sh rvitals $$CN errorcommand
 check:rc!=0
 end
diff --git a/xCAT-test/autotest/testcase/rvitals/cases1 b/xCAT-test/autotest/testcase/rvitals/cases1
index c59c99cf0..0e73ebe2b 100644
--- a/xCAT-test/autotest/testcase/rvitals/cases1
+++ b/xCAT-test/autotest/testcase/rvitals/cases1
@@ -1,6 +1,6 @@
 start:rvitals_outputs_format_checking
 description: Check the output formats of rvitals
-label:cn_bmc_ready,hctrl_gen
+label:cn_bmc_ready,hctrl_general
 cmd:rvitals $$CN | grep -v -E '^[^:]+:[^:]+:[^:]+$'
 check:rc==1
 end