Merge pull request #3123 from junxiawang/0524N

modify and add testcase for rvitals for issue:3062

xCAT-test/autotest/testcase/rvitals/cases0

@@ -1,40 +1,125 @@
+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:
+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
+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
+check:rc==0
+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
+check:rc==0
+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
-check:output=~Frame Voltages
+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)
+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
 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
-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
+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
+end

xCAT-test/autotest/testcase/rvitals/cases1

@@ -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