Merge lp:~jtv/maas/ui-maas_url into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Expose NodeGroup.maas_url in the NodeGroupEdit, so that it can be edited through the UI and the API.

Users will typically have to edit this URL before they can disable IPv4 on nodes. Otherwise, this will default to an IPv4 address which the nodes won't be able to reach.

I didn't bother testing the API side separately. We don't test that for other fields either; it's just another item in the request data as far as the API is concerned.

Along the way I touched up the help text for the ‘name’ field. Makes it feel more like this branch actually makes some changes. :)

Jeroen

[Gavin Panella (allenap)]

This looks good, but beware: maas_url is automatically updated by m.api.node_groups.update_nodegroup_maas_url() each time the cluster starts. I guess that behaviour will need to be changed.

review: Approve

=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2014-09-30 09:14:41 +0000
+++ src/maasserver/forms.py	2014-10-02 05:04:41 +0000
@@ -1610,9 +1610,9 @@
     name = forms.CharField(
         label="DNS zone name",
         help_text=(
-            "Name of the related DNS zone.  Note that this will only "
-            "be used if MAAS is managing a DNS zone for one of the interfaces "
-            "of this cluster.  See the 'status' of the interfaces below."),
+            "Name of this cluster's DNS zone.  This is only used if MAAS is "
+            "managing a DNS zone for any of the cluster's interfaces.  "
+            "See the interfaces' management settings below."),
         required=False)
 
     class Meta:
@@ -1621,6 +1621,7 @@
             'cluster_name',
             'status',
             'name',
+            'maas_url',
             )
 
     def clean_name(self):

=== modified file 'src/maasserver/models/nodegroup.py'
--- src/maasserver/models/nodegroup.py	2014-09-30 18:13:21 +0000
+++ src/maasserver/models/nodegroup.py	2014-10-02 05:04:41 +0000
@@ -20,6 +20,7 @@
 
 from apiclient.creds import convert_tuple_to_string
 from crochet import TimeoutError
+from django.core.validators import URLValidator
 from django.db.models import (
     BooleanField,
     CharField,
@@ -175,7 +176,11 @@
     # The URL where the cluster controller can access the region
     # controller.
     maas_url = CharField(
-        blank=True, editable=False, max_length=255, default='')
+        blank=True, editable=True, max_length=255, default='',
+        validators=[URLValidator()], verbose_name="Region controller URL",
+        help_text=(
+            "URL where nodes in this cluster can reach the MAAS region "
+            "controller API."))
 
     # Should nodes on this cluster be configured to disable IPv4 on deployment
     # by default?

=== 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-02 05:04:41 +0000
@@ -382,3 +382,40 @@
         self.assertTrue(form.is_valid())
         form.save()
         self.assertEqual(data['name'], reload_object(nodegroup).name)
+
+    def test_accepts_IPv4_URL(self):
+        url = 'http://%s/MAAS' % factory.make_ipv4_address()
+        cluster = factory.make_NodeGroup()
+        data = self.make_form_data(cluster)
+        data['maas_url'] = url
+        form = NodeGroupEdit(instance=cluster, data=data)
+        self.assertTrue(form.is_valid(), form._errors)
+        cluster = form.save()
+        self.assertEqual(url, cluster.maas_url)
+
+    def test_accepts_IPv6_URL(self):
+        url = 'http://[%s]/MAAS' % factory.make_ipv6_address()
+        cluster = factory.make_NodeGroup()
+        data = self.make_form_data(cluster)
+        data['maas_url'] = url
+        form = NodeGroupEdit(instance=cluster, data=data)
+        self.assertTrue(form.is_valid(), form._errors)
+        cluster = form.save()
+        self.assertEqual(url, cluster.maas_url)
+
+    def test_accepts_hostname_URL(self):
+        url = 'http://%s.example.com/MAAS' % factory.make_name('host')
+        cluster = factory.make_NodeGroup()
+        data = self.make_form_data(cluster)
+        data['maas_url'] = url
+        form = NodeGroupEdit(instance=cluster, data=data)
+        self.assertTrue(form.is_valid(), form._errors)
+        cluster = form.save()
+        self.assertEqual(url, cluster.maas_url)
+
+    def test_rejects_invalid_URL(self):
+        cluster = factory.make_NodeGroup()
+        data = self.make_form_data(cluster)
+        data['maas_url'] = '???//foo!'
+        form = NodeGroupEdit(instance=cluster, data=data)
+        self.assertFalse(form.is_valid())