[RTT][AWARE] Update regulatory configuration of tests
Setting regulator domain in test: instead of using 'iw'
command (which may be ignored by framework) use a Wi-Fi
HAL command.
Bug: 67750750
Test: impacted tests pass
Change-Id: I892a1af9769c1f07cf7db7230e150f0b138eaf68
diff --git a/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py b/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py
index c928acf..7d14aae 100644
--- a/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py
+++ b/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py
@@ -54,7 +54,7 @@
self.reset_device_parameters(ad)
self.reset_device_statistics(ad)
self.set_power_mode_parameters(ad)
- utils.set_regulatory_domain(ad, "US")
+ ad.droid.wifiSetCountryCode(wutils.WifiEnums.CountryCode.US)
autils.configure_ndp_allow_any_override(ad, True)
# set randomization interval to 0 (disable) to reduce likelihood of
# interference in tests
diff --git a/acts/framework/acts/test_utils/wifi/rtt/RttBaseTest.py b/acts/framework/acts/test_utils/wifi/rtt/RttBaseTest.py
index 62efc17..dc62a21 100644
--- a/acts/framework/acts/test_utils/wifi/rtt/RttBaseTest.py
+++ b/acts/framework/acts/test_utils/wifi/rtt/RttBaseTest.py
@@ -54,7 +54,7 @@
rutils.wait_for_event(ad, rconsts.BROADCAST_WIFI_RTT_AVAILABLE)
ad.ed.clear_all_events()
rutils.config_privilege_override(ad, False)
- utils.set_regulatory_domain(ad, "US")
+ ad.droid.wifiSetCountryCode(wutils.WifiEnums.CountryCode.US)
def teardown_test(self):
for ad in self.android_devices:
diff --git a/acts/framework/acts/utils.py b/acts/framework/acts/utils.py
index 2447548..62c5d58 100755
--- a/acts/framework/acts/utils.py
+++ b/acts/framework/acts/utils.py
@@ -728,16 +728,6 @@
1 if new_state else 0))
-def set_regulatory_domain(ad, domain):
- """Set the Wi-Fi regulatory domain
-
- Args:
- ad: android device object.
- domain: regulatory domain
- """
- ad.adb.shell("iw reg set %s" % domain)
-
-
def bypass_setup_wizard(ad, bypass_wait_time=3):
"""Bypass the setup wizard on an input Android device
diff --git a/acts/tests/google/wifi/aware/functional/DataPathTest.py b/acts/tests/google/wifi/aware/functional/DataPathTest.py
index 72ce3ef..8afb2a4 100644
--- a/acts/tests/google/wifi/aware/functional/DataPathTest.py
+++ b/acts/tests/google/wifi/aware/functional/DataPathTest.py
@@ -17,9 +17,9 @@
import time
from acts import asserts
-from acts import utils
from acts.test_decorators import test_tracker_info
from acts.test_utils.net import connectivity_const as cconsts
+from acts.test_utils.wifi import wifi_test_utils as wutils
from acts.test_utils.wifi.aware import aware_const as aconsts
from acts.test_utils.wifi.aware import aware_test_utils as autils
from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
@@ -1499,8 +1499,8 @@
init_dut = self.android_devices[0]
resp_dut = self.android_devices[1]
- utils.set_regulatory_domain(init_dut, init_domain)
- utils.set_regulatory_domain(resp_dut, resp_domain)
+ init_dut.droid.wifiSetCountryCode(init_domain)
+ resp_dut.droid.wifiSetCountryCode(resp_domain)
if use_ib:
(resp_req_key, init_req_key, resp_aware_if, init_aware_if, resp_ipv6,
@@ -1531,9 +1531,10 @@
- Uses in-band discovery
- Subscriber=US, Publisher=JP
"""
- self.run_multiple_regulatory_domains(use_ib=True,
- init_domain="US",
- resp_domain="JP")
+ self.run_multiple_regulatory_domains(
+ use_ib=True,
+ init_domain=wutils.WifiEnums.CountryCode.US,
+ resp_domain=wutils.WifiEnums.CountryCode.JAPAN)
@test_tracker_info(uuid="19af47cc-3204-40ef-b50f-14cf7b89cf4a")
def test_multiple_regulator_domains_ib_jp_us(self):
@@ -1542,9 +1543,10 @@
- Uses in-band discovery
- Subscriber=JP, Publisher=US
"""
- self.run_multiple_regulatory_domains(use_ib=True,
- init_domain="JP",
- resp_domain="US")
+ self.run_multiple_regulatory_domains(
+ use_ib=True,
+ init_domain=wutils.WifiEnums.CountryCode.JAPAN,
+ resp_domain=wutils.WifiEnums.CountryCode.US)
@test_tracker_info(uuid="65285ab3-977f-4dbd-b663-d5a02f4fc663")
def test_multiple_regulator_domains_oob_us_jp(self):
@@ -1553,9 +1555,10 @@
- Uses out-f-band discovery
- Initiator=US, Responder=JP
"""
- self.run_multiple_regulatory_domains(use_ib=False,
- init_domain="US",
- resp_domain="JP")
+ self.run_multiple_regulatory_domains(
+ use_ib=False,
+ init_domain=wutils.WifiEnums.CountryCode.US,
+ resp_domain=wutils.WifiEnums.CountryCode.JAPAN)
@test_tracker_info(uuid="8a417e24-aaf6-44b9-a089-a07c3ba8d954")
def test_multiple_regulator_domains_oob_jp_us(self):
@@ -1564,9 +1567,10 @@
- Uses out-of-band discovery
- Initiator=JP, Responder=US
"""
- self.run_multiple_regulatory_domains(use_ib=False,
- init_domain="JP",
- resp_domain="US")
+ self.run_multiple_regulatory_domains(
+ use_ib=False,
+ init_domain=wutils.WifiEnums.CountryCode.JAPAN,
+ resp_domain=wutils.WifiEnums.CountryCode.US)
########################################################################