Repository: stratos Updated Branches: refs/heads/master 02f9f530b -> 1d6c6664d
Updating metadata API calls in PCA plugins in tomcat-saml-sso and wso2is-saml-sso docker images Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1d6c6664 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1d6c6664 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1d6c6664 Branch: refs/heads/master Commit: 1d6c6664d6cbc4ffb6c16bef26388c4b58c6149e Parents: 02f9f53 Author: Imesh Gunaratne <[email protected]> Authored: Sun May 31 15:22:12 2015 +0100 Committer: Imesh Gunaratne <[email protected]> Committed: Sun May 31 15:29:27 2015 +0100 ---------------------------------------------------------------------- .../packs/plugins/TomcatWSO2ISMetadataPublisher.py | 14 +++++++------- .../packs/plugins/WSO2ISMetaDataHandler.py | 9 +++------ 2 files changed, 10 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/1d6c6664/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatWSO2ISMetadataPublisher.py ---------------------------------------------------------------------- diff --git a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatWSO2ISMetadataPublisher.py b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatWSO2ISMetadataPublisher.py index f363b19..b6a2d98 100644 --- a/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatWSO2ISMetadataPublisher.py +++ b/tools/docker-images/cartridge-docker-images/service-images/tomcat-saml-sso/packs/plugins/TomcatWSO2ISMetadataPublisher.py @@ -58,15 +58,15 @@ class TomcatWSO2ISMetadataPublisher(ICartridgeAgentPlugin): tomcat_http_port = port callback_url = "http://%s:%s/travelocity.com/home.jsp"; % (cluster_hostname, tomcat_http_port) - saml_callback_entry = {"key": "CALLBACK_URL", "values": [ callback_url ]} - issuer_entry = {"key": "SSO_ISSUER", "values": [ "travelocity.com" ]} - #properties_data = [saml_callback_entry, issuer_entry] - #publish_data.properties = properties_data - mdsclient.put(saml_callback_entry, app=True) - mdsclient.put(issuer_entry, app=True) + callback_url_property = {"key": "CALLBACK_URL", "values": [ callback_url ]} + mdsclient.put(callback_url_property, app=True) + log.info("Published property to metadata API: CALLBACK_URL: %s" % callback_url) + + issuer_property = {"key": "SSO_ISSUER", "values": [ "travelocity.com" ]} + mdsclient.put(issuer_property, app=True) + log.info("Published property to metadata API: SSO_ISSUER: travelocity.com") - log.info("Published values to metadata API: CALLBACK_URL: %s, SSO_ISSUER: travelocity.com" % callback_url) log.info("Tomcat metadata publisher completed") http://git-wip-us.apache.org/repos/asf/stratos/blob/1d6c6664/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py ---------------------------------------------------------------------- diff --git a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py index 0860328..439f53e 100644 --- a/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py +++ b/tools/docker-images/cartridge-docker-images/service-images/wso2is-saml-sso/packs/plugins/WSO2ISMetaDataHandler.py @@ -140,12 +140,9 @@ class WSO2ISMetaDataHandler(ICartridgeAgentPlugin): log.info("Kubernetes service management console https port: %s" % https_port) saml_endpoint = "https://%s:%s/samlsso"; % (member_hostname, https_port) - publish_data = mdsclient.MDSPutRequest() - hostname_entry = {"key": "SAML_ENDPOINT", "values": saml_endpoint} - properties_data = [hostname_entry] - publish_data.properties = properties_data - - mdsclient.put(publish_data, app=True) + saml_endpoint_property = {"key": "SAML_ENDPOINT", "values": [ saml_endpoint ]} + mdsclient.put(saml_endpoint_property, app=True) + log.info("Published property to metadata API: SAML_ENDPOINT: %s" % saml_endpoint) # start servers log.info("Starting WSO2 IS server")
