Merge lp:~jtv/maas/bug-1379641-pass-netmasks into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Add parameter to generation of Curtin network preseeds: netmasks. This is in support of non-64-bit IPv6 netmasks, but it also takes away an obstacle to static IPv4 configuration.

The new parameter is not yet used, nor is it populated. I'm leaving that for separate branches because just the parameter-passing (esp. across RPC) generates so many boilerplate changes.

Post-release we can restructure the way these parameters are passed, e.g. by grouping address, netmask, and gateway into a single dict. But for now the incremental change is still the path of least resistance, tedious as it looks.

(It may look odd that netmasks are mapped out by IP address, not by MAC address like some other items are. The reason is that a single network interface can have multiple IP addresses.)

Jeroen

[Gavin Panella (allenap)]

review: Approve

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'src/maasserver/clusterrpc/osystems.py'
--- src/maasserver/clusterrpc/osystems.py	2014-10-06 10:03:17 +0000
+++ src/maasserver/clusterrpc/osystems.py	2014-10-10 06:31:47 +0000
@@ -167,7 +167,9 @@
         `gateways_mapping` maps to a dict which maps MAC addresses to lists of
         gateway IP addresses (at most one IPv4 and one IPv6) to be used by the
         corresponding network interfaces.
-        'nameservers' maps to a list of DNS servers for the node to use.
+        `nameservers` maps to a list of DNS servers for the node to use.
+        `netmasks` maps IP addresses from `ips_mapping` to their respective
+            netmask strings.
     :return: A list of preseed dicts.
     """
     client = getClientFor(node.nodegroup.uuid)

=== modified file 'src/maasserver/networking_preseed.py'
--- src/maasserver/networking_preseed.py	2014-10-09 16:05:01 +0000
+++ src/maasserver/networking_preseed.py	2014-10-10 06:31:47 +0000
@@ -331,6 +331,8 @@
         'ips_mapping': map_static_ips(node),
         'gateways_mapping': map_gateways(node),
         'nameservers': list_dns_servers(node),
+        # XXX jtv 2014-10-10, bug=1379641: Pass netmasks.
+        'netmasks': {}
         }
     preseed = compose_curtin_network_preseed(node, config)
     return [json.dumps(item) for item in preseed]

=== modified file 'src/maasserver/tests/test_networking_preseed.py'
--- src/maasserver/tests/test_networking_preseed.py	2014-10-09 16:12:58 +0000
+++ src/maasserver/tests/test_networking_preseed.py	2014-10-10 06:31:47 +0000
@@ -767,6 +767,9 @@
             'ips_mapping': {},
             'gateways_mapping': {mac.mac_address: [router]},
             'nameservers': [dns],
+            # XXX jtv 2014-10-10, bug=1379641: empty for now, but to be
+            # populated soon.
+            'netmasks': {},
             }
         self.assertThat(fake, MockCalledOnceWith(node, expected_config))
 

=== modified file 'src/provisioningserver/drivers/osystem/__init__.py'
--- src/provisioningserver/drivers/osystem/__init__.py	2014-10-06 10:03:17 +0000
+++ src/provisioningserver/drivers/osystem/__init__.py	2014-10-10 06:31:47 +0000
@@ -196,7 +196,8 @@
 
     def compose_curtin_network_preseed(self, interfaces, auto_interfaces,
                                        ips_mapping, gateways_mapping,
-                                       disable_ipv4=False, nameservers=None):
+                                       disable_ipv4=False, nameservers=None,
+                                       netmasks=None):
         """Compose a Curtin preseed to configure a node's networking.
 
         :param interfaces: A list of tuples, each a pair of an interface name
@@ -218,6 +219,8 @@
         :param disable_ipv4: Should this node be installed without IPv4
             networking?
         :param nameservers: Optional list of DNS servers.
+        :param netmasks: Optional dict mapping IP addresses  from `ips_mapping`
+            to their respective netmask strings.
         :return: A list of dicts that can be JSON-encoded and submitted to
             Curtin as preseeds, perhaps in combination with other preseeds.
         """

=== modified file 'src/provisioningserver/drivers/osystem/debian_networking.py'
--- src/provisioningserver/drivers/osystem/debian_networking.py	2014-10-09 02:56:06 +0000
+++ src/provisioningserver/drivers/osystem/debian_networking.py	2014-10-10 06:31:47 +0000
@@ -101,7 +101,7 @@
 
 def compose_network_interfaces(interfaces, auto_interfaces, ips_mapping,
                                gateways_mapping, disable_ipv4=False,
-                               nameservers=None):
+                               nameservers=None, netmasks=None):
     """Return contents for a node's `/etc/network/interfaces` file.
 
     :param interfaces: A list of interface/MAC pairs for the node.
@@ -113,11 +113,15 @@
         containers of the corresponding network interfaces' default gateways.
     :param disable_ipv4: Should this node be installed without IPv4 networking?
     :param nameservers: Optional list of DNS servers.
