From 83136bb77992cc5a14192bee7564c009cd8d9ead Mon Sep 17 00:00:00 2001
From: Matthew Stidham <stidmatt@gmail.com>
Date: Tue, 7 Dec 2021 12:48:41 -0800
Subject: [PATCH] regression_test: Add System Information to System Information
 table

Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
---
 py-scripts/regression_test.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/py-scripts/regression_test.sh b/py-scripts/regression_test.sh
index 31e6a4d6..01dbe211 100755
--- a/py-scripts/regression_test.sh
+++ b/py-scripts/regression_test.sh
@@ -77,7 +77,11 @@ if [[ ${#MGR} -eq 0 ]]; then # Allow the user to change the radio they test agai
   MGR="localhost"
 fi
 
-PYTHON_VERSION=$(python -c 'import sys; print(sys.version)')
+PYTHON_VERSION=$(python3 -c 'import sys; print(sys.version)')
+
+BuildVersion=$(wget $MGR:8080 -q -O - jq '.VersionInfo.BuildVersion')
+BuildDate=$(wget $MGR:8080 -q -O - jq '.VersionInfo.BuildDate')
+OS_Version=$(echo /etc/os-release | grep 'VERSION')
 
 #SCENARIO_CHECK="$(python3 -c "import requests; print(requests.get('http://${MGR}:8080/events/').status_code)")"
 #if [[ ${SCENARIO_CHECK} -eq 200 ]]; then
@@ -644,9 +648,7 @@ td.testname {
     fname="${HOMEPATH}/html-reports/regression_file-${NOW}.html"
     echo "$header"  >> "$fname"
     echo "${results[@]}"  >> "$fname"
-    LANFORGE_DATA=$(python -c 'import lanforge_scripts
-    lfcli=lanforge_scripts.LFCliBase(\"192.168.92.12\",8080)
-    response=lfcli.json_get(\"/\")')
+    LANFORGE_DATA=$(python -c 'import lanforge_scripts; lfcli=lanforge_scripts.LFCliBase(\"192.168.92.12\",8080); response=lfcli.json_get(\"/\")')
     echo "</table>
     </table>
     <br />
@@ -657,11 +659,13 @@ td.testname {
         <th>Python version</th>
         <th>LANforge version</th>
         <th>LANforge build date</th>
+        <th>OS Version</th>
       </tr>
       <tr>
         <td id='PythonVersion'>${PYTHON_VERSION}</td>
-        <td id='LANforgeVersion'></td>
-        <td id='LANforgeBuildDate'></td>
+        <td id='LANforgeVersion'>${BuildVersion}</td>
+        <td id='LANforgeBuildDate'>${BuildDate}</td>
+        <td id='OS_Version'>${OS_Version}
       </tr>
     </table>" >> "$fname"
     echo "$tail" >> "$fname"