From: Cristina Pauna <cristina.pauna@enea.com>
Date: Mon, 27 Apr 2020 08:17:00 +0000 (+0000)
Subject: Merge "k8s conformance: Sanitize major/minor version str"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=commitdiff_plain;h=e9165d042a6012b82fa79f0cf245bd4f8b1e385d;hp=528222a0d0fff5208e298548a567f3a63ef4358a

Merge "k8s conformance: Sanitize major/minor version str"
---

diff --git a/tests/hardware/bios_version/bios_version_dell.robot b/tests/hardware/bios_version/bios_version_dell.robot
index 682e596..acbb5bc 100644
--- a/tests/hardware/bios_version/bios_version_dell.robot
+++ b/tests/hardware/bios_version/bios_version_dell.robot
@@ -27,21 +27,22 @@ Suite Teardown    Close All Connections
 #${HOST}           localhost
 #${USERNAME}       localadmin
 #${SYSINFO}        PowerEdge R740xd
-#${BIOS_REVISION}   1.3
+#${BIOS_REVISION}  1.3
+#${BLK_DEV_REGEXP} ([sh]d[a-z]+|nvme)[0-9]+
 ${SSH_KEYFILE}     /root/.ssh/id_rsa
 ${LOG}             ${LOG_PATH}${/}${SUITE_NAME.replace(' ','_')}.log
 
 *** Test Cases ***
 Get HW Details
         [Documentation]         Verify HW details
-        Start Command           dmidecode | grep -A3 '^System Information'   sudo=True
+        Start Command           cat /sys/class/dmi/id/product_name
         ${stdout}=              Read Command Output
         Append To File          ${LOG}  ${stdout}${\n}
         Should Contain          ${stdout}               ${SYSINFO}
 
 Verify BIOS Revision
         [Documentation]         Verify BIOS Revision
-        Start Command           dmidecode | more | grep 'BIOS Revision'    sudo=True
+        Start Command           printf "BIOS Revision: %u.%u" $(sudo od -t u1 -j 20 -N 2 -A none /sys/firmware/dmi/tables/DMI)
         ${stdout}=              Read Command Output
         Append To File          ${LOG}  ${stdout}${\n}
         Should Contain          ${stdout}               BIOS Revision: ${BIOS_REVISION}
@@ -50,16 +51,15 @@ Check NUMA and CPU
         [Documentation]         NUMAs and CPU components
         ${output}=              Execute Command         lscpu
         Append To File          ${LOG}  ${output}${\n}
-        Should Contain          ${output}       CPU(s):                88
+        Should Match Regexp     ${output}               CPU\\(s\\):\\s+\\d+
 
 Verify Block Devices
         [Documentation]         Reads the sysfs filesystem
         ${output}=              Execute Command         lsblk
         Append To File          ${LOG}  ${output}${\n}
-        Should Contain          ${output}       sdg4
+        Should Match Regexp     ${output}               ${BLK_DEV_REGEXP}
 
 *** Keywords ***
 Open Connection And Log In
-  Open Connection       ${HOST}
-  Login With Public Key    ${USERNAME}  ${SSH_KEYFILE}
-
+        Open Connection         ${HOST}
+        Login With Public Key   ${USERNAME}  ${SSH_KEYFILE}
diff --git a/tests/variables.yaml b/tests/variables.yaml
index 4a68a51..7e10871 100644
--- a/tests/variables.yaml
+++ b/tests/variables.yaml
@@ -40,6 +40,7 @@ ssh_keyfile: /root/.ssh/id_rsa  # Identity file for authentication
 ### Input variables for bios_version_dell.robot
 sysinfo: PowerEdge R740xd
 bios_revision: 1.3
+blk_dev_regexp: ([sh]d[a-z]+|nvme)[0-9]+
 
 ### Input variables for bare metal hardware test dell or hp
 base_uri: https://192.168.XX.XX/redfish/v1/   # OOB Redfish link address