openstack/keystone
Code Issues Proposed changes

Ensure serviceCatalog is list when empty, not dict

Browse Source 
Fixes bug 1087405.

Change-Id: I152c7f418a66ccfe541e26efe75b59bffa6c3849
This commit is contained in:
Brian Waldon 2012-12-06 12:31:51 -08:00
parent 7978bb271b
commit a800fae22c
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keystone/service.py
View File

@ -892,7 +892,7 @@ class TokenController(wsgi.Application):
""" """
if not catalog_ref: if not catalog_ref:
return {} return []
services = {} services = {}
for region, region_ref in catalog_ref.iteritems(): for region, region_ref in catalog_ref.iteritems():

19
tests/test_content_types.py
View File

@ -363,6 +363,22 @@ class CoreApiTests(object):
expected_status=200) expected_status=200)
self.assertValidAuthenticationResponse(r) self.assertValidAuthenticationResponse(r)
def test_authenticate_unscoped(self):
r = self.public_request(
method='POST',
path='/v2.0/tokens',
body={
'auth': {
'passwordCredentials': {
'username': self.user_foo['name'],
'password': self.user_foo['password'],
},
},
},
# TODO(dolph): creating a token should result in a 201 Created
expected_status=200)
self.assertValidAuthenticationResponse(r)
def test_get_tenants_for_token(self): def test_get_tenants_for_token(self):
r = self.public_request(path='/v2.0/tenants', r = self.public_request(path='/v2.0/tenants',
token=self.get_scoped_token()) token=self.get_scoped_token())
@ -534,7 +550,7 @@ class JsonTestCase(RestfulTestCase, CoreApiTests):
if require_service_catalog: if require_service_catalog:
self.assertIsNotNone(serviceCatalog) self.assertIsNotNone(serviceCatalog)
if serviceCatalog is not None: if serviceCatalog is not None:
self.assertTrue(len(r.body['access']['serviceCatalog'])) self.assertTrue(isinstance(serviceCatalog, list))
for service in r.body['access']['serviceCatalog']: for service in r.body['access']['serviceCatalog']:
# validate service # validate service
self.assertIsNotNone(service.get('name')) self.assertIsNotNone(service.get('name'))
@ -797,7 +813,6 @@ class XmlTestCase(RestfulTestCase, CoreApiTests):
if require_service_catalog: if require_service_catalog:
self.assertIsNotNone(serviceCatalog) self.assertIsNotNone(serviceCatalog)
if serviceCatalog is not None: if serviceCatalog is not None:
self.assertTrue(len(serviceCatalog.findall(self._tag('service'))))
for service in serviceCatalog.findall(self._tag('service')): for service in serviceCatalog.findall(self._tag('service')):
# validate service # validate service
self.assertIsNotNone(service.get('name')) self.assertIsNotNone(service.get('name'))