From 62414fcb8bf130a3ddb323ade74fd7bcd273930e Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Fri, 20 Apr 2018 04:25:10 -0400 Subject: [PATCH] update according to comments --- xCAT-test/autotest/testcase/rspconfig/cases1 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/xCAT-test/autotest/testcase/rspconfig/cases1 b/xCAT-test/autotest/testcase/rspconfig/cases1 index b59471a36..6862c30ea 100644 --- a/xCAT-test/autotest/testcase/rspconfig/cases1 +++ b/xCAT-test/autotest/testcase/rspconfig/cases1 @@ -32,12 +32,11 @@ check:rc == 0 cmd:rspconfig $$CN dump -g|tee /tmp/dumpgenerate check:rc == 0 check:output =~$$CN:\s*\[\d+\]\s* success -end cmd:sleep 300 cmd:rspconfig $$CN dump -l check:output =~$$CN:\s*\[\d+\]\s* Generated: check:rc == 0 -cmd:dumpnumber=`cat /tmp/dumpgenerate |awk -F '[' '{ print $2 }' | awk -F ']' '{ print $1 }'`|rspconfig $$CN dump --clear $dumpnumber +cmd:dumpnumber=`cat /tmp/dumpgenerate |awk -F '[' '{ print $2 }' | awk -F ']' '{ print $1 }'`;rspconfig $$CN dump --clear $dumpnumber check:rc == 0 check:output =~$$CN:\s*\[\d+\]\s* clear cmd:rspconfig $$CN dump -l|tee /tmp/dumplistnew @@ -168,11 +167,13 @@ cmd:rspconfig $$CN powerrestorepolicy=always_on check:output =~$$CN:\s*BMC Setting BMC PowerRestorePolicy... check:rc == 0 cmd:rspconfig $$CN powerrestorepolicy +check:rc == 0 check:output =~$$CN:\s*BMC PowerRestorePolicy:\s*AlwaysOn cmd:rspconfig $$CN powerrestorepolicy=always_off check:output =~$$CN:\s*BMC Setting BMC PowerRestorePolicy... check:rc == 0 cmd:rspconfig $$CN powerrestorepolicy +check:rc == 0 check:output =~$$CN:\s*BMC PowerRestorePolicy:\s*AlwaysOff cmd:rspconfig $$CN powerrestorepolicy=restore check:output =~$$CN:\s*BMC Setting BMC PowerRestorePolicy... @@ -181,6 +182,7 @@ cmd:rspconfig $$CN powerrestorepolicy=abc check:output =~$$CN:\s*Error: Invalid value '\S*' for 'powerrestorepolicy', Valid values: restore,always_on,always_off check:rc != 0 cmd:rspconfig $$CN powerrestorepolicy +check:rc == 0 check:output =~$$CN:\s*BMC PowerRestorePolicy:\s*Restore cmd:policy=`cat /tmp/powerrestorepolicy | awk -F ":" '{print $3}'`;newpolicy=`echo $policy |tr 'A-Z' 'a-z'`;rspconfig $$CN powerrestorepolicy=$newpolicy check:rc == 0 @@ -197,12 +199,14 @@ check:rc == 0 cmd:rspconfig $$CN powersupplyredundancy=enabled check:output =~$$CN:\s*BMC Setting BMC PowerSupplyRedundancy... check:rc == 0 -cmd:rspconfig $$CN powersupplyredundancy +cmd:rspconfig $$CN powersupplyredundancy +check:rc == 0 check:output =~$$CN:\s*BMC PowerSupplyRedundancy:\s*Enabled cmd:rspconfig $$CN powersupplyredundancy=disabled check:output =~$$CN:\s*BMC Setting BMC PowerSupplyRedundancy... check:rc == 0 cmd:rspconfig $$CN powersupplyredundancy +check:rc == 0 check:output =~$$CN:\s*BMC PowerSupplyRedundancy:\s*Disabled cmd:rspconfig $$CN powersupplyredundancy=abc check:output =~$$CN:\s*Error: Invalid value \S* for 'powersupplyredundancy', Valid values: disabled,enabled @@ -223,11 +227,13 @@ cmd:rspconfig $$CN timesyncmethod=ntp check:output =~$$CN:\s*BMC Setting BMC TimeSyncMethod... check:rc == 0 cmd:rspconfig $$CN timesyncmethod +check:rc == 0 check:output =~$$CN:\s*BMC TimeSyncMethod:\s*NTP cmd:rspconfig $$CN timesyncmethod=manual check:output =~$$CN:\s*BMC Setting BMC TimeSyncMethod... check:rc == 0 cmd:rspconfig $$CN timesyncmethod +check:rc == 0 check:output =~$$CN:\s*BMC TimeSyncMethod:\s*Manual cmd:rspconfig $$CN timesyncmethod=abc check:output =~$$CN:\s*Error: Invalid value \S* for 'timesyncmethod', Valid values: ntp,manual @@ -247,17 +253,20 @@ check:rc == 0 cmd:rspconfig $$CN bootmode=regular check:output =~$$CN:\s*BMC Setting BMC BootMode... check:rc == 0 -cmd:rspconfig $$CN bootmode +cmd:rspconfig $$CN bootmode +check:rc == 0 check:output =~$$CN:\s*BMC BootMode:\s*Regular cmd:rspconfig $$CN bootmode=safe check:output =~$$CN:\s*BMC Setting BMC BootMode... check:rc == 0 cmd:rspconfig $$CN bootmode +check:rc == 0 check:output =~$$CN:\s*BMC BootMode:\s*Safe cmd:rspconfig $$CN bootmode=setup check:output =~$$CN:\s*BMC Setting BMC BootMode... check:rc == 0 cmd:rspconfig $$CN bootmode +check:rc == 0 check:output =~$$CN:\s*BMC BootMode:\s*Setup cmd:rspconfig $$CN bootmode=abc check:output =~$$CN:\s*Error: Invalid value \S* for 'bootmode', Valid values: regular,safe,setup @@ -278,11 +287,13 @@ cmd:rspconfig $$CN autoreboot=1 check:output =~$$CN:\s*BMC Setting BMC AutoReboot... check:rc == 0 cmd:rspconfig $$CN autoreboot +check:rc == 0 check:output =~$$CN:\s*BMC AutoReboot:\s*1 cmd:rspconfig $$CN autoreboot=0 check:output =~$$CN:\s*BMC Setting BMC AutoReboot... check:rc == 0 cmd:rspconfig $$CN autoreboot +check:rc == 0 check:output =~$$CN:\s*BMC AutoReboot:\s*0 cmd:rspconfig $$CN autoreboot=2 check:output =~$$CN:\s*Error: Invalid value \S* for 'autoreboot', Valid values: 0,1