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=578107f88702ed86d85055b7bce5b694cd0a01b9;hpb=5c87567c1743fb3f6957fe8fe0906310212cd1d6;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 578107f8..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 @@ -32,6 +32,7 @@ import java.lang.invoke.MethodHandles; 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; @@ -52,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(); @@ -81,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(); @@ -100,6 +103,7 @@ public class AnrXappMockConfiguration { 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.getNcrt((String) isNull(), (String) isNull(), (String) isNull())).thenReturn(ncrt); when(mockApi.getNcrt(eq(""), any(String.class), any(String.class))).thenReturn(ncrt);