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

lf_check.py: dut_set_name needed to be under the test_rig or test configuration,

Browse Source 
removed from the database configuration
json files updated.

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>
This commit is contained in:
Chuck SmileyRekiere
2021-08-16 08:51:30 -06:00
parent 709e6fcfa8
commit 2940559185
7 changed files with 36 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
py-scripts/tools/ct_igg.json
View File

@@ -16,7 +16,6 @@
"database_token": "-u_Wd-L8o992701QF0c5UmqEp7w7Z7YOMaWLxOMgmHfATJGnQbbmYyNxHBR9PgD6taM_tcxqJl6U8DjU1xINFQ==",
"database_org": "Candela",
"database_bucket": "lanforge_qa_testing",
"dut_set_name": "DUT_NAME ASUSRT-AX88U",
"database_tag": "testbed CT-US-001",
"test_rig": "CT-US-001"
},

35
py-scripts/tools/ct_tests.json
View File

@@ -48,8 +48,8 @@
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct",
" --upstream 1.1.eth2 --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000",
" --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e'",
" --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG",
" --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME"
" --test_rig TEST_RIG",
" --set DUT_SET_NAME"
]
},
"CT-US-001_create_chamberview_mt7915e_sta1":{
@@ -75,7 +75,7 @@
" --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;88;120;256;512;1024;MTU' ",
" --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: 20'",
" --raw_line 'spatial_streams: 1' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e' ",
" --test_rig TEST_RIG"
" --test_rig TEST_RIG --set 'DUT_NAME"
]
},
"CT-US-001_QA":{
@@ -125,7 +125,8 @@
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct",
" --upstream 1.1.eth2 --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000",
" --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)'",
" --test_rig TEST_RIG "
" --test_rig TEST_RIG ",
" --set DUT_SET_NAME"
]
},
"CT-US-001_create_chamberview_dut_0":{
@@ -162,8 +163,8 @@
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct",
" --upstream 1.1.eth2 --batch_size 1,5,10,15,19 --loop_iter 1 --protocol UDP-IPv4 --duration 6000",
" --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e'",
" --test_rig TEST_RIG --influx_host DATABASE_HOST --influx_port DATABASE_PORT --influx_org DATABASE_ORG",
" --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME"
" --test_rig TEST_RIG",
" --set DUT_SET_NAME"
]
},
"CT-US-001_QA":{
@@ -212,7 +213,9 @@
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct",
" --upstream 1.1.eth2 --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000",
" --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)'",
" --test_rig TEST_RIG "]
" --test_rig TEST_RIG ",
" --set DUT_SET_NAME"
]
},
"CT-US-001_create_chamberview_ATH10K(9984)_sta1":{
"enabled":"TRUE",
@@ -237,7 +240,8 @@
" --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;88;120;256;512;1024;MTU' ",
" --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: 20'",
" --raw_line 'spatial_streams: 1' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)' ",
" --test_rig TEST_RIG"
" --test_rig TEST_RIG",
" --set DUT_SET_NAME"
]
},
"CT-US-001_create_chamberview_dut_for_AX210":{
@@ -273,7 +277,8 @@
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct",
" --upstream 1.1.eth2 --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000",
" --pull_report --local_lf_report_dir REPORT_PATH --stations 1.1.wlan3 --test_tag 'AX210'",
" --test_rig TEST_RIG "
" --test_rig TEST_RIG",
" --set DUT_SET_NAME"
]
},
"CT-US-001_dataplane_wiphy3_AX210_sta1":{
@@ -287,7 +292,8 @@
" --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;88;120;256;512;1024;MTU' ",
" --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: 20'",
" --raw_line 'spatial_streams: 1' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'AX210'",
" --test_rig TEST_RIG"
" --test_rig TEST_RIG",
" --set DUT_SET_NAME"
]
},
"CT-US-001_create_chamberview_dut_for_mt7915e":{
@@ -324,7 +330,8 @@
" --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name cicd-wct",
" --upstream 1.1.eth2 --batch_size 1,5,25 --loop_iter 1 --protocol UDP-IPv4 --duration 6000",
" --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e'",
" --test_rig TEST_RIG"
" --test_rig TEST_RIG",
" --set DUT_SET_NAME"
]
},
"CT-US-001_create_chamberview_mt7915e_sta1":{
@@ -350,7 +357,8 @@
" --download_speed 85% --upload_speed 0 --raw_line 'pkts: 60;88;120;256;512;1024;MTU' ",
" --raw_line 'directions: DUT Transmit' --raw_line 'traffic_types: UDP' --raw_line 'bandw_options: 20'",
" --raw_line 'spatial_streams: 1' --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e' ",
" --test_rig TEST_RIG"
" --test_rig TEST_RIG",
" --set DUT_SET_NAME"
]
},
"CT-US-001_create_chamberview_dut_2":{
@@ -391,7 +399,8 @@
" --set 'Multi Band Performance' 0 --set 'Stability' 0 --set 'Multi-Station Throughput vs Pkt Size' 0,",
" --set 'Throughput vs Pkt Size' 0 --set 'Capacity' 0 --set 'Band-Steering' 0 --set 'Skip 2.4 Ghz Tests' 1",
" --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'ATH10K(9984)'",
" --test_rig TEST_RIG"
" --test_rig TEST_RIG",
" --set DUT_SET_NAME"
]
},
"CT-US-001_QA":{

2
py-scripts/tools/ct_us_001.json
View File

@@ -13,6 +13,7 @@
"test_bed": "CT-US-001",
"lf_mgr_ip": "192.168.100.116",
"lf_mgr_port": "8080",
"dut_set_name": "DUT_NAME ASUSRT-AX88U",
"dut_name": "ASUSRT-AX88U",
"dut_bssid_2g": "3c:7c:3f:55:4d:60",
"dut_bssid_5g": "3c:7c:3f:55:4d:64",
@@ -50,7 +51,6 @@
"database_token": "-u_Wd-L8o992701QF0c5UmqEp7w7Z7YOMaWLxOMgmHfATJGnQbbmYyNxHBR9PgD6taM_tcxqJl6U8DjU1xINFQ==",
"database_org": "Candela",
"database_bucket": "lanforge_qa_testing",
"dut_set_name": "DUT_NAME ASUSRT-AX88U",
"database_tag": "testbed CT-US-001",
"test_rig": "CT-US-001"
},

