Skip to content

Removed overly specific reference to Block storage #1291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allmightyspiff merged 1 commit into from
Jul 1, 2020
Merged

Removed overly specific reference to Block storage #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SoftLayer/managers/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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']

Expand Down
2 changes: 1 addition & 1 deletion tests/managers/block_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)

Expand Down