commit d3b643c0758f17b03573e397bd2818a03c63093b
author Joe Brennan <jmbrenna@google.com> Sat Feb 20 00:50:42 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 20 00:50:42 2021 +0000
tree 08aeed49d7677d03e2f73afce4ddb07df9c8ed71
parent 82910d4c01c6ad092201b8fe20c7531dce619786
parent 01481048f6bc2854f69b61881b335b9715d72649

Merge "Updated the get_fuchsia_mdns_ipv6_address to handle loopback address" am: 5fcd0175f8 am: 568454d481 am: 01481048f6

Original change: https://android-review.googlesource.com/c/platform/tools/test/connectivity/+/1595031

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f8e927751263e67e89ef3bb8ffd04245aff16e1

acts/framework/acts/utils.py

diff --git a/acts/framework/acts/utils.py b/acts/framework/acts/utils.py
index 1e68dd4..c07f044 100755
--- a/acts/framework/acts/utils.py
+++ b/acts/framework/acts/utils.py
@@ -1764,6 +1764,13 @@
     for interface in interface_list:
         interface_ipv6_link_local = \
             get_interface_ip_addresses(job, interface)['ipv6_link_local']
+        if 'fe80::1' in interface_ipv6_link_local:
+            logging.info('Removing IPv6 loopback IP from %s interface list.'
+                         '  Not modifying actual system IP addresses.' %
+                         interface)
+            # This is needed as the Zeroconf library crashes if you try to
+            # instantiate it on a IPv6 loopback IP address.
+            interface_ipv6_link_local.remove('fe80::1')
 
         if interface_ipv6_link_local:
             zeroconf = Zeroconf(ip_version=IPVersion.V6Only,