From c20b5f4272f00c1c28d4deb8d98414fbc3598996 Mon Sep 17 00:00:00 2001
From: Matthew Stidham <stidmatt@protonmail.com>
Date: Fri, 5 Feb 2021 11:24:40 -0800
Subject: [PATCH] regression test additions and fixes to several scripts

---
 py-scripts/regression_test.sh         | 17 ++++++++++++++++-
 py-scripts/test_wanlink.py            |  5 ++---
 py-scripts/update_dependencies.py     |  2 +-
 py-scripts/ws_generic_monitor_test.py |  1 +
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/py-scripts/regression_test.sh b/py-scripts/regression_test.sh
index f9e87965..42d27493 100755
--- a/py-scripts/regression_test.sh
+++ b/py-scripts/regression_test.sh
@@ -22,18 +22,33 @@ REPORT_DIR="/home/lanforge/html-reports"
 
 #Test array
 testCommands=(
+    "./cpu_stats.py"
     "./example_security_connection.py --num_stations $NUM_STA --ssid jedway-wpa-1 --passwd jedway-wpa-1 --radio $RADIO_USED --security wpa"
     "./example_security_connection.py --num_stations $NUM_STA --ssid $SSID_USED --passwd $SSID_USED --radio $RADIO_USED --security wpa2"
     "./example_security_connection.py --num_stations $NUM_STA --ssid jedway-wep-48 --passwd 0123456789 --radio $RADIO_USED --security wep"
     "./example_security_connection.py --num_stations $NUM_STA --ssid jedway-wpa3-1 --passwd jedway-wpa3-1 --radio $RADIO_USED --security wpa3"
-    "./test_ipv4_connection.py --radio $RADIO_USED --num_stations $NUM_STA --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY"
+    "./sta_connect2.py --dut_ssid $SSID_USED --dut_passwd $PASSWD_USED --dut_security $SECURITY"
+    "./test_fileio.py "
     "./test_generic.py --radio $RADIO_USED --ssid $SSID_USED --passwd $PASSWD_USED --num_stations $NUM_STA --type lfping --dest 10.40.0.1 --security $SECURITY"
     "./test_generic.py --radio $RADIO_USED --ssid $SSID_USED --passwd $PASSWD_USED --num_stations $NUM_STA --type speedtest --speedtest_min_up 20 --speedtest_min_dl 20 --speedtest_max_ping 150 --security $SECURITY"
+    "./testgroup.py --group_name group1 --add_group --list_groups"
+    "./testgroup.py --group_name group1 --add_group --add_cx l3_test1,l3_test2 --remove_cx l3_test3 --list_groups"
+    "./test_ipv4_connection.py --radio $RADIO_USED --num_stations $NUM_STA --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY"
     "./test_ipv4_l4_urls_per_ten.py --radio $RADIO_USED --num_stations $NUM_STA --security $SECURITY --ssid $SSID_USED --passwd $PASSWD_USED --num_tests 1 --requests_per_ten 600 --target_per_ten 600"
     "./test_ipv4_l4_wifi.py --radio $RADIO_USED --num_stations $NUM_STA --security $SECURITY --ssid $SSID_USED --passwd $PASSWD_USED --test_duration 15s"
     "./test_ipv4_l4.py --radio $RADIO_USED --num_stations 4 --security $SECURITY --ssid $SSID_USED --passwd $PASSWD_USED --test_duration 15s"
     "./test_ipv4_variable_time.py --radio $RADIO_USED --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --test_duration 15s --output_format excel --col_names $COL_NAMES"
     "./test_ipv4_variable_time.py --radio $RADIO_USED --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --test_duration 15s --output_format csv --col_names $COL_NAMES"
+    "./test_ipv6_connection.py"
+    "./test_ipv6_variable_time.py --radio $RADIO_USED --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --test_duration 15s --cx_type tcp6"
+    "./test_l3_longevity.py"
+    "./test_l3_powersave_traffic.py" #this is all which is needed to run
+    "./test_l3_scenario_throughput.py -t 15s"
+    "./test_status_msg.py" #this is all which is needed to run
+    "./test_wanlink.py"
+    "./wlan_theoretical_sta.py"
+    "./ws_generic_monitor_test.py"
+    #"./ws-sta-monitor.py"
     #"./create_bridge.py --radio wiphy1 --upstream_port eth1 --target_device sta0000"NAME
     #"./create_l3.py --radio wiphy1 --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY"
     #"./create_l4.py --radio wiphy1 --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY"
diff --git a/py-scripts/test_wanlink.py b/py-scripts/test_wanlink.py
index 2f93f0ad..95a396d0 100755
--- a/py-scripts/test_wanlink.py
+++ b/py-scripts/test_wanlink.py
@@ -90,6 +90,5 @@ class LANtoWAN(LFCliBase):
 
 
 def main():
-
-if __name__ == "__main__":
-    main()
\ No newline at end of file
+    if __name__ == "__main__":
+        main()
\ No newline at end of file
diff --git a/py-scripts/update_dependencies.py b/py-scripts/update_dependencies.py
index dac713ce..f7b1f9bc 100644
--- a/py-scripts/update_dependencies.py
+++ b/py-scripts/update_dependencies.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import subprocess
 def main():
-    command = "pip install pandas seaborn plotly numpy dash --upgrade"
+    command = "pip install pandas seaborn plotly numpy dash paramiko --upgrade"
     res = subprocess.call(command, shell = True)
 
     print("Returned Value: ", res)
diff --git a/py-scripts/ws_generic_monitor_test.py b/py-scripts/ws_generic_monitor_test.py
index 157380b2..3e7c75be 100755
--- a/py-scripts/ws_generic_monitor_test.py
+++ b/py-scripts/ws_generic_monitor_test.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 """
 This example is to demonstrate ws_generic_monitor to monitor events triggered by scripts,
 This script when running, will monitor the events triggered by test_ipv4_connection.py