Merge lp:~jtv/maas/ubuntu-generate-networking-curtin-preseed into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Implement method for generating network preseed on Ubuntu. The other operating systems will return an empty list, meaning that they rely entirely on DHCP for configuring network interfaces.

This call is to be made available to the region controller through RPC.

The region controller will add the resulting preseeds to the ones it sends to Curtin when installing the node.

Jeroen

[Graham Binns (gmb)]

review: Approve

=== modified file 'src/provisioningserver/drivers/osystem/__init__.py'
--- src/provisioningserver/drivers/osystem/__init__.py	2014-09-29 13:22:44 +0000
+++ src/provisioningserver/drivers/osystem/__init__.py	2014-09-30 09:56:10 +0000
@@ -194,6 +194,31 @@
         """
         raise NotImplementedError()
 
+    def compose_curtin_network_preseed(interfaces, ips_mapping,
+                                       gateways_mapping, disable_ipv4=False):
+        """Compose a Curtin preseed to configure a node's networking.
+
+        :param interfaces: A list of tuples, each a pair of an interface name
+            and a MAC address.  If supported, the resulting preseed will assign
+            these interface names to these MAC addresses.
+        :param ips_mapping: A dict mapping MAC addresses to iterables of the
+            corresponding network interfaces' IP addresses (up to one each for
+            IPv4 and IPv6).  If supported, the resulting preseed will configure
+            the network interface corresponding to each MAC to have the given
+            IP addresses.  By default, DHCP is available for IPv4 and will
+            provide the same addresses, so the caller may choose not to
+            configure those in this way.
+        :param gateways_mapping: A dict mapping MAC addresses to iterables of
+            default gateways (up to one each for IPv4 and IPv6).  If supported,
+            the resulting preseed will configure the network interface
+            corresponding to each MAC to use the given default gateways.
+        :param disable_ipv4: Should this node be installed without IPv4
+            networking?
+        :return: A list of dicts that can be JSON-encoded and submitted to
+            Curtin as preseeds, perhaps in combination with other preseeds.
+        """
+        return []
+
     def get_xinstall_parameters(self, arch, subarch, release, label):
         """Return the xinstall image name and type for this operating system.
 

=== modified file 'src/provisioningserver/drivers/osystem/tests/test_ubuntu.py'
--- src/provisioningserver/drivers/osystem/tests/test_ubuntu.py	2014-09-20 15:48:39 +0000
+++ src/provisioningserver/drivers/osystem/tests/test_ubuntu.py	2014-09-30 09:56:10 +0000
@@ -19,9 +19,20 @@
 
 from distro_info import UbuntuDistroInfo
 from maastesting.factory import factory
+from maastesting.matchers import MockAnyCall
 from maastesting.testcase import MAASTestCase
 from provisioningserver.drivers.osystem import BOOT_IMAGE_PURPOSE
+from provisioningserver.drivers.osystem.debian_networking import (
+    compose_network_interfaces,
+    )
 from provisioningserver.drivers.osystem.ubuntu import UbuntuOS
+import provisioningserver.drivers.osystem.ubuntu as ubuntu_module
+from provisioningserver.udev import compose_network_interfaces_udev_rules
+from testtools.matchers import (
+    AllMatch,
+    HasLength,
+    IsInstance,
+    )
 
 
 class TestUbuntuOS(MAASTestCase):
@@ -77,3 +88,59 @@
         self.assertEqual(
             osystem.get_release_title(release),
             self.get_release_title(release))
