openstack
/
glance_store
Code Issues Proposed changes

Remove unused parameters from swift connection init 

glance_store passes some unused parameters such as tenant, auth_version
and others to Multi-tenant store when initializing Swift connection.
The patch removes these parameters from the Connection __init__
method because glance_store doesn't need to pass them - it passes
a valid auth_token to Swift connection (so it doesn't need to
initialize Keystone client and request the token).

Change-Id: I3805f2bb31b7c75d222867aaefefa0f5c0be3847
This commit is contained in:
kairat_kushaev 2016-01-21 15:57:10 +03:00 committed by Kairat Kushaev
parent 88c4a75366
commit 17b7c9a78e
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glance_store/_drivers/swift/store.py
View File

@ -937,11 +937,9 @@ class MultiTenantStore(BaseStore):
def get_connection(self, location, context=None):
return swiftclient.Connection(
None, context.user, None,
preauthurl=location.swift_url,
preauthtoken=context.auth_token,
tenant_name=context.tenant,
auth_version='2', insecure=self.insecure,
insecure=self.insecure,
ssl_compression=self.ssl_compression,
cacert=self.cacert)

14
glance_store/tests/unit/test_swift_store.py
View File

@ -1104,10 +1104,10 @@ class TestStoreAuthV3(TestStoreAuthV1):
class FakeConnection(object):
def __init__(self, authurl, user, key, retries=5, preauthurl=None,
preauthtoken=None, starting_backoff=1, tenant_name=None,
os_options=None, auth_version="1", insecure=False,
ssl_compression=True, cacert=None):
def __init__(self, authurl=None, user=None, key=None, retries=5,
preauthurl=None, preauthtoken=None, starting_backoff=1,
tenant_name=None, os_options=None, auth_version="1",
insecure=False, ssl_compression=True, cacert=None):
if os_options is None:
os_options = {}
@ -1332,9 +1332,9 @@ class TestMultiTenantStoreConnections(base.StoreBaseTest):
connection = self.store.get_connection(self.location,
context=self.context)
self.assertIsNone(connection.authurl)
self.assertEqual(connection.auth_version, '2')
self.assertEqual(connection.user, 'tenant:user1')
self.assertEqual(connection.tenant_name, 'tenant')
self.assertEqual(connection.auth_version, '1')
self.assertIsNone(connection.user)
self.assertIsNone(connection.tenant_name)
self.assertIsNone(connection.key)
self.assertEqual(connection.preauthurl, 'https://example.com')
self.assertEqual(connection.preauthtoken, '0123')