Merge lp:~jtv/maas/identify-auto-interfaces into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Select network interfaces on a node that should be brought up automatically on boot. This is part of the work for writing its /etc/network/interfaces (assuming it's installed with a Debian-like OS). That code is not active yet, but is now very close to completion (and has been tested in a spike).

We chose the selection behaviour as being the closest to existing behaviour, not as the ideal behaviour as we would without the time constraints. In the normal situation where a node has one network interface on a network where MAAS manages DHCP, it is identical to what happens in the current code. If the node has multiple network interfaces on one or more MAAS-managed networks, they will all come up; the existing code will only bring up the interface from which the node netbooted, and some people seem to run into problems in this situation. And finally, if the node is not connected to any MAAS-managed DHCP, we have no knowledge of how the machine netbooted, so we bring up all interfaces.

Dimiter agrees that this seems like a sensible approach. In the future we'll work on ways for users to customise nodes' networking setup in more detail, not as an excuse for avoiding this question ourselves, but to extend the portion of networking that MAAS can manage for you.

Jeroen

[Graham Binns (gmb)]

Approved with one minor comment. Nice work :).

review: Approve

[Jeroen T. Vermeulen (jtv)]

Good point. Done.

[MAAS Lander (maas-lander)]

The attempt to merge lp:~jtv/maas/identify-auto-interfaces into lp:maas failed. Below is the output from the failed tests.

Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://security.ubuntu.com trusty-security InRelease
Get:1 http://security.ubuntu.com trusty-security Release.gpg [933 B]
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Get:2 http://security.ubuntu.com trusty-security Release [59.7 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates Release [59.7 kB]
Get:5 http://security.ubuntu.com trusty-security/main Sources [46.3 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Get:6 http://security.ubuntu.com trusty-security/universe Sources [10.8 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Get:7 http://security.ubuntu.com trusty-security/main amd64 Packages [146 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Get:8 http://security.ubuntu.com trusty-security/universe amd64 Packages [49.0 kB]
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Get:9 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [125 kB]
Get:10 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [86.2 kB]
Get:11 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [337 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [208 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Fetched 1,129 kB in 0s (1,655 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make pep8 postgresql pyflakes python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-mimeparse python-mock python-netaddr python-netifaces python-nose python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-open...

[Jeroen T. Vermeulen (jtv)]

Spurious test failure. I get it in trunk too, about 1% of the times I eexecute that test.

=== modified file 'src/maasserver/networking_preseed.py'
--- src/maasserver/networking_preseed.py	2014-10-01 04:43:44 +0000
+++ src/maasserver/networking_preseed.py	2014-10-01 14:28:34 +0000
@@ -297,3 +297,20 @@
             if cluster_interface.manages_static_range():
                 add_ip_to_mapping(mapping, mac, cluster_interface.router_ip)
     return mapping
+
+
+def find_macs_for_automatic_interfaces(node):
+    """Return those MAC addresses for `node` that should come up on boot.
+
+    These are the MACs for the network interfaces that should be enabled when
+    a node boots.  If the node has `MACAddress` entries on managed networks,
+    these will be returned; if it doesn't, all of its `MACAddress` enries will
+    be returned.
+
+    :param node: A `Node`.
+    :return: A list of normalised MAC address strings.
+    """
+    macs = node.mac_addresses_on_managed_interfaces()
+    if len(macs) == 0:
+        macs = node.macaddress_set.all()
+    return [normalise_mac(unicode(mac.mac_address)) for mac in macs]
 
=== modified file 'src/maasserver/tests/test_networking_preseed.py'
--- src/maasserver/tests/test_networking_preseed.py	2014-10-01 04:43:44 +0000
+++ src/maasserver/tests/test_networking_preseed.py	2014-10-01 14:28:34 +0000
@@ -28,6 +28,7 @@
     add_ip_to_mapping,
     extract_mac_string,
     extract_network_interfaces,
+    find_macs_for_automatic_interfaces,
     generate_dns_server_entry,
     generate_ethernet_link_entry,
     generate_network_entry,
@@ -711,3 +712,39 @@
                     },
             },
             map_gateways(node))
+
+
+class TestFindMACsForAutomaticInterfaces(MAASServerTestCase):
+
+    def test__returns_netboot_interface_in_simple_case(self):
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface()
+        mac = node.get_primary_mac().mac_address
+        self.assertEqual(
+            [normalise_mac(unicode(mac))],
+            find_macs_for_automatic_interfaces(node))
+
+    def test__returns_only_macs_on_managed_networks_if_connected(self):
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface()
+        boot_mac = node.get_primary_mac().mac_address
+        factory.make_MACAddress(
+            node=node,
+            cluster_interface=factory.make_NodeGroupInterface(
+                node.nodegroup,
+                management=NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED))
+        self.assertEqual(
+            [normalise_mac(unicode(boot_mac))],
+            find_macs_for_automatic_interfaces(node))
+
+    def test__returns_all_macs_if_no_managed_networks_connected(self):
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface(
+            management=NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED)
+        mac1 = node.get_primary_mac().mac_address
+        other_mac = factory.make_MACAddress(
+            node=node,
+            cluster_interface=factory.make_NodeGroupInterface(
+                node.nodegroup,
+                management=NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED))
+        mac2 = other_mac.mac_address
+        self.assertItemsEqual(
+            [normalise_mac(unicode(mac1)), normalise_mac(unicode(mac2))],
+            find_macs_for_automatic_interfaces(node))