lf_cleanup.py : updated to choose a resource defaults to 1, for cleaning

QA 003 realm
ct_us_003_tests.json : re-arranged tests so nightly at top

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>

py-scripts/lf_cleanup.py

@@ -30,6 +30,7 @@ class lf_clean(Realm):
     def __init__(self,
                  host="localhost",
                  port=8080,
+                 resource=1,
                  clean_cxs=None,
                  clean_endp=None,
                  clean_sta=None):
@@ -37,6 +38,7 @@ class lf_clean(Realm):
                          lfclient_port=port),
         self.host = host
         self.port = port
+        self.resource = resource
         self.clean_cxs = clean_cxs
         self.clean_endp = clean_endp
         self.clean_sta = clean_sta
@@ -111,9 +113,10 @@ class lf_clean(Realm):
             print("sta_clean: iterations_sta: {iterations_sta}".format(iterations_sta=iterations_sta))
             try:
                 sta_json = super().json_get(
-                    "port/1/1/list?field=alias")['interfaces']
+                    "port/1/{resource}/list?field=alias".format(resource=self.resource))['interfaces']
             except TypeError:
                 sta_json = None
+                print("sta_json set to None")
 
             # get and remove current stations
             if sta_json is not None:
@@ -121,8 +124,8 @@ class lf_clean(Realm):
                 print("Removing old stations ")
                 for name in list(sta_json):
                     for alias in list(name):
+                        # print("alias {alias}".format(alias=alias))
                         if 'sta' in alias:
-                            print(alias)
                             info = self.name_to_eid(alias)
                             req_url = "cli-json/rm_vlan"
                             data = {
@@ -167,12 +170,11 @@ class lf_clean(Realm):
                             super().json_post(req_url, data)
                             time.sleep(.5)
                         if ('Unknown' not in alias) and ('wlan' not in alias) and ('sta' not in alias):
-                            still_looking_sta = False
+                            pass
                 time.sleep(1)
-
             else:
                 print("No stations found to cleanup")
-                still_looking_sta = False
+        still_looking_sta = False
         print("clean_sta still_looking_sta {sta_looking}".format(sta_looking=still_looking_sta))
         if not still_looking_sta:
             self.sta_done = True
@@ -215,7 +217,7 @@ class lf_clean(Realm):
             else:
                 print("No bridges found to cleanup")
                 still_looking_br = False
-        print("clean_sta still_looking_br {br_looking}".format(br_looking=still_looking_br))
+        print("clean_bridge still_looking_br {br_looking}".format(br_looking=still_looking_br))
         if not still_looking_br:
             self.br_done = True
         return still_looking_br
@@ -274,6 +276,11 @@ python3 ./lf_clean.py --mgr MGR
         '--lfmgr',
         help='--mgr <hostname for where LANforge GUI is running>',
         default='localhost')
