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%2FE2ManagerMockConfiguration.java;h=02b2ba4674cd0050045ad2e679675bde3ab13be8;hb=8da0a6ad3c28a52860d6c29b062462fe2abe39e0;hp=520da742e96574a82a0418ed2d0494f44870108f;hpb=2ab4c976427eb13105d8dd03dda3f040a94a1ec1;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
index 520da742..02b2ba46 100644
--- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
+++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
@@ -26,7 +26,9 @@ import static org.mockito.Mockito.when;
 
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
+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;
@@ -57,17 +59,21 @@ public class E2ManagerMockConfiguration {
 	@Value("${mock.config.delay:0}")
 	private int delayMs;
 
+	public static final String MOCK_RAN_NAME = "Mock RAN";
+
 	private final List<NodebIdentity> nodebIdList;
-	private final GetNodebResponse nodebResponse;
+	private final Map<String, GetNodebResponse> nodebResponseMap;
+	private final NodebIdentityGlobalNbId globalNbId;
 
 	public E2ManagerMockConfiguration() {
 		logger.info("Configuring mock E2 Manager");
-		NodebIdentityGlobalNbId globalNbId = new NodebIdentityGlobalNbId().nbId("mockNbId").plmnId("mockPlmId");
-		NodebIdentity nbid = new NodebIdentity().inventoryName("mockInvName").globalNbId(globalNbId);
+		globalNbId = new NodebIdentityGlobalNbId().nbId("mockNbId").plmnId("mockPlmId");
 		nodebIdList = new ArrayList<>();
-		nodebIdList.add(nbid);
-		nodebResponse = new GetNodebResponse().connectionStatus("mockConnectionStatus").failureType("mockFailureType")
-				.ip("127.0.0.1").nodeType("mockNodeType").port(123).ranName("mockRanName");
+		nodebResponseMap = new HashMap<>();
+		nodebIdList.add(new NodebIdentity().inventoryName(MOCK_RAN_NAME).globalNbId(globalNbId));
+		nodebResponseMap.put(MOCK_RAN_NAME,
+				new GetNodebResponse().connectionStatus("mockConnectionStatus").failureType("mockFailureType")
+						.ip("127.0.0.1").nodeType("mockNodeType").port(123).ranName(MOCK_RAN_NAME));
 	}
 
 	private ApiClient apiClient() {
@@ -94,11 +100,12 @@ public class E2ManagerMockConfiguration {
 		when(mockApi.getApiClient()).thenReturn(apiClient);
 		doAnswer(inv -> {
 			if (delayMs > 0) {
-				logger.debug("nodebDelete sleeping {}", delayMs);
+				logger.debug("nodebShutdownPut sleeping {}", delayMs);
 				Thread.sleep(delayMs);
 			}
+			nodebIdList.clear();
 			return null;
-		}).when(mockApi).nodebPut();
+		}).when(mockApi).nodebShutdownPut();
 		doAnswer(inv -> {
 			if (delayMs > 0) {
 				logger.debug("reset sleeping {}", delayMs);
@@ -111,7 +118,8 @@ public class E2ManagerMockConfiguration {
 				logger.debug("getNb sleeping {}", delayMs);
 				Thread.sleep(delayMs);
 			}
-			return nodebResponse;
+			String invName = inv.<String>getArgument(0);
+			return nodebResponseMap.get(invName);
 		}).when(mockApi).getNb(any(String.class));
 		doAnswer(inv -> {
 			if (delayMs > 0) {
@@ -125,6 +133,11 @@ public class E2ManagerMockConfiguration {
 				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 -> {
@@ -132,6 +145,11 @@ public class E2ManagerMockConfiguration {
 				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;