diff options
| author | Steve Martinelli <stevemar@ca.ibm.com> | 2015-02-08 23:52:56 -0500 |
|---|---|---|
| committer | Steve Martinelli <stevemar@ca.ibm.com> | 2015-02-09 15:19:11 +0000 |
| commit | 07c4fa9d4bde6f3d0a38bc4d7eb3df275e0b89cc (patch) | |
| tree | c918dbee932fc7eda17714942ee9a4fd890a2ad1 /openstackclient/identity | |
| parent | dca99782052da052aebea653bfbfc3dfc9a96a0e (diff) | |
| download | python-openstackclient-07c4fa9d4bde6f3d0a38bc4d7eb3df275e0b89cc.tar.gz | |
Restrict groups and users from changing domains
Similar to projects, we shouldn't allow users and groups to
change domains. The server side tosses up an error but osc
should restrict that behaviour in the first place.
Related-Bug: #1418384
Change-Id: I860291a5859c576021b18e35d1a12c32abfb6ca5
Diffstat (limited to 'openstackclient/identity')
| -rw-r--r-- | openstackclient/identity/v3/group.py | 8 | ||||
| -rw-r--r-- | openstackclient/identity/v3/user.py | 9 |
2 files changed, 1 insertions, 16 deletions
diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py index 94e101f3..a2afecb9 100644 --- a/openstackclient/identity/v3/group.py +++ b/openstackclient/identity/v3/group.py @@ -315,10 +315,6 @@ class SetGroup(command.Command): metavar='<name>', help='New group name') parser.add_argument( - '--domain', - metavar='<domain>', - help='New domain to contain <group> (name or ID)') - parser.add_argument( '--description', metavar='<description>', help='New group description') @@ -333,9 +329,7 @@ class SetGroup(command.Command): kwargs['name'] = parsed_args.name if parsed_args.description: kwargs['description'] = parsed_args.description - if parsed_args.domain: - kwargs['domain'] = common.find_domain(identity_client, - parsed_args.domain).id + if not len(kwargs): sys.stderr.write("Group not updated, no arguments present") return diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py index 7b847eed..0a154f64 100644 --- a/openstackclient/identity/v3/user.py +++ b/openstackclient/identity/v3/user.py @@ -300,11 +300,6 @@ class SetUser(command.Command): help='Set user name', ) parser.add_argument( - '--domain', - metavar='<domain>', - help='Set default domain (name or ID)', - ) - parser.add_argument( '--project', metavar='<project>', help='Set default project (name or ID)', @@ -354,7 +349,6 @@ class SetUser(command.Command): and not parsed_args.name and not parsed_args.password and not parsed_args.email - and not parsed_args.domain and not parsed_args.project and not parsed_args.description and not parsed_args.enable @@ -379,9 +373,6 @@ class SetUser(command.Command): project_id = utils.find_resource( identity_client.projects, parsed_args.project).id kwargs['project'] = project_id - if parsed_args.domain: - kwargs['domain'] = common.find_domain(identity_client, - parsed_args.domain).id kwargs['enabled'] = user.enabled if parsed_args.enable: kwargs['enabled'] = True |