Merge lp:~mpontillo/maas/recommission-storage-1575567-1.9 into lp:maas/1.9

[Mike Pontillo]

Change commissioning script to handle the case where existing disks are renamed by the kernel (such as in some cases when a storage device is added).

Backport of revision 5010 from trunk.

[Mike Pontillo (mpontillo)]

Self-approving approved backport.

review: Approve

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-04-28 16:45:07 +0000
+++ docs/changelog.rst	2016-05-10 21:38:31 +0000
@@ -2,6 +2,16 @@
 Changelog
 =========
 
+1.9.3
+=====
+
+See https://launchpad.net/maas/+milestone/1.9.3 for full details.
+
+Bug Fix Update
+--------------
+
+LP: #1575567    Re-commissioning doesn't detect storage changes
+
 
 1.9.2
 =====

=== modified file 'src/metadataserver/models/commissioningscript.py'
--- src/metadataserver/models/commissioningscript.py	2016-02-04 13:47:12 +0000
+++ src/metadataserver/models/commissioningscript.py	2016-05-10 21:38:31 +0000
@@ -628,6 +628,15 @@
             block_device.tags = tags
             block_device.save()
         else:
+            # First check if there is an existing device with the same name.
+            # If so, we need to rename it. Its name will be changed back later,
+            # when we loop around to it.
+            existing = PhysicalBlockDevice.objects.filter(
+                node=node, name=name).all()
+            for device in existing:
+                # Use the device ID to ensure a unique temporary name.
+                device.name = "%s.%d" % (device.name, device.id)
+                device.save()
             # New block device. Create it on the node.
             PhysicalBlockDevice.objects.create(
                 node=node,

=== modified file 'src/metadataserver/models/tests/test_commissioningscript.py'
--- src/metadataserver/models/tests/test_commissioningscript.py	2016-02-04 13:47:12 +0000
+++ src/metadataserver/models/tests/test_commissioningscript.py	2016-05-10 21:38:31 +0000
@@ -1248,6 +1248,24 @@
             ]
         self.assertItemsEqual(device_names, created_names)
 
+    def test__handles_renamed_block_device(self):
+        devices = [self.make_block_device(name='sda', serial='first')]
+        node = factory.make_Node()
+        json_output = json.dumps(devices).encode('utf-8')
+        update_node_physical_block_devices(node, json_output, 0)
+        devices = [
+            self.make_block_device(name='sda', serial='second'),
+            self.make_block_device(name='sdb', serial='first'),
+        ]
+        json_output = json.dumps(devices).encode('utf-8')
+        update_node_physical_block_devices(node, json_output, 0)
+        device_names = [device['NAME'] for device in devices]
+        created_names = [
+            device.name
+            for device in PhysicalBlockDevice.objects.filter(node=node)
+            ]
+        self.assertItemsEqual(device_names, created_names)
+
     def test__only_updates_physical_block_devices(self):
         devices = [self.make_block_device() for _ in range(3)]
         node = factory.make_Node()