Update E2 manager API to version 20190515

[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 3df6dc7..74d8c55 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
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
@@ -26,9 +26,8 @@ import static org.mockito.Mockito.when;
 
 import java.lang.invoke.MethodHandles;
 
-import org.oransc.ric.e2mgr.client.api.EndcSetupRequestApi;
 import org.oransc.ric.e2mgr.client.api.HealthCheckApi;
-import org.oransc.ric.e2mgr.client.api.X2SetupRequestApi;
+import org.oransc.ric.e2mgr.client.api.NodebApi;
 import org.oransc.ric.e2mgr.client.invoker.ApiClient;
 import org.oransc.ric.e2mgr.client.model.SetupRequest;
 import org.slf4j.Logger;
@@ -39,8 +38,8 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.http.HttpStatus;
 
 /**
- * Creates an implementation of the E2 manager client that answers requests with
- * mock data.
+ * Creates a mock implementation of the E2 manager client API. This version
+ * answers only status codes, no data, so the mock implementations are trivial.
  */
 @Profile("mock")
 @Configuration
@@ -59,32 +58,32 @@ public class E2ManagerMockConfiguration {
        }
 
        @Bean
-       public EndcSetupRequestApi endcSetupRequestApi() {
-               ApiClient apiClient = apiClient();
-               EndcSetupRequestApi mockApi = mock(EndcSetupRequestApi.class);
-               when(mockApi.getApiClient()).thenReturn(apiClient);
-               return mockApi;
-       }
-
-       @Bean
-       public HealthCheckApi healthCheckApi() {
+       public HealthCheckApi e2HealthCheckApi() {
                ApiClient apiClient = apiClient();
                HealthCheckApi mockApi = mock(HealthCheckApi.class);
                when(mockApi.getApiClient()).thenReturn(apiClient);
+
                doAnswer(i -> {
                        return null;
-               }).when(mockApi).healthCheck();
+               }).when(mockApi).healthGet();
+               
                return mockApi;
        }
 
        @Bean
-       public X2SetupRequestApi x2SetupRequestApi() {
+       public NodebApi e2NodebApi() {
                ApiClient apiClient = apiClient();
-               X2SetupRequestApi mockApi = mock(X2SetupRequestApi.class);
+               NodebApi mockApi = mock(NodebApi.class);
                when(mockApi.getApiClient()).thenReturn(apiClient);
+
+               doAnswer(i -> {
+                       return null;
+               }).when(mockApi).endcSetup(any(SetupRequest.class));
+
                doAnswer(i -> {
                        return null;
-               }).when(mockApi).setup(any(SetupRequest.class));
+               }).when(mockApi).x2Setup(any(SetupRequest.class));
+
                return mockApi;
        }