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=334915c8a9148bfbb9dd50f159a234dfada6bb4f;hb=81c5a43871449332f9a9560c7cf25d07cf714d8e;hp=74d8c5546102b9804fd15a62e0fbc7ce65ca7298;hpb=4d6f9a14931a6aaaab28b482d73380e0960a82d6;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 74d8c554..334915c8 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 @@ -29,6 +29,7 @@ import java.lang.invoke.MethodHandles; 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.SetupRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,8 +48,11 @@ public class E2ManagerMockConfiguration { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + private final GetNodebResponse nodebResponse; + public E2ManagerMockConfiguration() { logger.info("Configuring mock E2 Manager"); + nodebResponse = new GetNodebResponse().ip("1.2.3.4").port(123).ranName("myRan"); } private ApiClient apiClient() { @@ -58,7 +62,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); @@ -66,16 +71,21 @@ public class E2ManagerMockConfiguration { doAnswer(i -> { return null; }).when(mockApi).healthGet(); - + return mockApi; } @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 nodebResponse; + }).when(mockApi).getNb(any(String.class)); + doAnswer(i -> { return null; }).when(mockApi).endcSetup(any(SetupRequest.class));