openstack
/
keystone
Code Issues Proposed changes

Merge "Read idp_metadata_path value from CONF.saml"

This commit is contained in:
Jenkins 2014-09-24 14:42:22 +00:00 committed by Gerrit Code Review
parent 1af24284bd 5384b95eb1
commit 6feb6b4eb8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keystone/contrib/federation/controllers.py
View File

@ -339,7 +339,7 @@ class SAMLMetadataV3(_ControllerBase):
member_name = 'metadata'
def get_metadata(self, context):
metadata_path = CONF.federation.idp_metadata_path
metadata_path = CONF.saml.idp_metadata_path
try:
with open(metadata_path, 'r') as metadata_handler:
metadata = metadata_handler.read()

2
keystone/tests/test_v3_federation.py
View File

@ -2019,7 +2019,7 @@ class IdPMetadataGenerationTests(FederationTests):
self.get(self.METADATA_URL, expected_status=500)
def test_get_metadata(self):
CONF.federation.idp_metadata_path = XMLDIR + '/idp_saml2_metadata.xml'
CONF.saml.idp_metadata_path = XMLDIR + '/idp_saml2_metadata.xml'
r = self.get(self.METADATA_URL, response_content_type='text/xml',
expected_status=200)
self.assertEqual('text/xml', r.headers.get('Content-Type'))