openstack/python-manilaclient
Code Issues Proposed changes

Keep using the session we had when creating keystone client

Browse Source 
That way we keep the ssl-related flags when creating the client.

Closes-Bug: #1535322
Change-Id: I6c425ce5d8a2072c49fc26924147a9719379eff9
This commit is contained in:
Vincent Untz
2016-01-18 15:03:44 +01:00
parent 37dc7e8ebd
commit 82937b6bc7
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manilaclient/tests/unit/v2/test_client.py
View File

@@ -212,7 +212,7 @@ class ClientTest(utils.TestCase):
api_version=manilaclient.API_MIN_VERSION) api_version=manilaclient.API_MIN_VERSION)
client.ks_client.Client.assert_called_with( client.ks_client.Client.assert_called_with(
version=(3, 0), auth_url='url_v3.0', session=mock.ANY, version=(3, 0), auth_url='url_v3.0',
username=client_args['username'], username=client_args['username'],
password=client_args.get('password', client_args.get('api_key')), password=client_args.get('password', client_args.get('api_key')),
user_id=client_args['user_id'], user_id=client_args['user_id'],
@@ -266,7 +266,7 @@ class ClientTest(utils.TestCase):
cacert=None, timeout=None, retries=None, http_log_debug=False, cacert=None, timeout=None, retries=None, http_log_debug=False,
api_version=manilaclient.API_MIN_VERSION) api_version=manilaclient.API_MIN_VERSION)
client.ks_client.Client.assert_called_with( client.ks_client.Client.assert_called_with(
version=(2, 0), auth_url='url_v2.0', session=mock.ANY, version=(2, 0), auth_url='url_v2.0',
username=client_args['username'], username=client_args['username'],
password=client_args.get('password', client_args.get('api_key')), password=client_args.get('password', client_args.get('api_key')),
tenant_id=client_args.get('tenant_id', tenant_id=client_args.get('tenant_id',

2
manilaclient/v1/client.py
View File

@@ -256,6 +256,7 @@ class Client(object):
if v3_auth_url: if v3_auth_url:
keystone_client = ks_client.Client( keystone_client = ks_client.Client(
session=ks_session,
version=(3, 0), version=(3, 0),
auth_url=v3_auth_url, auth_url=v3_auth_url,
username=self.username, username=self.username,
@@ -270,6 +271,7 @@ class Client(object):
region_name=self.region_name) region_name=self.region_name)
elif v2_auth_url: elif v2_auth_url:
keystone_client = ks_client.Client( keystone_client = ks_client.Client(
session=ks_session,
version=(2, 0), version=(2, 0),
auth_url=v2_auth_url, auth_url=v2_auth_url,
username=self.username, username=self.username,

2
manilaclient/v2/client.py
View File

@@ -264,6 +264,7 @@ class Client(object):
if v3_auth_url: if v3_auth_url:
keystone_client = ks_client.Client( keystone_client = ks_client.Client(
session=ks_session,
version=(3, 0), version=(3, 0),
auth_url=v3_auth_url, auth_url=v3_auth_url,
username=self.username, username=self.username,
@@ -278,6 +279,7 @@ class Client(object):
region_name=self.region_name) region_name=self.region_name)
elif v2_auth_url: elif v2_auth_url:
keystone_client = ks_client.Client( keystone_client = ks_client.Client(
session=ks_session,
version=(2, 0), version=(2, 0),
auth_url=v2_auth_url, auth_url=v2_auth_url,
username=self.username, username=self.username,