Merge lp:~ltrager/maas/fix_xenial_net_detect-1.9 into lp:maas/1.9

[Lee Trager]

Backport from trunk: Fix cluster controller networking auto detection

* Don't require that a valid NIC has a kernel module loaded
* When falling back to scanning ip addr for devices look for network devices which follow the preedictable network interface names standard.

[Lee Trager (ltrager)]

Reviewed in https://code.launchpad.net/~ltrager/maas/fix_xenial_net_detect/+merge/278634

review: Approve

=== modified file 'src/provisioningserver/network.py'
--- src/provisioningserver/network.py	2015-10-23 21:26:12 +0000
+++ src/provisioningserver/network.py	2015-11-26 01:38:29 +0000
@@ -163,6 +163,7 @@
         for network in networks
         if 'interface' in network and
            (network['interface'].startswith('eth') or
+            network['interface'].startswith('en') or
             network['interface'].startswith('em') or
             network['interface'].startswith('vlan') or
             network['interface'].startswith('bond'))

=== modified file 'src/provisioningserver/utils/ipaddr.py'
--- src/provisioningserver/utils/ipaddr.py	2015-10-23 10:28:17 +0000
+++ src/provisioningserver/utils/ipaddr.py	2015-11-26 01:38:29 +0000
@@ -281,11 +281,8 @@
             return 'ethernet.bond'
         if os.path.isfile('%s/%s' % (proc_net_vlan, ifname)):
             return 'ethernet.vlan'
-        module_name_link = os.path.join(sys_path, 'device', 'driver', 'module')
-        if not os.path.islink(module_name_link):
-            return 'ethernet'
-        module_name = os.readlink(module_name_link).split('/')[-1]
-        if module_name:
+        device_path = os.path.join(sys_path, 'device')
+        if os.path.islink(device_path):
             device_80211 = os.path.join(sys_path, 'device', 'ieee80211')
             if os.path.isdir(device_80211):
                 return 'ethernet.wireless'

=== modified file 'src/provisioningserver/utils/tests/test_ipaddr.py'
--- src/provisioningserver/utils/tests/test_ipaddr.py	2015-10-23 10:28:17 +0000
+++ src/provisioningserver/utils/tests/test_ipaddr.py	2015-11-26 01:38:29 +0000
@@ -349,13 +349,9 @@
                 f.write(b"%s\n" % ' '.join(bonded_interfaces).encode('utf-8'))
                 f.close()
         if is_physical or is_wireless:
-            os.mkdir(os.path.join(ifdir, 'device'))
-            os.mkdir(os.path.join(ifdir, 'device', 'driver'))
-            # Note: the symlink here doesn't actually need to resolve
-            # to a real file.
-            os.symlink(
-                os.path.join('..', 'driver_module_name'),
-                os.path.join(ifdir, 'device', 'driver', 'module'))
+            device_real = os.path.join(ifdir, 'device.real')
+            os.mkdir(device_real)
+            os.symlink(device_real, os.path.join(ifdir, 'device'))
         if is_wireless:
             os.mkdir(os.path.join(ifdir, 'device', 'ieee80211'))
 
@@ -480,6 +476,10 @@
 
     def test__filters_based_on_name_by_default(self):
         input_networks = [
+            {"interface": "eno1"},
+            {"interface": "ens3"},
+            {"interface": "enp0s25"},
+            {"interface": "enx78e7d1ea46da"},
             {"interface": "em0"},
             {"interface": "eth0"},
             {"interface": "vlan0"},
@@ -490,6 +490,10 @@
         ]
         actual_networks = filter_and_annotate_networks(input_networks)
         expected_networks = [
+            {"interface": "eno1"},
+            {"interface": "ens3"},
+            {"interface": "enp0s25"},
+            {"interface": "enx78e7d1ea46da"},
             {"interface": "em0"},
             {"interface": "eth0"},
             {"interface": "vlan0"},
@@ -499,6 +503,10 @@
 
     def test__filters_and_annotates_based_on_json_data_if_available(self):
         input_networks = [
+            {"interface": "eno1"},
+            {"interface": "ens3"},
+            {"interface": "enp0s25"},
+            {"interface": "enx78e7d1ea46da"},
             {"interface": "em0"},
             {"interface": "eth0"},
             {"interface": "vlan0"},
@@ -521,7 +529,7 @@
                     "bridged_interfaces": ["avian0"]},
             "br3": {"type": "ethernet.bridge"},
             "wlan0": {"type": "ethernet.bond",
-                      "bonded_interfaces": ["em0", "eth0"]}
+                      "bonded_interfaces": ["eno1", "eth0"]}
         }
         actual_networks = filter_and_annotate_networks(
             input_networks, json.dumps(input_json))
@@ -533,12 +541,16 @@
              "bridged_interfaces": "avian0"},
             {"interface": "br3", 'type': "ethernet.bridge"},
             {"interface": "wlan0", 'type': "ethernet.bond",
-             "bonded_interfaces": "em0 eth0"},
+             "bonded_interfaces": "eno1 eth0"},
         ]
         self.assertThat(actual_networks, Equals(expected_networks))
 
     def test__falls_back_to_names_if_no_interfaces_found(self):
         input_networks = [
+            {"interface": "eno1"},
+            {"interface": "ens3"},
+            {"interface": "enp0s25"},
+            {"interface": "enx78e7d1ea46da"},
             {"interface": "em0"},
             {"interface": "eth0"},
             {"interface": "vlan0"},
@@ -552,6 +564,10 @@
         actual_networks = filter_and_annotate_networks(
             input_networks, json.dumps(input_json))
         expected_networks = [
+            {"interface": "eno1"},
+            {"interface": "ens3"},
+            {"interface": "enp0s25"},
+            {"interface": "enx78e7d1ea46da"},
             {"interface": "em0"},
             {"interface": "eth0"},
             {"interface": "vlan0"},