openstack/python-freezerclient
Code Issues Proposed changes

Freezerclient use "token" to authentication is not success

Browse Source 
1. When auth_type ='token',loader.load_from_options(**kwargs) is
   not defined these parameters:
   tenent_name, user_domain_id, user_domain_name
2. The class of freezerclient.client.Client add "token" parameter.

Change-Id: I0b320a608677bcac2b6226330f902365a27b58d5
This commit is contained in:
Cai Hui 2018-10-23 05:47:16 -04:00
parent 0b80ff7e9e
commit 4ab052733d
3 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
freezerclient/client.py
View File

@ -17,7 +17,9 @@ import os
def Client(version=None, endpoint=None, username=None, password=None,
project_name=None, auth_url=None, **kwargs):
project_name=None, auth_url=None, project_id=None, token=None,
cacert=None, project_domain_name=None, user_domain_id=None,
user_domain_name=None, **kwargs):
"""Initialize client object based on given version.
HOW-TO:
@ -25,11 +27,10 @@ def Client(version=None, endpoint=None, username=None, password=None,
credentials::
>>> from freezerclient import client
>>> freezer = client.Client(VERSION, ENDPOINT, USERNAME, PASSWORD,
... PROJECT_NAME, AUTH_URL)
>>> freezer = client.Client('2',username='admin',password='stack')
Here ``VERSION`` is freezer API Version, you can use ``1`` or ``2``,
default is API v2.
Here ``VERSION`` is freezer API Version, you can use ``1``(v1) or ``2``
(v2),default is API v2.
Alternatively, you can create a client instance using the keystoneauth
session API. See "The freezerclient Python API" page at
@ -60,11 +61,33 @@ def Client(version=None, endpoint=None, username=None, password=None,
else:
kwargs["auth_url"] = os.environ.get('OS_AUTH_URL')
kwargs["token"] = os.environ.get('OS_TOKEN')
kwargs["tenant_name"] = os.environ.get('OS_PROJECT_NAME')
if token:
kwargs["token"] = token
else:
kwargs["token"] = os.environ.get('OS_TOKEN')
kwargs["project_domain_name"] = os.environ.get('OS_PROJECT_DOMAIN_NAME')
if project_domain_name:
kwargs["project_domain_name"] = project_domain_name
if user_domain_name:
kwargs["user_domain_name"] = user_domain_name
else:
kwargs["user_domain_name"] = os.environ.get('OS_USER_DOMAIN_NAME')
if user_domain_id:
kwargs["user_domain_id"] = user_domain_id
else:
kwargs["user_domain_id"] = os.environ.get('OS_USER_DOMAIN_ID')
if project_id:
kwargs["project_id"] = project_id
else:
kwargs["project_id"] = os.environ.get('OS_PROJECT_ID')
kwargs["cacert"] = cacert or os.environ.get('OS_CACERT')
kwargs["endpoint_type"] = os.environ.get('OS_ENDPOINT_TYPE') or 'public'
kwargs["project_domain_id"] = os.environ.get('OS_PROJECT_DOMAIN_ID')
kwargs["user_domain_id"] = os.environ.get('OS_USER_DOMAIN_ID')
if not version:
version = os.environ.get('OS_BACKUP_API_VERSION', '2')

6
freezerclient/v1/client.py
View File

@ -111,10 +111,7 @@ class Client(object):
auth_kwargs = {
'auth_url': self.opts.os_auth_url,
'project_id': self.opts.os_project_id,
'tenant_name': self.opts.os_tenant_name,
'project_name': self.opts.os_project_name,
'user_domain_id': self.opts.os_user_domain_id,
'user_domain_name': self.opts.os_user_domain_name,
'project_domain_id': self.opts.os_project_domain_id,
'project_domain_name': self.opts.os_project_domain_name,
}
@ -122,6 +119,9 @@ class Client(object):
auth_kwargs.update({
'username': self.opts.os_username,
'password': self.opts.os_password,
'tenant_name': self.opts.os_tenant_name,
'user_domain_id': self.opts.os_user_domain_id,
'user_domain_name': self.opts.os_user_domain_name,
})
elif self.opts.os_token:
auth_type = 'token'

6
freezerclient/v2/client.py
View File

@ -111,10 +111,7 @@ class Client(object):
auth_kwargs = {
'auth_url': self.opts.os_auth_url,
'project_id': self.opts.os_project_id,
'tenant_name': self.opts.os_tenant_name,
'project_name': self.opts.os_project_name,
'user_domain_id': self.opts.os_user_domain_id,
'user_domain_name': self.opts.os_user_domain_name,
'project_domain_id': self.opts.os_project_domain_id,
'project_domain_name': self.opts.os_project_domain_name,
}
@ -122,6 +119,9 @@ class Client(object):
auth_kwargs.update({
'username': self.opts.os_username,
'password': self.opts.os_password,
'tenant_name': self.opts.os_tenant_name,
'user_domain_id': self.opts.os_user_domain_id,
'user_domain_name': self.opts.os_user_domain_name,
})
elif self.opts.os_token:
auth_type = 'token'