Merge pull request #1342 from ko101/master

for implementing FBLOCK-3470

Author: allmightyspiff

SoftLayer/CLI/block/refresh.py

@@ -1,4 +1,4 @@
-"""Refresh a dependent duplicate volume with a snapshot from its parent."""
+"""Refresh a duplicate volume with a snapshot from its parent."""
 # :license: MIT, see LICENSE for more details.
 
 import click
@@ -11,8 +11,8 @@
 @click.argument('snapshot_id')
 @environment.pass_env
 def cli(env, volume_id, snapshot_id):
-    """"Refresh a dependent duplicate volume with a snapshot from its parent."""
+    """Refresh a duplicate volume with a snapshot from its parent."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
-    resp = block_manager.refresh_dep_dupe(volume_id, snapshot_id)
+    resp = block_manager.refresh_dupe(volume_id, snapshot_id)
 
     click.echo(resp)

SoftLayer/CLI/file/refresh.py

@@ -11,8 +11,8 @@
 @click.argument('snapshot_id')
 @environment.pass_env
 def cli(env, volume_id, snapshot_id):
-    """"Refresh a dependent duplicate volume with a snapshot from its parent."""
+    """Refresh a duplicate volume with a snapshot from its parent."""
     file_manager = SoftLayer.FileStorageManager(env.client)
-    resp = file_manager.refresh_dep_dupe(volume_id, snapshot_id)
+    resp = file_manager.refresh_dupe(volume_id, snapshot_id)
 
     click.echo(resp)

SoftLayer/fixtures/SoftLayer_Network_Storage.py

@@ -235,8 +235,8 @@
     'provisionedCount': 100
 }
 
-refreshDependentDuplicate = {
-    'dependentDuplicate': 1
+refreshDuplicate = {
+     'dependentDuplicate': 1
 }
 
 convertCloneDependentToIndependent = {

SoftLayer/managers/storage.py

@@ -427,13 +427,13 @@ def cancel_volume(self, volume_id, reason='No longer needed', immediate=False):
 
         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.
+    def refresh_dupe(self, volume_id, snapshot_id):
+        """"Refresh a 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)
+        return self.client.call('Network_Storage', 'refreshDuplicate', snapshot_id, id=volume_id)
 
     def convert_dep_dupe(self, volume_id):
         """Convert a dependent duplicate volume to an independent volume.

tests/CLI/modules/block_tests.py

@@ -719,7 +719,7 @@ 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):
+    def test_dupe_refresh(self):
         result = self.run_command(['block', 'volume-refresh', '102', '103'])
 
         self.assert_no_fail(result)

tests/CLI/modules/file_tests.py

@@ -698,7 +698,7 @@ 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):
+    def test_dupe_refresh(self):
         result = self.run_command(['file', 'volume-refresh', '102', '103'])
 
         self.assert_no_fail(result)

tests/managers/block_tests.py

@@ -1044,13 +1044,13 @@ def test_get_ids_from_username_empty(self):
         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)
+    def test_refresh_block_dupe(self):
+        result = self.block.refresh_dupe(123, snapshot_id=321)
+        self.assertEqual(SoftLayer_Network_Storage.refreshDuplicate, result)
 
         self.assert_called_with(
             'SoftLayer_Network_Storage',
-            'refreshDependentDuplicate',
+            'refreshDuplicate',
             identifier=123
         )
 

tests/managers/file_tests.py

@@ -893,13 +893,13 @@ def test_get_ids_from_username_empty(self):
         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)
+    def test_refresh_file_dupe(self):
+        result = self.file.refresh_dupe(123, snapshot_id=321)
+        self.assertEqual(SoftLayer_Network_Storage.refreshDuplicate, result)
 
         self.assert_called_with(
             'SoftLayer_Network_Storage',
-            'refreshDependentDuplicate',
+            'refreshDuplicate',
             identifier=123
         )