From 40e314813381147fa1a1395b90612dfcb3a7e15a Mon Sep 17 00:00:00 2001 From: David Ames Date: Thu, 16 May 2019 23:25:32 +0000 Subject: [PATCH] Fixes for SAML testing Move SAML testing to zaza.openstack tests Bug fixes --- zaza/openstack/charm_tests/saml_mellon/setup.py | 7 +++++-- zaza/openstack/charm_tests/saml_mellon/tests.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/zaza/openstack/charm_tests/saml_mellon/setup.py b/zaza/openstack/charm_tests/saml_mellon/setup.py index e1184d5..7e5f96c 100644 --- a/zaza/openstack/charm_tests/saml_mellon/setup.py +++ b/zaza/openstack/charm_tests/saml_mellon/setup.py @@ -21,7 +21,7 @@ import tempfile import zaza.charm_lifecycle.utils as charm_lifecycle_utils import zaza.model -from zaza.utilities import ( +from zaza.openstack.utilities import ( cert as cert_utils, cli as cli_utils, openstack as openstack_utils, @@ -148,13 +148,16 @@ def attach_saml_resources(application="keystone-saml-mellon"): (key, cert) = cert_utils.generate_cert('SP Signing Key') + cert = cert.decode().strip("-----BEGIN CERTIFICATE-----") + cert = cert.strip("-----END CERTIFICATE-----") + with tempfile.NamedTemporaryFile(mode='w', suffix='.pem') as fp: fp.write(key.decode()) fp.flush() zaza.model.attach_resource(application, sp_private_key_name, fp.name) with tempfile.NamedTemporaryFile(mode='w', suffix='.xml') as fp: - fp.write(SP_SIGNING_KEY_INFO_XML_TEMPLATE.format(key.decode())) + fp.write(SP_SIGNING_KEY_INFO_XML_TEMPLATE.format(cert)) fp.flush() zaza.model.attach_resource( application, sp_signing_keyinfo_name, fp.name) diff --git a/zaza/openstack/charm_tests/saml_mellon/tests.py b/zaza/openstack/charm_tests/saml_mellon/tests.py index c1551e9..4eafda0 100644 --- a/zaza/openstack/charm_tests/saml_mellon/tests.py +++ b/zaza/openstack/charm_tests/saml_mellon/tests.py @@ -19,7 +19,7 @@ from lxml import etree import requests import zaza.model -from zaza.charm_tests.keystone import BaseKeystoneTest +from zaza.openstack.charm_tests.keystone import BaseKeystoneTest class FailedToReachIDP(Exception):