Merge lp:~ltrager/maas/lp1521833 into lp:~maas-committers/maas/trunk

[Lee Trager]

Fix bug where updates to the subnet would remove the first DNS server

[Blake Rouse (blake-rouse)]

Yeah hopefully the new ArrayField in django fixes this without needing this. But good to land this now in trunk to backport to 1.9.

review: Approve

=== modified file 'src/maasserver/forms_subnet.py'
--- src/maasserver/forms_subnet.py	2015-12-02 21:46:34 +0000
+++ src/maasserver/forms_subnet.py	2015-12-02 22:59:43 +0000
@@ -59,6 +59,10 @@
 
     def clean(self):
         cleaned_data = super(SubnetForm, self).clean()
+        # The djorm_pgarray.fields.ArrayField form has a bug which leaves out
+        # the first entry.
+        if 'dns_servers' in self.data and self.data['dns_servers'] != '':
+            cleaned_data['dns_servers'] = self.data.getlist('dns_servers')
         cleaned_data = self._clean_name(cleaned_data)
         cleaned_data = self._clean_dns_servers(cleaned_data)
         if self.instance.id is None:

=== modified file 'src/maasserver/tests/test_forms_subnet.py'
--- src/maasserver/tests/test_forms_subnet.py	2015-12-02 21:46:34 +0000
+++ src/maasserver/tests/test_forms_subnet.py	2015-12-02 22:59:43 +0000
@@ -252,6 +252,19 @@
             subnet, MatchesStructure.byEquality(
                 name=new_cidr, cidr=new_cidr, gateway_ip=new_gateway_ip))
 
+    def test__updates_subnet_name_doesnt_remove_dns_server(self):
+        # Regression test for lp:1521833
+        dns_servers = [factory.make_ip_address()
+                       for _ in range(random.randint(2, 10))]
+        subnet = factory.make_Subnet(dns_servers=dns_servers)
+        form = SubnetForm(instance=subnet, data={
+            "name": factory.make_name("subnet")
+        })
+        self.assertTrue(form.is_valid(), form.errors)
+        form.save()
+        subnet = reload_object(subnet)
+        self.assertEquals(dns_servers, subnet.dns_servers)
+
     def test__doesnt_overwrite_other_fields(self):
         new_name = factory.make_name("subnet")
         subnet = factory.make_Subnet()