+
+
+class TestComposeCurtinNetworkPreseed(MAASTestCase):
+
+    def test__returns_list_of_dicts(self):
+        preseed = UbuntuOS().compose_curtin_network_preseed([], {}, {})
+        self.assertIsInstance(preseed, list)
+        self.assertThat(preseed, HasLength(2))
+        [write_files, late_commands] = preseed
+
+        self.assertIsInstance(write_files, dict)
+        self.assertIn('write_files', write_files)
+        self.assertIsInstance(write_files['write_files'], dict)
+        self.assertThat(
+            write_files['write_files'].values(),
+            AllMatch(IsInstance(dict)))
+
+        self.assertIsInstance(late_commands, dict)
+        self.assertIn('late_commands', late_commands)
+        self.assertIsInstance(late_commands['late_commands'], dict)
+        self.assertThat(
+            late_commands['late_commands'].values(),
+            AllMatch(IsInstance(list)))
+
+    def test__installs_and_moves_network_interfaces_file(self):
+        interfaces_file = compose_network_interfaces([], {}, {})
+        write_text_file = self.patch_autospec(
+            ubuntu_module, 'compose_write_text_file')
+        mv_command = self.patch_autospec(ubuntu_module, 'compose_mv_command')
+
+        UbuntuOS().compose_curtin_network_preseed([], {}, {})
+
+        temp_path = '/tmp/maas-etc-network-interfaces'
+        self.expectThat(
+            write_text_file,
+            MockAnyCall(temp_path, interfaces_file, permissions=0644))
+        self.expectThat(
+            mv_command,
+            MockAnyCall(temp_path, '/etc/network/interfaces'))
+
+    def test__installs_and_moves_udev_rules_file(self):
+        udev_file = compose_network_interfaces_udev_rules([])
+        write_text_file = self.patch_autospec(
+            ubuntu_module, 'compose_write_text_file')
+        mv_command = self.patch_autospec(ubuntu_module, 'compose_mv_command')
+
+        UbuntuOS().compose_curtin_network_preseed([], {}, {})
+
+        temp_path = '/tmp/maas-udev-70-persistent-net.rules'
+        self.expectThat(
+            write_text_file,
+            MockAnyCall(temp_path, udev_file, permissions=0644))
+        self.expectThat(
+            mv_command,
+            MockAnyCall(
+                temp_path, '/etc/udev/rules.d/70-persistent-net.rules'))

=== modified file 'src/provisioningserver/drivers/osystem/ubuntu.py'
--- src/provisioningserver/drivers/osystem/ubuntu.py	2014-09-22 15:16:20 +0000
+++ src/provisioningserver/drivers/osystem/ubuntu.py	2014-09-30 09:56:10 +0000
@@ -21,6 +21,14 @@
     BOOT_IMAGE_PURPOSE,
     OperatingSystem,
     )
+from provisioningserver.drivers.osystem.debian_networking import (
+    compose_network_interfaces,
+    )
+from provisioningserver.udev import compose_network_interfaces_udev_rules
+from provisioningserver.utils.curtin import (
+    compose_mv_command,
+    compose_write_text_file,
+    )
 
 
 class UbuntuOS(OperatingSystem):
@@ -81,3 +89,39 @@
         if row is None:
             return None
         return UbuntuDistroInfo()._format("fullname", row)
+
+    def compose_curtin_network_preseed(self, interfaces, ips_mapping,
+                                       gateways_mapping, disable_ipv4=False):
+        """As defined in `OperatingSystem`: generate networking Curtin preseed.
+
+        Supports:
+        * Static IPv6 address and gateway configuration.
+        * DHCP-based IPv4 configuration.
+        * Assigning network interface names through udev rules.
+        * Disabling IPv4.
+        """
+        interfaces_file = compose_network_interfaces(
+            interfaces, ips_mapping=ips_mapping,
+            gateways_mapping=gateways_mapping, disable_ipv4=disable_ipv4)
+        udev_rules = compose_network_interfaces_udev_rules(interfaces)
+        write_files = {
+            'write_files': {
+                'etc_network_interfaces': compose_write_text_file(
+                    '/tmp/maas-etc-network-interfaces', interfaces_file,
+                    permissions=0644),
+                'udev_persistent_net': compose_write_text_file(
+                    '/tmp/maas-udev-70-persistent-net.rules', udev_rules,
+                    permissions=0644),
+            },
+        }
+        late_commands = {
+            'late_commands': {
+                'etc_network_interfaces': compose_mv_command(
+                    '/tmp/maas-etc-network-interfaces',
+                    '/etc/network/interfaces'),
+                'udev_persistent_net': compose_mv_command(
+                    '/tmp/maas-udev-70-persistent-net.rules',
+                    '/etc/udev/rules.d/70-persistent-net.rules')
+            },
+        }
+        return [write_files, late_commands]