UTs, and merge in coalesced storage branch

Author: Ian Sutton

SoftLayer/fixtures/SoftLayer_Network_Storage.py

@@ -157,6 +157,7 @@
     'storageTierLevel': 'READHEAVY_TIER',
     'storageType': {'keyName': 'ENDURANCE_STORAGE'},
     'username': 'username',
+    'dependentDuplicate': 1,
 }
 
 getSnapshots = [{
@@ -232,3 +233,11 @@
     'maximumAvailableCount': 300,
     'provisionedCount': 100
 }
+
+refreshDependentDuplicate = {
+    'dependentDuplicate': 1
+}
+
+convertCloneDependentToIndependent = {
+    'dependentDuplicate': 1
+}

SoftLayer/managers/storage.py

@@ -414,3 +414,18 @@ def cancel_volume(self, volume_id, reason='No longer needed', immediate=False):
             immediate = True
 
         return self.client.call('SoftLayer_Billing_Item', 'cancelItem', immediate, True, reason, id=billing_item_id)
+
+    def refresh_dep_dupe(self, volume_id, snapshot_id):
+        """"Refresh a dependent duplicate volume with a snapshot from its parent.
+
+        :param integer volume_id: The id of the volume
+        :param integer snapshot_id: The id of the snapshot
+        """
+        return self.client.call('Network_Storage', 'refreshDependentDuplicate', snapshot_id, id=volume_id)
+
+    def convert_dep_dupe(self, volume_id):
+        """Convert a dependent duplicate volume to an indepdent volume.
+
+        :param integer volume_id: The id of the volume.
+        """
+        return self.client.call('Network_Storage', 'convertCloneDependentToIndependent', id=volume_id)

tests/CLI/modules/block_tests.py

@@ -716,3 +716,13 @@ def test_volume_limit(self, list_mock):
 
         result = self.run_command(['block', 'volume-limits'])
         self.assert_no_fail(result)
+
+    def test_dep_dupe_refresh(self):
+        result = self.run_command(['block', 'volume-refresh', '102', '103'])
+
+        self.assert_no_fail(result)
+
+    def test_dep_dupe_convert(self):
+        result = self.run_command(['block', 'volume-convert', '102'])
+
+        self.assert_no_fail(result)

tests/CLI/modules/file_tests.py

@@ -695,3 +695,13 @@ def test_volume_limit(self, list_mock):
             }]
         result = self.run_command(['file', 'volume-limits'])
         self.assert_no_fail(result)
+
+    def test_dep_dupe_refresh(self):
+        result = self.run_command(['file', 'volume-refresh', '102', '103'])
+
+        self.assert_no_fail(result)
+
+    def test_dep_dupe_convert(self):
+        result = self.run_command(['file', 'volume-convert', '102'])
+
+        self.assert_no_fail(result)

tests/managers/block_tests.py

@@ -1042,3 +1042,23 @@ def test_get_ids_from_username_empty(self):
         result = self.block._get_ids_from_username("test")
         self.assert_called_with('SoftLayer_Account', 'getIscsiNetworkStorage')
         self.assertEqual([], result)
+
+    def test_refresh_block_depdupe(self):
+        result = self.block.refresh_dep_dupe(123, snapshot_id=321)
+        self.assertEqual(SoftLayer_Network_Storage.refreshDependentDuplicate, result)
+
+        self.assert_called_with(
+            'SoftLayer_Network_Storage',
+            'refreshDependentDuplicate',
+            identifier=123
+        )
+
+    def test_convert_block_depdupe(self):
+        result = self.block.convert_dep_dupe(123)
+        self.assertEqual(SoftLayer_Network_Storage.convertCloneDependentToIndependent, result)
+
+        self.assert_called_with(
+            'SoftLayer_Network_Storage',
+            'convertCloneDependentToIndependent',
+            identifier=123
+        )

tests/managers/file_tests.py

@@ -891,3 +891,23 @@ def test_get_ids_from_username_empty(self):
         result = self.file._get_ids_from_username("test")
         self.assert_called_with('SoftLayer_Account', 'getNasNetworkStorage')
         self.assertEqual([], result)
+
+    def test_refresh_file_depdupe(self):
+        result = self.file.refresh_dep_dupe(123, snapshot_id=321)
+        self.assertEqual(SoftLayer_Network_Storage.refreshDependentDuplicate, result)
+
+        self.assert_called_with(
+            'SoftLayer_Network_Storage',
+            'refreshDependentDuplicate',
+            identifier=123
+        )
+
+    def test_convert_file_depdupe(self):
+        result = self.file.convert_dep_dupe(123)
+        self.assertEqual(SoftLayer_Network_Storage.convertCloneDependentToIndependent, result)
+
+        self.assert_called_with(
+            'SoftLayer_Network_Storage',
+            'convertCloneDependentToIndependent',
+            identifier=123
+        )