resolved merge conflicts with master

Author: allmightyspiff

SoftLayer/managers/storage.py

@@ -197,9 +197,9 @@ def order_replicant_volume(self, volume_id, snapshot_schedule, location, tier=No
 
         return self.client.call('Product_Order', 'placeOrder', order)
 
-    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):
+    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, dependent_duplicate=False):
         """Places an order for a duplicate volume.
 
         :param origin_volume_id: The ID of the origin volume to be duplicated
@@ -234,6 +234,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:
+            # if isDependentDuplicateFlag is set to ANYTHING, it is considered dependent.
+            order['isDependentDuplicateFlag'] = 1
 
         return self.client.call('Product_Order', 'placeOrder', order)
 

tests/managers/block_tests.py

@@ -855,9 +855,9 @@ def test_order_block_duplicate_performance(self):
 
     def test_order_block_duplicate_depdupe(self):
         mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
-        mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
+        mock.return_value = [SoftLayer_Product_Package.SAAS_PACKAGE]
 
-        mock_volume = copy.deepcopy(fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME)
+        mock_volume = copy.deepcopy(SoftLayer_Network_Storage.STAAS_TEST_VOLUME)
         mock_volume['storageType']['keyName'] = 'PERFORMANCE_BLOCK_STORAGE'
         mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
         mock.return_value = mock_volume
@@ -872,7 +872,7 @@ def test_order_block_duplicate_depdupe(self):
             dependent_duplicate=True
         )
 
-        self.assertEqual(fixtures.SoftLayer_Product_Order.placeOrder, result)
+        self.assertEqual(SoftLayer_Product_Order.placeOrder, result)
 
         self.assert_called_with(
             'SoftLayer_Product_Order',

tests/managers/file_tests.py

@@ -747,9 +747,9 @@ def test_order_file_duplicate_endurance_no_duplicate_snapshot(self):
 
     def test_order_file_duplicate_depdupe(self):
         mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
-        mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
+        mock.return_value = [SoftLayer_Product_Package.SAAS_PACKAGE]
 
-        mock_volume = copy.deepcopy(fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME)
+        mock_volume = copy.deepcopy(SoftLayer_Network_Storage.STAAS_TEST_VOLUME)
         mock_volume['storageType']['keyName'] = 'ENDURANCE_FILE_STORAGE'
         mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')
         mock.return_value = mock_volume
@@ -764,7 +764,7 @@ def test_order_file_duplicate_depdupe(self):
             dependent_duplicate=True
         )
 
-        self.assertEqual(fixtures.SoftLayer_Product_Order.placeOrder, result)
+        self.assertEqual(SoftLayer_Product_Order.placeOrder, result)
 
         self.assert_called_with(
             'SoftLayer_Product_Order',