Cherry picked changes from master
Bug: 158349179
Test: Verified the changes
Merged-In: I6a4be4fb6a351234e79f7b3977bed5859a062a71
Change-Id: I832103f2d8420d78c49a26efba927f0f15a3181b
diff --git a/acts/tests/google/wifi/WifiEnterpriseRoamingTest.py b/acts/tests/google/wifi/WifiEnterpriseRoamingTest.py
index e494997..ca1c015 100644
--- a/acts/tests/google/wifi/WifiEnterpriseRoamingTest.py
+++ b/acts/tests/google/wifi/WifiEnterpriseRoamingTest.py
@@ -59,13 +59,22 @@
ap_count=2,
radius_conf_2g=self.radius_conf_2g,
radius_conf_5g=self.radius_conf_5g,)
+ elif "OpenWrtAP" in self.user_params:
+ self.configure_openwrt_ap_and_start(
+ mirror_ap=True,
+ ent_network=True,
+ ap_count=2,
+ radius_conf_2g=self.radius_conf_2g,
+ radius_conf_5g=self.radius_conf_5g,)
self.ent_network_2g_a = self.ent_networks[0]["2g"]
self.ent_network_2g_b = self.ent_networks[1]["2g"]
- self.bssid_2g_a = self.ent_network_2g_a[WifiEnums.BSSID_KEY.lower()]
- self.bssid_2g_b = self.ent_network_2g_b[WifiEnums.BSSID_KEY.lower()]
self.ent_roaming_ssid = self.ent_network_2g_a[WifiEnums.SSID_KEY]
- self.bssid_a = self.bssid_2g_a
- self.bssid_b = self.bssid_2g_b
+ if "AccessPoint" in self.user_params:
+ self.bssid_a = self.ent_network_2g_a[WifiEnums.BSSID_KEY.lower()]
+ self.bssid_b = self.ent_network_2g_b[WifiEnums.BSSID_KEY.lower()]
+ elif "OpenWrtAP" in self.user_params:
+ self.bssid_a = self.bssid_map[0]["2g"][self.ent_roaming_ssid]
+ self.bssid_b = self.bssid_map[1]["2g"][self.ent_roaming_ssid]
self.config_peap = {
Ent.EAP: int(EAP.PEAP),
@@ -97,6 +106,8 @@
}
self.attn_a = self.attenuators[0]
self.attn_b = self.attenuators[2]
+ if "OpenWrtAP" in self.user_params:
+ self.attn_b = self.attenuators[1]
# Set screen lock password so ConfigStore is unlocked.
self.dut.droid.setDevicePassword(self.device_password)
self.set_attns("default")
diff --git a/acts/tests/google/wifi/WifiHiddenSSIDTest.py b/acts/tests/google/wifi/WifiHiddenSSIDTest.py
index 8cb29cd..df18a04 100644
--- a/acts/tests/google/wifi/WifiHiddenSSIDTest.py
+++ b/acts/tests/google/wifi/WifiHiddenSSIDTest.py
@@ -14,17 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import itertools
-import pprint
-import queue
-import time
-
-import acts.base_test
import acts.signals
import acts.test_utils.wifi.wifi_test_utils as wutils
-import acts.utils
-from acts import asserts
from acts.test_decorators import test_tracker_info
from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
@@ -43,22 +35,16 @@
self.dut = self.android_devices[0]
wutils.wifi_test_device_init(self.dut)
- req_params = []
- opt_param = [
- "open_network", "reference_networks"]
- self.unpack_userparams(
- req_param_names=req_params, opt_param_names=opt_param)
if "AccessPoint" in self.user_params:
self.legacy_configure_ap_and_start(hidden=True)
elif "OpenWrtAP" in self.user_params:
self.configure_openwrt_ap_and_start(open_network=True,
wpa_network=True,
+ owe_network=True,
+ sae_network=True,
hidden=True)
- asserts.assert_true(
- len(self.reference_networks) > 0,
- "Need at least one reference network with psk.")
self.open_hidden_2g = self.open_network[0]["2g"]
self.open_hidden_5g = self.open_network[0]["5g"]
self.wpa_hidden_2g = self.reference_networks[0]["2g"]
@@ -162,3 +148,23 @@
"""
self.add_hiddenSSID_and_connect(self.open_hidden_5g)
+
+ @test_tracker_info(uuid="62b664df-6397-4360-97bf-a8095c23a878")
+ def test_connect_to_wpa3_owe_hidden_2g(self):
+ """Connect to WPA3 OWE 2G hidden wifi network."""
+ self.add_hiddenSSID_and_connect(self.owe_networks[0]["2g"])
+
+ @test_tracker_info(uuid="dd7b029d-c008-4288-a91c-0820b0b3f29d")
+ def test_connect_to_wpa3_owe_hidden_5g(self):
+ """Connect to WPA3 OWE 5G hidden wifi network."""
+ self.add_hiddenSSID_and_connect(self.owe_networks[0]["5g"])
+
+ @test_tracker_info(uuid="1a9f3ee8-3db0-4f07-a604-66c14a897f94")
+ def test_connect_to_wpa3_sae_hidden_2g(self):
+ """Connect to WPA3 SAE 2G hidden wifi network."""
+ self.add_hiddenSSID_and_connect(self.sae_networks[0]["2g"])
+
+ @test_tracker_info(uuid="6c75618b-9c9b-4eb6-a922-ef1719704a9c")
+ def test_connect_to_wpa3_sae_hidden_5g(self):
+ """Connect to WPA3 SAE 5G hidden wifi network."""
+ self.add_hiddenSSID_and_connect(self.sae_networks[0]["5g"])
diff --git a/acts/tests/google/wifi/WifiWpa3OweTest.py b/acts/tests/google/wifi/WifiWpa3OweTest.py
index b724310..d4b76dd 100644
--- a/acts/tests/google/wifi/WifiWpa3OweTest.py
+++ b/acts/tests/google/wifi/WifiWpa3OweTest.py
@@ -32,13 +32,10 @@
super().setup_class()
self.dut = self.android_devices[0]
- self.dut_client = self.android_devices[1]
wutils.wifi_test_device_init(self.dut)
- wutils.wifi_test_device_init(self.dut_client)
req_params = ["owe_networks", "sae_networks"]
self.unpack_userparams(req_param_names=req_params,)
wutils.wifi_toggle_state(self.dut, True)
- wutils.wifi_toggle_state(self.dut_client, True)
if "OpenWrtAP" in self.user_params:
self.configure_openwrt_ap_and_start(owe_network=True,
sae_network=True)
@@ -60,7 +57,6 @@
ad.droid.wakeLockRelease()
ad.droid.goToSleepNow()
wutils.reset_wifi(self.dut)
- wutils.reset_wifi(self.dut_client)
### Test cases ###
