Merge lp:~mpontillo/maas/link-subnet-no-match--bug-1643057--2.1 into lp:maas/2.1

[Mike Pontillo]

Merge revision 5563 from trunk to fix bug #1643057.

[Mike Pontillo (mpontillo)]

Self-review backport.

review: Approve

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-11-21 16:38:54 +0000
+++ docs/changelog.rst	2016-11-22 02:40:55 +0000
@@ -10,6 +10,8 @@
 
 LP: #1642996    2.x preseeds with {{escape.shell}} fail if not upgraded at 2.1.1
 
+LP: #1643057    juju2 with maas 2.1.1 LXD containers get wrong ip addresses
+
 
 2.1.1
 =====
 
=== modified file 'src/maasserver/forms_interface_link.py'
--- src/maasserver/forms_interface_link.py	2016-10-12 15:26:17 +0000
+++ src/maasserver/forms_interface_link.py	2016-11-22 02:40:55 +0000
@@ -75,7 +75,7 @@
                     'mode', mode_choices),
             })
         if self.instance.vlan is None:
-            self.fields['subnet'].queryset = Subnet.objects.none()
+            self.fields['subnet'].queryset = Subnet.objects.all()
         else:
             self.fields['subnet'].queryset = (
                 self.instance.vlan.subnet_set.all())
 
=== modified file 'src/maasserver/models/interface.py'
--- src/maasserver/models/interface.py	2016-11-04 20:33:51 +0000
+++ src/maasserver/models/interface.py	2016-11-22 02:40:55 +0000
@@ -858,18 +858,25 @@
         :param user: When alloc_type is set to USER_RESERVED, this user will
             be set on the link.
         """
+        # Allow the interface VLAN to be implied by the subnet VLAN, if we're
+        # setting up the interface for the first time and it doesn't have
+        # a VLAN assigned yet.
+        if self.vlan is None and subnet is not None:
+            self.vlan = subnet.vlan
+            self.save(update_fields=['vlan', 'updated'])
         if mode == INTERFACE_LINK_TYPE.AUTO:
-            return self._link_subnet_auto(subnet)
+            result = self._link_subnet_auto(subnet)
         elif mode == INTERFACE_LINK_TYPE.DHCP:
-            return self._link_subnet_dhcp(subnet)
+            result = self._link_subnet_dhcp(subnet)
         elif mode == INTERFACE_LINK_TYPE.STATIC:
-            return self._link_subnet_static(
+            result = self._link_subnet_static(
                 subnet, ip_address=ip_address,
                 alloc_type=alloc_type, user=user)
         elif mode == INTERFACE_LINK_TYPE.LINK_UP:
-            return self._link_subnet_link_up(subnet)
+            result = self._link_subnet_link_up(subnet)
         else:
             raise ValueError("Unknown mode: %s" % mode)
+        return result
 
     def force_auto_or_dhcp_link(self):
         """Force the interface to come up with an AUTO linked to a subnet on
 
=== modified file 'src/maasserver/models/tests/test_interface.py'
--- src/maasserver/models/tests/test_interface.py	2016-11-04 20:33:51 +0000
+++ src/maasserver/models/tests/test_interface.py	2016-11-22 02:40:55 +0000
@@ -2045,6 +2045,17 @@
             "IP address is not in the given subnet '%s'." % subnet,
             str(error))
 
+    def test__AUTO_link_sets_vlan_if_vlan_undefined(self):
+        interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
+        network = factory.make_ipv4_network()
+        subnet = factory.make_Subnet(
+            vlan=interface.vlan, cidr=str(network.cidr))
+        interface.vlan = None
+        interface.save()
+        interface.link_subnet(INTERFACE_LINK_TYPE.AUTO, subnet)
+        interface = reload_object(interface)
+        self.assertThat(interface.vlan, Equals(subnet.vlan))
+
     def test__STATIC_not_allowed_if_ip_address_in_dynamic_range(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         subnet = factory.make_ipv4_Subnet_with_IPRanges(vlan=interface.vlan)
 
=== modified file 'src/maasserver/tests/test_forms_interface_link.py'
--- src/maasserver/tests/test_forms_interface_link.py	2016-10-18 08:00:37 +0000
+++ src/maasserver/tests/test_forms_interface_link.py	2016-11-22 02:40:55 +0000
@@ -18,6 +18,7 @@
     InterfaceSetDefaultGatwayForm,
     InterfaceUnlinkForm,
 )
+from maasserver.models import Subnet
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import (
     MAASServerTestCase,
@@ -56,12 +57,13 @@
         self.assertTrue(form.is_valid(), form.errors)
 
     @transactional
-    def test__sets_subnet_queryset_to_empty_on_interface_wihtout_vlan(self):
+    def test__sets_subnet_queryset_to_all_on_interface_wihtout_vlan(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         interface.vlan = None
         interface.save()
         form = InterfaceLinkForm(instance=interface, data={})
-        self.assertItemsEqual([], form.fields["subnet"].queryset)
+        self.assertItemsEqual(
+            list(Subnet.objects.all()), list(form.fields["subnet"].queryset))
 
     @transactional
     def test__sets_subnet_queryset_to_subnets_on_interface_vlan(self):