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

lf_check.py add lanforge GUI version back to the meta data to be used

Browse Source 
for test tag
update scenerio naming

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-10-06 16:13:10 -06:00
parent 9e57b2ef19
commit b60ae7985c
5 changed files with 55 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
py-scripts/tools/ct_us_001_tests.json
View File

@@ -145,7 +145,7 @@
" "
]
},
"create_chamberview_dut_ATH10K(9984)_wc":{
"create_chamberview_dut_ATH10K_9984__wc":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview_dut.py",
@@ -157,19 +157,19 @@
" --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME"
]
},
"create_chamberview_ATH10K(9984)_wc":{
"create_chamberview_ATH10K_9984__wc":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview.py",
"args":"",
"args_list":[
" --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario",
" --create_scenario ATH10K(9984)_wc ",
" --create_scenario ATH10K_9984__wc ",
" --raw_line \"profile_link 1.1 STA-AUTO 32 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ",
" --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\""
]
},
"wifi_capacity_ATH10K(9984)":{
"wifi_capacity_ATH10K_9984_":{
"enabled":"TRUE",
"timeout":"600",
"iterations":"1",
@@ -177,14 +177,14 @@
"command":"lf_wifi_capacity_test.py",
"args":"",
"args_list":[
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K(9984)_wc",
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K_9984__wc",
" --upstream 1.1.eth2 --batch_size 1,5,25,32 --loop_iter 1 --protocol UDP-IPv4 --duration 6000",
" --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)'",
" --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984_'",
" --test_rig TEST_RIG ",
" --set DUT_SET_NAME"
]
},
"create_chamberview_dut_ATH10K(9984)_dp":{
"create_chamberview_dut_ATH10K_9984__dp":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview_dut.py",
@@ -196,19 +196,19 @@
" --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME"
]
},
"create_chamberview_ATH10K(9984)_dp":{
"create_chamberview_ATH10K_9984__dp":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview.py",
"args":"",
"args_list":[
" --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario",
" --create_scenario ATH10K(9984)_dp",
" --create_scenario ATH10K_9984__dp",
" --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ",
" --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\""
]
},
"dataplane_ATH10K(9984)":{
"dataplane_ATH10K_9984_":{
"enabled":"TRUE",
"load_db":"skip",
"timeout":"600",
@@ -216,12 +216,12 @@
"command":"lf_dataplane_test.py",
"args":"",
"args_list":[
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K(9984)_dp",
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K_9984__dp",
" --config_name test_con --upstream 1.1.eth2 --dut asus_5g --duration 30s --station 1.1.wlan1",
" --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;Custom' ",
" --raw_line 'cust_pkt_sz: 88;256;512;768;1024;MTU' ",
" --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: AUTO'",
" --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)' ",
" --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984_' ",
" --test_rig TEST_RIG",
" --set DUT_SET_NAME"
]

26
py-scripts/tools/ct_us_002_tests.json
View File

@@ -86,7 +86,7 @@
}
},
"suite_wc_dp":{
"create_chamberview_dut_ATH10k(9984)":{
"create_chamberview_dut_ATH10K_9984_":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview_dut.py",
@@ -97,33 +97,33 @@
" --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'",
" --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME"
]},
"create_chamberview_ATH10k(9984)":{
"create_chamberview_ATH10K_9984_":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview.py",
"args":"",
"args_list":[
" --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario",
" --create_scenario ATH10K(9984)_wc",
" --create_scenario ATH10K_9984__wc",
" --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: DUT_NAME Radio-1' NA AUTO,AUTO -1 NA\" ",
" --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: DUT_NAME Radio-2' NA AUTO,AUTO -1 NA\" ",
" --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" "
]
},
"wifi_capacity_ATH10k(9984)":{
"wifi_capacity_ATH10K_9984_":{
"enabled":"TRUE",
"load_db":"skip",
"command":"lf_wifi_capacity_test.py",
"args":"",
"args_list":[
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user LF_MGR_USER --lf_password LF_MGR_PASS --instance_name ATH10K(9984)_wc",
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user LF_MGR_USER --lf_password LF_MGR_PASS --instance_name ATH10K_9984__wc",
" --upstream UPSTREAM_PORT --batch_size 1,5,15 --loop_iter 1 --protocol UDP-IPv4 --duration 6000",
" --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)'",
" --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984_'",
" --test_rig TEST_RIG",
" --set DUT_SET_NAME "
]
},
"create_chamberview_dut_ATH10K(9984)_dp":{
"create_chamberview_dut_ATH10K_9984__dp":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview_dut.py",
@@ -134,30 +134,30 @@
" --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID'",
" --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME"
]},
"create_chamberview_ATH10K(9984)_dp":{
"create_chamberview_ATH10K_9984__dp":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview.py",
"args":"",
"args_list":[
" --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario",
" --create_scenario ATH10K(9984)_dp",
" --create_scenario ATH10K_9984__dp",
" --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ",
" --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" "
]
},
"dataplane_ATH10k(9984)":{
"dataplane_ATH10K_9984_":{
"enabled":"TRUE",
"load_db":"skip",
"command":"lf_dataplane_test.py",
"args":"",
"args_list":[
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user LF_MGR_USER --lf_password LF_MGR_PASS --instance_name ATH10K(9984)_dp",
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user LF_MGR_USER --lf_password LF_MGR_PASS --instance_name ATH10K_9984__dp",
" --config_name test_con --upstream UPSTREAM_PORT --dut DUT_NAME --duration 30s --station 1.1.wlan1",
" --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;Custom' ",
" --raw_line 'cust_pkt_sz: 88;256;512;768;1024;MTU' ",
" --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: 20' ",
" --raw_line 'spatial_streams: 4' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)' ",
" --raw_line 'spatial_streams: 4' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984_' ",
" --set DUT_SET_NAME"
]
},
@@ -193,7 +193,7 @@
"args_list":[
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user LF_MGR_USER --lf_password LF_MGR_PASS --instance_name AX200_wc",
" --upstream UPSTREAM_PORT --batch_size 1 --loop_iter 1 --protocol UDP-IPv4 --duration 6000",
" --pull_report --local_lf_report_dir REPORT_PATH --stations 1.1.wlan4 --test_tag 'ATH10K(9984)' ",
" --pull_report --local_lf_report_dir REPORT_PATH --stations 1.1.wlan4 --test_tag 'ATH10K_9984_' ",
" --set DUT_SET_NAME"
]
},

