mirror of
				https://github.com/Telecominfraproject/wlan-lanforge-scripts.git
				synced 2025-11-03 20:27:54 +00:00 
			
		
		
		
	Adding in lf_ap_auto_test to ct_us_002 and enabling local_lf_report_dir in lf_ap_auto_test
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
		@@ -186,6 +186,7 @@ class ApAutoTest(cvtest):
 | 
				
			|||||||
                 lf_port=8080,
 | 
					                 lf_port=8080,
 | 
				
			||||||
                 lf_user="lanforge",
 | 
					                 lf_user="lanforge",
 | 
				
			||||||
                 lf_password="lanforge",
 | 
					                 lf_password="lanforge",
 | 
				
			||||||
 | 
					                 local_lf_report_dir="",
 | 
				
			||||||
                 instance_name="ap_auto_instance",
 | 
					                 instance_name="ap_auto_instance",
 | 
				
			||||||
                 config_name="ap_auto_config",
 | 
					                 config_name="ap_auto_config",
 | 
				
			||||||
                 upstream="1.1.eth1",
 | 
					                 upstream="1.1.eth1",
 | 
				
			||||||
@@ -230,6 +231,7 @@ class ApAutoTest(cvtest):
 | 
				
			|||||||
        self.raw_lines_file = raw_lines_file
 | 
					        self.raw_lines_file = raw_lines_file
 | 
				
			||||||
        self.sets = sets
 | 
					        self.sets = sets
 | 
				
			||||||
        self.graph_groups = graph_groups
 | 
					        self.graph_groups = graph_groups
 | 
				
			||||||
 | 
					        self.local_lf_report_dir = local_lf_report_dir
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def setup(self):
 | 
					    def setup(self):
 | 
				
			||||||
        # Nothing to do at this time.
 | 
					        # Nothing to do at this time.
 | 
				
			||||||
@@ -282,7 +284,7 @@ class ApAutoTest(cvtest):
 | 
				
			|||||||
        self.create_and_run_test(self.load_old_cfg, self.test_name, self.instance_name,
 | 
					        self.create_and_run_test(self.load_old_cfg, self.test_name, self.instance_name,
 | 
				
			||||||
                                 self.config_name, self.sets,
 | 
					                                 self.config_name, self.sets,
 | 
				
			||||||
                                 self.pull_report, self.lf_host, self.lf_user, self.lf_password,
 | 
					                                 self.pull_report, self.lf_host, self.lf_user, self.lf_password,
 | 
				
			||||||
                                 cv_cmds, graph_groups_file=self.graph_groups)
 | 
					                                 cv_cmds, graph_groups_file=self.graph_groups, local_lf_report_dir=self.local_lf_report_dir)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        self.rm_text_blob(self.config_name, blob_test)  # To delete old config with same name
 | 
					        self.rm_text_blob(self.config_name, blob_test)  # To delete old config with same name
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -332,6 +334,7 @@ def main():
 | 
				
			|||||||
                        help="Specify 2.4Ghz radio.  May be specified multiple times.")
 | 
					                        help="Specify 2.4Ghz radio.  May be specified multiple times.")
 | 
				
			||||||
    parser.add_argument("--radio5", action='append', nargs=1, default=[],
 | 
					    parser.add_argument("--radio5", action='append', nargs=1, default=[],
 | 
				
			||||||
                        help="Specify 5Ghz radio.  May be specified multiple times.")
 | 
					                        help="Specify 5Ghz radio.  May be specified multiple times.")
 | 
				
			||||||
 | 
					    parser.add_argument("--local_lf_report_dir", help="--local_lf_report_dir <where to pull reports to>  default '' put where dataplane script run from",default="")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    args = parser.parse_args()
 | 
					    args = parser.parse_args()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -345,6 +348,7 @@ def main():
 | 
				
			|||||||
                         config_name = args.config_name,
 | 
					                         config_name = args.config_name,
 | 
				
			||||||
                         upstream = args.upstream,
 | 
					                         upstream = args.upstream,
 | 
				
			||||||
                         pull_report = args.pull_report,
 | 
					                         pull_report = args.pull_report,
 | 
				
			||||||
 | 
					                         local_lf_report_dir = args.local_lf_report_dir,
 | 
				
			||||||
                         dut5_0 = args.dut5_0,
 | 
					                         dut5_0 = args.dut5_0,
 | 
				
			||||||
                         dut2_0 = args.dut2_0,
 | 
					                         dut2_0 = args.dut2_0,
 | 
				
			||||||
                         load_old_cfg = args.load_old_cfg,
 | 
					                         load_old_cfg = args.load_old_cfg,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,7 +22,7 @@
 | 
				
			|||||||
        "custom_db": "DFLT_ETH1_GEN",
 | 
					        "custom_db": "DFLT_ETH1_GEN",
 | 
				
			||||||
        "email_list_production": "konikofi@candelatech.com,greearb@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,jreynolds@candelatech.com",
 | 
					        "email_list_production": "konikofi@candelatech.com,greearb@candelatech.com,logan.lipke@candelatech.com,dipti.dhond@candelatech.com,chuck.rekiere@candelatech.com,matthew@candelatech.com,iain.davidson@candelatech.com,jreynolds@candelatech.com",
 | 
				
			||||||
        "host_ip_production": "192.168.100.201",
 | 
					        "host_ip_production": "192.168.100.201",
 | 
				
			||||||
        "email_list_test": "chuck.rekiere@candelatech.com,logan.lipke@candelatech.com",
 | 
					        "email_list_test": "chuck.rekiere@candelatech.com,logan.lipke@candelatech.com,matthew.stidham@candelatech.com",
 | 
				
			||||||
        "host_ip_test": "192.168.100.201",
 | 
					        "host_ip_test": "192.168.100.201",
 | 
				
			||||||
        "email_title_txt": "Lanforge QA Testing CT-US-002",
 | 
					        "email_title_txt": "Lanforge QA Testing CT-US-002",
 | 
				
			||||||
        "email_txt": "Lanforge QA Testing CT-US-002"
 | 
					        "email_txt": "Lanforge QA Testing CT-US-002"
 | 
				
			||||||
