From 1b1a5cc428bd0c8b5150efc3b29fe2373c81cf5c Mon Sep 17 00:00:00 2001 From: junxiawang Date: Wed, 24 May 2017 07:33:02 -0400 Subject: [PATCH 1/3] modify and add testcase for rvitals for issue:3062 --- xCAT-test/autotest/testcase/rvitals/cases0 | 71 +++++++++++++++++++--- 1 file changed, 64 insertions(+), 7 deletions(-) diff --git a/xCAT-test/autotest/testcase/rvitals/cases0 b/xCAT-test/autotest/testcase/rvitals/cases0 index 055317a88..a9ccc3a69 100644 --- a/xCAT-test/autotest/testcase/rvitals/cases0 +++ b/xCAT-test/autotest/testcase/rvitals/cases0 @@ -1,40 +1,97 @@ +start:rvitals_h +cmd:rvitals -h +check:rc==0 +check:output=~Usage: +check:output=~rvitals +end + +start:rvitals_v +cmd:rvitals -v +check:rc==0 +check:output=~Version +end + start:rvitals_temp cmd:rvitals $$CN temp check:rc==0 -check:output=~System Temperature +check:output=~System Temperature|Ambient Temp|temperature end + +start:rvitals_disktemp +arch:ppc64le +hcp:ipmi +cmd:rvitals $$CN disktemp +check:rc==0 +check:output=~Ambient Temp +end + +start:rvitals_cputemp +arch:ppc64le +hcp:ipmi +cmd:rvitals $$CN cputemp +check:rc==0 +check:output=~Ambient Temp +end + start:rvitals_voltage hcp:hmc,ivm,fsp,ipmi cmd:rvitals $$CN voltage check:rc==0 -check:output=~Frame Voltages +check:output=~Frame Voltages|CPU VDD Volt|SysBrd end + start:rvitals_power cmd:rvitals $$CN power check:rc==0 -check:output=~Current Power Status:\s*(on|off) +check:output=~Current Power Status:\s*(on|off)|Power Status:\s*(on|off) end + start:rvitals_state cmd:rvitals $$CN state check:rc==0 check:output=~System State: end + start:rvitals_lcds hcp:hmc,ivm,fsp,ipmi cmd:rvitals $$CN lcds check:rc==0 check:output=~Current LCD end + start:rvitals_all cmd:rvitals $$CN all check:rc==0 -check:output=~System Temperature -check:output=~Frame Voltages -check:output=~Current Power Status:\s*(on|off) -check:output=~System State: +check:output=~System Temperature|Ambient Temp +check:output=~Frame Voltages|CPU VDD Volt|SysBrd +check:output=~Current Power Status:\s*(on|off)|Power Status:\s*(on|off) +check:output=~ System State:|System Event:|NMI State +end + +start:rvitals_leds +cmd:rvitals $$CN leds +check:rc==0 +check:output=~LED +end + +start:rvitals_fanspeed +cmd:rvitals $$CN fanspeed +check:rc==0 +check:output=~Fan|Fan\s*\d:\s*\w+\s*RPM +end +start:rvitals_wattage +cmd:rvitals $$CN wattage +check:rc==0 +check:output=~12V Sense|AC Avg Power +check:output=~Mem Cache Power|MEM Avg Power end start:rvitals_noderange_err cmd:rvitals testnode check:rc!=0 check:output=~Error end +start:rvitals_errorcommand +cmd: rvitals $$CN errorcommand +check:rc!=0 +check:output=~Unrecognized rvitals arguments +end From d22b6c57a78b8ff184ca199dee8cfc89a3c98958 Mon Sep 17 00:00:00 2001 From: junxiawang Date: Wed, 24 May 2017 07:39:19 -0400 Subject: [PATCH 2/3] delete cases1 and cases0 could cover cases1 --- xCAT-test/autotest/testcase/rvitals/cases1 | 61 ---------------------- 1 file changed, 61 deletions(-) delete mode 100644 xCAT-test/autotest/testcase/rvitals/cases1 diff --git a/xCAT-test/autotest/testcase/rvitals/cases1 b/xCAT-test/autotest/testcase/rvitals/cases1 deleted file mode 100644 index 8a43aedb6..000000000 --- a/xCAT-test/autotest/testcase/rvitals/cases1 +++ /dev/null @@ -1,61 +0,0 @@ -start:rvitals_temp -arch:ppc64le -hcp:ipmi -cmd:rvitals $$CN temp -check:rc==0 -check:output=~Ambient Temp -end - -start:rvitals_disktemp -arch:ppc64le -hcp:ipmi -cmd:rvitals $$CN disktemp -check:rc==0 -check:output=~Ambient Temp -end - -start:rvitals_cputemp -arch:ppc64le -hcp:ipmi -cmd:rvitals $$CN cputemp -check:rc==0 -check:output=~Ambient Temp -end - -start:rvitals_fanspeed -arch:ppc64le -hcp:ipmi -cmd:rvitals $$CN fanspeed -check:rc==0 -check:output=~Fan\s*\d:\s*\w+\s*RPM -end - -start:rvitals_voltage -arch:ppc64le -hcp:ipmi -cmd:rvitals $$CN voltage -check:rc==0 -check:output=~CPU VDD Volt -end - -start:rvitals_all -arch:ppc64le -hcp:ipmi -cmd:rvitals $$CN all -check:rc==0 -check:output=~Power Status -check:output=~Power Overload -check:output=~Power Interlock -check:output=~Power Fault -check:output=~Power Control Fault -check:output=~Power Restore Policy -check:output=~Ambient Temp -end - -start:rvitals_noderange_err -arch:ppc64le -hcp:ipmi -cmd:rvitals testnode -check:rc!=0 -check:output=~Error -end From 886571042bb091cec1602430f6506ca4a25dc081 Mon Sep 17 00:00:00 2001 From: junxiawang Date: Thu, 25 May 2017 06:12:46 -0400 Subject: [PATCH 3/3] modify and add testcase for rvitals for issue:3062 --- xCAT-test/autotest/testcase/rvitals/cases0 | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/xCAT-test/autotest/testcase/rvitals/cases0 b/xCAT-test/autotest/testcase/rvitals/cases0 index a9ccc3a69..348c0caa3 100644 --- a/xCAT-test/autotest/testcase/rvitals/cases0 +++ b/xCAT-test/autotest/testcase/rvitals/cases0 @@ -1,4 +1,6 @@ start:rvitals_h +description:get rvitals's usage +Attribute: $$CN-The operation object of rvitals command cmd:rvitals -h check:rc==0 check:output=~Usage: @@ -6,18 +8,24 @@ check:output=~rvitals end start:rvitals_v +description:get rvitals's version +Attribute: $$CN-The operation object of rvitals command cmd:rvitals -v check:rc==0 check:output=~Version end start:rvitals_temp +description:Retrieves temperatures +Attribute: $$CN-The operation object of rvitals command cmd:rvitals $$CN temp check:rc==0 check:output=~System Temperature|Ambient Temp|temperature end start:rvitals_disktemp +description:Retrieves disk temperatures +Attribute: $$CN-The operation object of rvitals command arch:ppc64le hcp:ipmi cmd:rvitals $$CN disktemp @@ -26,6 +34,8 @@ check:output=~Ambient Temp end start:rvitals_cputemp +description:Retrieves cpu temperatures +Attribute: $$CN-The operation object of rvitals command arch:ppc64le hcp:ipmi cmd:rvitals $$CN cputemp @@ -34,6 +44,8 @@ check:output=~Ambient Temp end start:rvitals_voltage +description:Retrieves power supply and VRM voltage readings +Attribute: $$CN-The operation object of rvitals command hcp:hmc,ivm,fsp,ipmi cmd:rvitals $$CN voltage check:rc==0 @@ -41,18 +53,24 @@ check:output=~Frame Voltages|CPU VDD Volt|SysBrd end start:rvitals_power +description:Retrieves power status +Attribute: $$CN-The operation object of rvitals command cmd:rvitals $$CN power check:rc==0 check:output=~Current Power Status:\s*(on|off)|Power Status:\s*(on|off) end start:rvitals_state +description:Retrieves the system state. +Attribute: $$CN-The operation object of rvitals command cmd:rvitals $$CN state check:rc==0 check:output=~System State: end start:rvitals_lcds +description:Retrieves LCDs status +Attribute: $$CN-The operation object of rvitals command hcp:hmc,ivm,fsp,ipmi cmd:rvitals $$CN lcds check:rc==0 @@ -60,6 +78,8 @@ check:output=~Current LCD end start:rvitals_all +description:Retrieves all status +Attribute: $$CN-The operation object of rvitals command cmd:rvitals $$CN all check:rc==0 check:output=~System Temperature|Ambient Temp @@ -69,28 +89,36 @@ check:output=~ System State:|System Event:|NMI State end start:rvitals_leds +description:Retrieves leds status +Attribute: $$CN-The operation object of rvitals command cmd:rvitals $$CN leds check:rc==0 check:output=~LED end start:rvitals_fanspeed +description:Retrieves fan speeds. +Attribute: $$CN-The operation object of rvitals command cmd:rvitals $$CN fanspeed check:rc==0 check:output=~Fan|Fan\s*\d:\s*\w+\s*RPM end start:rvitals_wattage +description:Retrieves wattage readings. +Attribute: $$CN-The operation object of rvitals command cmd:rvitals $$CN wattage check:rc==0 check:output=~12V Sense|AC Avg Power check:output=~Mem Cache Power|MEM Avg Power end start:rvitals_noderange_err +description:using not defined node cmd:rvitals testnode check:rc!=0 check:output=~Error end start:rvitals_errorcommand +description:using wrong command cmd: rvitals $$CN errorcommand check:rc!=0 check:output=~Unrecognized rvitals arguments