Merge lp:~blake-rouse/maas/fix-1384778-1.7 into lp:maas/1.7

[Blake Rouse]

Handle missing subarchitecture on CreateNode RPC call.

Merged into trunk here: https://code.launchpad.net/~blake-rouse/maas/fix-1384778/+merge/239489

Required or probe-and-enlist is broken.

[Julian Edwards (julian-edwards)]

review: Approve

[Christian Reis (kiko)]

I'd like to have seen a test that ensures the wider functional problem is solved. I guess that's not easy to do?

At any rate, the code is safe for 1.7.

review: Approve

[Blake Rouse (blake-rouse)]

Its not that its not easy. It just that multiple drivers on the cluster call the CreateNode RPC call, and the actual call on the region is patched out.

The based way to test this is to start testing probe-and-enlist in CI. That would have found this issue immediately. But that also means placing a sm15k in CI.

[Christian Reis (kiko)]

Could we do a fake or ultra-simple 1-node probe-and-enlist using, say IPMI, and if so, would that have caught the bug?

[Blake Rouse (blake-rouse)]

Overall that would do very little, as each power driver can call CreateNode RPC differently.

=== modified file 'src/maasserver/rpc/nodes.py'
--- src/maasserver/rpc/nodes.py	2014-09-27 04:25:55 +0000
+++ src/maasserver/rpc/nodes.py	2014-10-24 01:08:05 +0000
@@ -122,6 +122,12 @@
         raise NodeAlreadyExists(
             "One of the MACs %s is already in use by a node." %
             mac_addresses)
+
+    # It is possible that the enlistment code did not provide a subarchitecture
+    # for the give architecture; assume 'generic'.
+    if '/' not in architecture:
+        architecture = '%s/generic' % architecture
+
     cluster = NodeGroup.objects.get_by_natural_key(cluster_uuid)
     data = {
         'power_type': power_type,

=== modified file 'src/maasserver/rpc/tests/test_nodes.py'
--- src/maasserver/rpc/tests/test_nodes.py	2014-10-09 16:22:36 +0000
+++ src/maasserver/rpc/tests/test_nodes.py	2014-10-24 01:08:05 +0000
@@ -140,6 +140,24 @@
         node = reload_object(node)
         self.assertEqual(power_parameters, node.power_parameters)
 
+    def test__forces_generic_subarchitecture_if_missing(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, subarch_name='generic')
+        power_type = random.choice(self.power_types)['name']
+        power_parameters = dumps({})
+
+        arch, subarch = architecture.split('/')
+        node = create_node(
+            cluster.uuid, arch, power_type, power_parameters,
+            mac_addresses)
+
+        self.assertEqual(architecture, node.architecture)
+
 
 class TestMarkNodeFailed(MAASServerTestCase):