diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-16 13:02:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-16 13:02:02 +0000 |
| commit | 3d4750cdc875049c4332052d3dd46296d5f74319 (patch) | |
| tree | 354e614f78775be965828938f7346843657495ce /openstackclient/identity | |
| parent | 9184e1928843940509ba8f1e4069675454916d9a (diff) | |
| parent | 853ea5ab59e5d7845d389e46527038575c3c170c (diff) | |
| download | python-openstackclient-3d4750cdc875049c4332052d3dd46296d5f74319.tar.gz | |
Merge "Narrow expected responses for CheckUserInGroup"
Diffstat (limited to 'openstackclient/identity')
| -rw-r--r-- | openstackclient/identity/v3/group.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py index 2afdabc1..b5f5d8ad 100644 --- a/openstackclient/identity/v3/group.py +++ b/openstackclient/identity/v3/group.py @@ -102,12 +102,15 @@ class CheckUserInGroup(command.Command): try: identity_client.users.check_in_group(user_id, group_id) - except Exception: - msg = _("%(user)s not in group %(group)s\n") % { - 'user': parsed_args.user, - 'group': parsed_args.group, - } - sys.stderr.write(msg) + except ks_exc.http.HTTPClientError as e: + if e.http_status == 403 or e.http_status == 404: + msg = _("%(user)s not in group %(group)s\n") % { + 'user': parsed_args.user, + 'group': parsed_args.group, + } + sys.stderr.write(msg) + else: + raise e else: msg = _("%(user)s in group %(group)s\n") % { 'user': parsed_args.user, |