WifiSoftApTest add a new user param in ACTS config: sap_wpa3_supported_models.
This param is a list containing projects supporting SAP WPA3 feature.
Bug: 286151425
Change-Id: I2af112f160db67f6b64eace28362411124b11336
diff --git a/acts_tests/tests/google/wifi/WifiSoftApTest.py b/acts_tests/tests/google/wifi/WifiSoftApTest.py
index 54361e9..31fa072 100644
--- a/acts_tests/tests/google/wifi/WifiSoftApTest.py
+++ b/acts_tests/tests/google/wifi/WifiSoftApTest.py
@@ -48,7 +48,7 @@
self.dut = self.android_devices[0]
self.dut_client = self.android_devices[1]
req_params = ["dbs_supported_models", "sta_concurrency_supported_models",
- "wifi6_models"]
+ "sap_wpa3_supported_models", "wifi6_models"]
opt_param = ["reference_networks"]
self.unpack_userparams(
req_param_names=req_params, opt_param_names=opt_param)
@@ -406,7 +406,7 @@
1. Configure softap in default band and wpa3 security.
2. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA3 softAp")
self.validate_full_tether_startup(security=WPA3_SAE_SOFTAP)
@@ -418,7 +418,7 @@
1. Configure softap in 2G band and wpa3 security.
2. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA3 softAp")
self.validate_full_tether_startup(
WIFI_CONFIG_APBAND_2G, security=WPA3_SAE_SOFTAP)
@@ -431,7 +431,7 @@
1. Configure softap in 5G band and wpa3 security.
2. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA3 softAp")
self.validate_full_tether_startup(
WIFI_CONFIG_APBAND_5G, security=WPA3_SAE_SOFTAP)
@@ -444,7 +444,7 @@
1. Configure softap in auto band and wpa3 security.
2. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA3 softAp")
self.validate_full_tether_startup(
WIFI_CONFIG_APBAND_AUTO, security=WPA3_SAE_SOFTAP)
@@ -457,7 +457,7 @@
1. Configure hidden softap in default band and wpa3 security.
2. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA3 softAp")
self.validate_full_tether_startup(security=WPA3_SAE_SOFTAP, hidden=True)
@@ -469,7 +469,7 @@
1. Configure hidden softap in 2G band and wpa3 security.
2. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA3 softAp")
self.validate_full_tether_startup(
WIFI_CONFIG_APBAND_2G, True, security=WPA3_SAE_SOFTAP)
@@ -482,7 +482,7 @@
1. Configure hidden softap in 5G band and wpa3 security.
2. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA3 softAp")
self.validate_full_tether_startup(
WIFI_CONFIG_APBAND_5G, True, security=WPA3_SAE_SOFTAP)
@@ -495,7 +495,7 @@
1. Configure hidden softap in auto band and wpa3 security.
2. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA3 softAp")
self.validate_full_tether_startup(
WIFI_CONFIG_APBAND_AUTO, True, security=WPA3_SAE_SOFTAP)
@@ -508,7 +508,7 @@
1. Configure softap in default band and wpa2/wpa3 security.
2. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA2/WPA3 softAp")
self.validate_full_tether_startup(security=WPA3_SAE_TRANSITION_SOFTAP)
@@ -520,7 +520,7 @@
1. Configure softap in default band and wpa2/wpa3 security.
2. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA2/WPA3 softAp")
self.validate_full_tether_startup(
WIFI_CONFIG_APBAND_2G, security=WPA3_SAE_TRANSITION_SOFTAP)
@@ -533,7 +533,7 @@
1. Configure softap in default band and wpa2/wpa3 security.
2. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA2/WPA3 softAp")
self.validate_full_tether_startup(
WIFI_CONFIG_APBAND_5G, security=WPA3_SAE_TRANSITION_SOFTAP)
@@ -546,7 +546,7 @@
1. Configure softap in default band and wpa2/wpa3 security.
2. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA2/WPA3 softAp")
self.validate_full_tether_startup(
WIFI_CONFIG_APBAND_AUTO, security=WPA3_SAE_TRANSITION_SOFTAP)
@@ -559,7 +559,7 @@
1. Configure hidden softap in 2G band and wpa2/wpa3 security.
2. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA2/WPA3 softAp")
self.validate_full_tether_startup(
WIFI_CONFIG_APBAND_2G, True, security=WPA3_SAE_TRANSITION_SOFTAP)
@@ -572,7 +572,7 @@
1. Configure hidden softap in 5G band and wpa2/wpa3 security.
2. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA2/WPA3 softAp")
self.validate_full_tether_startup(
WIFI_CONFIG_APBAND_5G, True, security=WPA3_SAE_TRANSITION_SOFTAP)
@@ -585,7 +585,7 @@
1. Configure hidden softap in auto band and wpa2/wpa3 security.
2. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA3 softAp")
self.validate_full_tether_startup(
WIFI_CONFIG_APBAND_AUTO, True, security=WPA3_SAE_TRANSITION_SOFTAP)
@@ -599,7 +599,7 @@
2. Reboot device and start softap.
3. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA3 softAp")
self.validate_softap_after_reboot(
WIFI_CONFIG_APBAND_2G, WPA3_SAE_SOFTAP, False)
@@ -613,7 +613,7 @@
2. Reboot device and start softap.
3. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA3 softAp")
self.validate_softap_after_reboot(
WIFI_CONFIG_APBAND_5G, WPA3_SAE_SOFTAP, False)
@@ -627,7 +627,7 @@
2. Reboot device and start softap.
3. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA2/WPA3 softAp")
self.validate_softap_after_reboot(
WIFI_CONFIG_APBAND_2G, WPA3_SAE_TRANSITION_SOFTAP, False)
@@ -641,7 +641,7 @@
2. Reboot device and start softap.
3. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA2/WPA3 softAp")
self.validate_softap_after_reboot(
WIFI_CONFIG_APBAND_5G, WPA3_SAE_TRANSITION_SOFTAP, False)
@@ -655,7 +655,7 @@
2. Reboot device and start softap.
3. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA3 softAp")
self.validate_softap_after_reboot(
WIFI_CONFIG_APBAND_2G, WPA3_SAE_SOFTAP, True)
@@ -669,7 +669,7 @@
2. Reboot device and start softap.
3. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA3 softAp")
self.validate_softap_after_reboot(
WIFI_CONFIG_APBAND_5G, WPA3_SAE_SOFTAP, True)
@@ -683,7 +683,7 @@
2. Reboot device and start softap.
3. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA2/WPA3 softAp")
self.validate_softap_after_reboot(
WIFI_CONFIG_APBAND_2G, WPA3_SAE_TRANSITION_SOFTAP, True)
@@ -697,7 +697,7 @@
2. Reboot device and start softap.
3. Verify dut client connects to the softap.
"""
- asserts.skip_if(self.dut.model not in self.sta_concurrency_supported_models,
+ asserts.skip_if(self.dut.model not in self.sap_wpa3_supported_models,
"DUT does not support WPA2/WPA3 softAp")
self.validate_softap_after_reboot(
WIFI_CONFIG_APBAND_5G, WPA3_SAE_TRANSITION_SOFTAP, True)