+    parser.add_argument(
+        '--resource',
+        '--res',
+        help='--resource <realm resource>',
+        default='1')
     parser.add_argument(
         '--cxs',
         help="--cxs, this will clear all the endps and cxs",
@@ -293,7 +300,7 @@ python3 ./lf_clean.py --mgr MGR
 
     args = parser.parse_args()
     if args.cxs or args.endp or args.sta:
-        clean = lf_clean(host=args.mgr, clean_cxs=args.cxs, clean_endp=args.endp, clean_sta=args.sta)
+        clean = lf_clean(host=args.mgr, resource=int(args.resource), clean_cxs=args.cxs, clean_endp=args.endp, clean_sta=args.sta)
         print("cleaning cxs: {cxs} endpoints: {endp} stations: {sta} start".format(cxs=args.cxs, endp=args.endp, sta=args.sta))
         if args.cxs:
             print("cleaning cxs will also clean endp")

py-scripts/tools/ct_us_003_tests.json

@@ -5,136 +5,6 @@
         ]  
     },
     "test_suites": {
-        "suite_vap": {
-            "CT-US-003_VAP": {
-                "enabled": "TRUE",
-                "command": "create_vap.py",
-                "args": "",
-                "args_list": [
-                    " --mgr LF_MGR_IP",
-                    " --resource 1",
-                    " --ssid SSID_USED",
-                    " --password SSID_PW_USED",
-                    " --security wpa2",
-                    " --radio wiphy1",
-                    " --upstream_port UPSTREAM_PORT",
-                    " --mode 802.11abgn-AX"
-                ]
-            },
-            "test_l3_longevity":{
-                "enabled":"TRUE",
-                "load_db":"skip",
-                "command":"test_l3_longevity.py",
-                "args":"",
-                "args_list":[
-                    " --lfmgr LF_MGR_IP --test_duration 15s --polling_interval 5s --upstream_port eth2 ",
-                    " --radio 'radio==wiphy1,stations==4,ssid==SSID_USED,ssid_pw==SSID_PW_USED,security==SECURITY_USED' ",
-                    " --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000"
-                ]
-            },
-            "ct-us-003_QA":{
-                "enabled":"TRUE",
-                "timeout":"600",
-                "load_db":"skip",
-                "command":"./tools/lf_qa.py",
-                "args":"",
-                "args_list":[
-                    " --server TEST_SERVER --path REPORT_PATH --store --png --database DATABASE_SQLITE"
-                ]
-            }
-        },
-        "suite_wc_dp_shorter":{
-            "create_chamberview_dut_mt7915e_wc":{
-                "enabled":"TRUE",
-                "load_db":"skip",
-                "command":"create_chamberview_dut.py",
-                "args":"",
-                "args_list":[
-                    " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME",
-                    " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID_TO_USE'",
-                    " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID_TO_USE'",
-                    " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME"
-                ]
-            },
-            "create_chamberview_mt7915e_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 mt7915e_wc ",
-                    " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: USE_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_mt7915e":{
-                "enabled":"TRUE",
-                "timeout":"600",
-                "iterations":"1",
-                "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 mt7915e_wc",
-                    " --upstream UPSTREAM_PORT --batch_size 1,10,19 --loop_iter 1 --protocol UDP-IPv4 --duration 6000",
-                    " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e'",
-                    " --test_rig TEST_RIG",
-                    " --set DUT_SET_NAME"
-                ]
-            },
-            "create_chamberview_dut_mt7915e_dp":{
-                "enabled":"TRUE",
-                "load_db":"skip",
-                "command":"create_chamberview_dut.py",
-                "args":"",
-                "args_list":[
-                    " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME",
-                    " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID_TO_USE'",
-                    " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID_TO_USE'",
-                    " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME"
-                ]
-            },
-            "create_chamberview_mt7915e_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 mt7915e_dp ",
-                    " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_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_mt7915e":{
-                "enabled":"TRUE",
-                "load_db":"skip",
-                "iterations":"1",
-                "command":"lf_dataplane_test.py",
-                "args":"",
-                "args_list":[
-                    " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name mt7915e_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 'mt7915e' ",
-                    " --test_rig TEST_RIG",
-                    " --set DUT_SET_NAME"
-                ]
-            },
-            "ct-us-003_QA":{
-                "enabled":"TRUE",
-                "timeout":"600",
-                "load_db":"skip",
-                "command":"./tools/lf_qa.py",
-                "args":"",
-                "args_list":[
-                    " --server TEST_SERVER --path REPORT_PATH --store --png --database DATABASE_SQLITE"
-                ]
-            }
-        },
         "suite_wc_dp_nightly":{
             "lf_help_check":{
                 "enabled":"TRUE",
@@ -521,6 +391,186 @@
                     " --server TEST_SERVER --path REPORT_PATH --store --png --database DATABASE_SQLITE"
                 ]
             }
