diff --git a/SoftLayer/CLI/block/refresh.py b/SoftLayer/CLI/block/refresh.py index 66a2f3c22..369a6c815 100644 --- a/SoftLayer/CLI/block/refresh.py +++ b/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) diff --git a/SoftLayer/CLI/file/refresh.py b/SoftLayer/CLI/file/refresh.py index c566dac91..8e2b1c543 100644 --- a/SoftLayer/CLI/file/refresh.py +++ b/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) diff --git a/SoftLayer/fixtures/SoftLayer_Network_Storage.py b/SoftLayer/fixtures/SoftLayer_Network_Storage.py index 611e88005..8f9de6dc2 100644 --- a/SoftLayer/fixtures/SoftLayer_Network_Storage.py +++ b/SoftLayer/fixtures/SoftLayer_Network_Storage.py @@ -234,8 +234,8 @@ 'provisionedCount': 100 } -refreshDependentDuplicate = { - 'dependentDuplicate': 1 +refreshDuplicate = { + 'dependentDuplicate': 1 } convertCloneDependentToIndependent = { diff --git a/SoftLayer/managers/storage.py b/SoftLayer/managers/storage.py index fb5190d85..8a3c816d2 100644 --- a/SoftLayer/managers/storage.py +++ b/SoftLayer/managers/storage.py @@ -415,13 +415,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. diff --git a/tests/CLI/modules/block_tests.py b/tests/CLI/modules/block_tests.py index e5f6ba8c5..672bd3922 100644 --- a/tests/CLI/modules/block_tests.py +++ b/tests/CLI/modules/block_tests.py @@ -717,7 +717,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) diff --git a/tests/CLI/modules/file_tests.py b/tests/CLI/modules/file_tests.py index 1d64f54ae..f29809646 100644 --- a/tests/CLI/modules/file_tests.py +++ b/tests/CLI/modules/file_tests.py @@ -696,7 +696,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) diff --git a/tests/managers/block_tests.py b/tests/managers/block_tests.py index 1ba644236..6d155345e 100644 --- a/tests/managers/block_tests.py +++ b/tests/managers/block_tests.py @@ -1043,13 +1043,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 ) diff --git a/tests/managers/file_tests.py b/tests/managers/file_tests.py index 6df2b8721..141ab9602 100644 --- a/tests/managers/file_tests.py +++ b/tests/managers/file_tests.py @@ -892,13 +892,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 )