openstack
/
keystone
Code Issues Proposed changes

Merge "Remove reference of old endpoint_policy in paste file"

This commit is contained in:
Jenkins 2015-08-08 10:34:25 +00:00 committed by Gerrit Code Review
parent 8ea2cee5a9 c6dd5e04bd
commit 9491af2db6
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/keystone-paste.ini
View File

@ -42,9 +42,6 @@ paste.filter_factory = keystone.contrib.s3:S3Extension.factory
[filter:endpoint_filter_extension] [filter:endpoint_filter_extension]
paste.filter_factory = keystone.contrib.endpoint_filter.routers:EndpointFilterExtension.factory paste.filter_factory = keystone.contrib.endpoint_filter.routers:EndpointFilterExtension.factory
[filter:endpoint_policy_extension]
paste.filter_factory = keystone.contrib.endpoint_policy.routers:EndpointPolicyExtension.factory
[filter:simple_cert_extension] [filter:simple_cert_extension]
paste.filter_factory = keystone.contrib.simple_cert:SimpleCertExtension.factory paste.filter_factory = keystone.contrib.simple_cert:SimpleCertExtension.factory
@ -79,7 +76,7 @@ pipeline = sizelimit url_normalize request_id build_auth_context token_auth admi
[pipeline:api_v3] [pipeline:api_v3]
# The last item in this pipeline must be service_v3 or an equivalent # The last item in this pipeline must be service_v3 or an equivalent
# application. It cannot be a filter. # application. It cannot be a filter.
pipeline = sizelimit url_normalize request_id build_auth_context token_auth admin_token_auth json_body ec2_extension_v3 s3_extension simple_cert_extension revoke_extension federation_extension oauth1_extension endpoint_filter_extension endpoint_policy_extension service_v3 pipeline = sizelimit url_normalize request_id build_auth_context token_auth admin_token_auth json_body ec2_extension_v3 s3_extension simple_cert_extension revoke_extension federation_extension oauth1_extension endpoint_filter_extension service_v3
[app:public_version_service] [app:public_version_service]
paste.app_factory = keystone.service:public_version_app_factory paste.app_factory = keystone.service:public_version_app_factory

10
keystone/tests/unit/test_v3_endpoint_policy.py
View File

@ -17,13 +17,7 @@ from testtools import matchers
from keystone.tests.unit import test_v3 from keystone.tests.unit import test_v3
class TestExtensionCase(test_v3.RestfulTestCase): class EndpointPolicyTestCase(test_v3.RestfulTestCase):
EXTENSION_NAME = 'endpoint_policy'
EXTENSION_TO_ADD = 'endpoint_policy_extension'
class EndpointPolicyTestCase(TestExtensionCase):
"""Test endpoint policy CRUD. """Test endpoint policy CRUD.
In general, the controller layer of the endpoint policy extension is really In general, the controller layer of the endpoint policy extension is really
@ -203,7 +197,7 @@ class EndpointPolicyTestCase(TestExtensionCase):
self.head(url, expected_status=404) self.head(url, expected_status=404)
class JsonHomeTests(TestExtensionCase, test_v3.JsonHomeTestMixin): class JsonHomeTests(test_v3.JsonHomeTestMixin):
EXTENSION_LOCATION = ('http://docs.openstack.org/api/openstack-identity/3/' EXTENSION_LOCATION = ('http://docs.openstack.org/api/openstack-identity/3/'
'ext/OS-ENDPOINT-POLICY/1.0/rel') 'ext/OS-ENDPOINT-POLICY/1.0/rel')
PARAM_LOCATION = 'http://docs.openstack.org/api/openstack-identity/3/param' PARAM_LOCATION = 'http://docs.openstack.org/api/openstack-identity/3/param'