hardware: bios_version rework without dmidecode

[validation.git] / tests / hardware / bios_version / bios_version_dell.robot

diff --git a/tests/hardware/bios_version/bios_version_dell.robot b/tests/hardware/bios_version/bios_version_dell.robot
index efa9dd9..acbb5bc 100644 (file)
--- a/tests/hardware/bios_version/bios_version_dell.robot
+++ b/tests/hardware/bios_version/bios_version_dell.robot
@@ -24,40 +24,42 @@ Suite Setup       Open Connection And Log In
 Suite Teardown    Close All Connections
 
 *** Variables ***
-${HOST}           localhost
-${USERNAME}       localadmin
-${LOG}            /opt/akraino/validation/bios_version/print_bios.txt
-${SYSINFO}        PowerEdge R740xd
+#${HOST}           localhost
+#${USERNAME}       localadmin
+#${SYSINFO}        PowerEdge R740xd
+#${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: 1.3
+        Should Contain          ${stdout}               BIOS Revision: ${BIOS_REVISION}
 
 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}  /root/.ssh/${USERNAME}_id_rsa
-
+        Open Connection         ${HOST}
+        Login With Public Key   ${USERNAME}  ${SSH_KEYFILE}