X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FE2ManagerMockConfiguration.java;h=ddec4ae4bf4cfe2ac89224f68199282f5de01a27;hb=5b686151904e2582ea9ce9d2f1c6abb7a400afa5;hp=b05d817495c062067bb39260877128b71b02f133;hpb=50aee48c8b79e3b43b3da0eb471d8db84a361fff;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
index b05d8174..ddec4ae4 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
@@ -25,11 +25,15 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.List;
 
 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.SetupRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,8 +43,7 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.http.HttpStatus;
 
 /**
- * Creates a mock implementation of the E2 manager client API. This version
- * answers only status codes, no data, so the mock implementations are trivial.
+ * Creates a mock implementation of the E2 Manager client API.
  */
 @Profile("mock")
 @Configuration
@@ -48,11 +51,17 @@ public class E2ManagerMockConfiguration {
 
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
+	private final List<NodebIdentity> nodebIdList;
 	private final GetNodebResponse nodebResponse;
-	
+
 	public E2ManagerMockConfiguration() {
 		logger.info("Configuring mock E2 Manager");
-		nodebResponse = new GetNodebResponse().ip("1.2.3.4").port(123).ranName("myRan");
+		NodebIdentityGlobalNbId globalNbId = new NodebIdentityGlobalNbId().nbId("mockNbId").plmnId("mockPlmId");
+		NodebIdentity nbid = new NodebIdentity().inventoryName("mockInvName").globalNbId(globalNbId);
+		nodebIdList = new ArrayList<>();
+		nodebIdList.add(nbid);
+		nodebResponse = new GetNodebResponse().connectionStatus("mockConnectionStatus").failureType("mockFailureType")
+				.ip("1.2.3.4").nodeType("mockNodeType").port(123).ranName("mockRanName");
 	}
 
 	private ApiClient apiClient() {
@@ -62,7 +71,8 @@ public class E2ManagerMockConfiguration {
 	}
 
 	@Bean
-	public HealthCheckApi e2HealthCheckApi() {
+	// Use the same name as regular configuration
+	public HealthCheckApi e2MgrHealthCheckApi() {
 		ApiClient apiClient = apiClient();
 		HealthCheckApi mockApi = mock(HealthCheckApi.class);
 		when(mockApi.getApiClient()).thenReturn(apiClient);
@@ -75,15 +85,24 @@ public class E2ManagerMockConfiguration {
 	}
 
 	@Bean
-	public NodebApi e2NodebApi() {
+	// Use the same name as regular configuration
+	public NodebApi e2MgrNodebApi() {
 		ApiClient apiClient = apiClient();
 		NodebApi mockApi = mock(NodebApi.class);
 		when(mockApi.getApiClient()).thenReturn(apiClient);
 
+		doAnswer(i -> {
+			return null;
+		}).when(mockApi).nodebDelete();
+
 		doAnswer(i -> {
 			return nodebResponse;
 		}).when(mockApi).getNb(any(String.class));
 
+		doAnswer(i -> {
+			return nodebIdList;
+		}).when(mockApi).getNodebIdList();
+
 		doAnswer(i -> {
 			return null;
 		}).when(mockApi).endcSetup(any(SetupRequest.class));