24
py-scripts/tools/ct_us_003_tests.json
View File

@@ -136,7 +136,7 @@
}
},
"suite_wc_dp_ap":{
"create_chamberview_dut_ATH10K(9984)_wc":{
"create_chamberview_dut_ATH10K_9984__wc":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview_dut.py",
@@ -148,19 +148,19 @@
" --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME"
]
},
"create_chamberview_ATH10K(9984)_wc":{
"create_chamberview_ATH10K_9984__wc":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview.py",
"args":"",
"args_list":[
" --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario",
" --create_scenario ATH10K(9984)_wc ",
" --create_scenario ATH10K_9984__wc ",
" --raw_line \"profile_link 1.1 STA-AUTO 32 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ",
" --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\""
]
},
"wifi_capacity_ATH10K(9984)":{
"wifi_capacity_ATH10K_9984_":{
"enabled":"TRUE",
"timeout":"600",
"iterations":"1",
@@ -168,14 +168,14 @@
"command":"lf_wifi_capacity_test.py",
"args":"",
"args_list":[
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K(9984)_wc",
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K_9984__wc",
" --upstream 1.1.eth1 --batch_size 1,5,25,32 --loop_iter 1 --protocol UDP-IPv4 --duration 6000",
" --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)'",
" --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984_'",
" --test_rig TEST_RIG ",
" --set DUT_SET_NAME"
]
},
"create_chamberview_dut_ATH10K(9984)_dp":{
"create_chamberview_dut_ATH10K_9984__dp":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview_dut.py",
@@ -187,19 +187,19 @@
" --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME"
]
},
"create_chamberview_ATH10K(9984)_dp":{
"create_chamberview_ATH10K_9984__dp":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview.py",
"args":"",
"args_list":[
" --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario",
" --create_scenario ATH10K(9984)_dp",
" --create_scenario ATH10K_9984__dp",
" --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ",
" --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\""
]
},
"dataplane_ATH10K(9984)":{
"dataplane_ATH10K_9984_":{
"enabled":"TRUE",
"load_db":"skip",
"timeout":"600",
@@ -207,12 +207,12 @@
"command":"lf_dataplane_test.py",
"args":"",
"args_list":[
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K(9984)_dp",
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K_9984__dp",
" --config_name test_con --upstream 1.1.eth1 --dut asus_5g --duration 30s --station 1.1.wlan1",
" --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;Custom' ",
" --raw_line 'cust_pkt_sz: 88;256;512;768;1024;MTU' ",
" --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: AUTO'",
" --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)' ",
" --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984_' ",
" --test_rig TEST_RIG",
" --set DUT_SET_NAME"
]

24
py-scripts/tools/ct_us_004_tests.json
View File

@@ -145,7 +145,7 @@
" "
]
},
"create_chamberview_dut_ATH10K(9984)_wc":{
"create_chamberview_dut_ATH10K_9984__wc":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview_dut.py",
@@ -157,19 +157,19 @@
" --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME"
]
},
"create_chamberview_ATH10K(9984)_wc":{
"create_chamberview_ATH10K_9984__wc":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview.py",
"args":"",
"args_list":[
" --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario",
" --create_scenario ATH10K(9984)_wc ",
" --create_scenario ATH10K_9984__wc ",
" --raw_line \"profile_link 1.1 STA-AUTO 32 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ",
" --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\""
]
},
"wifi_capacity_ATH10K(9984)":{
"wifi_capacity_ATH10K_9984_":{
"enabled":"TRUE",
"timeout":"600",
"iterations":"1",
@@ -177,14 +177,14 @@
"command":"lf_wifi_capacity_test.py",
"args":"",
"args_list":[
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K(9984)_wc",
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K_9984__wc",
" --upstream 1.1.eth2 --batch_size 1,5,25,32 --loop_iter 1 --protocol UDP-IPv4 --duration 6000",
" --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)'",
" --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984_'",
" --test_rig TEST_RIG ",
" --set DUT_SET_NAME"
]
},
"create_chamberview_dut_ATH10K(9984)_dp":{
"create_chamberview_dut_ATH10K_9984__dp":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview_dut.py",
@@ -196,19 +196,19 @@
" --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num DUT_NAME"
]
},
"create_chamberview_ATH10K(9984)_dp":{
"create_chamberview_ATH10K_9984__dp":{
"enabled":"TRUE",
"load_db":"skip",
"command":"create_chamberview.py",
"args":"",
"args_list":[
" --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario",
" --create_scenario ATH10K(9984)_dp",
" --create_scenario ATH10K_9984__dp",
" --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-2' NA wiphy1,AUTO -1 NA\" ",
" --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA\""
]
},
"dataplane_ATH10K(9984)":{
"dataplane_ATH10K_9984_":{
"enabled":"TRUE",
"load_db":"skip",
"timeout":"600",
@@ -216,12 +216,12 @@
"command":"lf_dataplane_test.py",
"args":"",
"args_list":[
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K(9984)_dp",
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name ATH10K_9984__dp",
" --config_name test_con --upstream 1.1.eth2 --dut asus_5g --duration 30s --station 1.1.wlan1",
" --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;Custom' ",
" --raw_line 'cust_pkt_sz: 88;256;512;768;1024;MTU' ",
" --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: AUTO'",
" --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)' ",
" --raw_line 'spatial_streams: AUTO' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K_9984_' ",
" --test_rig TEST_RIG",
" --set DUT_SET_NAME"
]

8
py-scripts/tools/lf_check.py
View File

@@ -312,7 +312,8 @@ class lf_check():
for element in self.lanforge_gui_version_full:
if "BuildVersion" in element:
ver_str = str(element)
self.lanforge_gui_version = ver_str.split(':',maxsplit=1)[-1].replace(',','')
self.lanforge_gui_version = ver_str.split(':',maxsplit=1)[-1].replace(',','')
self.lanforge_gui_version = self.lanforge_gui_version.strip().replace('"','')
print("BuildVersion {}".format(self.lanforge_gui_version))
if "BuildDate" in element:
gui_str = str(element)
@@ -861,6 +862,8 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url)
meta_data_fd.write('$ Generated by Candela Technologies LANforge network testing tool\n')
meta_data_fd.write('$ meta.txt file location\n')
meta_data_fd.write("file {path}\n".format(path=meta_data_path))
meta_data_fd.write('$ LANforge GUI\n')
meta_data_fd.write('gui_version: {gui_version} \n'.format(gui_version=self.lanforge_gui_version))
meta_data_fd.write('$ LANforge SERVER\n')
meta_data_fd.write('server_version: {server_version} \n'.format(server_version=self.lanforge_server_version))
meta_data_fd.write('$ LANforge command\n')
@@ -868,12 +871,13 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url)
# split command at test-tag , at rest of string once at the actual test-tag value
test_tag = command.split('test_tag',maxsplit=1)[-1].split(maxsplit=1)[0]
test_tag = test_tag.replace("'","")
meta_data_fd.write('$ LANforge test_tag\n')
meta_data_fd.write('$ LANforge test tag\n')
meta_data_fd.write("test_tag {test_tag}\n".format(test_tag=test_tag))
# LANforge information is a list thus [0]
meta_data_fd.write('$ LANforge Information\n')
meta_data_fd.write("lanforge_system_node {lanforge_system_node}\n".format(lanforge_system_node=self.lanforge_system_node_version[0]))
meta_data_fd.write("lanforge_kernel_version {lanforge_kernel_version}\n".format(lanforge_kernel_version=self.lanforge_kernel_version[0]))
meta_data_fd.write("lanforge_gui_version_full {lanforge_gui_version_full}\n".format(lanforge_gui_version_full=self.lanforge_gui_version_full[0]))
meta_data_fd.write("lanforge_server_version_full {lanforge_server_version_full}\n".format(lanforge_server_version_full=self.lanforge_server_version_full[0]))
meta_data_fd.close()