Merge lp:~blake-rouse/maas/fix-1554999 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Include ethernet interfaces when no other interface types exist.

[Andres Rodriguez (andreserl)]

lgtm! Just one non-blocker comment!

review: Approve

=== modified file 'src/provisioningserver/utils/network.py'
--- src/provisioningserver/utils/network.py	2016-03-12 03:19:19 +0000
+++ src/provisioningserver/utils/network.py	2016-03-16 19:28:17 +0000
@@ -625,12 +625,28 @@
     exclude_types = ["loopback", "ipip"]
     if not running_in_container():
         exclude_types.append("ethernet")
+    original_ipaddr_info = get_ip_addr()
     ipaddr_info = {
         name: ipaddr
-        for name, ipaddr in get_ip_addr().items()
+        for name, ipaddr in original_ipaddr_info.items()
         if (ipaddr["type"] not in exclude_types and
             not ipaddr["type"].startswith("unknown-"))
     }
+
+    # It's not always 100% that we can determine that this machine is running
+    # in a container. To handle this case we include "ethernet" interfaces
+    # when no other interfaces could be identified. See lp:1554999.
+    if len(ipaddr_info) == 0 and "ethernet" in exclude_types:
+        # No interfaces have been discovered from "ip addr" excluding
+        # "ethernet". Re-filter including ethernet.
+        exclude_types.remove("ethernet")
+        ipaddr_info = {
+            name: ipaddr
+            for name, ipaddr in original_ipaddr_info.items()
+            if (ipaddr["type"] not in exclude_types and
+                not ipaddr["type"].startswith("unknown-"))
+        }
+
     for name, ipaddr in ipaddr_info.items():
         iface_type = "physical"
         parents = []

=== modified file 'src/provisioningserver/utils/tests/test_network.py'
--- src/provisioningserver/utils/tests/test_network.py	2016-03-12 03:19:19 +0000
+++ src/provisioningserver/utils/tests/test_network.py	2016-03-16 19:28:17 +0000
@@ -837,8 +837,14 @@
         }
         self.assertInterfacesResult(ip_addr, {}, {}, MatchesDict({}))
 
-    def test__ignores_ethernet(self):
+    def test__ignores_ethernet_when_physical(self):
         ip_addr = {
+            "eth0": {
+                "type": "ethernet.physical",
+                "mac": factory.make_mac_address(),
+                "flags": ["UP"],
+                "inet": [],
+            },
             "vnet": {
                 "type": "ethernet",
                 "mac": factory.make_mac_address(),
@@ -846,7 +852,38 @@
                 "inet": ["192.168.122.2/24"],
             },
         }
-        self.assertInterfacesResult(ip_addr, {}, {}, MatchesDict({}))
+        expected_result = MatchesDict({
+            "eth0": MatchesDict({
+                "type": Equals("physical"),
+                "mac_address": Equals(ip_addr["eth0"]["mac"]),
+                "enabled": Is(True),
+                "parents": Equals([]),
+                "links": Equals([]),
+                "source": Equals("ipaddr"),
+            }),
+        })
+        self.assertInterfacesResult(ip_addr, {}, {}, expected_result)
+
+    def test__includes_ethernet_when_only_ethernet(self):
+        ip_addr = {
+            "vnet": {
+                "type": "ethernet",
+                "mac": factory.make_mac_address(),
+                "flags": ["UP"],
+                "inet": [],
+            },
+        }
+        expected_result = MatchesDict({
+            "vnet": MatchesDict({
+                "type": Equals("physical"),
+                "mac_address": Equals(ip_addr["vnet"]["mac"]),
+                "enabled": Is(True),
+                "parents": Equals([]),
+                "links": Equals([]),
+                "source": Equals("ipaddr"),
+            }),
+        })
+        self.assertInterfacesResult(ip_addr, {}, {}, expected_result)
 
     def test__ignores_ipip(self):
         ip_addr = {