Merge pull request #1291 from JonWoodlief/patch-1

Removed overly specific reference to Block storage

Author: allmightyspiff

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']
 

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)
         )