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%2FE2ManagerMockConfiguration.java;h=942c3c362815f14a26426c4d94890b6626b33dcb;hb=HEAD;hp=16d248614915f411caed1e2593e2248c14b78bc6;hpb=64a5e9470799236f0af4ce2df98f77c94eb1bed3;p=portal%2Fric-dashboard.git

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
index 16d24861..942c3c36 100644
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
@@ -30,14 +30,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.oransc.ric.e2mgr.client.api.HealthCheckApi;
-import org.oransc.ric.e2mgr.client.api.NodebApi;
-import org.oransc.ric.e2mgr.client.invoker.ApiClient;
-import org.oransc.ric.e2mgr.client.model.GetNodebResponse;
-import org.oransc.ric.e2mgr.client.model.NodebIdentity;
-import org.oransc.ric.e2mgr.client.model.NodebIdentityGlobalNbId;
-import org.oransc.ric.e2mgr.client.model.ResetRequest;
-import org.oransc.ric.e2mgr.client.model.SetupRequest;
+import org.oransc.ric.portal.dashboard.model.RicRegionList;
+import org.oransc.ricplt.e2mgr.client.api.HealthCheckApi;
+import org.oransc.ricplt.e2mgr.client.api.NodebApi;
+import org.oransc.ricplt.e2mgr.client.invoker.ApiClient;
+import org.oransc.ricplt.e2mgr.client.model.GetNodebResponse;
+import org.oransc.ricplt.e2mgr.client.model.NodebIdentity;
+import org.oransc.ricplt.e2mgr.client.model.UpdateGnbRequest;
+import org.oransc.ricplt.e2mgr.client.model.UpdateGnbResponseGlobalNbId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,9 +62,13 @@ public class E2ManagerMockConfiguration {
 	// 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 E2ManagerMockConfiguration(@Value("${mock.config.delay:0}") int delayMs) {
-		logger.debug("ctor: configured with delay {}", delayMs);
+	public E2ManagerMockConfiguration(@Value("${e2mgr.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;
 	}
 
@@ -91,7 +95,7 @@ public class E2ManagerMockConfiguration {
 	 */
 	private NodebApi nodebApi(String instanceKey) {
 
-		final NodebIdentityGlobalNbId globalNbId = new NodebIdentityGlobalNbId().nbId("mockNbId-" + instanceKey)
+		final UpdateGnbResponseGlobalNbId globalNbId = new UpdateGnbResponseGlobalNbId().nbId("mockNbId-" + instanceKey)
 				.plmnId("mockPlmId");
 		final List<NodebIdentity> nodebIdList = new ArrayList<>();
 		final Map<String, GetNodebResponse> nodebResponseMap = new HashMap<>();
@@ -104,9 +108,12 @@ public class E2ManagerMockConfiguration {
 		// "nodebStatus":{"connectionStatus":"CONNECTING","enb":null,"failureType":null,
 		// "globalNbId":null,"gnb":null,"ip":"10.2.0.6","nodeType":null,"port":36444,
 		// "ranName":"AAAA123456","setupFailure":null}}]
-		nodebIdList.add(new NodebIdentity().inventoryName(RAN_NAME_2));
-		nodebResponseMap.put(RAN_NAME_2,
-				new GetNodebResponse().connectionStatus("CONNECTING").ip("127.0.0.2").port(456).ranName(RAN_NAME_2));
+		nodebIdList.add(new NodebIdentity().inventoryName(RAN_NAME_1).globalNbId(globalNbId));
+		nodebResponseMap.put(RAN_NAME_1, new GetNodebResponse().connectionStatus("CONNECTING").ip("127.0.0.1").port(456)
+				.ranName(RAN_NAME_2).nodeType("ENDC").port(100));
+		nodebIdList.add(new NodebIdentity().inventoryName(RAN_NAME_2).globalNbId(globalNbId));
+		nodebResponseMap.put(RAN_NAME_2, new GetNodebResponse().connectionStatus("CONNECTED").ip("127.0.0.2").port(456)
+				.ranName(RAN_NAME_2).nodeType("X2").port(200));
 
 		ApiClient apiClient = apiClient();
 		NodebApi mockApi = mock(NodebApi.class);
@@ -121,11 +128,11 @@ public class E2ManagerMockConfiguration {
 		}).when(mockApi).nodebShutdownPut();
 		doAnswer(inv -> {
 			if (delayMs > 0) {
-				logger.debug("reset sleeping {}", delayMs);
+				logger.debug("updateGnb sleeping {}", delayMs);
 				Thread.sleep(delayMs);
 			}
 			return null;
-		}).when(mockApi).reset(any(String.class), any(ResetRequest.class));
+		}).when(mockApi).updateGnb(any(UpdateGnbRequest.class), any(String.class));
 		doAnswer(inv -> {
 			if (delayMs > 0) {
 				logger.debug("getNb sleeping {}", delayMs);
@@ -141,30 +148,6 @@ public class E2ManagerMockConfiguration {
 			}
 			return nodebIdList;
 		}).when(mockApi).getNodebIdList();
-		doAnswer(inv -> {
-			if (delayMs > 0) {
-				logger.debug("endcSetup sleeping {}", delayMs);
-				Thread.sleep(delayMs);
-			}
-			SetupRequest sr = inv.<SetupRequest>getArgument(0);
-			nodebIdList.add(new NodebIdentity().inventoryName(sr.getRanName()).globalNbId(globalNbId));
-			nodebResponseMap.put(sr.getRanName(),
-					new GetNodebResponse().connectionStatus("mockConnectionStatus").failureType("mockFailureType")
-							.ip(sr.getRanIp()).nodeType("ENDC").port(sr.getRanPort()).ranName(sr.getRanName()));
-			return null;
-		}).when(mockApi).endcSetup(any(SetupRequest.class));
-		doAnswer(inv -> {
-			if (delayMs > 0) {
-				logger.debug("x2Setup sleeping {}", delayMs);
-				Thread.sleep(delayMs);
-			}
-			SetupRequest sr = inv.<SetupRequest>getArgument(0);
-			nodebIdList.add(new NodebIdentity().inventoryName(sr.getRanName()).globalNbId(globalNbId));
-			nodebResponseMap.put(sr.getRanName(),
-					new GetNodebResponse().connectionStatus("mockConnectionStatus").failureType("mockFailureType")
-							.ip(sr.getRanIp()).nodeType("X2").port(sr.getRanPort()).ranName(sr.getRanName()));
-			return null;
-		}).when(mockApi).x2Setup(any(SetupRequest.class));
 		return mockApi;
 	}