From aa8fd3d14d824edc562666bac49f124938f864c9 Mon Sep 17 00:00:00 2001 From: Jonathan Woodlief Date: Wed, 1 Jul 2020 16:20:18 -0400 Subject: [PATCH] Removed overly specific reference to Block storage I found a specific reference to block storage in code shared between file and block. reworded it to refer to either block or storage volumes --- SoftLayer/managers/storage.py | 4 ++-- tests/managers/block_tests.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SoftLayer/managers/storage.py b/SoftLayer/managers/storage.py index 9a8015d58..fb5190d85 100644 --- a/SoftLayer/managers/storage.py +++ b/SoftLayer/managers/storage.py @@ -396,7 +396,7 @@ def failback_from_replicant(self, volume_id): return self.client.call('Network_Storage', 'failbackFromReplicant', id=volume_id) def cancel_volume(self, volume_id, reason='No longer needed', immediate=False): - """Cancels the given block storage volume. + """Cancels the given storage volume. :param integer volume_id: The volume ID :param string reason: The reason for cancellation @@ -406,7 +406,7 @@ def cancel_volume(self, volume_id, reason='No longer needed', immediate=False): volume = self.get_volume_details(volume_id, mask=object_mask) if 'billingItem' not in volume: - raise exceptions.SoftLayerError("Block Storage was already cancelled") + raise exceptions.SoftLayerError("Storage Volume was already cancelled") billing_item_id = volume['billingItem']['id'] diff --git a/tests/managers/block_tests.py b/tests/managers/block_tests.py index c9731a04d..1ba644236 100644 --- a/tests/managers/block_tests.py +++ b/tests/managers/block_tests.py @@ -61,7 +61,7 @@ def test_cancel_block_volume_exception_billing_item_not_found(self): immediate=True ) self.assertEqual( - 'Block Storage was already cancelled', + 'Storage Volume was already cancelled', str(exception) )