add dep. dupe ordering support

Author: Ian Sutton

SoftLayer/CLI/block/duplicate.py

@@ -54,9 +54,15 @@
               type=click.Choice(['hourly', 'monthly']),
               default='monthly',
               help="Optional parameter for Billing rate (default to monthly)")
+@click.option('--dependent-duplicate',
+              type=click.BOOL,
+              default=False,
+              help='Whether or not this duplicate will be a dependent duplicate '
+                    'of the origin volume (default to false)')
 @environment.pass_env
 def cli(env, origin_volume_id, origin_snapshot_id, duplicate_size,
-        duplicate_iops, duplicate_tier, duplicate_snapshot_size, billing):
+        duplicate_iops, duplicate_tier, duplicate_snapshot_size, billing,
+        dependent_duplicate):
     """Order a duplicate block storage volume."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
 
@@ -75,7 +81,8 @@ def cli(env, origin_volume_id, origin_snapshot_id, duplicate_size,
             duplicate_iops=duplicate_iops,
             duplicate_tier_level=duplicate_tier,
             duplicate_snapshot_size=duplicate_snapshot_size,
-            hourly_billing_flag=hourly_billing_flag
+            hourly_billing_flag=hourly_billing_flag,
+            dependent_duplicate=dependent_duplicate
         )
     except ValueError as ex:
         raise exceptions.ArgumentError(str(ex))

SoftLayer/CLI/file/duplicate.py

@@ -52,9 +52,16 @@
               type=click.Choice(['hourly', 'monthly']),
               default='monthly',
               help="Optional parameter for Billing rate (default to monthly)")
+@click.option('--dependent-duplicate',
+              type=click.BOOL,
+              default=False,
+              help='Whether or not this duplicate will be a dependent duplicate'
+                    'of the origin volume (default to false)')
+
 @environment.pass_env
 def cli(env, origin_volume_id, origin_snapshot_id, duplicate_size,
-        duplicate_iops, duplicate_tier, duplicate_snapshot_size, billing):
+        duplicate_iops, duplicate_tier, duplicate_snapshot_size, billing,
+        dependent_duplicate):
     """Order a duplicate file storage volume."""
     file_manager = SoftLayer.FileStorageManager(env.client)
 
@@ -73,7 +80,8 @@ def cli(env, origin_volume_id, origin_snapshot_id, duplicate_size,
             duplicate_iops=duplicate_iops,
             duplicate_tier_level=duplicate_tier,
             duplicate_snapshot_size=duplicate_snapshot_size,
-            hourly_billing_flag=hourly_billing_flag
+            hourly_billing_flag=hourly_billing_flag,
+            dependent_duplicate=dependent_duplicate
         )
     except ValueError as ex:
         raise exceptions.ArgumentError(str(ex))

SoftLayer/managers/block.py

@@ -310,7 +310,8 @@ def order_duplicate_volume(self, origin_volume_id, origin_snapshot_id=None,
                                duplicate_size=None, duplicate_iops=None,
                                duplicate_tier_level=None,
                                duplicate_snapshot_size=None,
-                               hourly_billing_flag=False):
+                               hourly_billing_flag=False,
+                               dependent_duplicate=False):
         """Places an order for a duplicate block volume.
 
         :param origin_volume_id: The ID of the origin volume to be duplicated
@@ -321,6 +322,8 @@ def order_duplicate_volume(self, origin_volume_id, origin_snapshot_id=None,
         :param duplicate_snapshot_size: Snapshot space size for the duplicate
         :param hourly_billing_flag: Billing type, monthly (False)
             or hourly (True), default to monthly.
+        :param dependent_duplicate: Duplicate type, normal (False) or dependent
+            duplicate (True)
         :return: Returns a SoftLayer_Container_Product_Order_Receipt
         """
 
@@ -348,6 +351,9 @@ def order_duplicate_volume(self, origin_volume_id, origin_snapshot_id=None,
         if origin_snapshot_id is not None:
             order['duplicateOriginSnapshotId'] = origin_snapshot_id
 
+        if dependent_duplicate:
+            order['isDependentDuplicateFlag'] = 1
+
         return self.client.call('Product_Order', 'placeOrder', order)
 
     def order_modified_volume(self, volume_id, new_size=None, new_iops=None, new_tier_level=None):

SoftLayer/managers/file.py

@@ -259,7 +259,8 @@ def order_duplicate_volume(self, origin_volume_id, origin_snapshot_id=None,
                                duplicate_size=None, duplicate_iops=None,
                                duplicate_tier_level=None,
                                duplicate_snapshot_size=None,
-                               hourly_billing_flag=False):
+                               hourly_billing_flag=False,
+                               dependent_duplicate=False):
         """Places an order for a duplicate file volume.
 
         :param origin_volume_id: The ID of the origin volume to be duplicated
@@ -270,6 +271,8 @@ def order_duplicate_volume(self, origin_volume_id, origin_snapshot_id=None,
         :param duplicate_snapshot_size: Snapshot space size for the duplicate
         :param hourly_billing_flag: Billing type, monthly (False)
             or hourly (True), default to monthly.
+        :param dependent_duplicate: Duplicate type, normal (False) or dependent
+            duplicate (True)
         :return: Returns a SoftLayer_Container_Product_Order_Receipt
         """
 
@@ -289,6 +292,9 @@ def order_duplicate_volume(self, origin_volume_id, origin_snapshot_id=None,
         if origin_snapshot_id is not None:
             order['duplicateOriginSnapshotId'] = origin_snapshot_id
 
+        if dependent_duplicate:
+            order['isDependentDuplicateFlag'] = 1
+
         return self.client.call('Product_Order', 'placeOrder', order)
 
     def order_modified_volume(self, volume_id, new_size=None, new_iops=None, new_tier_level=None):

SoftLayer/managers/storage_utils.py

@@ -788,7 +788,8 @@ def prepare_replicant_order_object(manager, snapshot_schedule, location,
 
 def prepare_duplicate_order_object(manager, origin_volume, iops, tier,
                                    duplicate_size, duplicate_snapshot_size,
-                                   volume_type, hourly_billing_flag=False):
+                                   volume_type, hourly_billing_flag=False,
+                                   dependent_duplicate=False):
     """Prepare the duplicate order to submit to SoftLayer_Product::placeOrder()
 
     :param manager: The File or Block manager calling this function
@@ -799,6 +800,8 @@ def prepare_duplicate_order_object(manager, origin_volume, iops, tier,
     :param duplicate_snapshot_size: The size for the duplicate snapshot space
     :param volume_type: The type of the origin volume ('file' or 'block')
     :param hourly_billing_flag: Billing type, monthly (False) or hourly (True)
+    :param dependent_duplicate: Duplicate type, normal (False) or dependent 
+        duplicate (True)
     :return: Returns the order object to be passed to the
              placeOrder() method of the Product_Order service
     """
@@ -903,6 +906,9 @@ def prepare_duplicate_order_object(manager, origin_volume, iops, tier,
     if volume_is_performance:
         duplicate_order['iops'] = iops
 
+    if dependent_duplicate:
+        duplicate_order['isDependentDuplicateFlag'] = 1
+
     return duplicate_order