From ea764f9f6dfefd2706ff668a88fb9b8f4a75ede6 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Mon, 26 Sep 2022 15:46:55 +0100 Subject: Amend GUI to work directly towards ACM runtime GUI proxies the URLs towards the ACM runtime server across CLAMP backend because clamp-backend handles the certificates for HTTPS communication and also handles AAF. For now, the Policy GUI is being used for testing and demonstration purposes only. As AAF is disabled and we are using HTTP, the GUI can now work towards the ACM runtime server port directly for test installations. Issue-ID: POLICY-4122 Change-Id: Idca87d520a5eef2058781534df6f96a0260c5eaf Signed-off-by: liamfallon --- .../gui/server/rest/ApexEditorRestController.java | 1 - .../policy/gui/server/test/util/KeyStoreHelper.java | 2 ++ gui-server/src/test/resources/application_http.yaml | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gui-server/src/test/resources/application_http.yaml (limited to 'gui-server') diff --git a/gui-server/src/main/java/org/onap/policy/gui/server/rest/ApexEditorRestController.java b/gui-server/src/main/java/org/onap/policy/gui/server/rest/ApexEditorRestController.java index 3d7b49f..a4b92ef 100644 --- a/gui-server/src/main/java/org/onap/policy/gui/server/rest/ApexEditorRestController.java +++ b/gui-server/src/main/java/org/onap/policy/gui/server/rest/ApexEditorRestController.java @@ -33,7 +33,6 @@ public class ApexEditorRestController { /** * Strip /apex-editor prefix from Apex Editor rest calls. */ - @SuppressWarnings("java:S3752") // Suppress warning about RequestMapping without HTTP method. @RequestMapping("/**") public ModelAndView forwardApexEditorRest(ModelMap model, HttpServletRequest request) { String targetUrl = request.getRequestURI().replaceFirst("^/apex-editor", ""); diff --git a/gui-server/src/test/java/org/onap/policy/gui/server/test/util/KeyStoreHelper.java b/gui-server/src/test/java/org/onap/policy/gui/server/test/util/KeyStoreHelper.java index a4aabb8..6df8318 100644 --- a/gui-server/src/test/java/org/onap/policy/gui/server/test/util/KeyStoreHelper.java +++ b/gui-server/src/test/java/org/onap/policy/gui/server/test/util/KeyStoreHelper.java @@ -81,6 +81,8 @@ public class KeyStoreHelper { * Exception class for KeyStoreHelper methods. */ public static class CouldNotLoadCertificateException extends java.lang.Exception { + private static final long serialVersionUID = 4858081258043045085L; + protected CouldNotLoadCertificateException(String errorMessage) { super(errorMessage); } diff --git a/gui-server/src/test/resources/application_http.yaml b/gui-server/src/test/resources/application_http.yaml new file mode 100644 index 0000000..24f3e8e --- /dev/null +++ b/gui-server/src/test/resources/application_http.yaml @@ -0,0 +1,19 @@ +server: + port: 2443 + ssl: + enabled: false + +clamp: + url: http://localhost:30258 + disable-ssl-validation: true + disable-ssl-hostname-check: true + +apex-editor: + upload-url: + upload-userid: + +management: + endpoints: + web: + exposure: + include: health, metrics, prometheus -- cgit 1.2.3-korg