Merge lp:~jtv/maas/hide-cluster-default-disable-ipv4-if-no-ipv6 into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Hide the cluster edit form's “disable IPv4 by default” button if the cluster has no managed IPv6 interfaces.

Depends on https://code.launchpad.net/~jtv/maas/bug-1379816/+merge/238001 (which is blocked on this change).

The trick is the same one we also used on the Node form's disable_ipv4 field. If the field should not be displayed, we configure it with an empty label and its widget type set to HiddenInput. That way the field still works in the API, but the UI won't show it.

What happens if you leave this field in the “disable IPv4” setting but disable IPv6 on your cluster? Any new nodes will still be created with the setting enabled by default. But when you deploy a node with IPv4 disabled on a cluster that does not manage any IPv6 subnets, the nodes will simply ignore the setting and come up with IPv4 anyway. (This is currently done in the Ubuntu OperatingSystem implementation, but it should eventually be in generic code.)

Jeroen

[Raphaël Badin (rvb)]

Looks good.

review: Approve

=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2014-10-14 11:23:07 +0000
+++ src/maasserver/forms.py	2014-10-14 11:23:08 +0000
@@ -1713,6 +1713,16 @@
             'default_disable_ipv4',
             )
 
+    def __init__(self, *args, **kwargs):
+        super(NodeGroupEdit, self).__init__(*args, **kwargs)
+        # Hide the default_disable_ipv4 field if the cluster is not
+        # configured for IPv6.
+        show_default_disable_ipv4 = contains_managed_ipv6_interface(
+            self.instance.nodegroupinterface_set.all())
+        if not show_default_disable_ipv4:
+            self.fields['default_disable_ipv4'] = forms.BooleanField(
+                label="", required=False, widget=forms.HiddenInput())
+
     def clean_name(self):
         old_name = self.instance.name
         new_name = self.cleaned_data['name']

=== modified file 'src/maasserver/tests/test_forms_nodegroup.py'
--- src/maasserver/tests/test_forms_nodegroup.py	2014-09-19 04:49:07 +0000
+++ src/maasserver/tests/test_forms_nodegroup.py	2014-10-14 11:23:08 +0000
@@ -17,6 +17,10 @@
 import json
 from random import randint
 
+from django.forms import (
+    CheckboxInput,
+    HiddenInput,
+    )
 from maasserver.enum import (
     NODE_STATUS,
     NODEGROUP_STATUS,
@@ -382,3 +386,34 @@
         self.assertTrue(form.is_valid())
         form.save()
         self.assertEqual(data['name'], reload_object(nodegroup).name)
+
+    def test_shows_default_disable_ipv4_if_managed_ipv6_configured(self):
+        nodegroup = factory.make_NodeGroup()
+        factory.make_NodeGroupInterface(
+            nodegroup, network=factory.make_ipv6_network(),
+            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP)
+        form = NodeGroupEdit(instance=nodegroup)
+        self.assertIsInstance(
+            form.fields['default_disable_ipv4'].widget, CheckboxInput)
+
+    def test_hides_default_disable_ipv4_if_no_managed_ipv6_configured(self):
+        nodegroup = factory.make_NodeGroup()
+        eth = factory.make_name('eth')
+        factory.make_NodeGroupInterface(
+            nodegroup, network=factory.make_ipv4_network(), interface=eth,
+            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP_AND_DNS)
+        factory.make_NodeGroupInterface(
+            nodegroup, network=factory.make_ipv6_network(), interface=eth,
+            management=NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED)
+        form = NodeGroupEdit(instance=nodegroup)
+        self.assertIsInstance(
+            form.fields['default_disable_ipv4'].widget, HiddenInput)
+
+    def test_default_disable_ipv4_field_ignores_other_nodegroups(self):
+        factory.make_NodeGroupInterface(
+            factory.make_NodeGroup(), network=factory.make_ipv6_network(),
+            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP)
+        nodegroup = factory.make_NodeGroup()
+        form = NodeGroupEdit(instance=nodegroup)
+        self.assertIsInstance(
+            form.fields['default_disable_ipv4'].widget, HiddenInput)