diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-17 06:24:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-17 06:24:35 +0000 |
| commit | 1464c8a23755f70bb60ed37abe1edf5c7e0b7203 (patch) | |
| tree | bf50f9e53bbcc4b79a128af3bf00228928d0994f /openstackclient/identity | |
| parent | 2740291f491804be5f521770ee773fa62894e8a3 (diff) | |
| parent | 8a12a39ece3882af56b42898ffee0d537c96edc8 (diff) | |
| download | python-openstackclient-1464c8a23755f70bb60ed37abe1edf5c7e0b7203.tar.gz | |
Merge "Make set/unset command in identity and image pass normally when nothing specified"
Diffstat (limited to 'openstackclient/identity')
| -rw-r--r-- | openstackclient/identity/v2_0/project.py | 21 | ||||
| -rw-r--r-- | openstackclient/identity/v2_0/user.py | 9 |
2 files changed, 5 insertions, 25 deletions
diff --git a/openstackclient/identity/v2_0/project.py b/openstackclient/identity/v2_0/project.py index 8be482fe..c4f730e0 100644 --- a/openstackclient/identity/v2_0/project.py +++ b/openstackclient/identity/v2_0/project.py @@ -189,13 +189,6 @@ class SetProject(command.Command): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - if (not parsed_args.name - and not parsed_args.description - and not parsed_args.enable - and not parsed_args.property - and not parsed_args.disable): - return - project = utils.find_resource( identity_client.tenants, parsed_args.project, @@ -295,7 +288,6 @@ class UnsetProject(command.Command): metavar='<key>', action='append', default=[], - required=True, help=_('Unset a project property ' '(repeat option to unset multiple properties)'), ) @@ -307,11 +299,8 @@ class UnsetProject(command.Command): identity_client.tenants, parsed_args.project, ) - if not parsed_args.property: - self.app.log.error(_("No changes requested\n")) - else: - kwargs = project._info - for key in parsed_args.property: - if key in kwargs: - kwargs[key] = None - identity_client.tenants.update(project.id, **kwargs) + kwargs = project._info + for key in parsed_args.property: + if key in kwargs: + kwargs[key] = None + identity_client.tenants.update(project.id, **kwargs) diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py index 7777bab8..3ee2a65e 100644 --- a/openstackclient/identity/v2_0/user.py +++ b/openstackclient/identity/v2_0/user.py @@ -287,15 +287,6 @@ class SetUser(command.Command): if parsed_args.password_prompt: parsed_args.password = utils.get_password(self.app.stdin) - if (not parsed_args.name - and not parsed_args.name - and not parsed_args.password - and not parsed_args.email - and not parsed_args.project - and not parsed_args.enable - and not parsed_args.disable): - return - user = utils.find_resource( identity_client.users, parsed_args.user, |