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=1983623036d001b86202f3ad63ebf29026c5f955;hpb=a4c7cdd075d372de0ab352abc46359d88a570d90;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 19836230..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,6 +20,7 @@
 package org.oransc.ric.portal.dashboard.config;
 
 import java.lang.invoke.MethodHandles;
+import java.net.URI;
 
 import org.oransc.ric.e2mgr.client.api.HealthCheckApi;
 import org.oransc.ric.e2mgr.client.api.NodebApi;
@@ -31,7 +32,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.util.Assert;
 import org.springframework.web.client.RestTemplate;
 
 /**
@@ -44,28 +44,32 @@ public class E2ManagerConfiguration {
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
 	// Populated by the autowired constructor
-	private final String e2mgrBasepath;
+	private final String e2mgrUrl;
 
 	@Autowired
-	public E2ManagerConfiguration(@Value("${e2mgr.basepath}") final String e2mgrBasepath) {
-		Assert.notNull(e2mgrBasepath, "base path must not be null");
-		logger.info("Configuring E2 Manager at base path {}", e2mgrBasepath);
-		this.e2mgrBasepath = e2mgrBasepath;
+	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() {
 		ApiClient apiClient = new ApiClient(new RestTemplate());
-		apiClient.setBasePath(e2mgrBasepath);
+		apiClient.setBasePath(e2mgrUrl);
 		return apiClient;
 	}
 
 	@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());
 	}