@@ -75,6 +75,48 @@
 | 
				
			|||||||
        "suite_two":{
 | 
					        "suite_two":{
 | 
				
			||||||
                "test_l3_longevity":{"enabled":"TRUE","command":"test_l3_longevity.py","args":"--test_duration 15s --polling_interval 5s --upstream_port eth2 --radio 'radio==wiphy1,stations==4,ssid==ct523c-vap,ssid_pw==ct523c-vap,security==wpa2' --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000"}
 | 
					                "test_l3_longevity":{"enabled":"TRUE","command":"test_l3_longevity.py","args":"--test_duration 15s --polling_interval 5s --upstream_port eth2 --radio 'radio==wiphy1,stations==4,ssid==ct523c-vap,ssid_pw==ct523c-vap,security==wpa2' --endp_type lf_udp --rates_are_totals --side_a_min_bps=20000 --side_b_min_bps=300000000"}
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
 | 
					        "auto_suite":{
 | 
				
			||||||
 | 
					            "CT-US-002_create_chamberview_dut_1":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview_dut.py","args":"",
 | 
				
			||||||
 | 
					                "args_list":[
 | 
				
			||||||
 | 
					                    " --lfmgr LF_MGR_IP --port LF_MGR_PORT --dut_name DUT_NAME",
 | 
				
			||||||
 | 
					                    " --ssid 'ssid_idx=0 ssid=ruckus-r750-5g security=WPA2 password=hello123 bssid=4c:b1:cd:18:e8:ec'",
 | 
				
			||||||
 | 
					                    " --ssid 'ssid_idx=1 ssid=ruckus-r750-5g security=WPA2 password=hello123 bssid=4c:b1:cd:18:e8:ec'",
 | 
				
			||||||
 | 
					                    " --sw_version '3.5.4' --hw_version 5.12.14+ --serial_num ct523c-3b7b --model_num DUT_NAME"
 | 
				
			||||||
 | 
					                ]},
 | 
				
			||||||
 | 
					            "CT-US-002_create_chamberview_1":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview.py","args":"",
 | 
				
			||||||
 | 
					                "args_list":[
 | 
				
			||||||
 | 
					                    " --lfmgr LF_MGR_IP --port LF_MGR_PORT --delete_scenario",
 | 
				
			||||||
 | 
					                    " --create_scenario ucentral-scenario ",
 | 
				
			||||||
 | 
					                    " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy1,AUTO -1 NA\" ",
 | 
				
			||||||
 | 
					                    " --raw_line \"profile_link 1.1 STA-AC 1 'DUT: DUT_NAME Radio-1' NA wiphy4,AUTO -1 NA\" ",
 | 
				
			||||||
 | 
					                    " --raw_line \"profile_link 1.1 upstream-dhcp 1 NA NA UPSTREAM_PORT,AUTO -1 NA \" "
 | 
				
			||||||
 | 
					                ]
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
 | 
					            "CT-US-002_lf_ap_auto_test": {
 | 
				
			||||||
 | 
					                "enabled": "TRUE",
 | 
				
			||||||
 | 
					                "command": "lf_ap_auto_test.py",
 | 
				
			||||||
 | 
					                "args": "",
 | 
				
			||||||
 | 
					                "args_list":[
 | 
				
			||||||
 | 
					                    " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge",
 | 
				
			||||||
 | 
					                    " --instance_name ap-auto-instance --config_name test_con --upstream 1.1.eth1",
 | 
				
			||||||
 | 
					                    " --dut5_0 'DUT_NAME lanforge DUT_BSSID (1)' --dut2_0 'DUT_NAME lanforge DUT_BSSID (1)'",
 | 
				
			||||||
 | 
					                    " --max_stations_2 32 --max_stations_5 32 --max_stations_dual 100 --radio2 1.1.wiphy1",
 | 
				
			||||||
 | 
					                    " --radio5 1.1.wiphy2 --set 'Basic Client Connectivity' 1",
 | 
				
			||||||
 | 
					                    " --set 'Multi Band Performance' 1 --set 'Skip 2.4 Ghz Tests' 1 --pull_report --local_lf_report_dir REPORT_PATH",
 | 
				
			||||||
 | 
					                    " --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"
 | 
				
			||||||
 | 
					                ]
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
 | 
					            "GHOST":{"enabled":"TRUE","load_db":"skip","command":"ghost_profile.py","args":"",
 | 
				
			||||||
 | 
					                "args_list":[
 | 
				
			||||||
 | 
					                    " --ghost_token BLOG_TOKEN --ghost_host BLOG_HOST --authors BLOG_AUTHORS --customer BLOG_CUSTOMER",
 | 
				
			||||||
 | 
					                    " --user_push BLOG_USER_PUSH --password BLOG_PASSWORD_PUSH BLOG_FLAG --grafana_token DASHBOARD_TOKEN",
 | 
				
			||||||
 | 
					                    " --grafana_host DASHBOARD_HOST --grafana_bucket DATABASE_BUCKET --parent_folder REPORT_PATH",
 | 
				
			||||||
 | 
					                    " --influx_host DATABASE_HOST --influx_org DATABASE_ORG --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET",
 | 
				
			||||||
 | 
					                    " --influx_tag DATABASE_TAG "
 | 
				
			||||||
 | 
					                ]
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
        "suite_wc_dp":{
 | 
					        "suite_wc_dp":{
 | 
				
			||||||
            "CT-US-002_create_chamberview_dut_1":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview_dut.py","args":"",
 | 
					            "CT-US-002_create_chamberview_dut_1":{"enabled":"TRUE","load_db":"skip","command":"create_chamberview_dut.py","args":"",
 | 
				
			||||||
                "args_list":[
 | 
					                "args_list":[
 | 
				
			||||||
@@ -148,6 +190,22 @@
 | 
				
			|||||||
                    " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME"
 | 
					                    " --influx_token=DATABASE_TOKEN --influx_bucket DATABASE_BUCKET --influx_tag DATABASE_TAG --set DUT_SET_NAME"
 | 
				
			||||||
                ]
 | 
					                ]
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
 | 
					            "CT-US-002_lf_ap_auto_test": {
 | 
				
			||||||
 | 
					                "enabled": "TRUE",
 | 
				
			||||||
 | 
					                "command": "lf_ap_auto_test.py",
 | 
				
			||||||
 | 
					                "args": "",
 | 
				
			||||||
 | 
					                "args_list":[
 | 
				
			||||||
 | 
					                    " --mgr LF_MGR_IP --port LF_MGR_PORT --lf_user lanforge --lf_password lanforge",
 | 
				
			||||||
 | 
					                    "--instance_name ap-auto-instance --config_name test_con --upstream 1.1.eth1",
 | 
				
			||||||
 | 
					                    "--dut5_0 'DUT_NAME lanforge DUT_BSSID (1)' --dut2_0 'DUT_NAME lanforge DUT_BSSID (1)'",
 | 
				
			||||||
 | 
					                    "--max_stations_2 32 --max_stations_5 32 --max_stations_dual 100 --radio2 1.1.wiphy1",
 | 
				
			||||||
 | 
					                    "--radio5 1.1.wiphy2 --set 'Basic Client Connectivity' 1",
 | 
				
			||||||
 | 
					                    "--set 'Multi Band Performance' 1 --set 'Skip 2.4 Ghz Tests' 1 --pull_report --local_lf_report_dir REPORT_PATH",
 | 
				
			||||||
 | 
					                    "--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"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                ]
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
            "GHOST":{"enabled":"TRUE","load_db":"skip","command":"ghost_profile.py","args":"",
 | 
					            "GHOST":{"enabled":"TRUE","load_db":"skip","command":"ghost_profile.py","args":"",
 | 
				
			||||||
                "args_list":[
 | 
					                "args_list":[
 | 
				
			||||||
                    " --ghost_token BLOG_TOKEN --ghost_host BLOG_HOST --authors BLOG_AUTHORS --customer BLOG_CUSTOMER",
 | 
					                    " --ghost_token BLOG_TOKEN --ghost_host BLOG_HOST --authors BLOG_AUTHORS --customer BLOG_CUSTOMER",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -50,7 +50,8 @@
 | 
				
			|||||||
            "create_station":{"enabled":"TRUE","command":"create_station.py","args":"--radio RADIO_USED --start_id 2 --num_stations 1 --ssid SSID_USED --passwd SSID_PW_USED --security SECURITY_USED --debug"},
 | 
					            "create_station":{"enabled":"TRUE","command":"create_station.py","args":"--radio RADIO_USED --start_id 2 --num_stations 1 --ssid SSID_USED --passwd SSID_PW_USED --security SECURITY_USED --debug"},
 | 
				
			||||||
            "data_plane_0":{"enabled":"TRUE","load_db":"skip","command":"lf_dataplane_test.py","args":"--json lf_dp.json --influx_json lf_influx_db.json"},
 | 
					            "data_plane_0":{"enabled":"TRUE","load_db":"skip","command":"lf_dataplane_test.py","args":"--json lf_dp.json --influx_json lf_influx_db.json"},
 | 
				
			||||||
            "data_plane_1":{"enabled":"TRUE","load_db":"skip","command":"lf_dataplane_test.py","args":"--json lf_dp.json --influx_json lf_influx_db.json"},
 | 
					            "data_plane_1":{"enabled":"TRUE","load_db":"skip","command":"lf_dataplane_test.py","args":"--json lf_dp.json --influx_json lf_influx_db.json"},
 | 
				
			||||||
            "data_plane_2":{"enabled":"TRUE","load_db":"skip","command":"lf_dataplane_test.py","args":"--json lf_dp.json --influx_json lf_influx_db.json"}
 | 
					            "data_plane_2":{"enabled":"TRUE","load_db":"skip","command":"lf_dataplane_test.py","args":"--json lf_dp.json --influx_json lf_influx_db.json"},
 | 
				
			||||||
 | 
					            "lf_ap_auto_test": {"enabled":"True","command":"lf_ap_auto_test.py","args": "--instance_name ap-auto-instance --config_name test_con --upstream 1.1.eth1 --dut5_0 'linksys-8450 lanforge 04:f0:21:2c:41:84 (1)' --dut2_0 'linksys-8450 lanforge 04:f0:21:2c:41:84 (1)' --max_stations_2 32 --max_stations_5 32 --max_stations_dual 100 --radio2 1.1.wiphy1 --radio5 1.1.wiphy2 --set 'Basic Client Connectivity' 1 --set 'Multi Band Performance' 1 --set 'Skip 2.4 Ghz Tests' 1 –set ‘Stability’ 0 --set ‘Multi-Station Throughput vs Pkt Size’ 0 --set ‘Throughput vs Pkt Size’ 0 --set ‘Capacity’ 0 --set ‘Band-Steering’ 0 –pull_report"}
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -921,7 +921,7 @@ Example :
 | 
				
			|||||||
    parser.add_argument('--ini', help="--ini <config.ini file>  default lf_check_config.ini", default="lf_check_config.ini")
 | 
					    parser.add_argument('--ini', help="--ini <config.ini file>  default lf_check_config.ini", default="lf_check_config.ini")
 | 
				
			||||||
    parser.add_argument('--json', help="--json <lf_ckeck_config.json file> ", default="lf_check_config.json")
 | 
					    parser.add_argument('--json', help="--json <lf_ckeck_config.json file> ", default="lf_check_config.json")
 | 
				
			||||||
    parser.add_argument('--use_json', help="--use_json ", action='store_true')
 | 
					    parser.add_argument('--use_json', help="--use_json ", action='store_true')
 | 
				
			||||||
    parser.add_argument('--suite', help="--suite <suite name>  default TEST_DICTIONARY", default="TEST_DICTIONARY")
 | 
					    parser.add_argument('--suite', '--test_suite', help="--suite <suite name>  default TEST_DICTIONARY", default="TEST_DICTIONARY")
 | 
				
			||||||
    parser.add_argument('--production', help="--production  stores true, sends email results to production email list", action='store_true')
 | 
					    parser.add_argument('--production', help="--production  stores true, sends email results to production email list", action='store_true')
 | 
				
			||||||
    parser.add_argument('--outfile', help="--outfile <Output Generic Name>  used as base name for all files generated", default="")
 | 
					    parser.add_argument('--outfile', help="--outfile <Output Generic Name>  used as base name for all files generated", default="")
 | 
				
			||||||
    parser.add_argument('--logfile', help="--logfile <logfile Name>  logging for output of lf_check.py script", default="lf_check.log")
 | 
					    parser.add_argument('--logfile', help="--logfile <logfile Name>  logging for output of lf_check.py script", default="lf_check.log")
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user