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%2FAnrXappMockConfiguration.java;h=550963b33ed7c2d2f53e775c28e468e7472180f3;hb=29ce34b03e4099786f14cd7fc5473305da8750d6;hp=bfaad92c4ef786147b087f6cad0047047c0584ec;hpb=60ea93eb75e4c0d54cf4b6959a60f0c7a0c8e292;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java
index bfaad92c..550963b3 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/AnrXappMockConfiguration.java
@@ -29,10 +29,10 @@ import static org.mockito.Mockito.when;
 
 import java.lang.invoke.MethodHandles;
 
-import org.oransc.ric.anrxapp.client.api.GnodebsApi;
 import org.oransc.ric.anrxapp.client.api.HealthApi;
 import org.oransc.ric.anrxapp.client.api.NcrtApi;
 import org.oransc.ric.anrxapp.client.invoker.ApiClient;
+import org.oransc.ric.anrxapp.client.model.GgNodeBTable;
 import org.oransc.ric.anrxapp.client.model.NeighborCellRelation;
 import org.oransc.ric.anrxapp.client.model.NeighborCellRelationMod;
 import org.oransc.ric.anrxapp.client.model.NeighborCellRelationTable;
@@ -53,9 +53,12 @@ public class AnrXappMockConfiguration {
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
 	private final NeighborCellRelationTable ncrt, ncrtNodeB1, ncrtNodeB2;
-	
+	private final GgNodeBTable gNodebTable;
+
 	public AnrXappMockConfiguration() {
 		logger.info("Configuring mock ANR xApp client");
+		gNodebTable = new GgNodeBTable();
+		gNodebTable.addGNodeBIdsItem("A").addGNodeBIdsItem("B");
 		ncrtNodeB1 = new NeighborCellRelationTable();
 		ncrtNodeB2 = new NeighborCellRelationTable();
 		ncrt = new NeighborCellRelationTable();
@@ -82,11 +85,10 @@ public class AnrXappMockConfiguration {
 	}
 
 	@Bean
-	public HealthApi anrHealthMockApi() {
-		ApiClient mockClient = mock(ApiClient.class);
-		when(mockClient.getStatusCode()).thenReturn(HttpStatus.OK);
+	public HealthApi anrHealthApi() {
+		ApiClient apiClient = apiClient();
 		HealthApi mockApi = mock(HealthApi.class);
-		when(mockApi.getApiClient()).thenReturn(mockClient);
+		when(mockApi.getApiClient()).thenReturn(apiClient);
 		doAnswer(i -> {
 			return null;
 		}).when(mockApi).getHealthAlive();
@@ -95,26 +97,18 @@ public class AnrXappMockConfiguration {
 		}).when(mockApi).getHealthReady();
 		return mockApi;
 	}
-	
-	@Bean
-	public GnodebsApi anrGnodebsMockApi() {
-		ApiClient mockClient = mock(ApiClient.class);
-		when(mockClient.getStatusCode()).thenReturn(HttpStatus.OK);
-		GnodebsApi mockApi = mock(GnodebsApi.class);
-		
-		return mockApi;
-	}
 
 	@Bean
 	public NcrtApi ncrtMockApi() {
 		ApiClient apiClient = apiClient();
 		NcrtApi mockApi = mock(NcrtApi.class);
 		when(mockApi.getApiClient()).thenReturn(apiClient);
+		when(mockApi.getgNodeB()).thenReturn(gNodebTable);
 		// Swagger sends nulls; front end sends empty strings
-		when(mockApi.getNcrtInfo((String) isNull(), (String) isNull(), (String) isNull())).thenReturn(ncrt);
-		when(mockApi.getNcrtInfo(eq(""), any(String.class), any(String.class))).thenReturn(ncrt);
-		when(mockApi.getNcrtInfo(startsWith("A"), any(String.class), any(String.class))).thenReturn(ncrtNodeB1);
-		when(mockApi.getNcrtInfo(startsWith("B"), any(String.class), any(String.class))).thenReturn(ncrtNodeB2);
+		when(mockApi.getNcrt((String) isNull(), (String) isNull(), (String) isNull())).thenReturn(ncrt);
+		when(mockApi.getNcrt(eq(""), any(String.class), any(String.class))).thenReturn(ncrt);
+		when(mockApi.getNcrt(startsWith("A"), any(String.class), any(String.class))).thenReturn(ncrtNodeB1);
+		when(mockApi.getNcrt(startsWith("B"), any(String.class), any(String.class))).thenReturn(ncrtNodeB2);
 		doAnswer(i -> {
 			return null;
 		}).when(mockApi).deleteNcrt(any(String.class), any(String.class));