Merge lp:~lamont/maas/bug-1625689 into lp:~maas-committers/maas/trunk

[LaMont Jones]

Allow link-local gateway addresses via the web UI.

Allow link-local gateway addresses via the web UI.

[Blake Rouse (blake-rouse)]

Looks good. Good catch!

review: Approve

=== modified file 'src/maasserver/websockets/handlers/tests/test_vlan.py'
--- src/maasserver/websockets/handlers/tests/test_vlan.py	2016-09-06 17:02:03 +0000
+++ src/maasserver/websockets/handlers/tests/test_vlan.py	2016-09-20 15:37:40 +0000
@@ -358,6 +358,27 @@
                 }
             })
 
+    def test__configure_dhcp_gateway_fe80_allowed(self):
+        rack = factory.make_RackController()
+        user = factory.make_admin()
+        handler = VLANHandler(user, {})
+        vlan = factory.make_VLAN()
+        subnet = factory.make_Subnet(
+            vlan=vlan, cidr="2001:db8::/64", gateway_ip="")
+        self.assertThat(subnet.get_dynamic_ranges().count(), Equals(0))
+        handler.configure_dhcp({
+            "id": vlan.id,
+            "controllers": [rack.system_id],
+            "extra": {
+                "subnet": subnet.id,
+                "gateway": "fe80::1",
+                "start": "2001:db8:0:0:1::",
+                "end": "2001:db8:0:0:1:ffff:ffff:ffff"
+            }
+        })
+        subnet = reload_object(subnet)
+        self.assertEqual(subnet.gateway_ip, 'fe80::1')
+
     def test__configure_dhcp_gateway_inside_range_raises(self):
         rack = factory.make_RackController()
         user = factory.make_admin()
@@ -377,6 +398,7 @@
                     "end": "10.0.0.99"
                 }
             })
+        vlan = reload_object(vlan)
 
     def test__configure_dhcp_gateway_raises_if_dynamic_range_required(self):
         rack = factory.make_RackController()

=== modified file 'src/maasserver/websockets/handlers/vlan.py'
--- src/maasserver/websockets/handlers/vlan.py	2016-06-09 20:04:24 +0000
+++ src/maasserver/websockets/handlers/vlan.py	2016-09-20 15:37:40 +0000
@@ -112,7 +112,8 @@
             if len(gateway_text) > 0:
                 gateway = netaddr.IPAddress(gateway_text)
                 ipnetwork = netaddr.IPNetwork(subnet.cidr)
-                if gateway not in ipnetwork:
+                if gateway not in ipnetwork and not (
+                        gateway.version == 6 and gateway.is_link_local()):
                     raise ValueError(
                         "Gateway IP must be within specified subnet: %s" %
                         subnet.cidr)