Merge lp:~blake-rouse/maas/fix-1597324-2.0 into lp:maas/2.0

[Blake Rouse]

Allow selection of a DHCP link for the default gateway of a node.

Backport: https://code.launchpad.net/~blake-rouse/maas/fix-1597324/+merge/298656

[Blake Rouse (blake-rouse)]

Self-approving backport.

review: Approve

=== modified file 'src/maasserver/forms_interface_link.py'
--- src/maasserver/forms_interface_link.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/forms_interface_link.py	2016-06-30 15:22:24 +0000
@@ -228,7 +228,10 @@
         """Return IP links on the instance that are of the correct type,
         have a subnet, and has a gateway_ip set."""
         links = self.instance.ip_addresses.filter(
-            alloc_type__in=[IPADDRESS_TYPE.AUTO, IPADDRESS_TYPE.STICKY],
+            alloc_type__in=[
+                IPADDRESS_TYPE.AUTO,
+                IPADDRESS_TYPE.STICKY,
+                IPADDRESS_TYPE.DHCP],
             subnet__isnull=False, subnet__gateway_ip__isnull=False)
         links = links.select_related("subnet")
         return [

=== modified file 'src/maasserver/tests/test_forms_interface_link.py'
--- src/maasserver/tests/test_forms_interface_link.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/tests/test_forms_interface_link.py	2016-06-30 15:22:24 +0000
@@ -563,6 +563,19 @@
         ]
         self.assertItemsEqual(link_ids, choice_ids)
 
+    def test__sets_gateway_links_works_on_dhcp_with_gateway_ip(self):
+        interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
+        ipv4_link = self.make_ip_family_link(
+            interface, factory.make_ipv4_network(), IPADDRESS_TYPE.DHCP)
+        ipv6_link = self.make_ip_family_link(
+            interface, factory.make_ipv6_network(), IPADDRESS_TYPE.DHCP)
+        form = InterfaceSetDefaultGatwayForm(instance=interface, data={})
+        self.assertTrue(form.is_valid(), form.errors)
+        interface = form.save()
+        node = interface.get_node()
+        self.assertEqual(ipv4_link, node.gateway_link_ipv4)
+        self.assertEqual(ipv6_link, node.gateway_link_ipv6)
+
     def test__sets_gateway_links_on_node_when_no_link_id(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         ipv4_link = self.make_ip_family_link(