diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-20 13:05:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-20 13:05:41 +0000 |
| commit | a0f13ea8f1b7e5269f73e2175ace03347090f345 (patch) | |
| tree | 4a5c885db8af6bc9b56e9f504a20003cb1a6422f /cinderclient/shell.py | |
| parent | 159783743ea3a7681ba0fe941ac9bca1fe8ff178 (diff) | |
| parent | 8afc06c562ac8c189fae6ded7cc50f1b579f06c4 (diff) | |
| download | python-cinderclient-a0f13ea8f1b7e5269f73e2175ace03347090f345.tar.gz | |
Merge "Remove unnecessary check for tenant information"
Diffstat (limited to 'cinderclient/shell.py')
| -rw-r--r-- | cinderclient/shell.py | 66 |
1 files changed, 36 insertions, 30 deletions
diff --git a/cinderclient/shell.py b/cinderclient/shell.py index 37afba9..a33c8d8 100644 --- a/cinderclient/shell.py +++ b/cinderclient/shell.py @@ -590,6 +590,14 @@ class OpenStackCinderShell(object): # FIXME(usrleon): Here should be restrict for project id same as # for os_username or os_password but for compatibility it is not. + # V3 stuff + project_info_provided = ((self.options.os_tenant_name or + self.options.os_tenant_id) or + (self.options.os_project_name and + (self.options.os_project_domain_name or + self.options.os_project_domain_id)) or + self.options.os_project_id) + if not utils.isunauthenticated(args.func): if auth_plugin: auth_plugin.parse_opts(args) @@ -616,32 +624,20 @@ class OpenStackCinderShell(object): "env[OS_PASSWORD] " "or, prompted response.") - if not (os_tenant_name or os_tenant_id): - raise exc.CommandError("You must provide a tenant ID " - "through --os-tenant-id or " - "env[OS_TENANT_ID].") - - # V3 stuff - project_info_provided = self.options.os_tenant_name or \ - self.options.os_tenant_id or \ - (self.options.os_project_name and - (self.options.project_domain_name or - self.options.project_domain_id)) or \ - self.options.os_project_id - - if (not project_info_provided): - raise exc.CommandError( - _("You must provide a tenant_name, tenant_id, " - "project_id or project_name (with " - "project_domain_name or project_domain_id) via " - " --os-tenant-name (env[OS_TENANT_NAME])," - " --os-tenant-id (env[OS_TENANT_ID])," - " --os-project-id (env[OS_PROJECT_ID])" - " --os-project-name (env[OS_PROJECT_NAME])," - " --os-project-domain-id " - "(env[OS_PROJECT_DOMAIN_ID])" - " --os-project-domain-name " - "(env[OS_PROJECT_DOMAIN_NAME])")) + if not project_info_provided: + raise exc.CommandError(_( + "You must provide a tenant_name, tenant_id, " + "project_id or project_name (with " + "project_domain_name or project_domain_id) via " + " --os-tenant-name (env[OS_TENANT_NAME])," + " --os-tenant-id (env[OS_TENANT_ID])," + " --os-project-id (env[OS_PROJECT_ID])" + " --os-project-name (env[OS_PROJECT_NAME])," + " --os-project-domain-id " + "(env[OS_PROJECT_DOMAIN_ID])" + " --os-project-domain-name " + "(env[OS_PROJECT_DOMAIN_NAME])" + )) if not os_auth_url: if os_auth_system and os_auth_system != 'keystone': @@ -652,10 +648,20 @@ class OpenStackCinderShell(object): "You must provide an authentication URL " "through --os-auth-url or env[OS_AUTH_URL].") - if not (os_tenant_name or os_tenant_id): - raise exc.CommandError( - "You must provide a tenant ID " - "through --os-tenant-id or env[OS_TENANT_ID].") + if not project_info_provided: + raise exc.CommandError(_( + "You must provide a tenant_name, tenant_id, " + "project_id or project_name (with " + "project_domain_name or project_domain_id) via " + " --os-tenant-name (env[OS_TENANT_NAME])," + " --os-tenant-id (env[OS_TENANT_ID])," + " --os-project-id (env[OS_PROJECT_ID])" + " --os-project-name (env[OS_PROJECT_NAME])," + " --os-project-domain-id " + "(env[OS_PROJECT_DOMAIN_ID])" + " --os-project-domain-name " + "(env[OS_PROJECT_DOMAIN_NAME])" + )) if not os_auth_url: raise exc.CommandError( |