Merge lp:~lamont/maas/bug-1640147-2.1 into lp:maas/2.1

[LaMont Jones]

Backport r5724 from trunk: Do not attempt ipv6 discovery on interfaces where ipv6 is disabled.

Do not attempt ipv6 discovery on interfaces where ipv6 is disabled.

[LaMont Jones (lamont)]

Trivial backport.

review: Approve

=== modified file 'src/provisioningserver/refresh/node_info_scripts.py'
--- src/provisioningserver/refresh/node_info_scripts.py	2016-11-03 16:06:25 +0000
+++ src/provisioningserver/refresh/node_info_scripts.py	2017-02-14 15:59:14 +0000
@@ -130,11 +130,16 @@
         return False
 
     def has_ipv6_address(iface):
+        no_ipv6_found = True
         output = check_output(('ip', '-6', 'addr', 'list', 'dev', iface))
         for line in output.splitlines():
-            if line.find(b' inet6 ') >= 0 and line.find(b' inet6 fe80:') == -1:
-                return True
-        return False
+            if line.find(b' inet6 ') >= 0:
+                if line.find(b' inet6 fe80:') == -1:
+                    return True
+                no_ipv6_found = False
+        # Bug 1640147: If there is no IPv6 address, then we consider this to be
+        # a configured ipv6 interface, since ipv6 won't work there.
+        return no_ipv6_found
 
     all_ifaces = get_iface_list(check_output(("ifconfig", "-s", "-a")))
     configured_ifaces = get_iface_list(check_output(("ifconfig", "-s")))
 
=== modified file 'src/provisioningserver/refresh/tests/test_node_info_scripts.py'
--- src/provisioningserver/refresh/tests/test_node_info_scripts.py	2016-11-03 18:32:09 +0000
+++ src/provisioningserver/refresh/tests/test_node_info_scripts.py	2017-02-14 15:59:14 +0000
@@ -216,6 +216,7 @@
 eth1       1500 0         0      0      0 0             0      0
 eth0       1500 0   1366127      0      0 0        831110      0
 eth4       1500 0         0      0      0 0             0      0
+eth5       1500 0         0      0      0 0             0      0
 eth6       1500 0         0      0      0 0             0      0
 lo        65536 0     38075      0      0 0         38075      0
 virbr0     1500 0         0      0      0 0             0      0
@@ -227,6 +228,7 @@
 Iface   MTU Met   RX-OK RX-ERR RX-DRP RX-OVR    TX-OK TX-ERR TX-DRP
 eth0       1500 0   1366127      0      0 0        831110      0
 eth4       1500 0   1366127      0      0 0        831110      0
+eth5       1500 0   1366127      0      0 0        831110      0
 eth6       1500 0   1366127      0      0 0        831110      0
 lo        65536 0     38115      0      0 0         38115      0
 virbr0     1500 0         0      0      0 0             0      0
@@ -252,6 +254,12 @@
     inet6 fe80::0201:02ff:fe03:0404/64 scope link
        valid_lft forever preferred_lft forever
 """
+ip_eth5 = b"""\
+6: eth5: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP ...
+    link/ether 00:01:02:03:04:06 brd ff:ff:ff:ff:ff:ff
+    inet 192.168.5.1/24 brd 192.168.4.255 scope global eth4
+       valid_lft forever preferred_lft forever
+"""
 ip_eth6 = b"""\
 6: eth6: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP ...
     link/ether 00:01:02:03:04:06 brd ff:ff:ff:ff:ff:ff
@@ -292,8 +300,8 @@
         check_output = self.patch(subprocess, "check_output")
         check_output.side_effect = [
             ifconfig_all, ifconfig_config,
-            ip_eth0, ip_eth4, ip_eth6, ip_lo, ip_virbr0, ip_wlan0,
-            ip_eth0, ip_eth4, ip_eth6, ip_lo, ip_virbr0, ip_wlan0
+            ip_eth0, ip_eth4, ip_eth5, ip_eth6, ip_lo, ip_virbr0, ip_wlan0,
+            ip_eth0, ip_eth4, ip_eth5, ip_eth6, ip_lo, ip_virbr0, ip_wlan0
             ]
         mock_call = self.patch(subprocess, "call")
         mock_popen = self.patch(subprocess, "Popen")