Merge "Upgrade E2 to API spec 20190611"

[portal/ric-dashboard.git] / webapp-backend / src / main / java / org / oransc / ric / portal / dashboard / config / E2ManagerMockConfiguration.java

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 400397c..b05d817 100644 (file)
--- 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
@@ -26,8 +26,10 @@ import static org.mockito.Mockito.when;
 
 import java.lang.invoke.MethodHandles;
 
-import org.oransc.ric.e2mgr.client.api.E2ManagerApi;
+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;
@@ -46,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() {
@@ -57,14 +62,27 @@ public class E2ManagerMockConfiguration {
        }
 
        @Bean
-       public E2ManagerApi e2ManagerApi() {
+       public HealthCheckApi e2HealthCheckApi() {
                ApiClient apiClient = apiClient();
-               E2ManagerApi mockApi = mock(E2ManagerApi.class);
+               HealthCheckApi mockApi = mock(HealthCheckApi.class);
                when(mockApi.getApiClient()).thenReturn(apiClient);
 
                doAnswer(i -> {
                        return null;
-               }).when(mockApi).healthCheck();
+               }).when(mockApi).healthGet();
+
+               return mockApi;
+       }
+
+       @Bean
+       public NodebApi e2NodebApi() {
+               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;
@@ -72,7 +90,7 @@ public class E2ManagerMockConfiguration {
 
                doAnswer(i -> {
                        return null;
-               }).when(mockApi).setup(any(SetupRequest.class));
+               }).when(mockApi).x2Setup(any(SetupRequest.class));
 
                return mockApi;
        }