From ee8728f51e9bd5f9f7c5ca2fc65424a6f2e19201 Mon Sep 17 00:00:00 2001 From: Ben Greear Date: Sat, 17 Apr 2021 08:33:33 -0700 Subject: [PATCH] cv-dataplane: Add test-rig support. For better KPI.csv output. Signed-off-by: Ben Greear --- py-scripts/lf_dataplane_test.py | 17 +++++++++++++++-- py-scripts/lf_wifi_capacity_test.py | 21 ++++++++++++--------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/py-scripts/lf_dataplane_test.py b/py-scripts/lf_dataplane_test.py index 9f9df276..084c3a8c 100755 --- a/py-scripts/lf_dataplane_test.py +++ b/py-scripts/lf_dataplane_test.py @@ -18,7 +18,8 @@ the options and how best to input data. --raw_line 'pkts: Custom;60;142;256;512;1024;MTU' \ --raw_line 'cust_pkt_sz: 88 1200' \ --raw_line 'directions: DUT Transmit;DUT Receive' \ - --raw_line 'traffic_types: UDP;TCP' + --raw_line 'traffic_types: UDP;TCP' \ + --test_rig Testbed-01 Note: --raw_line 'line contents' will add any setting to the test config. This is @@ -106,7 +107,7 @@ if 'py-json' not in sys.path: sys.path.append(os.path.join(os.path.abspath('..'), 'py-json')) from cv_test_manager import cv_test as cvtest -from cv_test_manager import cv_add_base_parser +from cv_test_manager import * from cv_commands import chamberview as cv @@ -209,6 +210,16 @@ def main(): Open this file in an editor and read the top notes for more details. Example: + + ./lf_dataplane_test.py --mgr localhost --port 8080 --lf_user lanforge --lf_password lanforge \ + --instance_name dataplane-instance --config_name test_con --upstream 1.1.eth2 \ + --dut linksys-8450 --duration 15s --station 1.1.sta01500 \ + --download_speed 85% --upload_speed 0 \ + --raw_line 'pkts: Custom;60;142;256;512;1024;MTU' \ + --raw_line 'cust_pkt_sz: 88 1200' \ + --raw_line 'directions: DUT Transmit;DUT Receive' \ + --raw_line 'traffic_types: UDP;TCP' \ + --test_rig Testbed-01 """ ) @@ -231,6 +242,8 @@ def main(): args = parser.parse_args() + cv_base_adjust_parser(args) + CV_Test = DataplaneTest(lf_host = args.mgr, lf_port = args.port, lf_user = args.lf_user, diff --git a/py-scripts/lf_wifi_capacity_test.py b/py-scripts/lf_wifi_capacity_test.py index 84479af6..9fab9443 100755 --- a/py-scripts/lf_wifi_capacity_test.py +++ b/py-scripts/lf_wifi_capacity_test.py @@ -9,15 +9,17 @@ Note: To Run this script gui should be opened with Note: This is a test file which will run a wifi capacity test. ex. on how to run this script (if stations are available in lanforge): - ./lf_wifi_capacity_test.py --mgr localhost --port 8080 --lf_user lanforge --lf_password lanforge - --instance_name this_inst --config_name test_con --upstream 1.1.eth1 --batch_size 1 --loop_iter 1 - --protocol UDP-IPv4 --duration 6000 --pull_report --stations 1.1.sta0000,1.1.sta0002 + ./lf_wifi_capacity_test.py --mgr localhost --port 8080 --lf_user lanforge --lf_password lanforge \ + --instance_name this_inst --config_name test_con --upstream 1.1.eth1 --batch_size 1 --loop_iter 1 \ + --protocol UDP-IPv4 --duration 6000 --pull_report --stations 1.1.sta0000,1.1.sta0002 \ + --test_rig Testbed-01 ex. on how to run this script (to create new stations): - ./lf_wifi_capacity_test.py --mgr localhost --port 8080 --lf_user lanforge --lf_password lanforge - --instance_name wct_instance --config_name wifi_config --upstream 1.1.eth1 --batch_size 1 --loop_iter 1 - --protocol UDP-IPv4 --duration 6000 --pull_report --stations 1.1.sta0000,1.1.sta0001 - --create_stations --radio wiphy0 --ssid test-ssid --security open --paswd [BLANK] + ./lf_wifi_capacity_test.py --mgr localhost --port 8080 --lf_user lanforge --lf_password lanforge \ + --instance_name wct_instance --config_name wifi_config --upstream 1.1.eth1 --batch_size 1 --loop_iter 1 \ + --protocol UDP-IPv4 --duration 6000 --pull_report --stations 1.1.sta0000,1.1.sta0001 \ + --create_stations --radio wiphy0 --ssid test-ssid --security open --paswd [BLANK] \ + --test_rig Testbed-01 Note: --pull_report == If specified, this will pull reports from lanforge to your code directory, @@ -455,10 +457,11 @@ def main(): parser = argparse.ArgumentParser( description=""" - ./lf_wifi_capacity_test.py --mgr localhost --port 8080 --lf_user lanforge --lf_password lanforge \ + ./lf_wifi_capacity_test.py --mgr localhost --port 8080 --lf_user lanforge --lf_password lanforge \ --instance_name wct_instance --config_name wifi_config --upstream 1.1.eth1 --batch_size 1 --loop_iter 1 \ --protocol UDP-IPv4 --duration 6000 --pull_report --stations 1.1.sta0000,1.1.sta0001 \ - --create_stations --radio wiphy0 --ssid test-ssid --security open --paswd [BLANK] + --create_stations --radio wiphy0 --ssid test-ssid --security open --paswd [BLANK] \ + --test_rig Testbed-01 """) cv_add_base_parser(parser) # see cv_test_manager.py