openstack
/
heat
Code Issues Proposed changes

Merge "Fix a wrong argument name at Heat keystoneclient plugin"

This commit is contained in:
Jenkins 2014-09-04 07:16:42 +00:00 committed by Gerrit Code Review
parent e70eb089a1 0224f0d0a3
commit af1de565ab
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/client.py
View File

@ -65,7 +65,7 @@ class KeystoneClientV2(object):
def _v2_client_init(self):
kwargs = {
'auth_url': self.context.auth_url,
'region': cfg.CONF.region_name_for_services
'region_name': cfg.CONF.region_name_for_services
}
auth_kwargs = {}
# Note try trust_id first, as we can't reuse auth_token in that case

6
contrib/heat_keystoneclient_v2/heat_keystoneclient_v2/tests/test_client.py
View File

@ -58,7 +58,7 @@ class KeystoneClientTest(HeatTestCase):
cacert=None,
cert=None,
insecure=False,
region=None,
region_name=None,
key=None).AndReturn(self.mock_ks_client)
self.mock_ks_client.authenticate().AndReturn(auth_ok)
elif method == 'password':
@ -71,7 +71,7 @@ class KeystoneClientTest(HeatTestCase):
cacert=None,
cert=None,
insecure=False,
region=None,
region_name=None,
key=None).AndReturn(self.mock_ks_client)
self.mock_ks_client.authenticate().AndReturn(auth_ok)
if method == 'trust':
@ -83,7 +83,7 @@ class KeystoneClientTest(HeatTestCase):
cacert=None,
cert=None,
insecure=False,
region=None,
region_name=None,
key=None).AndReturn(self.mock_ks_client)
self.mock_ks_client.authenticate(trust_id='atrust123',
tenant_id='test_tenant_id'