scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-20 12:04:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

ct_us_001_scripts.json updated for testing individual scripts

Browse Source 
updated layer3_test.py to accept the correct parameters

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-11-11 20:37:22 -07:00
parent c10a2ec2cf
commit dd80666057
2 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
py-scripts/layer3_test.py
View File

@@ -21,7 +21,7 @@ Realm = realm.Realm
class Layer3Test(Realm): class Layer3Test(Realm):
def __init__(self, lfclient_host="localhost", lfclient_port=8080, radio="wiphy1", sta_prefix="sta", start_id=0, num_sta=2, def __init__(self, lfclient_host="localhost", lfclient_port=8080, radio="wiphy1", sta_prefix="sta", start_id=0, num_sta=2,
dut_ssid="lexusdut", dut_security="open", dut_passwd="[BLANK]", upstream="eth1", name_prefix="L3Test", dut_ssid="lexusdut", dut_security="open", dut_passwd="[BLANK]", upstream="1.1.eth1", name_prefix="L3Test",
traffic_type="lf_udp", traffic_type="lf_udp",
side_a_min_rate=256000, side_a_max_rate=0, side_a_min_rate=256000, side_a_max_rate=0,
side_b_min_rate=256000, side_b_max_rate=0, side_b_min_rate=256000, side_b_max_rate=0,
@@ -137,7 +137,11 @@ class Layer3Test(Realm):
pass pass
def main(): def main():
# This has --mgr, --mgr_port and --debug # Realm.create_basic_argparse defined in
# /py-json/LANforge/lfcli_base.py
# args --mgr --mgr_port --upstream_port --num_stations --test_id
# --debug --proxy --debugging --debug_log
# --radio --security --ssid --passwd
parser = Realm.create_basic_argparse( parser = Realm.create_basic_argparse(
prog="layer3_test.py", prog="layer3_test.py",
formatter_class=argparse.RawTextHelpFormatter, formatter_class=argparse.RawTextHelpFormatter,
@@ -157,6 +161,7 @@ def main():
obj = Layer3Test(lfclient_host=args.mgr, lfclient_port=args.mgr_port, obj = Layer3Test(lfclient_host=args.mgr, lfclient_port=args.mgr_port,
duration=args.test_duration, session_id=args.session_id, duration=args.test_duration, session_id=args.session_id,
traffic_type=args.traffic_type, traffic_type=args.traffic_type,
upstream=args.upstream_port,
dut_ssid=args.ssid, dut_passwd=args.passwd, dut_security=args.security, num_sta=args.num_client, dut_ssid=args.ssid, dut_passwd=args.passwd, dut_security=args.security, num_sta=args.num_client,
side_a_min_rate=args.side_a_min_speed, side_b_min_rate=args.side_b_min_speed, radio=args.radio,_debug_on=args.debug) side_a_min_rate=args.side_a_min_speed, side_b_min_rate=args.side_b_min_speed, radio=args.radio,_debug_on=args.debug)
obj.precleanup() obj.precleanup()

50
py-scripts/tools/ct_us_001_scripts.json
View File

@@ -66,21 +66,31 @@
" --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000 --local_lf_report_dir REPORT_PATH"]} " --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000 --local_lf_report_dir REPORT_PATH"]}
}, },
"suite_test":{ "suite_test":{
"create_l3_stations":{ "lf_cleanup":{
"enabled":"TRUE", "enabled":"TRUE",
"load_db":"NONE", "load_db":"NONE",
"command":"create_l3_stations.py", "command":"lf_cleanup.py",
"args":"", "args":"",
"args_list":[" --mgr LF_MGR_IP ", "args_list":["--mgr LF_MGR_IP --cxs --sta"
]
},
"layer3_test":{
"enabled":"TRUE",
"load_db":"NONE",
"timeout":"60",
"command":"layer3_test.py",
"args":"",
"args_list":[" --mgr LF_MGR_IP --upstream_port UPSTREAM_PORT",
" use_ssid_idx=1 --radio wiphy1 --ssid SSID_USED --passwd SSID_PW_USED --security SECURITY_USED " " use_ssid_idx=1 --radio wiphy1 --ssid SSID_USED --passwd SSID_PW_USED --security SECURITY_USED "
] ]
}, },
"create_l4":{ "layer4_test":{
"enabled":"TRUE", "enabled":"TRUE",
"load_db":"NONE", "load_db":"NONE",
"command":"create_l4.py", "timeout":"60",
"command":"layer4_test.py",
"args":"", "args":"",
"args_list":[" --mgr LF_MGR_IP ", "args_list":[" --mgr LF_MGR_IP --upstream_port UPSTREAM_PORT",
" use_ssid_idx=1 --radio wiphy1 --ssid SSID_USED --passwd SSID_PW_USED --security SECURITY_USED " " use_ssid_idx=1 --radio wiphy1 --ssid SSID_USED --passwd SSID_PW_USED --security SECURITY_USED "
] ]
}, },
@@ -105,24 +115,6 @@
" " " "
] ]
}, },
"create_l3_stations":{
"enabled":"TRUE",
"load_db":"NONE",
"command":"create_l3_stations.py",
"args":"",
"args_list":[" --mgr LF_MGR_IP ",
" use_ssid_idx=1 --radio wiphy1 --ssid SSID_USED --passwd SSID_PW_USED --security SECURITY_USED "
]
},
"create_l4":{
"enabled":"TRUE",
"load_db":"NONE",
"command":"create_l4.py",
"args":"",
"args_list":[" --mgr LF_MGR_IP ",
" use_ssid_idx=1 --radio wiphy1 --ssid SSID_USED --passwd SSID_PW_USED --security SECURITY_USED "
]
},
"create_chamberview_dut_ATH10K_9984__wc":{ "create_chamberview_dut_ATH10K_9984__wc":{
"enabled":"TRUE", "enabled":"TRUE",
"load_db":"skip", "load_db":"skip",
@@ -204,7 +196,6 @@
" --set DUT_SET_NAME" " --set DUT_SET_NAME"
] ]
}, },
"test_l3_longevity":{ "test_l3_longevity":{
"enabled":"TRUE", "enabled":"TRUE",
"load_db":"NONE", "load_db":"NONE",
@@ -374,6 +365,15 @@
"command":"create_l4.py", "command":"create_l4.py",
"args":"", "args":"",
"args_list":[" use_ssid_idx=1 --mgr LF_MGR_IP --radio wiphy1 --ssid SSID_USED --passwd SSID_PW_USED --security SECURITY_USED --debug"]}, "args_list":[" use_ssid_idx=1 --mgr LF_MGR_IP --radio wiphy1 --ssid SSID_USED --passwd SSID_PW_USED --security SECURITY_USED --debug"]},
"create_l3_stations":{
"enabled":"TRUE",
"load_db":"NONE",
"command":"create_l3_stations.py",
"args":"",
"args_list":[" --mgr LF_MGR_IP ",
" use_ssid_idx=1 --radio wiphy1 --ssid SSID_USED --passwd SSID_PW_USED --security SECURITY_USED "
]
},
"create_macvlan":{ "create_macvlan":{
"enabled":"TRUE", "enabled":"TRUE",
"command":"create_macvlan.py", "command":"create_macvlan.py",