Merge pull request #1666 from caberos/issue1665

add a new command on block object-storage details

Author: allmightyspiff

SoftLayer/CLI/block/object_storage_detail.py

@@ -0,0 +1,34 @@
+"""Display details for a specified cloud object storage."""
+# :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, )
+@click.argument('object_id')
+@environment.pass_env
+def cli(env, object_id):
+    """Display details for a cloud object storage."""
+
+    block_manager = SoftLayer.BlockStorageManager(env.client)
+
+    cloud = block_manager.get_volume_details(object_id)
+    bucket = block_manager.get_buckets(object_id)
+
+    table = formatting.KeyValueTable(['Name', 'Value'])
+    table.align['Name'] = 'r'
+    table.align['Value'] = 'l'
+
+    table.add_row(['Id', cloud.get('id')])
+    table.add_row(['Username', cloud.get('username')])
+    table.add_row(['Name Service Resource', cloud['serviceResource']['name']])
+    table.add_row(['Type Service Resource', cloud['serviceResource']['type']['type']])
+    table.add_row(['Datacenter', cloud['serviceResource']['datacenter']['name']])
+    table.add_row(['Storage type', cloud['storageType']['keyName']])
+    table.add_row(['Bytes Used', formatting.b_to_gb(bucket[0]['bytesUsed'])])
+    table.add_row(['Bucket name', bucket[0]['name']])
+
+    env.fout(table)

SoftLayer/CLI/routes.py

@@ -127,6 +127,7 @@
     ('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'),
+    ('block:object-storage-detail', 'SoftLayer.CLI.block.object_storage_detail:cli'),
 
     ('email', 'SoftLayer.CLI.email'),
     ('email:list', 'SoftLayer.CLI.email.list:cli'),

SoftLayer/fixtures/SoftLayer_Network_Storage.py

@@ -149,7 +149,11 @@
         }
     ],
     'serviceProviderId': 1,
-    'serviceResource': {'datacenter': {'id': 449500, 'name': 'dal05'}},
+    'serviceResource': {'datacenter': {'id': 449500, 'name': 'dal05'},
+                        'name': 'Cleversafe - US Region',
+                        'type': {
+                            'type': 'CLEVERSAFE_SVC_API'
+                        }},
     'serviceResourceBackendIpAddress': '10.1.2.3',
     'serviceResourceName': 'Storage Type 01 Aggregate staaspar0101_pc01',
     'snapshotCapacityGb': '10',

SoftLayer/managers/block.py

@@ -207,3 +207,13 @@ def get_cloud_list(self):
         mask = 'mask[id,username,billingItem,storageType, notes]'
 
         return self.client.call('Account', 'getHubNetworkStorage', mask=mask)
+
+    def get_buckets(self, object_id):
+        """Return  buckets data of the cloud storage.
+
+        :param object_id cloud object storage identifier
+
+        Returns: Get buckets
+
+        """
+        return self.client.call('SoftLayer_Network_Storage_Hub_Cleversafe_Account', 'getBuckets', id=object_id)

docs/cli/block.rst

@@ -160,6 +160,10 @@ Block Commands
     :prog: block object-list
     :show-nested:
 
+.. click:: SoftLayer.CLI.block.object_storage_detail:cli
+    :prog: block object-storage-detail
+    :show-nested:
+
 .. click:: SoftLayer.CLI.block.duplicate_convert_status:cli
     :prog: block duplicate-convert-status
     :show-nested:

tests/CLI/modules/block_tests.py

@@ -444,7 +444,7 @@ def test_snapshot_restore(self):
 
         self.assert_no_fail(result)
         self.assertEqual(result.output, 'Block volume 12345678 is being'
-                         ' restored using snapshot 87654321\n')
+                                        ' restored using snapshot 87654321\n')
 
     @mock.patch('SoftLayer.BlockStorageManager.order_snapshot_space')
     def test_snapshot_order_order_not_placed(self, order_mock):
@@ -825,3 +825,9 @@ def test_object_list(self):
 
         self.assert_no_fail(result)
         self.assert_called_with('SoftLayer_Account', 'getHubNetworkStorage')
+
+    def test_object_details(self):
+        result = self.run_command(['block', 'object-storage-detail', '1234'])
+
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_Network_Storage_Hub_Cleversafe_Account', 'getBuckets')

tests/managers/block_tests.py

@@ -1119,3 +1119,7 @@ def test_convert_block_depdupe(self):
     def test_get_cloud_list(self):
         self.block.get_cloud_list()
         self.assert_called_with('SoftLayer_Account', 'getHubNetworkStorage')
+
+    def test_get_bucket(self):
+        self.block.get_buckets(1234)
+        self.assert_called_with('SoftLayer_Network_Storage_Hub_Cleversafe_Account', 'getBuckets')