openstack/python-novaclient
Code Issues Proposed changes

now uses tenantName vs. tenantId to auth

Browse Source
This commit is contained in:
Sandy Walsh 2011-09-28 11:00:15 -07:00
parent 96e04e64e9
commit 42e726ffed
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
novaclient/client.py
View File

@ -256,7 +256,7 @@ class HTTPClient(httplib2.Http):
"password": self.apikey}}}
if self.projectid:
body['auth']['tenantId'] = self.projectid
body['auth']['tenantName'] = self.projectid
token_url = urlparse.urljoin(url, "tokens")
resp, body = self.request(token_url, "POST", body=body)

4
tests/v1_1/test_auth.py
View File

@ -45,7 +45,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
body = {'auth': {
'passwordCredentials': {'username': cs.client.user,
'password': cs.client.apikey},
'tenantId': cs.client.projectid, }}
'tenantName': cs.client.projectid, }}
token_url = urlparse.urljoin(cs.client.auth_url, "tokens")
mock_request.assert_called_with(token_url, "POST",
@ -117,7 +117,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase):
body = {'auth': {
'passwordCredentials': {'username': cs.client.user,
'password': cs.client.apikey},
'tenantId': cs.client.projectid,}}
'tenantName': cs.client.projectid,}}
token_url = urlparse.urljoin(cs.client.auth_url, "tokens")
mock_request.assert_called_with(token_url, "POST",