Merge lp:~allenap/maas/cluster-name-override--bug-1380805 into lp:~maas-committers/maas/trunk

[Gavin Panella]

Don't clobber the cluster name and domain when a cluster registers.

A cluster goes through the registration process every time it connects to a region controller, whether or not it has done so before.

Follows on from https://code.launchpad.net/~julian-edwards/maas/cluster-name-override-bug-1380805/+merge/238226.

[Graham Binns (gmb)]

review: Approve

[Raphaël Badin (rvb)]

review: Approve

[Gavin Panella (allenap)]

Thanks for your blessing m'lord!

=== modified file 'src/maasserver/rpc/clusters.py'
--- src/maasserver/rpc/clusters.py	2014-10-09 21:49:44 +0000
+++ src/maasserver/rpc/clusters.py	2014-10-14 15:23:14 +0000
@@ -81,11 +81,11 @@
         message = "Cluster registered"
 
     # Massage the data so that we can pass it into NodeGroupDefineForm.
-    data = {
-        "cluster_name": name,
-        "name": domain,
-        "uuid": uuid,
-    }
+    data = {"uuid": uuid}
+    if name is not None:
+        data["cluster_name"] = name
+    if domain is not None:
+        data["name"] = domain
 
     # Populate networks when there are no preexisting networks.
     if networks is not None:
 
=== modified file 'src/maasserver/rpc/tests/test_clusters.py'
--- src/maasserver/rpc/tests/test_clusters.py	2014-10-10 09:51:36 +0000
+++ src/maasserver/rpc/tests/test_clusters.py	2014-10-14 15:23:14 +0000
@@ -27,6 +27,7 @@
     register_cluster,
     )
 from maasserver.testing.factory import factory
+from maasserver.testing.orm import reload_object
 from maasserver.testing.testcase import MAASServerTestCase
 from provisioningserver.rpc.exceptions import NoSuchCluster
 from testtools.matchers import Equals
@@ -154,6 +155,19 @@
         cluster_registered = register_cluster(cluster.uuid, url=None)
         self.assertEqual(old_url, cluster_registered.maas_url)
 
+    def test__does_NOT_update_cluster_name_if_none_provided(self):
+        cluster_name = factory.make_name("cluster")
+        cluster = factory.make_NodeGroup(cluster_name=cluster_name)
+        cluster_registered = register_cluster(cluster.uuid, name=None)
+        self.assertEqual(
+            cluster_name, reload_object(cluster_registered).cluster_name)
+
+    def test__does_NOT_update_domain_if_none_provided(self):
+        domain = factory.make_name("domain")
+        cluster = factory.make_NodeGroup(name=domain)
+        cluster_registered = register_cluster(cluster.uuid, domain=None)
+        self.assertEqual(domain, reload_object(cluster_registered).name)
+
     def test__raises_ValidationError_when_input_is_bad(self):
         error = self.assertRaises(
             ValidationError, register_cluster, factory.make_UUID(),