27
py-scripts/tools/ct_us_001_rig.json
View File

@@ -14,6 +14,7 @@
"test_rig": "CT-US-001",
"lf_mgr_ip": "192.168.100.116",
"lf_mgr_port": "8080",
"dut_set_name": "DUT_NAME ASUSRT-AX88U",
"dut_name": "ASUSRT-AX88U",
"dut_bssid_2g": "3c:7c:3f:55:4d:60",
"dut_bssid_5g": "3c:7c:3f:55:4d:64",
@@ -44,32 +45,6 @@
"col_names": "name,tx_byptes,rx_bytes,dropped",
"upstream_port": "eth2"
},
"test_database":{
"database_config": "True",
"database_host": "192.168.100.201",
"database_port": "8086",
"database_token": "-u_Wd-L8o992701QF0c5UmqEp7w7Z7YOMaWLxOMgmHfATJGnQbbmYyNxHBR9PgD6taM_tcxqJl6U8DjU1xINFQ==",
"database_org": "Candela",
"database_bucket": "lanforge_qa_testing",
"dut_set_name": "DUT_NAME ASUSRT-AX88U",
"database_tag": "testbed CT-US-001",
"test_rig": "CT-US-001"
},
"test_dashboard":{
"dashboard_config": "True",
"dashboard_host": "192.168.100.201",
"dashboard_token": "eyJrIjoiS1NGRU8xcTVBQW9lUmlTM2dNRFpqNjFqV05MZkM0dzciLCJuIjoibWF0dGhldyIsImlkIjoxfQ=="
},
"test_blog":{
"blog_config": "True",
"blog_host": "192.168.100.153",
"blog_token": "60df4b0175953f400cd30650:d50e1fabf9a9b5d3d30fe97bc3bf04971d05496a89e92a169a0d72357c81f742",
"blog_authors": "Matthew",
"blog_customer": "candela",
"blog_user_push": "lanforge",
"blog_password_push": "lanforge",
"blog_flag": "--kpi_to_ghost"
},
"radio_dict":{
"RADIO_0_CFG":{"KEY":"RADIO_0_CFG","RADIO":"wiphy0","STATIONS":"1","SSID":"asus11ax-5","PASSWD":"hello123","SECURITY":"wpa2"},
"RADIO_1_CFG":{"KEY":"RADIO_1_CFG","RADIO":"wiphy1","STATIONS":"1","SSID":"asus11ax-5","PASSWD":"hello123","SECURITY":"wpa2"}

2
py-scripts/tools/ct_us_002.json
View File

@@ -13,6 +13,7 @@
"test_bed": "CT-US-002",
"lf_mgr_ip": "192.168.100.200",
"lf_mgr_port": "8080",
"dut_set_name": "DUT_NAME NETGEAR59-5G",
"dut_name": "NETGEAR-AX12",
"dut_bssid_5g": "94:a6:7e:54:d4:33",
"test_timeout": 1200,
@@ -48,7 +49,6 @@
"database_token": "-u_Wd-L8o992701QF0c5UmqEp7w7Z7YOMaWLxOMgmHfATJGnQbbmYyNxHBR9PgD6taM_tcxqJl6U8DjU1xINFQ==",
"database_org": "Candela",
"database_bucket": "lanforge_qa_testing",
"dut_set_name": "DUT_NAME NETGEAR59-5G",
"database_tag": "testbed CT-US-002",
"test_rig": "CT-US-002"
},