+        },
+        "suite_vap": {
+            "CT-US-003_VAP": {
+                "enabled": "TRUE",
+                "command": "create_vap.py",
+                "args": "",
+                "args_list": [
+                    " --mgr LF_MGR_IP",
+                    " --resource 1",
+                    " --ssid SSID_USED",
+                    " --password SSID_PW_USED",
+                    " --security wpa2",
+                    " --radio wiphy1",
+                    " --upstream_port UPSTREAM_PORT",
+                    " --mode 802.11abgn-AX"
+                ]
+            },
+            "test_l3_longevity":{
+                "enabled":"TRUE",
+                "load_db":"skip",
+                "command":"test_l3_longevity.py",
+                "args":"",
+                "args_list":[
+                    " --lfmgr LF_MGR_IP --test_duration 15s --polling_interval 5s --upstream_port eth2 ",
+                    " --radio 'radio==wiphy1,stations==4,ssid==SSID_USED,ssid_pw==SSID_PW_USED,security==SECURITY_USED' ",
+                    " --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000"
+                ]
+            },
+            "ct-us-003_QA":{
+                "enabled":"TRUE",
+                "timeout":"600",
+                "load_db":"skip",
+                "command":"./tools/lf_qa.py",
+                "args":"",
+                "args_list":[
+                    " --server TEST_SERVER --path REPORT_PATH --store --png --database DATABASE_SQLITE"
+                ]
+            }
+        },
+        "suite_wc_dp_shorter":{
+            "create_chamberview_dut_mt7915e_wc":{
+                "enabled":"TRUE",
+                "load_db":"skip",
+                "command":"create_chamberview_dut.py",
+                "args":"",
+                "args_list":[
+                    " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME",
+                    " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID_TO_USE'",
+                    " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID_TO_USE'",
+                    " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME"
+                ]
+            },
+            "create_chamberview_mt7915e_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 mt7915e_wc ",
+                    " --raw_line \"profile_link 1.1 STA-AC 19 'DUT: USE_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_mt7915e":{
+                "enabled":"TRUE",
+                "timeout":"600",
+                "iterations":"1",
+                "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 mt7915e_wc",
+                    " --upstream UPSTREAM_PORT --batch_size 1,10,19 --loop_iter 1 --protocol UDP-IPv4 --duration 6000",
+                    " --pull_report --local_lf_report_dir REPORT_PATH --test_tag 'mt7915e'",
+                    " --test_rig TEST_RIG",
+                    " --set DUT_SET_NAME"
+                ]
+            },
+            "create_chamberview_dut_mt7915e_dp":{
+                "enabled":"TRUE",
+                "load_db":"skip",
+                "command":"create_chamberview_dut.py",
+                "args":"",
+                "args_list":[
+                    " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name USE_DUT_NAME",
+                    " --ssid 'ssid_idx=0 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID_TO_USE'",
+                    " --ssid 'ssid_idx=1 ssid=SSID_USED security=SECURITY_USED password=SSID_PW_USED bssid=BSSID_TO_USE'",
+                    " --sw_version DUT_SW --hw_version DUT_HW --serial_num DUT_SERIAL --model_num USE_DUT_NAME"
+                ]
+            },
+            "create_chamberview_mt7915e_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 mt7915e_dp ",
+                    " --raw_line \"profile_link 1.1 STA-AUTO 1 'DUT: USE_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_mt7915e":{
+                "enabled":"TRUE",
+                "load_db":"skip",
+                "iterations":"1",
+                "command":"lf_dataplane_test.py",
+                "args":"",
+                "args_list":[
+                    " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge --instance_name mt7915e_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 'mt7915e' ",
+                    " --test_rig TEST_RIG",
+                    " --set DUT_SET_NAME"
+                ]
+            },
+            "ct-us-003_QA":{
+                "enabled":"TRUE",
+                "timeout":"600",
+                "load_db":"skip",
+                "command":"./tools/lf_qa.py",
+                "args":"",
+                "args_list":[
+                    " --server TEST_SERVER --path REPORT_PATH --store --png --database DATABASE_SQLITE"
+                ]
+            }
+        },
+        "suite_l3":{
+            "test_l3_longevity":{
+                "enabled":"TRUE",
+                "load_db":"skip",
+                "command":"test_l3_longevity.py",
+                "args":"",
+                "args_list":[
+                    " --lfmgr LF_MGR_IP --local_lf_report_dir REPORT_PATH --test_duration 15s --polling_interval 5s --upstream_port UPSTREAM_PORT ",
+                    " use_ssid_idx=1 --radio 'radio==wiphy1,stations==4,ssid==SSID_USED,ssid_pw==SSID_PW_USED,security==SECURITY_USED' ",
+                    " --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000",
+                    " --test_rig TEST_RIG --test_tag 'l3_longevity'",
+                    " --dut_model_num  USE_DUT_NAME --dut_sw_version DUT_SW --dut_hw_version DUT_HW --dut_serial_num DUT_SN"
+                ]
+            },
+            "lf_qa":{
+                "enabled":"TRUE",
+                "timeout":"600",
+                "load_db":"skip",
+                "command":"./tools/lf_qa.py",
+                "args":"",
+                "args_list":[
+                    " --server TEST_SERVER --path REPORT_PATH --store --png --database DATABASE_SQLITE"
+                ]
+            }
+        },
+        "suite_l3f":{
+            "test_l3_longevity":{
+                "enabled":"TRUE",
+                "load_db":"skip",
+                "command":"test_l3_longevity.py",
+                "args":"",
+                "args_list":[
+                    " --lfmgr LF_MGR_IP --local_lf_report_dir REPORT_PATH --test_duration 15s --polling_interval 5s --upstream_port UPSTREAM_PORT ",
+                    " use_ssid_idx=1 --radio 'radio==wiphy1,stations==4,ssid==SSID_USED,ssid_pw==SSID_PW_USED,security==SECURITY_USED wifi_mode==0 wifi_settings==wifi_settings enable_flags==(ht160_enable|wpa2_enable|80211u_enable|create_admin_down)'",                     
+                    " --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000",
+                    " --test_rig TEST_RIG --test_tag 'l3_longevity'",
+                    " --dut_model_num  USE_DUT_NAME --dut_sw_version DUT_SW --dut_hw_version DUT_HW --dut_serial_num DUT_SN"
+                ]
+            },
+            "lf_qa":{
+                "enabled":"TRUE",
+                "timeout":"600",
+                "load_db":"skip",
+                "command":"./tools/lf_qa.py",
+                "args":"",
+                "args_list":[
+                    " --server TEST_SERVER --path REPORT_PATH --store --png --database DATABASE_SQLITE"
+                ]
+            }
         }
     }   
 }