Skip to content

Commit 1bd5deb

Browse files
author
Fernando Ojeda
committed
Refactor object storage credentials.
1 parent 9479d91 commit 1bd5deb

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

SoftLayer/CLI/object_storage/credential/delete.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
@click.command()
1111
@click.argument('identifier')
12-
@click.option('--credential_id', '-id', type=click.INT,
12+
@click.option('--credential_id', '-c', type=click.INT,
1313
help="This is the credential id associated with the volume")
1414
@environment.pass_env
1515
def cli(env, identifier, credential_id):
@@ -18,5 +18,4 @@ def cli(env, identifier, credential_id):
1818
mgr = SoftLayer.ObjectStorageManager(env.client)
1919
credential = mgr.delete_credential(identifier, credential_id=credential_id)
2020

21-
if credential:
22-
env.fout("The credential was deleted successful")
21+
env.fout(credential)

tests/CLI/modules/object_storage_tests.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,10 @@ def test_delete_credential(self):
6767
accounts = self.set_mock('SoftLayer_Network_Storage_Hub_Cleversafe_Account', 'credentialDelete')
6868
accounts.return_value = True
6969

70-
result = self.run_command(['object-storage', 'credential', 'delete', '-id=100', '100'])
70+
result = self.run_command(['object-storage', 'credential', 'delete', '-c=100', '100'])
7171

7272
self.assert_no_fail(result)
73-
self.assertEqual(json.loads(result.output),
74-
'The credential was deleted successful'
75-
)
73+
self.assertEqual(json.loads(result.output), True)
7674

7775
def test_limit_credential(self):
7876
accounts = self.set_mock('SoftLayer_Network_Storage_Hub_Cleversafe_Account', 'getCredentialLimit')

tests/managers/object_storage_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def test_delete_credential(self):
6969
accounts.return_value = 'The credential was deleted successful'
7070

7171
credential = self.object_storage.delete_credential(100)
72-
self.assertEqual(credential, 'The credential was deleted successful')
72+
self.assertEqual(credential, True)
7373

7474
def test_limit_credential(self):
7575
accounts = self.set_mock('SoftLayer_Network_Storage_Hub_Cleversafe_Account', 'getCredentialLimit')

0 commit comments

Comments
 (0)