Add testcases to check cache invalidation in endpoint filter extension
keystone now has the ability to cache catalog, and will invalidate the cache when there is any change about the catalog, i.e. add endpoints to project or remove endpoints from project. But the testcase was missed. The patch focus on endpoint project association and leave endpoint_group project association as it is. since these two APIs should impact the endpoints in theory but it's doesnot in practice. So, add some testcases to test its impact on catalog is impossible. There is another bug filed [1] and testcases for endpoint group will be added when that bug is fixed. [1] https://bugs.launchpad.net/keystone/+bug/1516469 Change-Id: Ie85679111e0f8b9d00e11155594db391eb92c09f Closes-Bug: #1516468
This commit is contained in:
Dave Chen
Steve Martinelli
parent
b51521a951
commit
0bad37f82c
|
|
@ -18,6 +18,7 @@ import uuid
|
|||
from six.moves import http_client
|
||||
from testtools import matchers
|
||||
|
||||
from keystone.tests import unit
|
||||
from keystone.tests.unit import test_v3
|
||||
|
||||
|
||||
|
|
@ -242,6 +243,140 @@ class EndpointFilterCRUDTestCase(TestExtensionCase):
|
|||
r = self.get(association_url)
|
||||
self.assertValidEndpointListResponse(r, expected_length=0)
|
||||
|
||||
@unit.skip_if_cache_disabled('catalog')
|
||||
def test_create_endpoint_project_association_invalidates_cache(self):
|
||||
# NOTE(davechen): create another endpoint which will be added to
|
||||
# default project, this should be done at first since
|
||||
# `create_endpoint` will also invalidate cache.
|
||||
endpoint_id2 = uuid.uuid4().hex
|
||||
endpoint2 = unit.new_endpoint_ref(service_id=self.service_id,
|
||||
region_id=self.region_id,
|
||||
interface='public',
|
||||
id=endpoint_id2)
|
||||
self.catalog_api.create_endpoint(endpoint_id2, endpoint2.copy())
|
||||
|
||||
# create endpoint project association.
|
||||
self.put(self.default_request_url)
|
||||
|
||||
# should get back only one endpoint that was just created.
|
||||
user_id = uuid.uuid4().hex
|
||||
catalog = self.catalog_api.get_v3_catalog(
|
||||
user_id,
|
||||
self.default_domain_project_id)
|
||||
|
||||
# there is only one endpoints associated with the default project.
|
||||
self.assertEqual(1, len(catalog[0]['endpoints']))
|
||||
self.assertEqual(self.endpoint_id, catalog[0]['endpoints'][0]['id'])
|
||||
|
||||
# add the second endpoint to default project, bypassing
|
||||
# endpoint_filter_api API manager.
|
||||
self.endpoint_filter_api.driver.add_endpoint_to_project(
|
||||
endpoint_id2,
|
||||
self.default_domain_project_id)
|
||||
|
||||
# but, we can just get back one endpoint from the cache, since the
|
||||
# catalog is pulled out from cache and its haven't been invalidated.
|
||||
catalog = self.catalog_api.get_v3_catalog(
|
||||
user_id,
|
||||
self.default_domain_project_id)
|
||||
|
||||
self.assertEqual(1, len(catalog[0]['endpoints']))
|
||||
|
||||
# remove the endpoint2 from the default project, and add it again via
|
||||
# endpoint_filter_api API manager.
|
||||
self.endpoint_filter_api.driver.remove_endpoint_from_project(
|
||||
endpoint_id2,
|
||||
self.default_domain_project_id)
|
||||
|
||||
# add second endpoint to default project, this can be done by calling
|
||||
# the endpoint_filter_api API manager directly but call the REST API
|
||||
# instead for consistency.
|
||||
self.put('/OS-EP-FILTER/projects/%(project_id)s'
|
||||
'/endpoints/%(endpoint_id)s' % {
|
||||
'project_id': self.default_domain_project_id,
|
||||
'endpoint_id': endpoint_id2})
|
||||
|
||||
# should get back two endpoints since the cache has been
|
||||
# invalidated when the second endpoint was added to default project.
|
||||
catalog = self.catalog_api.get_v3_catalog(
|
||||
user_id,
|
||||
self.default_domain_project_id)
|
||||
|
||||
self.assertEqual(2, len(catalog[0]['endpoints']))
|
||||
|
||||
ep_id_list = [catalog[0]['endpoints'][0]['id'],
|
||||
catalog[0]['endpoints'][1]['id']]
|
||||
self.assertEqual(self.endpoint_id, catalog[0]['endpoints'][0]['id'])
|
||||
self.assertListEqual([self.endpoint_id, endpoint_id2], ep_id_list)
|
||||
|
||||
@unit.skip_if_cache_disabled('catalog')
|
||||
def test_remove_endpoint_from_project_invalidates_cache(self):
|
||||
endpoint_id2 = uuid.uuid4().hex
|
||||
endpoint2 = unit.new_endpoint_ref(service_id=self.service_id,
|
||||
region_id=self.region_id,
|
||||
interface='public',
|
||||
id=endpoint_id2)
|
||||
self.catalog_api.create_endpoint(endpoint_id2, endpoint2.copy())
|
||||
# create endpoint project association.
|
||||
self.put(self.default_request_url)
|
||||
|
||||
# add second endpoint to default project.
|
||||
self.put('/OS-EP-FILTER/projects/%(project_id)s'
|
||||
'/endpoints/%(endpoint_id)s' % {
|
||||
'project_id': self.default_domain_project_id,
|
||||
'endpoint_id': endpoint_id2})
|
||||
|
||||
# should get back only one endpoint that was just created.
|
||||
user_id = uuid.uuid4().hex
|
||||
catalog = self.catalog_api.get_v3_catalog(
|
||||
user_id,
|
||||
self.default_domain_project_id)
|
||||
|
||||
# there are two endpoints associated with the default project.
|
||||
ep_id_list = [catalog[0]['endpoints'][0]['id'],
|
||||
catalog[0]['endpoints'][1]['id']]
|
||||
self.assertEqual(2, len(catalog[0]['endpoints']))
|
||||
self.assertEqual(self.endpoint_id, catalog[0]['endpoints'][0]['id'])
|
||||
self.assertListEqual([self.endpoint_id, endpoint_id2], ep_id_list)
|
||||
|
||||
# remove the endpoint2 from the default project, bypassing
|
||||
# endpoint_filter_api API manager.
|
||||
self.endpoint_filter_api.driver.remove_endpoint_from_project(
|
||||
endpoint_id2,
|
||||
self.default_domain_project_id)
|
||||
|
||||
# but, we can just still get back two endpoints from the cache,
|
||||
# since the catalog is pulled out from cache and its haven't
|
||||
# been invalidated.
|
||||
catalog = self.catalog_api.get_v3_catalog(
|
||||
user_id,
|
||||
self.default_domain_project_id)
|
||||
|
||||
self.assertEqual(2, len(catalog[0]['endpoints']))
|
||||
|
||||
# add back the endpoint2 to the default project, and remove it by
|
||||
# endpoint_filter_api API manage.
|
||||
self.endpoint_filter_api.driver.add_endpoint_to_project(
|
||||
endpoint_id2,
|
||||
self.default_domain_project_id)
|
||||
|
||||
# remove the endpoint2 from the default project, this can be done
|
||||
# by calling the endpoint_filter_api API manager directly but call
|
||||
# the REST API instead for consistency.
|
||||
self.delete('/OS-EP-FILTER/projects/%(project_id)s'
|
||||
'/endpoints/%(endpoint_id)s' % {
|
||||
'project_id': self.default_domain_project_id,
|
||||
'endpoint_id': endpoint_id2})
|
||||
|
||||
# should only get back one endpoint since the cache has been
|
||||
# invalidated after the endpoint project association was removed.
|
||||
catalog = self.catalog_api.get_v3_catalog(
|
||||
user_id,
|
||||
self.default_domain_project_id)
|
||||
|
||||
self.assertEqual(1, len(catalog[0]['endpoints']))
|
||||
self.assertEqual(self.endpoint_id, catalog[0]['endpoints'][0]['id'])
|
||||
|
||||
|
||||
class EndpointFilterTokenRequestTestCase(TestExtensionCase):
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue