1 files changed, 5 insertions, 14 deletions

diff --git a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/aai/AaiServiceTest.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/aai/AaiServiceTest.java
index f8f9597..a4e0625 100644
--- a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/aai/AaiServiceTest.java
+++ b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/service/aai/AaiServiceTest.java
@@ -16,7 +16,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -30,8 +29,6 @@ public class AaiServiceTest {
     @Mock
     private MulticloudClient multicloudClient;
     @Mock
-    private AaiRequestSender aaiRequestSender;
-    @Mock
     private AaiResponseParser responseParser;
     @Mock
     private AaiConfiguration aaiConfiguration;
@@ -45,8 +42,8 @@ public class AaiServiceTest {
         K8sRbInstanceResourceStatus status = mock(K8sRbInstanceResourceStatus.class);
         List<K8sRbInstanceResourceStatus> resourcesStatus = new ArrayList<>();
         resourcesStatus.add(status);
-        ParseResult parseResult = mock(ParseResult.class);
-        List<ParseResult> parseResultList = new ArrayList<>();
+        KubernetesResource parseResult = mock(KubernetesResource.class);
+        List<KubernetesResource> parseResultList = new ArrayList<>();
         parseResultList.add(parseResult);
 
         // when
@@ -54,14 +51,11 @@ public class AaiServiceTest {
         when(multicloudClient.getInstanceStatus(instanceId)).thenReturn(instanceStatus);
         when(instanceStatus.getResourcesStatus()).thenReturn(resourcesStatus);
         when(responseParser.parse(status, aaiRequest)).thenReturn(parseResult);
-        when(aaiConfiguration.isEnabled()).thenReturn(true);
-        doNothing().when(aaiRequestSender).sendUpdateRequestToAai(parseResult, aaiRequest);
 
         // then
         aaiServiceTested.aaiUpdate(aaiRequest);
 
         verify(responseParser, atLeast(1)).parse(status, aaiRequest);
-        verify(aaiRequestSender, atLeast(1)).sendUpdateRequestToAai(parseResult, aaiRequest);
     }
 
 
@@ -74,8 +68,8 @@ public class AaiServiceTest {
         K8sRbInstanceResourceStatus status = mock(K8sRbInstanceResourceStatus.class);
         List<K8sRbInstanceResourceStatus> resourcesStatus = new ArrayList<>();
         resourcesStatus.add(status);
-        ParseResult parseResult = mock(ParseResult.class);
-        List<ParseResult> parseResultList = new ArrayList<>();
+        KubernetesResource parseResult = mock(KubernetesResource.class);
+        List<KubernetesResource> parseResultList = new ArrayList<>();
         parseResultList.add(parseResult);
 
         // when
@@ -83,13 +77,10 @@ public class AaiServiceTest {
         when(multicloudClient.getInstanceStatus(instanceId)).thenReturn(instanceStatus);
         when(instanceStatus.getResourcesStatus()).thenReturn(resourcesStatus);
         when(responseParser.parse(status, aaiRequest)).thenReturn(parseResult);
-        when(aaiConfiguration.isEnabled()).thenReturn(true);
-        doNothing().when(aaiRequestSender).sendUpdateRequestToAai(parseResult, aaiRequest);
 
         // then
         aaiServiceTested.aaiDelete(aaiRequest);
 
         verify(responseParser, atLeast(1)).parse(status, aaiRequest);
-        verify(aaiRequestSender, atLeast(1)).sendDeleteRequestToAai(aaiRequest);
     }
-}
\ No newline at end of file
+}