X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dashboard%2Fwebapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FAppManagerMockConfiguration.java;h=27e59ad6305a7aaa4d153c220b94525a372f4bf9;hb=05c8688cd695a381eadaaa05f2027cf3f68feb5c;hp=36f6ff322769ecfd5b6b437b83c0891fb6877ad7;hpb=64a5e9470799236f0af4ce2df98f77c94eb1bed3;p=portal%2Fric-dashboard.git

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java
index 36f6ff32..27e59ad6 100644
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/AppManagerMockConfiguration.java
@@ -26,23 +26,24 @@ import static org.mockito.Mockito.when;
 
 import java.lang.invoke.MethodHandles;
 
-import org.oransc.ric.plt.appmgr.client.api.HealthApi;
-import org.oransc.ric.plt.appmgr.client.api.XappApi;
-import org.oransc.ric.plt.appmgr.client.invoker.ApiClient;
-import org.oransc.ric.plt.appmgr.client.model.AllDeployableXapps;
-import org.oransc.ric.plt.appmgr.client.model.AllDeployedXapps;
-import org.oransc.ric.plt.appmgr.client.model.AllXappConfig;
-import org.oransc.ric.plt.appmgr.client.model.ConfigMetadata;
-import org.oransc.ric.plt.appmgr.client.model.ConfigValidationError;
-import org.oransc.ric.plt.appmgr.client.model.ConfigValidationErrors;
-import org.oransc.ric.plt.appmgr.client.model.EventType;
-import org.oransc.ric.plt.appmgr.client.model.SubscriptionRequest;
-import org.oransc.ric.plt.appmgr.client.model.SubscriptionResponse;
-import org.oransc.ric.plt.appmgr.client.model.XAppConfig;
-import org.oransc.ric.plt.appmgr.client.model.Xapp;
-import org.oransc.ric.plt.appmgr.client.model.Xapp.StatusEnum;
-import org.oransc.ric.plt.appmgr.client.model.XappDescriptor;
-import org.oransc.ric.plt.appmgr.client.model.XappInstance;
+import org.oransc.ric.portal.dashboard.model.RicRegionList;
+import org.oransc.ricplt.appmgr.client.api.HealthApi;
+import org.oransc.ricplt.appmgr.client.api.XappApi;
+import org.oransc.ricplt.appmgr.client.invoker.ApiClient;
+import org.oransc.ricplt.appmgr.client.model.AllDeployableXapps;
+import org.oransc.ricplt.appmgr.client.model.AllDeployedXapps;
+import org.oransc.ricplt.appmgr.client.model.AllXappConfig;
+import org.oransc.ricplt.appmgr.client.model.ConfigMetadata;
+import org.oransc.ricplt.appmgr.client.model.ConfigValidationError;
+import org.oransc.ricplt.appmgr.client.model.ConfigValidationErrors;
+import org.oransc.ricplt.appmgr.client.model.EventType;
+import org.oransc.ricplt.appmgr.client.model.SubscriptionRequest;
+import org.oransc.ricplt.appmgr.client.model.SubscriptionResponse;
+import org.oransc.ricplt.appmgr.client.model.XAppConfig;
+import org.oransc.ricplt.appmgr.client.model.Xapp;
+import org.oransc.ricplt.appmgr.client.model.Xapp.StatusEnum;
+import org.oransc.ricplt.appmgr.client.model.XappDescriptor;
+import org.oransc.ricplt.appmgr.client.model.XappInstance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,9 +66,13 @@ public class AppManagerMockConfiguration {
 	// Simulate remote method delay for UI testing
 	private int delayMs;
 
+	// Autowire all the properties required by the real class
+	// (even tho not used here) as a test of the properties.
 	@Autowired
-	public AppManagerMockConfiguration(@Value("${mock.config.delay:0}") int delayMs) {
-		logger.debug("ctor: configured with delay {}", delayMs);
+	public AppManagerMockConfiguration(@Value("${appmgr.url.suffix}") final String urlSuffix, //
+			final RicRegionList instanceConfig, //
+			@Value("${mock.config.delay:0}") int delayMs) {
+		logger.info("ctor: configured with suffix {}, instances {}, delay {}", urlSuffix, instanceConfig, delayMs);
 		this.delayMs = delayMs;
 	}
 
@@ -97,7 +102,7 @@ public class AppManagerMockConfiguration {
 	private XappApi xappApi(String instanceKey) {
 		logger.debug("Creating XappApi for instance {}", instanceKey);
 		// Create instance-specific objects
-		String[] appNames = { "AdmissionControl " + instanceKey, "UE Event Collector " + instanceKey };
+		String[] appNames = { "Measurement Campaign " + instanceKey, "UE Event Collector " + instanceKey };
 		final String configJson = " { \"config\" : \"example-" + instanceKey + "\"}";
 		final ConfigValidationErrors configValErrs = new ConfigValidationErrors();
 		configValErrs.add(new ConfigValidationError().field("mock error"));