openstack/python-cinderclient
Code Issues Proposed changes

OS_TENANT_NAME is not required when we have OS_PROJECT_NAME

Browse Source 
Cinder support both v2 and v3 auth. Use v3 if possible.
In consideration of backwards compatibility, when we have
OS_PROJECT_NAME, the v2 auth should be ok because
tenant_name can be set by env[OS_PROJECT_NAME].


Change-Id: I9eed9c41a9deb5ecafa8d9e12f6d1b50d34f986d
Closes-Bug: #1588261
This commit is contained in:
liyuanzhen
2016-06-03 07:00:15 +01:00
parent 3d06d358ad
commit 426055c48e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cinderclient/shell.py
View File

@@ -265,6 +265,7 @@ class OpenStackCinderShell(object):
parser.add_argument('--os-tenant-name', parser.add_argument('--os-tenant-name',
metavar='<auth-tenant-name>', metavar='<auth-tenant-name>',
default=utils.env('OS_TENANT_NAME', default=utils.env('OS_TENANT_NAME',
'OS_PROJECT_NAME',
'CINDER_PROJECT_ID'), 'CINDER_PROJECT_ID'),
help='Tenant name. ' help='Tenant name. '
'Default=env[OS_TENANT_NAME].') 'Default=env[OS_TENANT_NAME].')
@@ -274,6 +275,7 @@ class OpenStackCinderShell(object):
parser.add_argument('--os-tenant-id', parser.add_argument('--os-tenant-id',
metavar='<auth-tenant-id>', metavar='<auth-tenant-id>',
default=utils.env('OS_TENANT_ID', default=utils.env('OS_TENANT_ID',
'OS_PROJECT_ID',
'CINDER_TENANT_ID'), 'CINDER_TENANT_ID'),
help='ID for the tenant. ' help='ID for the tenant. '
'Default=env[OS_TENANT_ID].') 'Default=env[OS_TENANT_ID].')
@@ -732,8 +734,10 @@ class OpenStackCinderShell(object):
username = self.options.os_username username = self.options.os_username
password = self.options.os_password password = self.options.os_password
tenant_id = self.options.os_tenant_id tenant_id = (self.options.os_tenant_id
tenant_name = self.options.os_tenant_name or self.options.os_project_id)
tenant_name = (self.options.os_tenant_name
or self.options.os_project_name)
return v2_auth.Password( return v2_auth.Password(
v2_auth_url, v2_auth_url,

3
cinderclient/tests/functional/base.py
View File

@@ -34,7 +34,8 @@ def credentials():
username = os.environ.get('OS_USERNAME') username = os.environ.get('OS_USERNAME')
password = os.environ.get('OS_PASSWORD') password = os.environ.get('OS_PASSWORD')
tenant_name = os.environ.get('OS_TENANT_NAME') tenant_name = (os.environ.get('OS_TENANT_NAME')
or os.environ.get('OS_PROJECT_NAME'))
auth_url = os.environ.get('OS_AUTH_URL') auth_url = os.environ.get('OS_AUTH_URL')
config = six.moves.configparser.RawConfigParser() config = six.moves.configparser.RawConfigParser()