Merge lp:~gmb/maas/prob-mscm-power-params-testcase into lp:~maas-committers/maas/trunk

[Graham Binns]

Fix the RPC create_node() utility, which didn't save node power parameters, unlike its API counterpart.

Power parameters need to be saved explicitly, since the NodeForms won't do it for us.

[Raphaël Badin (rvb)]

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~gmb/maas/prob-mscm-power-params-testcase into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Hit http://security.ubuntu.com trusty-security Release
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:1 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:2 http://nova.clouds.archive.ubuntu.com trusty-updates Release [59.7 kB]
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [120 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [84.7 kB]
Get:5 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [320 kB]
Get:6 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [203 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 788 kB in 0s (1,624 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make pep8 postgresql pyflakes python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-mimeparse python-mock python-netaddr python-netifaces python-nose python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-openssl python-paramiko python-pexpect python-pip python-pocket-lint py...

=== modified file 'src/maasserver/rpc/nodes.py'
--- src/maasserver/rpc/nodes.py	2014-09-10 16:20:31 +0000
+++ src/maasserver/rpc/nodes.py	2014-09-22 12:05:24 +0000
@@ -33,6 +33,7 @@
     NoSuchNode,
     )
 from provisioningserver.utils.twisted import synchronous
+import simplejson as json
 
 
 @synchronous
@@ -128,6 +129,10 @@
     form = AdminNodeWithMACAddressesForm(data_query_dict)
     if form.is_valid():
         node = form.save()
+        # We have to explicitly save the power parameters; the form
+        # won't do it for us.
+        node.power_parameters = json.loads(power_parameters)
+        node.save()
         return node
     else:
         raise ValidationError(form.errors)

=== modified file 'src/maasserver/rpc/tests/test_nodes.py'
--- src/maasserver/rpc/tests/test_nodes.py	2014-09-19 03:44:04 +0000
+++ src/maasserver/rpc/tests/test_nodes.py	2014-09-22 12:05:24 +0000
@@ -25,6 +25,7 @@
     RunningEventLoopFixture,
     )
 from maasserver.testing.factory import factory
+from maasserver.testing.orm import reload_object
 from maasserver.testing.testcase import MAASServerTestCase
 from provisioningserver.drivers import PowerTypeRegistry
 from provisioningserver.rpc.cluster import DescribePowerTypes
@@ -66,7 +67,7 @@
                 cluster,
                 architecture,
                 power_type,
-                ''
+                {},
             ),
             (
                 node.nodegroup,
@@ -106,3 +107,26 @@
         self.assertRaises(
             NodeAlreadyExists, create_node, cluster.uuid, architecture,
             power_type, power_parameters, [mac_addresses[0]])
+
+    def test__saves_power_parameters(self):
+        cluster = factory.make_NodeGroup()
+        cluster.accept()
+        self.prepare_cluster_rpc(cluster)
+
+        mac_addresses = [
+            factory.make_mac_address() for _ in range(3)]
+        architecture = make_usable_architecture(self)
+        power_type = random.choice(self.power_types)['name']
+        power_parameters = {
+            factory.make_name('key'): factory.make_name('value')
+            for _ in range(3)
+        }
+
+        node = create_node(
+            cluster.uuid, architecture, power_type, dumps(power_parameters),
+            mac_addresses)
+
+        # Reload the object from the DB so that we're sure its power
+        # parameters are being persisted.
+        node = reload_object(node)
+        self.assertEqual(power_parameters, node.power_parameters)