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=192f2b0c361695634a724e0512e3c12a5a51f573;hb=c0398e31cc04e7d5aa2076c525741d4207e5e0c8;hp=812ba203559a437e5e772f7311b5ed57cbf3581d;hpb=ea0bb57b5c50ec5a60901c7227bf269009120968;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 812ba203..192f2b0c 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
@@ -37,7 +37,6 @@ import org.oransc.ricplt.e2mgr.client.model.GetNodebResponse;
 import org.oransc.ricplt.e2mgr.client.model.NodebIdentity;
 import org.oransc.ricplt.e2mgr.client.model.NodebIdentityGlobalNbId;
 import org.oransc.ricplt.e2mgr.client.model.ResetRequest;
-import org.oransc.ricplt.e2mgr.client.model.SetupRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -104,9 +103,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));
+		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("CONNECTING").ip("127.0.0.2").port(456).ranName(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);
@@ -141,30 +143,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;
 	}