Need a command for slcli object-storage delete <storageId>

Author: caberos

SoftLayer/CLI/object_storage/cancel.py

@@ -0,0 +1,39 @@
+"""Cancel an existing object-storage account."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import exceptions
+from SoftLayer.CLI import formatting
+
+
+@click.command(cls=SoftLayer.CLI.command.SLCommand, )
+@click.argument('storage-id')
+@click.option('--reason', help="An optional reason for cancellation")
+@click.option('--immediate',
+              is_flag=True,
+              help="Cancels the object storage immediately instead "
+                   "of on the billing anniversary")
+@environment.pass_env
+def cli(env, storage_id, reason, immediate):
+    """Cancel an existing object storage."""
+
+    block_storage_manager = SoftLayer.BlockStorageManager(env.client)
+
+    if not (env.skip_confirmations or formatting.no_going_back(storage_id)):
+        raise exceptions.CLIAbort('Aborted')
+
+    cancelled = block_storage_manager.cancel_block_volume(storage_id,
+                                                          reason, immediate)
+
+    if cancelled:
+        if immediate:
+            click.echo('Object storage with id %s has been marked'
+                       ' for immediate cancellation' % storage_id)
+        else:
+            click.echo('Object storage with id %s has been marked'
+                       ' for cancellation' % storage_id)
+    else:
+        click.echo('Unable to cancel object storage %s' % storage_id)

SoftLayer/CLI/routes.py

@@ -260,6 +260,7 @@
     ('object-storage:accounts', 'SoftLayer.CLI.object_storage.list_accounts:cli'),
     ('object-storage:endpoints', 'SoftLayer.CLI.object_storage.list_endpoints:cli'),
     ('object-storage:credential', 'SoftLayer.CLI.object_storage.credential:cli'),
+    ('object-storage:cancel', 'SoftLayer.CLI.object_storage.cancel:cli'),
 
     ('order', 'SoftLayer.CLI.order'),
     ('order:category-list', 'SoftLayer.CLI.order.category_list:cli'),

docs/cli/object_storage.rst

@@ -28,3 +28,7 @@ Object Storage Commands
 .. click:: SoftLayer.CLI.object_storage.credential.create:cli
     :prog: object-storage credential create
     :show-nested:
+
+.. click:: SoftLayer.CLI.object_storage.cancel:cli
+    :prog: object-storage cancel
+    :show-nested:

tests/CLI/modules/object_storage_tests.py

@@ -120,3 +120,13 @@ def test_list_credential_by_username(self, resolve_id_mock):
         resolve_id_mock.return_value = 100
         result = self.run_command(['object-storage', 'credential', 'list', 'test'])
         self.assert_no_fail(result)
+
+    def test_object_storage_cancel(self):
+        result = self.run_command([
+            '--really', 'object-storage', 'cancel', '1234'])
+
+        self.assert_no_fail(result)
+        self.assertEqual('Object storage with id 1234 has been marked'
+                         ' for cancellation\n', result.output)
+        self.assert_called_with('SoftLayer_Billing_Item', 'cancelItem',
+                                args=(False, True, None))