From 437f67407aece6f7aed8e989638b0d64075f0c0a Mon Sep 17 00:00:00 2001 From: Aijana Schumann Date: Wed, 4 Aug 2021 11:59:18 +0200 Subject: Update ODLUX Add various updates and bugfixes to NetworkMap, Configuration, LinkCalculation and ConnectApp Issue-ID: CCSDK-3414 Signed-off-by: Aijana Schumann Change-Id: I6ea5c3a9d6ccbe9c450da43220654a53fd2f262b Signed-off-by: Aijana Schumann --- .../ccsdk/features/sdnr/wt/odlux/IndexOdluxBundle.java | 15 +++++++++++++-- .../ccsdk/features/sdnr/wt/odlux/ResFilesServlet.java | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'sdnr/wt/odlux/core/provider/src') diff --git a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/IndexOdluxBundle.java b/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/IndexOdluxBundle.java index c1cf875fc..82df2f0cd 100644 --- a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/IndexOdluxBundle.java +++ b/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/IndexOdluxBundle.java @@ -48,14 +48,18 @@ public class IndexOdluxBundle extends OdluxBundle implements OdluxBundleResource private static final String ENABLE_OAUTH_DEFAULT = "false"; private static final String ENV_ENABLE_ODLUX_RBAC = "ENABLE_ODLUX_RBAC"; private static final String ENABLE_ODLUX_RBAC_DEFAULT = "false"; + private static final String ENV_TRANSPORTPCEGUIURL = "TRPCEGUIURL"; + private static final String TRANSPORTPCEGUIURL_DEFAULT = ""; private final boolean oauthEnabled; private final boolean policyEnabled; + private final String transportPceGuiUrl; public IndexOdluxBundle() { super(null, BUNDLENAME_APP); this.oauthEnabled = "true".equals(getEnvVar(ENV_ENABLE_OAUTH, ENABLE_OAUTH_DEFAULT)); this.policyEnabled = "true".equals(getEnvVar(ENV_ENABLE_ODLUX_RBAC, ENABLE_ODLUX_RBAC_DEFAULT)); + this.transportPceGuiUrl = getEnvVar(ENV_TRANSPORTPCEGUIURL, TRANSPORTPCEGUIURL_DEFAULT); LOG.info("instantiating index with oauthEnabled={} and policyEnabled={}",this.oauthEnabled, this.policyEnabled); } @@ -134,8 +138,15 @@ public class IndexOdluxBundle extends OdluxBundle implements OdluxBundleResource } private String generateConfigureJson() { - return String.format("{\"authentication\":\"%s\",\"enablePolicy\":%s}", this.oauthEnabled ? "oauth" : "basic", - String.valueOf(this.policyEnabled)); + StringBuilder sb = new StringBuilder(); + sb.append(String.format("{\"authentication\":\"%s\",\"enablePolicy\":%s", this.oauthEnabled ? "oauth" : "basic", + String.valueOf(this.policyEnabled))); + if (this.transportPceGuiUrl != null && this.transportPceGuiUrl.length() > 0) { + sb.append(String.format(",\"transportpceUrl\":\"%s\"}", this.transportPceGuiUrl)); + } else { + sb.append("}"); + } + return sb.toString(); } private static String getEnvVar(String v, String defaultValue) { diff --git a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/ResFilesServlet.java b/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/ResFilesServlet.java index b8afc3329..62e73ef1d 100644 --- a/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/ResFilesServlet.java +++ b/sdnr/wt/odlux/core/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/odlux/ResFilesServlet.java @@ -88,4 +88,5 @@ public class ResFilesServlet extends HttpServlet { return t; } + } -- cgit 1.2.3-korg