openstack/keystone
Code Issues Proposed changes

Fix errors for create_endpoint api in version2

Browse Source 
1. Create an endpoint without 'service_id' should return a 400 Bad Request
with appropriate message instead of 500 Internal Server Error.
2. Empty urls should be discarded.

Change-Id: I535467ec35fe2ae738ecae0a4f20d19ff4f001ec
Closes-Bug: #1250765
This commit is contained in:
huangtianhua 2013-11-13 18:05:22 +08:00
parent 6c7f00d459
commit dbd98a4c85
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
keystone/catalog/controllers.py
View File

@ -91,18 +91,22 @@ class Endpoint(controller.V2Controller):
# according to the v2 spec publicurl is mandatory # according to the v2 spec publicurl is mandatory
self._require_attribute(endpoint, 'publicurl') self._require_attribute(endpoint, 'publicurl')
# service_id is necessary
self._require_attribute(endpoint, 'service_id')
legacy_endpoint_ref = endpoint.copy() legacy_endpoint_ref = endpoint.copy()
urls = {} urls = {}
for i in INTERFACES: for i in INTERFACES:
# remove all urls so they aren't persisted them more than once # remove all urls so they aren't persisted them more than once
if endpoint.get('%surl' % i) is not None: url = '%surl' % i
if endpoint.get(url):
# valid urls need to be persisted # valid urls need to be persisted
urls[i] = endpoint.pop('%surl' % i) urls[i] = endpoint.pop(url)
elif '%surl' % i in endpoint: elif url in endpoint:
# null urls can be discarded # null or empty urls can be discarded
endpoint.pop('%surl' % i) endpoint.pop(url)
legacy_endpoint_ref.pop(url)
legacy_endpoint_id = uuid.uuid4().hex legacy_endpoint_id = uuid.uuid4().hex
for interface, url in urls.iteritems(): for interface, url in urls.iteritems():

27
keystone/tests/test_catalog.py
View File

@ -91,10 +91,33 @@ class V2CatalogTestCase(rest.RestfulTestCase):
self.assertEqual(response.result['endpoint'][field], value) self.assertEqual(response.result['endpoint'][field], value)
def test_endpoint_create_with_null_adminurl(self): def test_endpoint_create_with_null_adminurl(self):
self._endpoint_create(adminurl=None) req_body, response = self._endpoint_create(adminurl=None)
self.assertEqual(req_body['endpoint']['adminurl'], None)
self.assertNotIn('adminurl', response.result['endpoint'])
def test_endpoint_create_with_empty_adminurl(self):
req_body, response = self._endpoint_create(adminurl='')
self.assertEqual(req_body['endpoint']['adminurl'], '')
self.assertNotIn("adminurl", response.result['endpoint'])
def test_endpoint_create_with_null_internalurl(self): def test_endpoint_create_with_null_internalurl(self):
self._endpoint_create(internalurl=None) req_body, response = self._endpoint_create(internalurl=None)
self.assertEqual(req_body['endpoint']['internalurl'], None)
self.assertNotIn('internalurl', response.result['endpoint'])
def test_endpoint_create_with_empty_internalurl(self):
req_body, response = self._endpoint_create(internalurl='')
self.assertEqual(req_body['endpoint']['internalurl'], '')
self.assertNotIn("internalurl", response.result['endpoint'])
def test_endpoint_create_with_null_publicurl(self): def test_endpoint_create_with_null_publicurl(self):
self._endpoint_create(expected_status=400, publicurl=None) self._endpoint_create(expected_status=400, publicurl=None)
def test_endpoint_create_with_empty_publicurl(self):
self._endpoint_create(expected_status=400, publicurl='')
def test_endpoint_create_with_null_service_id(self):
self._endpoint_create(expected_status=400, service_id=None)
def test_endpoint_create_with_empty_service_id(self):
self._endpoint_create(expected_status=400, service_id='')