Merge lp://qastaging/~jtv/maas/bug-1379816 into lp://qastaging/~maas-committers/maas/trunk

Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 3248
Proposed branch: lp://qastaging/~jtv/maas/bug-1379816
Merge into: lp://qastaging/~maas-committers/maas/trunk
Diff against target: 135 lines (+51/-3)
5 files modified
src/maasserver/api/tests/test_nodegroup.py (+17/-1)
src/maasserver/forms.py (+11/-0)
src/maasserver/models/nodegroup.py (+2/-2)
src/maasserver/views/clusters.py (+9/-0)
src/maasserver/views/tests/test_clusters.py (+12/-0)
To merge this branch: bzr merge lp://qastaging/~jtv/maas/bug-1379816
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Christian Reis (community) Needs Fixing
Review via email: mp+238001@code.qastaging.launchpad.net

Commit message

Make the “disable IPv4 by default” checkbox visible in the cluster UI.

This includes the UI trick we needed to get the “disable IPv4” checkbox working in the node UI, which Raphaël generalised into a reusable pattern. Without it, once checked, the box can never be unchecked.

Description of the change

That should explain why the tests may seem to have an unhealthy obsession with changing the setting from True to False, instead of just trying it either way. I hope the comments make the situation clear throughout.

In a next step we could hide this button if the cluster does not have any IPv6 configured, like we do in the node UI.

Jeroen

To post a comment you must log in.
Revision history for this message
Christian Reis (kiko) wrote :

Let's hide the button if there's no IPv6 configured -- and in fact, what happens if it is selected and there is no IPv6 on the cluster?

Pending that change and review, approved for 1.7.

review: Needs Fixing
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :
Revision history for this message
Raphaël Badin (rvb) wrote :

Looks good to me, with the additional lp:~jtv/maas/hide-cluster-default-disable-ipv4-if-no-ipv6/ branch.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.