X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FRICInstanceMockConfiguration.java;fp=webapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FRICInstanceMockConfiguration.java;h=4b1158efd5ed34e59ab6fcfb7475e805aa534df2;hb=c1c667f0a1aa289655b5309aff4c1c748733f4d2;hp=2f9e82cf9fa47d0a42efd7ec048a6c874ff5f7db;hpb=b7d7982bbfbf3a1333feb8b811f99497752d3722;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/RICInstanceMockConfiguration.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/RICInstanceMockConfiguration.java
index 2f9e82cf..4b1158ef 100644
--- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/RICInstanceMockConfiguration.java
+++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/RICInstanceMockConfiguration.java
@@ -20,11 +20,16 @@
 
 package org.oransc.ric.portal.dashboard.config;
 
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.oransc.ric.portal.dashboard.model.RicInstance;
 import org.oransc.ric.portal.dashboard.model.RicInstanceList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
@@ -36,21 +41,36 @@ import org.springframework.stereotype.Component;
 @Profile("test")
 public class RICInstanceMockConfiguration {
 
+	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
 	// Publish constants for use in tests
 	public static final String INSTANCE_KEY_1 = "i1";
 	public static final String INSTANCE_KEY_2 = "i2";
+	public static final String[] INSTANCE_KEYS = { INSTANCE_KEY_1, INSTANCE_KEY_2 };
+
+	// Simulate remote method delay for UI testing
+	private int delayMs;
+
+	@Autowired
+	public RICInstanceMockConfiguration(@Value("${mock.config.delay:0}") int delayMs) {
+		logger.debug("ctor: configured with delay {}", delayMs);
+		this.delayMs = delayMs;
+	}
 
 	@Bean
-	public RicInstanceList ricInstanceList() {
+	public RicInstanceList ricInstanceList() throws InterruptedException {
+		if (delayMs > 0) {
+			logger.debug("ricInstanceList sleeping {}", delayMs);
+			Thread.sleep(delayMs);
+		}
 		List<RicInstance> instances = new ArrayList<>();
-		RicInstance i1 = new RicInstance().key(INSTANCE_KEY_1).name("Friendly Name One")
-				.appUrlPrefix("http://foo.bar/app").pltUrlPrefix("http://foo.bar/plt")
-				.caasUrlPrefix("http://foo.bar/caas");
-		instances.add(i1);
-		RicInstance i2 = new RicInstance().key(INSTANCE_KEY_2).name("Friendly Name Two")
-				.appUrlPrefix("http://foo.bar/2/app").pltUrlPrefix("http://foo.bar/2/plt")
-				.caasUrlPrefix("http://foo.bar/2/caas");
-		instances.add(i2);
+		for (String key : INSTANCE_KEYS) {
+			RicInstance i = new RicInstance().key(key).name("RIC Instance " + key)
+					.appUrlPrefix("http://" + key + ".domain.name/app")
+					.pltUrlPrefix("http://" + key + ".domain.name/plt")
+					.caasUrlPrefix("http://" + key + ".domain.name/caas");
+			instances.add(i);
+		}
 		return new RicInstanceList(instances);
 	}