Merge lp:~blake-rouse/maas/fix-1685904 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Ensure that remote target drive is larger than master drive size. Use snapshot instead of clone to speed up composition.

[Newell Jensen (newell-jensen)]

Looks good.

review: Approve

=== modified file 'src/provisioningserver/drivers/pod/rsd.py'
--- src/provisioningserver/drivers/pod/rsd.py	2017-04-21 19:23:03 +0000
+++ src/provisioningserver/drivers/pod/rsd.py	2017-04-24 20:11:16 +0000
@@ -801,7 +801,7 @@
             "CapacityGiB": None,
             "iSCSIAddress": None,
             "Master": {
-                "Type": "Clone",
+                "Type": "Snapshot",
                 "Resource": None,
             },
         }
@@ -885,6 +885,7 @@
                     # Force 'iscsi' into the tags if not present.
                     if 'iscsi' not in block_device.tags:
                         block_device.tags.append('iscsi')
+                    # Convert from bytes to GiB.
                     size = block_device.size / (1024 ** 3)
 
                     # Determine the remote master that can be used.
@@ -895,8 +896,9 @@
                             'iSCSI remote drive cannot be created because '
                             'not enough space is available.')
                     drive = remote_drive.copy()
-                    # Convert from bytes to GiB.
                     drive['CapacityGiB'] = size
+                    if remote_master['size'] > size:
+                        drive['CapacityGiB'] = remote_master['size']
                     drive['iSCSIAddress'] = 'iqn.2010-08.io.maas:%s-%s' % (
                         request.hostname, idx)
                     drive['Master']['Resource'] = {

=== modified file 'src/provisioningserver/drivers/pod/tests/test_rsd.py'
--- src/provisioningserver/drivers/pod/tests/test_rsd.py	2017-04-21 19:23:03 +0000
+++ src/provisioningserver/drivers/pod/tests/test_rsd.py	2017-04-24 20:11:16 +0000
@@ -1687,7 +1687,11 @@
     def test__convert_request_to_json_payload(self):
         driver = RSDPodDriver()
         request = make_requested_machine()
+        # iSCSI disk smaller than master drive size of 10GiB.
         request.block_devices[1].tags.append('iscsi')
+        request.block_devices[1].size = 9 * (1024 ** 3)
+        # iSCSI disk larger than master drive size of 10GiB.
+        request.block_devices[2].size = 15 * (1024 ** 3)
         processors = 2
         cores = request.cores / 2
         remote_storage = {
@@ -1696,7 +1700,7 @@
                 'available': 40 * (1024 ** 3),
                 'master': {
                     'path': b"redfish/v1/Services/1/LogicalDrives/2",
-                    'size': 10 * (1024 ** 3)
+                    'size': 10
                 }
             }
         }
@@ -1758,10 +1762,9 @@
                                 "@odata.id": Equals(
                                     'redfish/v1/Services/1/LogicalDrives/2')
                             }),
-                            "Type": Equals('Clone')
+                            "Type": Equals('Snapshot')
                         }),
-                        "CapacityGiB": Equals(
-                            request.block_devices[1].size / (1024 ** 3)),
+                        "CapacityGiB": Equals(10),
                         "iSCSIAddress": Equals(
                             'iqn.2010-08.io.maas:' + request.hostname + '-1')
                     }),
@@ -1771,7 +1774,7 @@
                                 "@odata.id": Equals(
                                     'redfish/v1/Services/1/LogicalDrives/2')
                             }),
-                            "Type": Equals('Clone')
+                            "Type": Equals('Snapshot')
                         }),
                         "CapacityGiB": Equals(
                             request.block_devices[2].size / (1024 ** 3)),