Merge pull request #1662 from caberos/issue1659

add a new feature to get all cloud object storage

Author: allmightyspiff

SoftLayer/CLI/block/object_list.py

@@ -0,0 +1,31 @@
+"""List cloud object storage volumes."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+
+
+@click.command(cls=SoftLayer.CLI.command.SLCommand, )
+@environment.pass_env
+def cli(env):
+    """List cloud block storage."""
+    block_manager = SoftLayer.BlockStorageManager(env.client)
+
+    storages = block_manager.get_cloud_list()
+
+    table = formatting.Table(['Id',
+                              'Account name',
+                              'Description',
+                              'Create Date',
+                              'Type'])
+    for storage in storages:
+        table.add_row([storage.get('id'),
+                       storage.get('username'),
+                       storage['storageType']['description'],
+                       storage['billingItem']['createDate'],
+                       storage['storageType']['keyName']])
+
+    env.fout(table)

SoftLayer/CLI/routes.py

@@ -126,6 +126,7 @@
     ('block:volume-refresh', 'SoftLayer.CLI.block.refresh:cli'),
     ('block:volume-convert', 'SoftLayer.CLI.block.convert:cli'),
     ('block:volume-set-note', 'SoftLayer.CLI.block.set_note:cli'),
+    ('block:object-list', 'SoftLayer.CLI.block.object_list:cli'),
 
     ('email', 'SoftLayer.CLI.email'),
     ('email:list', 'SoftLayer.CLI.email.list:cli'),

SoftLayer/fixtures/SoftLayer_Account.py

@@ -647,8 +647,36 @@
 
 getNextInvoiceTotalAmount = 2
 
-getHubNetworkStorage = [{'id': 12345, 'username': 'SLOS12345-1', 'serviceResource': {'name': 'Cleversafe - US Region'}},
-                        {'id': 12346, 'username': 'SLOS12345-2', 'vendorName': 'Swift'}]
+getHubNetworkStorage = [
+    {
+        "id": 12345,
+        "username": "SLOS12345-1",
+        "billingItem": {
+            "createDate": "2020-10-08T11:45:17-06:00"
+        },
+        "serviceResource": {
+            "name": "Cleversafe - US Region"
+        },
+        "storageType": {
+            "description": "Object Storage Standard Account",
+            "id": 24,
+            "keyName": "OBJECT_STORAGE_STANDARD"
+        }
+    },
+    {
+        "id": 12346,
+        "username": "SLOS12345-2",
+        "vendorName": "Swift",
+        "billingItem": {
+            "createDate": "2020-10-08T11:45:17-06:00"
+        },
+        "storageType": {
+            "description": "Object Storage Standard Account",
+            "id": 24,
+            "keyName": "OBJECT_STORAGE_STANDARD"
+        }
+    }
+]
 
 getIscsiNetworkStorage = [{
     'accountId': 1234,

SoftLayer/managers/block.py

@@ -9,6 +9,7 @@
 from SoftLayer.managers import storage_utils
 from SoftLayer import utils
 
+
 # pylint: disable=too-many-public-methods
 
 
@@ -196,3 +197,13 @@ def _get_ids_from_username(self, username):
         if results:
             return [result['id'] for result in results]
         return []
+
+    def get_cloud_list(self):
+        """Returns a list cloud object storage.
+
+        return: Returns a list cloud object storage.
+        """
+
+        mask = 'mask[id,username,billingItem,storageType, notes]'
+
+        return self.client.call('Account', 'getHubNetworkStorage', mask=mask)

docs/cli/block.rst

@@ -156,6 +156,10 @@ Block Commands
     :prog: block snapshot-get-notification-status
     :show-nested:
 
+.. click:: SoftLayer.CLI.block.object_list:cli
+    :prog: block object-list
+    :show-nested:
+
 .. click:: SoftLayer.CLI.block.duplicate_convert_status:cli
     :prog: block duplicate-convert-status
     :show-nested:

tests/CLI/modules/block_tests.py

@@ -819,3 +819,9 @@ def test_snapshot_get_notification_status(self, status):
             result = self.run_command(['block', 'snapshot-get-notification-status', '999'])
             self.assert_no_fail(result)
             self.assertIn(expect, result.output)
+
+    def test_object_list(self):
+        result = self.run_command(['block', 'object-list'])
+
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_Account', 'getHubNetworkStorage')