summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-12-11 22:45:54 +0000
committerGerrit Code Review <review@openstack.org>2017-12-11 22:45:54 +0000
commit58e5abf2946ce9f0fa118866ac89f6ce881e440e (patch)
tree9b14fe77936fff2bc0ebf0c742f2f0e7ee2d39a5 /openstackclient
parent1d914dd9ad9cb9e5d7bba2dab50d9e292c149842 (diff)
parent0f749cacc2b0a76226a6a7ab7769ecf1475a160b (diff)
downloadpython-openstackclient-58e5abf2946ce9f0fa118866ac89f6ce881e440e.tar.gz
Merge "Fix credentials in create, update and list."
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/identity/v3/credential.py9
-rw-r--r--openstackclient/tests/unit/identity/v3/test_credential.py14
2 files changed, 3 insertions, 20 deletions
diff --git a/openstackclient/identity/v3/credential.py b/openstackclient/identity/v3/credential.py
index 79ef632c..981f940a 100644
--- a/openstackclient/identity/v3/credential.py
+++ b/openstackclient/identity/v3/credential.py
@@ -43,8 +43,7 @@ class CreateCredential(command.ShowOne):
'--type',
default="cert",
metavar='<type>',
- choices=['ec2', 'cert'],
- help=_('New credential type: cert, ec2'),
+ help=_('New credential type: cert, ec2, totp and so on'),
)
parser.add_argument(
'data',
@@ -124,8 +123,7 @@ class ListCredential(command.Lister):
parser.add_argument(
'--type',
metavar='<type>',
- choices=['ec2', 'cert'],
- help=_('Filter credentials by type: cert, ec2'),
+ help=_('Filter credentials by type: cert, ec2, totp and so on'),
)
return parser
@@ -173,9 +171,8 @@ class SetCredential(command.Command):
parser.add_argument(
'--type',
metavar='<type>',
- choices=['ec2', 'cert'],
required=True,
- help=_('New credential type: cert, ec2'),
+ help=_('New credential type: cert, ec2, totp and so on'),
)
parser.add_argument(
'--data',
diff --git a/openstackclient/tests/unit/identity/v3/test_credential.py b/openstackclient/tests/unit/identity/v3/test_credential.py
index 161f0484..de0306dd 100644
--- a/openstackclient/tests/unit/identity/v3/test_credential.py
+++ b/openstackclient/tests/unit/identity/v3/test_credential.py
@@ -124,20 +124,6 @@ class TestCredentialCreate(TestCredential):
self.assertEqual(self.columns, columns)
self.assertEqual(self.data, data)
- def test_credential_create_with_invalid_type(self):
- arglist = [
- self.credential.user_id,
- self.credential.blob,
- '--type', 'invalid_type',
- ]
- verifylist = [
- ('user', self.credential.user_id),
- ('data', self.credential.blob),
- ('type', 'invalid_type'),
- ]
- self.assertRaises(utils.ParserException, self.check_parser,
- self.cmd, arglist, verifylist)
-
class TestCredentialDelete(TestCredential):