From e13a71c03fcba3a94ca6faffe3c17b899c2515d2 Mon Sep 17 00:00:00 2001 From: huweihua Date: Thu, 25 Oct 2018 03:42:51 -0400 Subject: [PATCH] Update some openbmc test cases --- .../testcase/UT_openbmc/rflash_cases0 | 2 +- .../UT_openbmc/supported_commands_case0 | 6 ++-- xCAT-test/autotest/testcase/rpower/cases0 | 32 ------------------- xCAT-test/autotest/testcase/rspconfig/cases0 | 30 ++++++++++++----- xCAT-test/autotest/testcase/rspconfig/cases1 | 2 +- 5 files changed, 27 insertions(+), 45 deletions(-) diff --git a/xCAT-test/autotest/testcase/UT_openbmc/rflash_cases0 b/xCAT-test/autotest/testcase/UT_openbmc/rflash_cases0 index de394bdf3..5a9ea47d8 100644 --- a/xCAT-test/autotest/testcase/UT_openbmc/rflash_cases0 +++ b/xCAT-test/autotest/testcase/UT_openbmc/rflash_cases0 @@ -85,6 +85,6 @@ os:Linux hcp:openbmc label:cn_bmc_ready,hctrl_openbmc cmd: rflash $$CN -l | grep \* | grep BMC | awk '{print $2}' | xargs -i{} rflash $$CN --delete {} -check:rc==1 +check:rc!=0 check:output=~$$CN: (\[.*?\]: )?Error: Deleting currently active BMC firmware is not supported end diff --git a/xCAT-test/autotest/testcase/UT_openbmc/supported_commands_case0 b/xCAT-test/autotest/testcase/UT_openbmc/supported_commands_case0 index dd20a6260..403511355 100644 --- a/xCAT-test/autotest/testcase/UT_openbmc/supported_commands_case0 +++ b/xCAT-test/autotest/testcase/UT_openbmc/supported_commands_case0 @@ -62,9 +62,9 @@ check:rc==0 check:output=~$$CN: Total Power: cmd: rvitals $$CN leds check:rc==0 -check:output=~$$CN: Front -check:output=~$$CN: Front Fans -check:output=~$$CN: Rear +check:output=~$$CN: LEDs Front +check:output=~$$CN: LEDs Fan +check:output=~$$CN: LEDs Rear cmd: rvitals $$CN all check:rc==0 check:output=~$$CN: Ambient: diff --git a/xCAT-test/autotest/testcase/rpower/cases0 b/xCAT-test/autotest/testcase/rpower/cases0 index c87c569c4..cc3c0affd 100644 --- a/xCAT-test/autotest/testcase/rpower/cases0 +++ b/xCAT-test/autotest/testcase/rpower/cases0 @@ -197,35 +197,3 @@ check:output=~Error: (\[.*?\]: )?[Uu]nsupported command[:]* rpower ddd check:rc==1 end -start:rpower_bmcreboot_perl_python_output -description:record the output for rpower bmcreboot and compare the output for perl and python version. -hcp:openbmc -label:cn_bmc_ready,hctrl_openbmc -cmd: /opt/xcat/share/xcat/tools/autotest/testcase/UT_openbmc/scripts/bmcreboot.sh $$CN /tmp/xcattest.rpower.bmcstate.perl.out PERL -check:rc==0 -cmd: grep "Login to BMC failed: 500" /tmp/xcattest.rpower.bmcstate.perl.out | sort | uniq | wc -l -check:output=~3 -cmd: grep "timeout" /tmp/xcattest.rpower.bmcstate.perl.out | sort | uniq | wc -l -check:output=~1 -cmd: grep "No route to host" /tmp/xcattest.rpower.bmcstate.perl.out | sort | uniq | wc -l -check:output=~1 -cmd: grep "BMC NotReady" /tmp/xcattest.rpower.bmcstate.perl.out | sort | uniq | wc -l -check:output=~1 -cmd: grep "BMC Ready" /tmp/xcattest.rpower.bmcstate.perl.out | sort | uniq | wc -l -check:output=~1 -cmd: cat /tmp/xcattest.rpower.bmcstate.perl.out -cmd: /opt/xcat/share/xcat/tools/autotest/testcase/UT_openbmc/scripts/bmcreboot.sh $$CN /tmp/xcattest.rpower.bmcstate.python.out PYTHON -check:rc==0 -cmd: grep "Login to BMC failed: 500" /tmp/xcattest.rpower.bmcstate.python.out | sort | uniq | wc -l -check:output=~3 -cmd: grep "timeout" /tmp/xcattest.rpower.bmcstate.python.out | sort | uniq | wc -l -check:output=~1 -cmd: grep "No route to host" /tmp/xcattest.rpower.bmcstate.python.out | sort | uniq | wc -l -check:output=~1 -cmd: grep "BMC NotReady" /tmp/xcattest.rpower.bmcstate.python.out | sort | uniq | wc -l -check:output=~1 -cmd: grep "BMC Ready" /tmp/xcattest.rpower.bmcstate.python.out | sort | uniq | wc -l -check:output=~1 -cmd: cat /tmp/xcattest.rpower.bmcstate.python.out -cmd:rm -rf /tmp/xcattest.rpower.bmcstate.perl.out /tmp/xcattest.rpower.bmcstate.python.out -end diff --git a/xCAT-test/autotest/testcase/rspconfig/cases0 b/xCAT-test/autotest/testcase/rspconfig/cases0 index c69df2a04..8bc7f1bc2 100644 --- a/xCAT-test/autotest/testcase/rspconfig/cases0 +++ b/xCAT-test/autotest/testcase/rspconfig/cases0 @@ -45,7 +45,7 @@ end start:rspconfig_sshcfg hcp:hmc -label:cn_bmc_ready,hctrl_hmc,hctrl_openbmc +label:cn_bmc_ready,hctrl_hmc cmd:rspconfig __GETNODEATTR($$CN,hcp)__ sshcfg check:rc==0 check:output=~__GETNODEATTR($$CN,hcp)__: \w+ @@ -302,27 +302,41 @@ cmd:mkdir -p /tmp/rspconfig_set_hostname_equal_star_with_bmc_is_hostname check:rc == 0 cmd:lsdef $$CN -z > /tmp/rspconfig_set_hostname_equal_star_with_bmc_is_hostname/$$CN.stanza check:rc == 0 -cmd:chdef -t node -o bogus_bmc_hostname groups=bmc ip=__GETNODEATTR($$CN,bmc)__ +cmd:rspconfig $$CN sshcfg check:rc == 0 -cmd:lsdef bogus_bmc_hostname +cmd:ssh __GETNODEATTR($$CN,bmc)__ "hostname" | tee /tmp/rspconfig_set_hostname_equal_star_with_bmc_is_hostname/bmc_old_name +cmd:chdef -t node -o bogus-bmc-hostname groups=bmc ip=__GETNODEATTR($$CN,bmc)__ check:rc == 0 -cmd:makehosts bogus_bmc_hostname +cmd:lsdef bogus-bmc-hostname check:rc == 0 -cmd:chdef $$CN bmc=bogus_bmc_hostname +cmd:makehosts bogus-bmc-hostname +check:rc == 0 +cmd:makedns bogus-bmc-hostname +check:rc == 0 +cmd:chdef $$CN bmc=bogus-bmc-hostname check:rc == 0 cmd:lsdef $$CN -i bmc -c check:rc == 0 cmd:rspconfig $$CN hostname=* check:rc == 0 -check:output =~$$CN: BMC Hostname: bogus_bmc_hostname -cmd:makehosts -d bogus_bmc_hostname +check:output =~$$CN: BMC Hostname: bogus-bmc-hostname +cmd:ssh __GETNODEATTR(bogus-bmc-hostname,ip)__ "hostname" | tee /tmp/rspconfig_set_hostname_equal_star_with_bmc_is_hostname/bmc_new_name check:rc == 0 -cmd:rmdef bogus_bmc_hostname +cmd:echo "bogus-bmc-hostname" > /tmp/rspconfig_set_hostname_equal_star_with_bmc_is_hostname/bmc_set_name +cmd:diff -y /tmp/rspconfig_set_hostname_equal_star_with_bmc_is_hostname/bmc_set_name /tmp/rspconfig_set_hostname_equal_star_with_bmc_is_hostname/bmc_new_name +check:rc == 0 +cmd:makedns -d bogus-bmc-hostname +check:rc == 0 +cmd:makehosts -d bogus-bmc-hostname +check:rc == 0 +cmd:rmdef bogus-bmc-hostname check:rc == 0 cmd:rmdef $$CN check:rc == 0 cmd:cat /tmp/rspconfig_set_hostname_equal_star_with_bmc_is_hostname/$$CN.stanza |mkdef -z check:rc == 0 +cmd:ip=$(cat /tmp/rspconfig_set_hostname_equal_star_with_bmc_is_hostname/bmc_old_name);ssh __GETNODEATTR($$CN,bmc)__ "hostname=bogus-bmc-hostname" +cmd:ssh __GETNODEATTR($$CN,bmc)__ "hostname" cmd:rm -rf /tmp/rspconfig_set_hostname_equal_star_with_bmc_is_hostname check:rc == 0 end diff --git a/xCAT-test/autotest/testcase/rspconfig/cases1 b/xCAT-test/autotest/testcase/rspconfig/cases1 index ee4f552dc..e475bcad0 100644 --- a/xCAT-test/autotest/testcase/rspconfig/cases1 +++ b/xCAT-test/autotest/testcase/rspconfig/cases1 @@ -145,7 +145,7 @@ check:output =~$$CN:\s*Dump requested check:output =~$$CN:\s*Downloading dump cmd:rspconfig $$CN dump -l |tail -n 1 |tee /tmp/dumpgenerate check:rc == 0 -cmd:dumpnumber=`sed -r 's/.+\[(.+)\].+/\1/g' /tmp/dumpgenerate`;dumpsize=`grep "\[$dumpnumber\] Generated" /tmp/dumpgenerate |cut -d : -f 6`;ls -l /var/log/xcat/dump/*_$$CN_dump_$dumpnumber.tar.xz|grep $dumpsize +cmd:dumpnumber=`sed -r 's/.+\[(.+)\].+/\1/g' /tmp/dumpgenerate`;dumpsize=`grep "\[$dumpnumber\] Generated" /tmp/dumpgenerate |cut -d : -f 6`;ls -l /var/log/xcat/dump/*_dump_$dumpnumber.tar.xz|grep $dumpsize|grep $$CN check:rc == 0 cmd:rm -rf /tmp/dumpgenerate end