#1410 add username lookup to slcli object-storage credential limit, delete, create

Author: ATGE

SoftLayer/CLI/object_storage/credential/create.py

@@ -6,6 +6,7 @@
 import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
+from SoftLayer.CLI import helpers
 
 
 @click.command()
@@ -15,14 +16,15 @@ def cli(env, identifier):
     """Create credentials for an IBM Cloud Object Storage Account"""
 
     mgr = SoftLayer.ObjectStorageManager(env.client)
-    credential = mgr.create_credential(identifier)
+    storage_id = helpers.resolve_id(mgr.resolve_ids, identifier, 'Object Storage')
+    credential = mgr.create_credential(storage_id)
     table = formatting.Table(['id', 'password', 'username', 'type_name'])
     table.sortby = 'id'
     table.add_row([
-        credential['id'],
-        credential['password'],
-        credential['username'],
-        credential['type']['name']
+        credential.get('id'),
+        credential.get('password'),
+        credential.get('username'),
+        credential.get('type', {}).get('name')
     ])
 
     env.fout(table)

SoftLayer/CLI/object_storage/credential/delete.py

@@ -5,6 +5,7 @@
 
 import SoftLayer
 from SoftLayer.CLI import environment
+from SoftLayer.CLI import helpers
 
 
 @click.command()
@@ -16,6 +17,7 @@ def cli(env, identifier, credential_id):
     """Delete the credential of an Object Storage Account."""
 
     mgr = SoftLayer.ObjectStorageManager(env.client)
-    credential = mgr.delete_credential(identifier, credential_id=credential_id)
+    storage_id = helpers.resolve_id(mgr.resolve_ids, identifier, 'Object Storage')
+    credential = mgr.delete_credential(storage_id, credential_id=credential_id)
 
     env.fout(credential)

SoftLayer/CLI/object_storage/credential/limit.py

@@ -6,6 +6,7 @@
 import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
+from SoftLayer.CLI import helpers
 
 
 @click.command()
@@ -15,7 +16,8 @@ def cli(env, identifier):
     """Credential limits for this IBM Cloud Object Storage account."""
 
     mgr = SoftLayer.ObjectStorageManager(env.client)
-    credential_limit = mgr.limit_credential(identifier)
+    storage_id = helpers.resolve_id(mgr.resolve_ids, identifier, 'Object Storage')
+    credential_limit = mgr.limit_credential(storage_id)
     table = formatting.Table(['limit'])
     table.add_row([
         credential_limit,

SoftLayer/fixtures/SoftLayer_Network_Storage_Hub_Cleversafe_Account.py

@@ -46,3 +46,7 @@
         "storageLocation": "us-standard"
     }
 ]
+
+getCredentialLimit = 2
+
+credentialDelete = True

tests/CLI/modules/object_storage_tests.py

@@ -40,47 +40,37 @@ def test_list_endpoints(self):
                            'public': 'https://dal05/auth/v1.0/'}])
 
     def test_create_credential(self):
-        accounts = self.set_mock('SoftLayer_Network_Storage_Hub_Cleversafe_Account', 'credentialCreate')
-        accounts.return_value = {
-            "accountId": "12345",
-            "createDate": "2019-04-05T13:25:25-06:00",
-            "id": 11111,
-            "password": "nwUEUsx6PiEoN0B1Xe9z9hUCy",
-            "username": "XfHhBNBPlPdl",
-            "type": {
-                "description": "A credential for generating S3 Compatible Signatures.",
-                "keyName": "S3_COMPATIBLE_SIGNATURE",
-                "name": "S3 Compatible Signature"
-            }
-        }
-
         result = self.run_command(['object-storage', 'credential', 'create', '100'])
+        self.assert_no_fail(result)
 
+    @mock.patch('SoftLayer.CLI.helpers.resolve_id')
+    def test_create_credential_by_username(self, resolve_id_mock):
+        resolve_id_mock.return_value = 100
+        result = self.run_command(['object-storage', 'credential', 'create', 'test'])
         self.assert_no_fail(result)
-        self.assertEqual(json.loads(result.output),
-                         [{'id': 11111,
-                           'password': 'nwUEUsx6PiEoN0B1Xe9z9hUCy',
-                           'type_name': 'S3 Compatible Signature',
-                           'username': 'XfHhBNBPlPdl'}]
-                         )
 
     def test_delete_credential(self):
-        accounts = self.set_mock('SoftLayer_Network_Storage_Hub_Cleversafe_Account', 'credentialDelete')
-        accounts.return_value = True
-
         result = self.run_command(['object-storage', 'credential', 'delete', '-c', 100, '100'])
-
         self.assert_no_fail(result)
         self.assertEqual(result.output, 'True\n')
 
-    def test_limit_credential(self):
-        accounts = self.set_mock('SoftLayer_Network_Storage_Hub_Cleversafe_Account', 'getCredentialLimit')
-        accounts.return_value = 2
+    @mock.patch('SoftLayer.CLI.helpers.resolve_id')
+    def test_delete_credential_by_username(self, resolve_id_mock):
+        resolve_id_mock.return_value = 100
+        result = self.run_command(['object-storage', 'credential', 'delete', 'test'])
+        self.assert_no_fail(result)
 
+    def test_limit_credential(self):
         result = self.run_command(['object-storage', 'credential', 'limit', '100'])
 
         self.assert_no_fail(result)
-        self.assertEqual(json.loads(result.output), [{'limit': 2}])
+        self.assertIn('limit', result.output)
+
+    @mock.patch('SoftLayer.CLI.helpers.resolve_id')
+    def test_limit_credential_by_username(self, resolve_id_mock):
+        resolve_id_mock.return_value = 100
+        result = self.run_command(['object-storage', 'credential', 'limit', 'test'])
+        self.assert_no_fail(result)
 
     def test_list_credential(self):
         result = self.run_command(['object-storage', 'credential', 'list', '100'])