diff --git a/py-scripts/tools/ct_us_001.json b/py-scripts/tools/ct_us_001.json index 853c370f..08cec364 100644 --- a/py-scripts/tools/ct_us_001.json +++ b/py-scripts/tools/ct_us_001.json @@ -35,8 +35,14 @@ "test_ip": "192.168.0.104" }, "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"} + "1.1.wiphy0":{"KEY":"1.1.wiphy0","RADIO":"1.1.wiphy0","DRIVER":"ath10k(9984)","CAPABILITIES":"802.11bgn-AC","MAX_STA":"128","MAX_VAP":"24","MAX_VIFS":"64"}, + "1.1.wiphy1":{"KEY":"1.1.wiphy1","RADIO":"1.1.wiphy1","DRIVER":"ath10k(9984)","CAPABILITIES":"802.11bgn-AC","MAX_STA":"128","MAX_VAP":"24","MAX_VIFS":"64"}, + "1.1.wiphy2":{"KEY":"1.1.wiphy2","RADIO":"1.1.wiphy2","DRIVER":"ath9k()","CAPABILITIES":"802.11abgn","MAX_STA":"2048","MAX_VAP":"24","MAX_VIFS":"64"}, + "1.1.wiphy3":{"KEY":"1.1.wiphy3","RADIO":"1.1.wiphy3","DRIVER":"ath10k(998x)","CAPABILITIES":"802.11abgn-AC","MAX_STA":"127","MAX_VAP":"24","MAX_VIFS":"64"}, + "1.1.wiphy4":{"KEY":"1.1.wiphy4","RADIO":"1.1.wiphy4","DRIVER":"iwlwifi(AX200)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, + "1.1.wiphy5":{"KEY":"1.1.wiphy5","RADIO":"1.1.wiphy5","DRIVER":"iwlwifi(AX210)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, + "1.1.wiphy6":{"KEY":"1.1.wiphy6","RADIO":"1.1.wiphy6","DRIVER":"iwlwifi(AX210)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, + "1.1.wiphy7":{"KEY":"1.1.wiphy7","RADIO":"1.1.wiphy7","DRIVER":"mt7915e()","CAPABILITIES":"802.11abgn-AX","MAX_STA":"19","MAX_VAP":"16","MAX_VIFS":"19"} } } diff --git a/py-scripts/tools/ct_us_004.json b/py-scripts/tools/ct_us_004.json index 8375d93d..0c571a90 100644 --- a/py-scripts/tools/ct_us_004.json +++ b/py-scripts/tools/ct_us_004.json @@ -40,8 +40,14 @@ "test_ip": "192.168.0.104" }, "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"} + "1.1.wiphy0":{"KEY":"1.1.wiphy0","RADIO":"1.1.wiphy0","DRIVER":"ath10k(9984)","CAPABILITIES":"802.11bgn-AC","MAX_STA":"128","MAX_VAP":"24","MAX_VIFS":"64"}, + "1.1.wiphy1":{"KEY":"1.1.wiphy1","RADIO":"1.1.wiphy1","DRIVER":"ath10k(9984)","CAPABILITIES":"802.11bgn-AC","MAX_STA":"128","MAX_VAP":"24","MAX_VIFS":"64"}, + "1.1.wiphy2":{"KEY":"1.1.wiphy2","RADIO":"1.1.wiphy2","DRIVER":"ath9k()","CAPABILITIES":"802.11abgn","MAX_STA":"2048","MAX_VAP":"24","MAX_VIFS":"64"}, + "1.1.wiphy3":{"KEY":"1.1.wiphy3","RADIO":"1.1.wiphy3","DRIVER":"ath10k(998x)","CAPABILITIES":"802.11abgn-AC","MAX_STA":"127","MAX_VAP":"24","MAX_VIFS":"64"}, + "1.1.wiphy4":{"KEY":"1.1.wiphy4","RADIO":"1.1.wiphy4","DRIVER":"iwlwifi(AX200)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, + "1.1.wiphy5":{"KEY":"1.1.wiphy5","RADIO":"1.1.wiphy5","DRIVER":"iwlwifi(AX210)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, + "1.1.wiphy6":{"KEY":"1.1.wiphy6","RADIO":"1.1.wiphy6","DRIVER":"iwlwifi(AX210)","CAPABILITIES":"802.11abgn-AX","MAX_STA":"1","MAX_VAP":"1","MAX_VIFS":"1"}, + "1.1.wiphy7":{"KEY":"1.1.wiphy7","RADIO":"1.1.wiphy7","DRIVER":"mt7915e()","CAPABILITIES":"802.11abgn-AX","MAX_STA":"19","MAX_VAP":"16","MAX_VIFS":"19"} } } diff --git a/py-scripts/tools/lf_check.py b/py-scripts/tools/lf_check.py index 750428fc..05b2623c 100755 --- a/py-scripts/tools/lf_check.py +++ b/py-scripts/tools/lf_check.py @@ -876,6 +876,14 @@ http://{blog}:2368""".format(blog=self.blog_host_ghost) self.start_csv_results() print(self.test_dict) + # loop through radios (For future functionality based on radio) + for radio in self.radio_dict: + # This has been changed to reflect the Radio configuriaton of LANforge, for now print + print("rig json config: RADIO: {radio} DRIVER: {driver} CAPABILITIES {cap} MAX_STA {max_sta} MAX_VAP {max_vap} MAX_VIF {max_vif}" + .format(radio=self.radio_dict[radio]['RADIO'],driver=self.radio_dict[radio]['DRIVER'],cap=self.radio_dict[radio]['CAPABILITIES'], + max_sta=self.radio_dict[radio]['MAX_STA'],max_vap=self.radio_dict[radio]['MAX_VAP'],max_vif=self.radio_dict[radio['MAX_VIF']])) + + # Configure Tests for test in self.test_dict: if self.test_dict[test]['enabled'] == "FALSE": self.logger.info("test: {} skipped".format(test)) @@ -899,19 +907,6 @@ http://{blog}:2368""".format(blog=self.blog_host_ghost) self.test_dict[test]['args'] = self.test_dict[test]['args'].replace(self.test_dict[test]['args'], ''.join(self.test_dict[test][ 'args_list'])) - # Configure Tests - # loop through radios - for radio in self.radio_dict: - # replace RADIO, SSID, PASSWD, SECURITY with actual config values (e.g. RADIO_0_CFG to values) - # not "KEY" is just a word to refer to the RADIO define (e.g. RADIO_0_CFG) to get the vlaues - # --num_stations needs to be int not string (no double quotes) - if self.radio_dict[radio]["KEY"] in self.test_dict[test]['args']: - self.test_dict[test]['args'] = self.test_dict[test]['args'].replace( - self.radio_dict[radio]["KEY"], - '--radio {} --ssid {} --passwd {} --security {} --num_stations {}' - .format(self.radio_dict[radio]['RADIO'], self.radio_dict[radio]['SSID'], - self.radio_dict[radio]['PASSWD'], self.radio_dict[radio]['SECURITY'], - self.radio_dict[radio]['STATIONS'])) if 'DATABASE_SQLITE' in self.test_dict[test]['args']: self.text_dict[test]['args'] = self.test_dict[test]['args'].replace('DATABASE_SQLITE', self.database_sqlite)