Lookup Fuchsia phy device ID instead of assuming it is 0.
Fuchsia device IDs are randomized, but the Fuchsia wlan
controller was assuming that the first phy would have id 0.
This change corrects the error.
Bug: None
Fixes: http://fxbug.dev/116500
Test: antlion [...] -tc WlanPhyComplianceABGTest
Change-Id: Id4000504ce7a5a52a8487e03da681d1b58ad7be0
Reviewed-on: https://fuchsia-review.googlesource.com/c/antlion/+/769631
Fuchsia-Auto-Submit: Karl Ward <karlward@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
Reviewed-by: Sam Balana <sbalana@google.com>
diff --git a/src/antlion/controllers/fuchsia_device.py b/src/antlion/controllers/fuchsia_device.py
index 9f90d90..ceb1878 100644
--- a/src/antlion/controllers/fuchsia_device.py
+++ b/src/antlion/controllers/fuchsia_device.py
@@ -884,9 +884,19 @@
raise FuchsiaDeviceError(
'Failed to set regulatory domain. Err: %s' %
response['error'])
+
+ phy_list_response = self.sl4f.wlan_lib.wlanPhyIdList()
+ if phy_list_response.get('error'):
+ raise FuchsiaDeviceError(
+ f'Failed to get phy list. Err: {response["error"]}')
+ phy_list = phy_list_response.get('result')
+ if not phy_list:
+ raise FuchsiaDeviceError('No phy available in phy list')
+ phy_id = phy_list[0]
+
end_time = time.time() + FUCHSIA_COUNTRY_CODE_TIMEOUT
while time.time() < end_time:
- ascii_cc = self.sl4f.wlan_lib.wlanGetCountry(0).get(
+ ascii_cc = self.sl4f.wlan_lib.wlanGetCountry(phy_id).get(
'result')
# Convert ascii_cc to string, then compare
if ascii_cc and (''.join(chr(c) for c in ascii_cc).upper()
