Upgrade to E2 API with disconnect-all method

[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 04bb8fc..a03b33e 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
@@ -62,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);
@@ -75,11 +76,16 @@ public class E2ManagerMockConfiguration {
        }
 
        @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 null;
+               }).when(mockApi).nodebDelete();
+
                doAnswer(i -> {
                        return nodebResponse;
                }).when(mockApi).getNb(any(String.class));