From d80adecbc29d3dcdf63741f183056aa86b8da140 Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Thu, 15 Jun 2017 05:43:58 -0400 Subject: [PATCH 1/4] add hardware control bundle for different hardware type --- xCAT-test/autotest/bundle/hdctrl_bmc.bundle | 5 ++++ .../autotest/bundle/hdctrl_general.bundle | 25 +++++++++++++++++++ .../bundle/hdctrl_openpower_ipmi.bundle | 10 ++++++++ .../bundle/hdctrl_openpower_openbmc.bundle | 10 ++++++++ .../autotest/bundle/hdctrl_ppc_hmc.bundle | 4 +++ 5 files changed, 54 insertions(+) create mode 100644 xCAT-test/autotest/bundle/hdctrl_bmc.bundle create mode 100644 xCAT-test/autotest/bundle/hdctrl_general.bundle create mode 100644 xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle create mode 100644 xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle create mode 100644 xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle diff --git a/xCAT-test/autotest/bundle/hdctrl_bmc.bundle b/xCAT-test/autotest/bundle/hdctrl_bmc.bundle new file mode 100644 index 000000000..08ddf66c1 --- /dev/null +++ b/xCAT-test/autotest/bundle/hdctrl_bmc.bundle @@ -0,0 +1,5 @@ +#INCLUDE:hdctrl_general.bundle# +rvitals_wattage +rvitals_fanspeed +rvitals_power +rvitals_leds diff --git a/xCAT-test/autotest/bundle/hdctrl_general.bundle b/xCAT-test/autotest/bundle/hdctrl_general.bundle new file mode 100644 index 000000000..7ea993052 --- /dev/null +++ b/xCAT-test/autotest/bundle/hdctrl_general.bundle @@ -0,0 +1,25 @@ +rpower_off +rpower_stat +rpower_status +rpower_state +rpower_boot +rpower_on +rpower_reset +rpower_noderange +rpower_noderange_nodeps +rpower_err_noderange +rinv_h +rinv_v +rinv_help +rinv_errorcommand +rinv_serial +rinv_model +rinv_firm +rinv_all +rvitals_h +rvitals_v +rvitals_errorcommand +rvitals_temp +rvitals_voltage +rvitals_all +rvitals_noderange_err diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle new file mode 100644 index 000000000..7ab405aab --- /dev/null +++ b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle @@ -0,0 +1,10 @@ +#INCLUDE:hdctrl_general.bundle# +rinv_deviceid +rinv_uuid +rinv_guid +rinv_vpd +rinv_mprom +rvitals_wattage +rvitals_fanspeed +rvitals_power +rvitals_leds diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle new file mode 100644 index 000000000..043bb245e --- /dev/null +++ b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle @@ -0,0 +1,10 @@ +#INCLUDE:hdctrl_general.bundle# +rinv_deviceid +rinv_uuid +rinv_vpd +rinv_cpu +rinv_dimm +rvitals_wattage +rvitals_fanspeed +rvitals_power +rvitals_leds diff --git a/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle new file mode 100644 index 000000000..e7ba1aa74 --- /dev/null +++ b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle @@ -0,0 +1,4 @@ +#INCLUDE:hdctrl_general.bundle# +rinv_bus +rinv_config +rvitals_lcds From 9e0406b0e960511349f6d533ada42b7409993dd2 Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Fri, 16 Jun 2017 02:15:04 -0400 Subject: [PATCH 2/4] update descriptions and rspconfig/rsetboot cases --- xCAT-test/autotest/bundle/hdctrl_bmc.bundle | 11 +++++++++++ xCAT-test/autotest/bundle/hdctrl_general.bundle | 1 + .../autotest/bundle/hdctrl_openpower_ipmi.bundle | 1 + .../autotest/bundle/hdctrl_openpower_openbmc.bundle | 11 +++++++++++ xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle | 1 + 5 files changed, 25 insertions(+) diff --git a/xCAT-test/autotest/bundle/hdctrl_bmc.bundle b/xCAT-test/autotest/bundle/hdctrl_bmc.bundle index 08ddf66c1..b75dc41ce 100644 --- a/xCAT-test/autotest/bundle/hdctrl_bmc.bundle +++ b/xCAT-test/autotest/bundle/hdctrl_bmc.bundle @@ -1,5 +1,16 @@ +description:the cases in this bundle is to used to verify xCAT hardware control funtions on BMC managed servers. #INCLUDE:hdctrl_general.bundle# rvitals_wattage rvitals_fanspeed rvitals_power rvitals_leds +rsetboot_net_statcheck +rsetboot_cd_statcheck +rsetboot_default_statcheck +rsetboot_h +rsetboot_help +rsetboot_v +rsetboot_node_invalidnode +rsetboot_noderange_net +rsetboot_node_invalidaction +rsetboot_group_net diff --git a/xCAT-test/autotest/bundle/hdctrl_general.bundle b/xCAT-test/autotest/bundle/hdctrl_general.bundle index 7ea993052..84ed91f6f 100644 --- a/xCAT-test/autotest/bundle/hdctrl_general.bundle +++ b/xCAT-test/autotest/bundle/hdctrl_general.bundle @@ -1,3 +1,4 @@ +description:the cases in this bundle is to verify xCAT hardware control functions. This is the basic bundle for all hardware types. rpower_off rpower_stat rpower_status diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle index 7ab405aab..c44ce9d54 100644 --- a/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle +++ b/xCAT-test/autotest/bundle/hdctrl_openpower_ipmi.bundle @@ -1,3 +1,4 @@ +description:the cases in this bundle is to verify xCAT hardware control functions on servers which are managed using IPMI. #INCLUDE:hdctrl_general.bundle# rinv_deviceid rinv_uuid diff --git a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle index 043bb245e..a271c5b6a 100644 --- a/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle +++ b/xCAT-test/autotest/bundle/hdctrl_openpower_openbmc.bundle @@ -1,3 +1,4 @@ +description:the cases in this bundle is to used to verify xCAT hardware control funtions on openpower servers which are mananged using openbmc. #INCLUDE:hdctrl_general.bundle# rinv_deviceid rinv_uuid @@ -8,3 +9,13 @@ rvitals_wattage rvitals_fanspeed rvitals_power rvitals_leds +rsetboot_net_statcheck +rsetboot_cd_statcheck +rsetboot_default_statcheck +rsetboot_h +rsetboot_help +rsetboot_v +rsetboot_node_invalidnode +rsetboot_noderange_net +rsetboot_node_invalidaction +rsetboot_group_net diff --git a/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle index e7ba1aa74..2cf057542 100644 --- a/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle +++ b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle @@ -1,3 +1,4 @@ +description:the cases in this bundle is to used to verify xCAT hardware control funtions on HMC managed servers. #INCLUDE:hdctrl_general.bundle# rinv_bus rinv_config From 56e418d81aa3b3fa0e11f4fe20249e9d6d8b04c7 Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Fri, 16 Jun 2017 04:05:04 -0400 Subject: [PATCH 3/4] add reventlog cases in hdctrl_general.bundle --- xCAT-test/autotest/bundle/hdctrl_general.bundle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xCAT-test/autotest/bundle/hdctrl_general.bundle b/xCAT-test/autotest/bundle/hdctrl_general.bundle index 84ed91f6f..e7020b1d6 100644 --- a/xCAT-test/autotest/bundle/hdctrl_general.bundle +++ b/xCAT-test/autotest/bundle/hdctrl_general.bundle @@ -24,3 +24,7 @@ rvitals_temp rvitals_voltage rvitals_all rvitals_noderange_err +reventlog_null +reventlog_all +reventlog_clear +reventlog_numofentries From 32060a54cc2a58b63bcb48c9e4d880fe134bfbc2 Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Mon, 19 Jun 2017 23:23:00 -0400 Subject: [PATCH 4/4] update rpower cases for hdctrl_ppc_hmc.bundle and rinv cases for hdctrl_bmc.bundle --- xCAT-test/autotest/bundle/hdctrl_bmc.bundle | 3 +++ xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle | 2 ++ 2 files changed, 5 insertions(+) diff --git a/xCAT-test/autotest/bundle/hdctrl_bmc.bundle b/xCAT-test/autotest/bundle/hdctrl_bmc.bundle index b75dc41ce..e8fcfd2fa 100644 --- a/xCAT-test/autotest/bundle/hdctrl_bmc.bundle +++ b/xCAT-test/autotest/bundle/hdctrl_bmc.bundle @@ -1,5 +1,8 @@ description:the cases in this bundle is to used to verify xCAT hardware control funtions on BMC managed servers. #INCLUDE:hdctrl_general.bundle# +rinv_mprom +rinv_guid +rinv_dimm rvitals_wattage rvitals_fanspeed rvitals_power diff --git a/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle index 2cf057542..51a886de1 100644 --- a/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle +++ b/xCAT-test/autotest/bundle/hdctrl_ppc_hmc.bundle @@ -1,5 +1,7 @@ description:the cases in this bundle is to used to verify xCAT hardware control funtions on HMC managed servers. #INCLUDE:hdctrl_general.bundle# +rpower_softoff +rpower_onstandby rinv_bus rinv_config rvitals_lcds