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

[Jeroen T. Vermeulen]

Pass netmasks along with the parameters for generating /etc/network/interfaces.

This is one of a group of 4 branches that together implement support for arbitrary netmasks in IPv6. But the netmasks would also be useful in configuring static IPv4 addresses later.

I hope the main implementing function is clear enough. It's tempting to query for a StaticIPAddress—MACAddress—NodeGroupInterface relationship through the ORM, but that won't work: when a MAC address is connected to both IPv4 and IPv6 network interfaces, one connection will be direct through a foreign key; the other will be derived from the cluster and the network interface name.

Eventually we do want that connection to go into the schema as an m:n relationship.

Jeroen

[Gavin Panella (allenap)]

review: Approve

[Jeroen T. Vermeulen (jtv)]

Thanks!

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'src/maasserver/models/macaddress.py'
--- src/maasserver/models/macaddress.py	2014-09-24 14:20:51 +0000
+++ src/maasserver/models/macaddress.py	2014-10-10 11:59:22 +0000
@@ -13,6 +13,7 @@
 
 __metaclass__ = type
 __all__ = [
+    'find_cluster_interface_responsible_for_ip',
     'MACAddress',
     ]
 

=== modified file 'src/maasserver/networking_preseed.py'
--- src/maasserver/networking_preseed.py	2014-10-10 11:59:22 +0000
+++ src/maasserver/networking_preseed.py	2014-10-10 11:59:22 +0000
@@ -35,6 +35,9 @@
 from maasserver.clusterrpc.osystems import compose_curtin_network_preseed
 from maasserver.dns.zonegenerator import get_dns_server_address
 from maasserver.exceptions import UnresolvableHost
+from maasserver.models.macaddress import (
+    find_cluster_interface_responsible_for_ip,
+    )
 from maasserver.models.nodeprobeddetails import get_probed_details
 from maasserver.models.staticipaddress import StaticIPAddress
 from netaddr import (
@@ -279,7 +282,7 @@
 
 
 def map_static_ips(node):
-    """Return a `defaultdict` mapping node's MAC addresses to their static IPs.
+    """Return a dict mapping node's MAC addresses to their static IPs.
 
     :param node: A `Node`.
     :return: A dict mapping normalised MAC address strings to sets of
@@ -320,6 +323,23 @@
     return normalise_mac(unicode(pxe_mac.mac_address))
 
 
+def map_netmasks(node):
+    """Return respective netmasks for node's configured IP addresses."""
+    mapping = {}
+    for mac in node.macaddress_set.filter(cluster_interface__isnull=False):
+        interfaces = mac.get_cluster_interfaces()
+        for sip in StaticIPAddress.objects.filter(macaddress=mac):
+            interface = find_cluster_interface_responsible_for_ip(
+                interfaces, IPAddress(sip.ip))
+            if interface is not None:
+                if valid_ipv4(sip.ip):
+                    netmask = interface.subnet_mask
+                else:
+                    netmask = '%d' % interface.network.prefixlen
+                mapping[normalise_ip(sip.ip)] = netmask
+    return mapping
+
+
 def compose_curtin_network_preseed_for(node):
     """Compose OS-dependent preseed for configuring networking on `node`.
 
@@ -332,8 +352,7 @@
         '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': {}
+        'netmasks': map_netmasks(node),
         }
     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-10 11:59:22 +0000
+++ src/maasserver/tests/test_networking_preseed.py	2014-10-10 11:59:22 +0000
@@ -38,6 +38,7 @@
     get_mac_for_automatic_interfaces,
     list_dns_servers,
     map_gateways,
+    map_netmasks,
     map_static_ips,
     normalise_ip,
     normalise_mac,
@@ -45,7 +46,10 @@
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
 from maastesting.matchers import MockCalledOnceWith
-from netaddr import IPAddress
+from netaddr import (
+    IPAddress,
+    IPNetwork,
+    )
 from testtools.matchers import HasLength
 
 
@@ -748,6 +752,49 @@
         self.assertEqual(result, extract_mac_string(mac))
 
 
+class TestMapNetmasks(MAASServerTestCase):
+
+    def test__maps_ipv4_netmask(self):
+        network = factory.make_ipv4_network()
+        netmask = unicode(IPNetwork(network).netmask)
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface(
+            network=network)
+        mac = node.get_primary_mac()
+        ip = factory.pick_ip_in_network(network)
+        factory.make_StaticIPAddress(mac=mac, ip=ip)
+        self.assertEqual({normalise_ip(ip): netmask}, map_netmasks(node))
+
+    def test__maps_ipv6_netmask_as_prefix_bits(self):
+        network = factory.make_ipv6_network(slash=randint(16, 127))
+        netmask = '%d' % IPNetwork(network).prefixlen
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface()
+        [ipv4_interface] = node.nodegroup.nodegroupinterface_set.all()
+        factory.make_NodeGroupInterface(
+            node.nodegroup, network=network,
+            interface=ipv4_interface.interface)
+        mac = node.get_primary_mac()
+        ip = factory.pick_ip_in_network(network)
+        factory.make_StaticIPAddress(mac=mac, ip=ip)
+        self.assertEqual({normalise_ip(ip): netmask}, map_netmasks(node))
+
+    def test__ignores_network_interface_without_cluster_interface(self):
+        network = factory.make_ipv4_network()
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface(
+            network=network)
+        mac = node.get_primary_mac()
+        mac.cluster_interface = None
+        mac.save()
+        ip = factory.pick_ip_in_network(network)
+        factory.make_StaticIPAddress(mac=mac, ip=ip)
+        self.assertEqual({}, map_netmasks(node))
+
+    def test__ignores_network_interface_without_static_IP(self):
+        network = factory.make_ipv4_network()
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface(
+            network=network)
+        self.assertEqual({}, map_netmasks(node))
+
+
 class TestComposeCurtinNetworkPreseedFor(MAASServerTestCase):
 
     def test__composes_config(self):
@@ -782,8 +829,6 @@
             '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))