openstack
/
senlin
Code Issues Proposed changes

Merge "Set auth_plugin type to password when building sdk connection"

This commit is contained in:
Jenkins 2015-11-25 13:18:10 +00:00 committed by Gerrit Code Review
parent 46ec3d488f d1f21ce88b
commit eac42b3732
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
senlin/drivers/openstack/sdk.py
View File

@ -100,7 +100,7 @@ def create_connection(params=None):
params.pop('region_name')
try:
conn = connection.Connection(profile=prof, user_agent=USER_AGENT,
**params)
auth_plugin="password", **params)
except Exception as ex:
raise parse_exception(ex)

7
senlin/tests/unit/drivers/test_sdk.py
View File

@ -142,6 +142,7 @@ class OpenStackSDKTest(base.SenlinTestCase):
mock_profile.assert_called_once_with()
mock_conn.assert_called_once_with(profile=x_profile,
user_agent=sdk.USER_AGENT,
auth_plugin="password",
foo='bar')
@mock.patch.object(profile, 'Profile')
@ -159,7 +160,8 @@ class OpenStackSDKTest(base.SenlinTestCase):
x_profile.set_region.assert_called_once_with(x_profile.ALL,
'REGION_ONE')
mock_conn.assert_called_once_with(profile=x_profile,
user_agent=sdk.USER_AGENT)
user_agent=sdk.USER_AGENT,
auth_plugin="password")
@mock.patch.object(profile, 'Profile')
@mock.patch.object(connection, 'Connection')
@ -178,7 +180,8 @@ class OpenStackSDKTest(base.SenlinTestCase):
mock_profile.assert_called_once_with()
mock_conn.assert_called_once_with(profile=x_profile,
user_agent=sdk.USER_AGENT)
user_agent=sdk.USER_AGENT,
auth_plugin="password")
mock_parse.assert_called_once_with(ex_raw)
self.assertEqual(123, ex.code)
self.assertEqual('BOOM', ex.message)