X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FE2ManagerConfiguration.java;h=4ea8bff143e2a7d07a3f4c9baa9c6d64c5f2f315;hb=b8f4e986970eab6cfa5729c24680f2816f056edb;hp=92bef319f2c25f21a5266f0077c238992ade7cf9;hpb=a91a1032725b91b493c060937b3f27ac9e62807e;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerConfiguration.java
index 92bef319..4ea8bff1 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerConfiguration.java
@@ -20,8 +20,7 @@
 package org.oransc.ric.portal.dashboard.config;
 
 import java.lang.invoke.MethodHandles;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
 
 import org.oransc.ric.e2mgr.client.api.HealthCheckApi;
 import org.oransc.ric.e2mgr.client.api.NodebApi;
@@ -48,10 +47,12 @@ public class E2ManagerConfiguration {
 	private final String e2mgrUrl;
 
 	@Autowired
-	public E2ManagerConfiguration(@Value("${e2mgr.url}") final String url) throws MalformedURLException {
-		logger.info("Configuring E2 Manager at base path {}", url);
-		new URL(url);
-		this.e2mgrUrl = url;
+	public E2ManagerConfiguration(@Value("${e2mgr.url.prefix}") final String urlPrefix,
+			@Value("${e2mgr.url.suffix}") final String urlSuffix) throws Exception {
+		logger.debug("ctor prefix '{}' suffix '{}'", urlPrefix, urlSuffix);
+		URI uri = new URI(urlPrefix.trim() + "/" + urlSuffix.trim()).normalize();
+		e2mgrUrl = uri.toString();
+		logger.info("Configuring E2 Manager at URL {}", e2mgrUrl);
 	}
 
 	private ApiClient apiClient() {
@@ -61,12 +62,14 @@ public class E2ManagerConfiguration {
 	}
 
 	@Bean
-	public HealthCheckApi e2HealthCheckApi() {
+	// The bean (method) name must be globally unique
+	public HealthCheckApi e2MgrHealthCheckApi() {
 		return new HealthCheckApi(apiClient());
 	}
 
 	@Bean
-	public NodebApi e2NodebApi() {
+	// The bean (method) name must be globally unique
+	public NodebApi e2MgrNodebApi() {
 		return new NodebApi(apiClient());
 	}