openstack/glance_store
Code Issues Proposed changes

Merge "Setup defaults for swift driver authentication"

Browse Source
This commit is contained in:
Jenkins 2016-04-07 18:44:07 +00:00 committed by Gerrit Code Review
commit bc074d4718
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glance_store/_drivers/swift/utils.py
View File

@ -60,9 +60,9 @@ swift_opts = [
'configs.')),
]
_config_defaults = {'user_domain_id': None,
_config_defaults = {'user_domain_id': 'default',
'user_domain_name': None,
'project_domain_id': None,
'project_domain_id': 'default',
'project_domain_name': None}
# NOTE(bourke): The default dict_type is collections.OrderedDict in py27, but
@ -99,9 +99,9 @@ class SwiftParams(object):
default['user'] = glance_store.swift_store_user
default['key'] = glance_store.swift_store_key
default['auth_address'] = glance_store.swift_store_auth_address
default['project_domain_id'] = None
default['project_domain_id'] = 'default'
default['project_domain_name'] = None
default['user_domain_id'] = None
default['user_domain_id'] = 'default'
default['user_domain_name'] = None
default['auth_version'] = glance_store.swift_store_auth_version
return {glance_store.default_swift_reference: default}

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

@ -1290,8 +1290,8 @@ class TestStoreAuthV3(TestStoreAuthV1):
auth_url=loc.store_location.swift_url + '/',
username=username, password="key",
project_name=tenant,
project_domain_id=None, project_domain_name=None,
user_domain_id=None, user_domain_name=None,)
project_domain_id='default', project_domain_name=None,
user_domain_id='default', user_domain_name=None,)
mock_session.Session.assert_called_once_with(auth=mock_v3.Password())
mock_client.Client.assert_called_once_with(
session=mock_session.Session())