From 5c0487c1220dec0ff6577a48586fe2fdabc4114c Mon Sep 17 00:00:00 2001 From: Matthew Stidham Date: Fri, 12 Feb 2021 10:47:52 -0800 Subject: [PATCH] regression update and fixing typos --- py-scripts/regression_test.sh | 8 +++++--- py-scripts/test_l3_longevity.py | 6 +++--- py-scripts/test_l3_scenario_throughput.py | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/py-scripts/regression_test.sh b/py-scripts/regression_test.sh index 6600f3a9..6ae1dcfd 100755 --- a/py-scripts/regression_test.sh +++ b/py-scripts/regression_test.sh @@ -40,9 +40,11 @@ testCommands=( "./test_ipv4_variable_time.py --radio $RADIO_USED --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --test_duration 15s --output_format excel --layer3_cols $COL_NAMES --debug" "./test_ipv4_variable_time.py --radio $RADIO_USED --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --test_duration 15s --output_format csv --layer3_cols $COL_NAMES --debug" "./test_ipv4_l4_ftp_upload.py --upstream_port eth1 --radio RADIO_USED --num_stations $NUM_STA --security $SECURITY --ssid $SSID_USED --debug" - "./test_ipv6_connection.py --radio $RADIO_USED --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --debug" + "./test_ipv6_connection.py --radio $RADIO_USED --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY" "./test_ipv6_variable_time.py --radio $RADIO_USED --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --test_duration 15s --cx_type tcp6 --debug" - "./test_l3_longevity.py --test_duration 4m --endp_type \"lf_tcp lf_udp mc_udp\" --tos \"BK VI\" --upstream_port eth1 --radio \"radio==wiphy0 stations==32 ssid==$SSID_USED ssid_pw==$PASSWD_USED security==$SECURITY\" --radio \"radio==wiphy1 stations==32 ssid==$SSID_USED ssid_pw==$PASSWD_USED security==$SECURITY\"" + "./test_l3_longevity.py --test_duration 4m --endp_type \"lf_tcp lf_udp mc_udp\" --tos \"BK VI\" --upstream_port eth1 + --radio \"radio==wiphy0 stations==4 ssid==$SSID_USED ssid_pw==$PASSWD_USED security==$SECURITY\" + --radio \"radio==wiphy1 stations==4 ssid==$SSID_USED ssid_pw==$PASSWD_USED security==$SECURITY\"" "./test_l3_powersave_traffic.py --radio $RADIO_USED --ssid $SSID_USED --passwd $PASSWD_USED --security $SECURITY --debug" "./test_l3_scenario_throughput.py -t 15 -sc BLANK" "./test_status_msg.py --debug " #this is all which is needed to run @@ -62,7 +64,7 @@ testCommands=( declare -A name_to_num name_to_num=( ["example_security_connection"]=1 - ["test_ipv4_connectio n"]=2 + ["test_ipv4_connection"]=2 ["test_generic"]=3 ["test_ipv4_l4_urls_per_ten"]=4 ["test_ipv4_l4_wifi"]=5 diff --git a/py-scripts/test_l3_longevity.py b/py-scripts/test_l3_longevity.py index 41adbeb4..482e50f5 100755 --- a/py-scripts/test_l3_longevity.py +++ b/py-scripts/test_l3_longevity.py @@ -1073,15 +1073,15 @@ Summary : ---------- create stations, create traffic between upstream port and stations, run traffic. The traffic on the stations will be checked once per minute to verify that traffic is transmitted -and recieved. +and received. Generic command layout: ----------------------- python .\\test_l3_longevity.py --test_duration --endp_type --upstream_port - --radio "radio== stations== ssid== ssid_pw== security==" --debug + --radio "radio== stations== ssid== ssid_pw== security==" --debug Multiple radios may be entered with individual --radio switches -generiic command with controller setting channel and channel width test duration 5 min +generic command with controller setting channel and channel width test duration 5 min python3 test_l3_longevity.py --cisco_ctlr --cisco_dfs True/False --mgr --cisco_channel --cisco_chan_width <20,40,80,120> --endp_type 'lf_udp lf_tcp mc_udp' --upstream_port <1.ethX> --radio "radio== stations== ssid== ssid_pw== security==" diff --git a/py-scripts/test_l3_scenario_throughput.py b/py-scripts/test_l3_scenario_throughput.py index bdc9ab19..9f884759 100755 --- a/py-scripts/test_l3_scenario_throughput.py +++ b/py-scripts/test_l3_scenario_throughput.py @@ -2,7 +2,7 @@ ''' This Script Loads the Existing Scenario and Run the Simultaenous Throughput over time and Generate Report and Plot the Graph - This Scrip has three classes : + This Script has three classes : 1. LoadScenario : It will load the existing saved scenario to the Lanforge (Here used for Loading Bridged VAP) 2. FindPorts : Fetch the L3CX Throughput and VAP Throughput 3. Login_DUT : This class is specifically used to test the Linux based DUT that has SSH Server. It is used to read the CPU Core temperature during testing @@ -45,7 +45,7 @@ import realm from realm import Realm import logging -import paramiko as pm +import paramiko as pmgo from paramiko.ssh_exception import NoValidConnectionsError as exception import xlsxwriter from bokeh.io import output_file, show