diff --git a/py-scripts/tools/ct_us_001.json b/py-scripts/tools/ct_us_001.json index 92fa2c8e..853c370f 100644 --- a/py-scripts/tools/ct_us_001.json +++ b/py-scripts/tools/ct_us_001.json @@ -16,6 +16,7 @@ "database_tag_influx": "testbed CT-US-001", "lf_mgr_ip": "192.168.100.116", "lf_mgr_port": "8080", + "upstream_port":"1.1.eth2", "test_timeout": 600, "load_blank_db": false, "load_factory_default_db": true, @@ -33,12 +34,6 @@ "ftp_test_ip": "10.40.0.10", "test_ip": "192.168.0.104" }, - "test_generic":{ - "radio_used": "wiphy1", - "num_sta": 1, - "col_names": "name,tx_byptes,rx_bytes,dropped", - "upstream_port": "eth2" - }, "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"} diff --git a/py-scripts/tools/ct_us_002.json b/py-scripts/tools/ct_us_002.json index 26911fa7..0fa696a9 100644 --- a/py-scripts/tools/ct_us_002.json +++ b/py-scripts/tools/ct_us_002.json @@ -15,6 +15,7 @@ "database_tag": "testbed CT-US-002", "lf_mgr_ip": "192.168.100.200", "lf_mgr_port": "8080", + "upstream_port": "1.1.eth2", "dut_set_name": "DUT_NAME NETGEAR59-5G", "dut_name": "NETGEAR-AX12", "dut_bssid_2g": "94:a6:7e:54:d4:31", @@ -36,15 +37,6 @@ "ftp_test_ip": "10.40.0.10", "test_ip": "192.168.0.104" }, - "test_generic":{ - "radio_used": "wiphy1", - "ssid_used": "NETGEAR59-5G", - "ssid_pw_used": "crispynest798", - "security_used": "wpa2", - "num_sta": 4, - "col_names": "name,tx_byptes,rx_bytes,dropped", - "upstream_port": "1.1.eth2" - }, "radio_dict":{ "RADIO_0_CFG":{"KEY":"RADIO_0_CFG","RADIO":"wiphy0","STATIONS":"4","SSID":"NETGEAR59-5G","PASSWD":"crispynest798","SECURITY":"wpa2"}, "RADIO_1_CFG":{"KEY":"RADIO_1_CFG","RADIO":"wiphy1","STATIONS":"4","SSID":"NETGEAR59-5G","PASSWD":"crispynest798","SECURITY":"wpa2"} diff --git a/py-scripts/tools/ct_us_003.json b/py-scripts/tools/ct_us_003.json index 10251e98..0b103248 100644 --- a/py-scripts/tools/ct_us_003.json +++ b/py-scripts/tools/ct_us_003.json @@ -18,15 +18,6 @@ "ftp_test_ip": "10.40.0.10", "test_ip": "192.168.0.104" }, - "test_generic":{ - "radio_used": "wiphy1", - "ssid_used": "asus11ax-5", - "ssid_pw_used": "hello123", - "security_used": "wpa2", - "num_sta": 4, - "col_names": "name,tx_byptes,rx_bytes,dropped", - "upstream_port": "eth1" - }, "radio_dict":{ "RADIO_0_CFG":{"KEY":"RADIO_0_CFG","RADIO":"wiphy0","STATIONS":"4","SSID":"ct523c-vap","PASSWD":"ct523c-vap","SECURITY":"wpa2"}, "RADIO_1_CFG":{"KEY":"RADIO_1_CFG","RADIO":"wiphy1","STATIONS":"4","SSID":"ct523c-vap","PASSWD":"ct523c-vap","SECURITY":"wpa2"} diff --git a/py-scripts/tools/ct_us_004.json b/py-scripts/tools/ct_us_004.json index 736f5e28..466ed229 100644 --- a/py-scripts/tools/ct_us_004.json +++ b/py-scripts/tools/ct_us_004.json @@ -14,6 +14,7 @@ "test_rig": "CT-US-004", "lf_mgr_ip": "192.168.100.194", "lf_mgr_port": "8080", + "upstream_port": "1.1.eth2", "dut_set_name": "DUT_NAME Asus-RT-AX88U", "dut_name": "Asus-RT-AX88U", "dut_bssid_2g": "d4:5d:64:a0:7f:78", @@ -36,15 +37,6 @@ "ftp_test_ip": "10.40.0.10", "test_ip": "192.168.0.104" }, - "test_generic":{ - "radio_used": "wiphy1", - "ssid_used": "asus11ax-5", - "ssid_pw_used": "hello123", - "security_used": "wpa2", - "num_sta": 1, - "col_names": "name,tx_byptes,rx_bytes,dropped", - "upstream_port": "eth2" - }, "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"} diff --git a/py-scripts/tools/lf_check.py b/py-scripts/tools/lf_check.py index 9d0c718b..750428fc 100755 --- a/py-scripts/tools/lf_check.py +++ b/py-scripts/tools/lf_check.py @@ -148,6 +148,8 @@ class lf_check(): self.lf_mgr_port = "8080" self.lf_mgr_user = "lanforge" self.lf_mgr_pass = "lanforge" + self.upstream_port = "" + # results self.database_sqlite = "" @@ -185,12 +187,6 @@ class lf_check(): self.ssid_6g_pw = "" self.security_6g = "" - # section TEST_GENERIC - self.radio_lf = "" - self.num_sta = "" - self.col_names = "" - self.upstream_port = "" - self.csv_results = _csv_results self.csv_results_file = "" self.csv_results_writer = "" @@ -488,14 +484,6 @@ http://{blog}:2368""".format(blog=self.blog_host_ghost) self.logger.info("EXITING test_network not in json {}".format(self.json_rig)) exit(1) - if "test_generic" in self.json_rig: - self.logger.info("json: read test_generic") - # self.logger.info("test_generic {}".format(self.json_rig["test_generic"])) - self.read_test_generic() - else: - self.logger.info("EXITING test_generic not in json {}".format(self.json_rig)) - exit(1) - if "radio_dict" in self.json_rig: self.logger.info("json: read radio_dict") # self.logger.info("radio_dict {}".format(self.json_rig["radio_dict"])) @@ -564,6 +552,18 @@ http://{blog}:2368""".format(blog=self.blog_host_ghost) self.database_sqlite = self.json_rig["test_parameters"]["database_sqlite"] else: self.logger.info("database_sqlite not in test_parameters json") + if "lf_mgr_ip" in self.json_rig["test_parameters"]: + self.lf_mgr_ip = self.json_rig["test_parameters"]["lf_mgr_ip"] + else: + self.logger.info("lf_mgr_ip not in test_parameters json") + if "lf_mgr_port" in self.json_rig["test_parameters"]: + self.lf_mgr_port = self.json_rig["test_parameters"]["lf_mgr_port"] + else: + self.logger.info("lf_mgr_port not in test_parameters json") + if "upstream_port" in self.json_rig["test_parameters"]: + self.upstream_port = self.json_rig["test_parameters"]["upstream_port"] + else: + self.logger.info("upstream_port not in test_parameters json") if "test_timeout" in self.json_rig["test_parameters"]: self.test_timeout = self.json_rig["test_parameters"]["test_timeout"] self.test_timeout_default = self.test_timeout @@ -619,15 +619,7 @@ http://{blog}:2368""".format(blog=self.blog_host_ghost) self.email_txt = self.json_rig["test_parameters"]["email_txt"] else: self.logger.info("email_txt not in test_parameters json") - if "lf_mgr_ip" in self.json_rig["test_parameters"]: - self.lf_mgr_ip = self.json_rig["test_parameters"]["lf_mgr_ip"] - else: - self.logger.info("lf_mgr_ip not in test_parameters json") - if "lf_mgr_port" in self.json_rig["test_parameters"]: - 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 def read_dut_parameters(self): @@ -738,28 +730,6 @@ http://{blog}:2368""".format(blog=self.blog_host_ghost) self.logger.info("test_ip not in test_network json") exit(1) - def read_test_generic(self): - if "radio_used" in self.json_rig["test_generic"]: - self.radio_lf = self.json_rig["test_generic"]["radio_used"] - else: - self.logger.info("radio_used not in test_generic json") - exit(1) - if "num_sta" in self.json_rig["test_generic"]: - self.num_sta = self.json_rig["test_generic"]["num_sta"] - else: - self.logger.info("num_sta not in test_generic json") - exit(1) - if "col_names" in self.json_rig["test_generic"]: - self.num_sta = self.json_rig["test_generic"]["col_names"] - else: - self.logger.info("col_names not in test_generic json") - exit(1) - if "upstream_port" in self.json_rig["test_generic"]: - self.upstream_port = self.json_rig["test_generic"]["upstream_port"] - else: - self.logger.info("upstream_port not in test_generic json") - exit(1) - # Optional from --json_igg switch # kpi.csv and meta.txt can be read after test run performed holds same data def read_test_database(self):