+    :param netmasks: Optional dict mapping MAC IP addresses from `ips_mapping`
+        to their respective netmask strings.
     """
     if nameservers is None:
         ipv6_nameserver = None
     else:
         ipv6_nameserver = extract_ip_from_sequence(nameservers, 6)
+    if netmasks is None:
+        netmasks = {}
 
     # Should we disable IPv4 on this node?  For safety's sake, we won't do this
     # if the node has no static IPv6 addresses.  Otherwise it might become

=== modified file 'src/provisioningserver/drivers/osystem/ubuntu.py'
--- src/provisioningserver/drivers/osystem/ubuntu.py	2014-10-06 07:09:37 +0000
+++ src/provisioningserver/drivers/osystem/ubuntu.py	2014-10-10 06:31:47 +0000
@@ -92,7 +92,8 @@
 
     def compose_curtin_network_preseed(self, interfaces, auto_interfaces,
                                        ips_mapping, gateways_mapping,
-                                       disable_ipv4=False, nameservers=None):
+                                       disable_ipv4=False, nameservers=None,
+                                       netmasks=None):
         """As defined in `OperatingSystem`: generate networking Curtin preseed.
 
         Supports:
@@ -104,7 +105,7 @@
         interfaces_file = compose_network_interfaces(
             interfaces, auto_interfaces, ips_mapping=ips_mapping,
             gateways_mapping=gateways_mapping, disable_ipv4=disable_ipv4,
-            nameservers=nameservers)
+            nameservers=nameservers, netmasks=netmasks)
         udev_rules = compose_network_interfaces_udev_rules(interfaces)
         write_files = {
             'write_files': {

=== modified file 'src/provisioningserver/rpc/clusterservice.py'
--- src/provisioningserver/rpc/clusterservice.py	2014-10-08 22:05:15 +0000
+++ src/provisioningserver/rpc/clusterservice.py	2014-10-10 06:31:47 +0000
@@ -230,11 +230,12 @@
         ips_mapping = config.get('ips_mapping', {})
         gateways_mapping = config.get('gateways_mapping', {})
         nameservers = config.get('nameservers', [])
+        netmasks = config.get('netmasks', {})
         return {
             'data': compose_curtin_network_preseed(
                 osystem, interfaces, auto_interfaces, ips_mapping=ips_mapping,
                 gateways_mapping=gateways_mapping, disable_ipv4=disable_ipv4,
-                nameservers=nameservers),
+                nameservers=nameservers, netmasks=netmasks),
             }
 
     @log_call(level=logging.DEBUG)

=== modified file 'src/provisioningserver/rpc/osystems.py'
--- src/provisioningserver/rpc/osystems.py	2014-10-06 10:03:17 +0000
+++ src/provisioningserver/rpc/osystems.py	2014-10-10 06:31:47 +0000
@@ -119,7 +119,7 @@
 
 def compose_curtin_network_preseed(os_name, interfaces, auto_interfaces,
                                    ips_mapping, gateways_mapping,
-                                   disable_ipv4, nameservers):
+                                   disable_ipv4, nameservers, netmasks):
     """Compose Curtin network preseed for a node.
 
     :param os_name: Identifying name of the operating system for which a
@@ -127,12 +127,14 @@
     :param interfaces: A list of interface/MAC pairs for the node.
     :param auto_interfaces: A list of MAC addresses whose network interfaces
         should come up automatically on node boot.
-    :param ips_mapping: A dict mapping MAC addresses to containers of the
+    :param ips_mapping: A dict mapping MAC addresses to lists of the
         corresponding network interfaces' IP addresses.
-    :param gateways_mapping: A `defaultdict` mapping MAC addresses to
-        containers of the corresponding network interfaces' default gateways.
+    :param gateways_mapping: A dict mapping MAC addresses to lists of the
+        corresponding network interfaces' default gateways.
     :param disable_ipv4: Should this node be installed without IPv4 networking?
     :param nameservers: List of DNS servers.
+    :param netmasks: A dict mapping IP dadresses from `ips_mapping` to their
+        respective netmasks.
     :return: Preseed data, as JSON.
     """
     try:
@@ -143,4 +145,4 @@
         return osystem.compose_curtin_network_preseed(
             interfaces, auto_interfaces, ips_mapping=ips_mapping,
             gateways_mapping=gateways_mapping, disable_ipv4=disable_ipv4,
-            nameservers=nameservers)
+            nameservers=nameservers, netmasks=netmasks)

=== modified file 'src/provisioningserver/rpc/tests/test_osystems.py'
--- src/provisioningserver/rpc/tests/test_osystems.py	2014-10-06 10:03:17 +0000
+++ src/provisioningserver/rpc/tests/test_osystems.py	2014-10-10 06:31:47 +0000
@@ -205,15 +205,14 @@
 
     def make_args(self):
         mac = factory.make_mac_address()
+        ipv4_net = factory.make_ipv4_network()
+        ipv4_addr = factory.pick_ip_in_network(ipv4_net)
+        ipv6_net = factory.make_ipv6_network()
+        ipv6_addr = factory.pick_ip_in_network(ipv6_net)
         return {
             'interfaces': [(factory.make_name('eth'), mac)],
             'auto_interfaces': [mac],
-            'ips_mapping': {
-                mac: [
-                    factory.make_ipv4_address(),
-                    factory.make_ipv6_address(),
-                    ],
-                },
+            'ips_mapping': {mac: [ipv4_addr, ipv6_addr]},
             'gateways_mapping': {
                 mac: [
                     factory.make_ipv4_address(),
@@ -222,6 +221,10 @@
                 },
             'disable_ipv4': factory.pick_bool(),
             'nameservers': [factory.make_ipv6_address()],
+            'netmasks': {
+                ipv4_addr: unicode(ipv4_net.netmask),
+                ipv6_addr: unicode(ipv6_net.netmask),
+                },
             }
 
     def test__forwards_to_OS_implementation(self):