2
py-scripts/tools/ct_us_004.json
View File

@@ -13,6 +13,7 @@
"test_bed": "CT-US-004",
"lf_mgr_ip": "192.168.100.194",
"lf_mgr_port": "8080",
"dut_set_name": "DUT_NAME Asus-RT-AX88U",
"dut_name": "Asus-RT-AX88U",
"dut_bssid_2g": "d4:5d:64:a0:7f:78",
"dut_bssid_5g": "d4:5d:64:a0:7f:7c",
@@ -50,7 +51,6 @@
"database_token": "-u_Wd-L8o992701QF0c5UmqEp7w7Z7YOMaWLxOMgmHfATJGnQbbmYyNxHBR9PgD6taM_tcxqJl6U8DjU1xINFQ==",
"database_org": "Candela",
"database_bucket": "lanforge_qa_testing",
"dut_set_name": "DUT_NAME Asus-RT-AX88U",
"database_tag": "testbed CT-US-004",
"test_rig": "CT-US-004"
},

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

@@ -163,6 +163,9 @@ class lf_check():
self.lf_mgr_user = "lanforge"
self.lf_mgr_pass = "lanforge"
# dut selection
self.dut_set_name = 'DUT_NAME ASUSRT-AX88U' # note the name will be set as --set DUT_NAME ASUSRT-AX88U, this is not dut_name (see above)
# dut configuration
self.dut_name = "DUT_NAME_NA" # "ASUSRT-AX88U" note this is not dut_set_name
self.dut_hw = "DUT_HW_NA"
@@ -193,7 +196,6 @@ class lf_check():
self.database_org = "Candela"
self.database_bucket = "lanforge_qa_testing"
self.database_tag = 'testbed CT-US-001' # the test_rig needs to match
self.dut_set_name = 'DUT_NAME ASUSRT-AX88U' # note the name will be set as --set DUT_NAME ASUSRT-AX88U, this is not dut_name (see above)
# grafana configuration #dashboard
self.dashboard_json = ""
@@ -541,6 +543,13 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url)
self.lf_mgr_port = self.json_rig["test_parameters"]["lf_mgr_port"]
else:
self.logger.info("lf_mgr_port not in test_parameters json")
# dut_set_name selectes the DUT to test against , it is different then dut_name
# this value gets set in the test
if "dut_set_name" in self.json_rig["test_database"]:
self.dut_set_name = self.json_rig["test_database"]["dut_set_name"]
else:
self.logger.info("dut_set_name not in test_database json")
# dut name will set a chamberview scenerio for a DUT which can be selected with dut_set_name
if "dut_name" in self.json_rig["test_parameters"]:
self.dut_name = self.json_rig["test_parameters"]["dut_name"]
else:
@@ -620,10 +629,6 @@ NOTE: Diagrams are links in dashboard""".format(ip_qa=ip,qa_url=qa_url)
self.database_tag = self.json_igg["test_database"]["database_tag"]
else:
self.logger.info("database_tag not in test_database json")
if "dut_set_name" in self.json_igg["test_database"]:
self.dut_set_name = self.json_igg["test_database"]["dut_set_name"]
else:
self.logger.info("dut_set_name not in test_database json")
def read_test_dashboard(self):
if "dashboard_config" in self.json_igg["test_dashboard"]: