diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-04 14:33:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-04 14:33:57 +0000 |
| commit | 266ecf57f508b7dab2e005aecff9dc66bb81a6d1 (patch) | |
| tree | d7e1e79c0931e9c6b37bfde0ec9c4321a6550073 /openstackclient/identity | |
| parent | 332ec43b5f61e84c319eff1215cb5ab8c4221522 (diff) | |
| parent | b33cdec92ab3707886c12f49e9db27981114b35d (diff) | |
| download | python-openstackclient-266ecf57f508b7dab2e005aecff9dc66bb81a6d1.tar.gz | |
Merge "Mark arguments for 'credential' commands as required"
Diffstat (limited to 'openstackclient/identity')
| -rw-r--r-- | openstackclient/identity/v3/credential.py | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/openstackclient/identity/v3/credential.py b/openstackclient/identity/v3/credential.py index dbd73e2e..f22092d4 100644 --- a/openstackclient/identity/v3/credential.py +++ b/openstackclient/identity/v3/credential.py @@ -17,7 +17,6 @@ import logging import six -import sys from cliff import command from cliff import lister @@ -130,17 +129,20 @@ class SetCredential(command.Command): parser.add_argument( '--user', metavar='<user>', + required=True, help='Name or ID of user that owns the credential', ) parser.add_argument( '--type', metavar='<type>', choices=['ec2', 'cert'], + required=True, help='New credential type', ) parser.add_argument( '--data', metavar='<data>', + required=True, help='New credential data', ) parser.add_argument( @@ -153,25 +155,22 @@ class SetCredential(command.Command): @utils.log_method(log) def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - kwargs = {} - if parsed_args.user: - user_id = utils.find_resource(identity_client.users, - parsed_args.user).id - if user_id: - kwargs['user'] = user_id - if parsed_args.type: - kwargs['type'] = parsed_args.type - if parsed_args.data: - kwargs['data'] = parsed_args.data + + user_id = utils.find_resource(identity_client.users, + parsed_args.user).id + if parsed_args.project: project = utils.find_resource(identity_client.projects, parsed_args.project).id - kwargs['project'] = project + else: + project = None + + identity_client.credentials.update(parsed_args.credential, + user=user_id, + type=parsed_args.type, + blob=parsed_args.data, + project=project) - if not kwargs: - sys.stdout.write("Credential not updated, no arguments present") - return - identity_client.credentials.update(parsed_args.credential, **kwargs) return |