commit 8501d12d7d81dbd0bb0dbf7bd516eb17625844e7
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 24 16:31:48 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 24 16:31:48 2022 +0000
tree 31395a9f76117af39d1d5649628c1935e5be9fec
parent 5c2daa1cea2c15a214d40035f98527f861b5bdcf
parent 71d79bb08dc0b0c947c0c08943e3e38b320964d4

Merge "Handle virtual interfaces without a MAC"

acts/framework/acts/controllers/fuchsia_lib/lib_controllers/wlan_controller.py

diff --git a/acts/framework/acts/controllers/fuchsia_lib/lib_controllers/wlan_controller.py b/acts/framework/acts/controllers/fuchsia_lib/lib_controllers/wlan_controller.py
index 1d202c6..d50f726 100644
--- a/acts/framework/acts/controllers/fuchsia_lib/lib_controllers/wlan_controller.py
+++ b/acts/framework/acts/controllers/fuchsia_lib/lib_controllers/wlan_controller.py
@@ -111,7 +111,12 @@
         net_ifaces = self.device.netstack_controller.list_interfaces()
         wlan_ifaces_by_role = {'client': {}, 'ap': {}}
         for iface in net_ifaces:
-            iface_mac = utils.mac_address_list_to_str(iface['mac'])
+            try:
+                # Some interfaces might not have a MAC
+                iface_mac = utils.mac_address_list_to_str(iface['mac'])
+            except Exception as e:
+                self.log.debug(f'Error {e} getting MAC for iface {iface}')
+                continue
             if iface_mac in wlan_ifaces_by_mac:
                 wlan_ifaces_by_mac[iface_mac]['netstack_id'] = iface['id']