Merge lp:~jtv/maas/fix-ipv6-gateway into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Fix a subtle bug that was stopping IPv6 gateways from being configured on the nodes.

[Graham Binns (gmb)]

One suggested (and maybe unnecessary) tweak, but looks good. Thanks!

review: Approve

=== modified file 'src/maasserver/preseed.py'
--- src/maasserver/preseed.py	2014-09-16 10:00:23 +0000
+++ src/maasserver/preseed.py	2014-09-17 01:59:49 +0000
@@ -94,16 +94,17 @@
 
 
 def list_gateways_and_macs(node):
-    """Return a node's router addresses, as IP/MAC pairs.
+    """Return a node's router addresses, as a set of IP/MAC pairs.
 
     In each returned pair, the MAC address is that of a network interface
     on the node.  The IP address is a router address for that interface.
     """
-    return [
-        (mac.cluster_interface.router_ip, mac.mac_address)
-        for mac in node.macaddress_set.filter(cluster_interface__isnull=False)
-        if mac.cluster_interface.router_ip not in (None, '')
-        ]
+    result = set()
+    for mac in node.macaddress_set.filter(cluster_interface__isnull=False):
+        for cluster_interface in mac.get_cluster_interfaces():
+            if cluster_interface.router_ip not in (None, ''):
+                result.add((cluster_interface.router_ip, mac.mac_address))
+    return result
 
 
 def compose_curtin_network_preseed(node):

=== modified file 'src/maasserver/tests/test_preseed.py'
--- src/maasserver/tests/test_preseed.py	2014-09-16 10:00:23 +0000
+++ src/maasserver/tests/test_preseed.py	2014-09-17 01:59:49 +0000
@@ -681,7 +681,32 @@
         mac.cluster_interface.router_ip = gateway
         mac.cluster_interface.save()
         self.assertEqual(
-            [(gateway, mac.mac_address)],
+            {(gateway, mac.mac_address)},
+            list_gateways_and_macs(node))
+
+    def test__lists_gateways_from_all_associated_cluster_interfaces(self):
+        # XXX jtv 2014-09-16 bug=1358130: There's a quick-and-dirty solution
+        # where all cluster interfaces on the same cluster network interface
+        # are all considered connected to the same node MACs.  And so,
+        # list_gateways_and_macs must respect that association, rather than
+        # just query MACAddress.cluster_interface.
+        ipv4_network = factory.make_ipv4_network()
+        ipv6_network = factory.make_ipv6_network()
+        node = factory.make_node_with_mac_attached_to_nodegroupinterface(
+            network=ipv4_network)
+        ipv4_gateway = factory.pick_ip_in_network(ipv4_network)
+        mac = node.get_primary_mac()
+        mac.cluster_interface.router_ip = ipv4_gateway
+        mac.cluster_interface.save()
+        ipv6_gateway = factory.pick_ip_in_network(ipv6_network)
+        factory.make_NodeGroupInterface(
+            node.nodegroup, interface=mac.cluster_interface.interface,
+            network=ipv6_network, router_ip=ipv6_gateway)
+        self.assertEqual(
+            {
+                (ipv4_gateway, mac.mac_address),
+                (ipv6_gateway, mac.mac_address),
+            },
             list_gateways_and_macs(node))
 
     def test__skips_unknown_cluster_interfaces(self):
@@ -689,7 +714,7 @@
         mac = node.get_primary_mac()
         mac.cluster_interface = None
         mac.save()
-        self.assertEqual([], list_gateways_and_macs(node))
+        self.assertEqual(set(), list_gateways_and_macs(node))
 
     def test__skips_unknown_routers(self):
         node = factory.make_node_with_mac_attached_to_nodegroupinterface()
@@ -698,7 +723,7 @@
         mac.cluster_interface.management = (
             NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED)
         mac.cluster_interface.save()
-        self.assertEqual([], list_gateways_and_macs(node))
+        self.assertEqual(set(), list_gateways_and_macs(node))
 
 
 class TestComposeCurtinNetworkPreseed(MAASServerTestCase):