X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=rapp-manager-application%2Fsrc%2Ftest%2Fjava%2Fcom%2Foransc%2Frappmanager%2Frest%2FRappInstanceControllerTest.java;h=9eb959a2514cfe7c3ed72d01e0a04aee7b20fbb7;hb=40a82302ff06348e446a2de3c4a552b1ee9bc61b;hp=3ad2059cb5ea8311c444266b2fb7ecc417db3d00;hpb=a071d6befe8d38a5e589dffbbf1dc3904ff3aa79;p=nonrtric%2Fplt%2Frappmanager.git

diff --git a/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java b/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java
index 3ad2059..9eb959a 100755
--- a/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java
+++ b/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java
@@ -8,6 +8,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.oransc.rappmanager.acm.service.AcmDeployer;
+import com.oransc.rappmanager.dme.service.DmeDeployer;
 import com.oransc.rappmanager.models.rappinstance.DeployOrder;
 import com.oransc.rappmanager.models.rapp.Rapp;
 import com.oransc.rappmanager.models.rappinstance.RappInstance;
@@ -17,6 +18,7 @@ import com.oransc.rappmanager.models.rapp.RappState;
 import com.oransc.rappmanager.models.cache.RappCacheService;
 import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
 import com.oransc.rappmanager.sme.service.SmeDeployer;
+import com.oransc.rappmanager.sme.service.SmeLifecycleManager;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -31,7 +33,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
-public class RappInstanceControllerTest {
+class RappInstanceControllerTest {
 
     @Autowired
     private MockMvc mockMvc;
@@ -48,6 +50,12 @@ public class RappInstanceControllerTest {
     @MockBean
     SmeDeployer smeDeployer;
 
+    @MockBean
+    DmeDeployer dmeDeployer;
+
+    @MockBean
+    SmeLifecycleManager smeLifecycleManager;
+
     private final String validRappFile = "valid-rapp-package.csar";
 
     private final String invalidRappFile = "invalid-rapp-package.csar";
@@ -142,6 +150,7 @@ public class RappInstanceControllerTest {
         rappInstanceDeployOrder.setDeployOrder(DeployOrder.DEPLOY);
         when(acmDeployer.deployRappInstance(any(), any())).thenReturn(true);
         when(smeDeployer.deployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.deployRappInstance(any(), any())).thenReturn(true);
         mockMvc.perform(MockMvcRequestBuilders.put("/rapps/{rapp_id}/instance/{instance_id}", rappId, rappInstanceId)
                                 .contentType(MediaType.APPLICATION_JSON)
                                 .content(objectMapper.writeValueAsString(rappInstanceDeployOrder)))
@@ -160,6 +169,7 @@ public class RappInstanceControllerTest {
         rappInstanceDeployOrder.setDeployOrder(DeployOrder.DEPLOY);
         when(acmDeployer.deployRappInstance(any(), any())).thenReturn(true);
         when(smeDeployer.deployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.deployRappInstance(any(), any())).thenReturn(true);
         mockMvc.perform(MockMvcRequestBuilders.put("/rapps/{rapp_id}/instance/{instance_id}", rappId, rappInstanceId)
                                 .contentType(MediaType.APPLICATION_JSON)
                                 .content(objectMapper.writeValueAsString(rappInstanceDeployOrder)))
@@ -172,6 +182,7 @@ public class RappInstanceControllerTest {
         rappInstanceDeployOrder.setDeployOrder(DeployOrder.DEPLOY);
         when(acmDeployer.deployRappInstance(any(), any())).thenReturn(true);
         when(smeDeployer.deployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.deployRappInstance(any(), any())).thenReturn(true);
         mockMvc.perform(MockMvcRequestBuilders.put("/rapps/{rapp_id}/instance/{instance_id}", UUID.randomUUID(),
                                 UUID.randomUUID()).contentType(MediaType.APPLICATION_JSON)
                                 .content(objectMapper.writeValueAsString(rappInstanceDeployOrder)))
@@ -190,6 +201,7 @@ public class RappInstanceControllerTest {
         rappInstanceDeployOrder.setDeployOrder(DeployOrder.UNDEPLOY);
         when(acmDeployer.undeployRappInstance(any(), any())).thenReturn(true);
         when(smeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
         mockMvc.perform(MockMvcRequestBuilders.put("/rapps/{rapp_id}/instance/{instance_id}", rappId, rappInstanceId)
                                 .contentType(MediaType.APPLICATION_JSON)
                                 .content(objectMapper.writeValueAsString(rappInstanceDeployOrder)))
@@ -208,6 +220,7 @@ public class RappInstanceControllerTest {
         rappInstanceDeployOrder.setDeployOrder(DeployOrder.UNDEPLOY);
         when(acmDeployer.undeployRappInstance(any(), any())).thenReturn(true);
         when(smeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
         mockMvc.perform(MockMvcRequestBuilders.put("/rapps/{rapp_id}/instance/{instance_id}", rappId, rappInstanceId)
                                 .contentType(MediaType.APPLICATION_JSON)
                                 .content(objectMapper.writeValueAsString(rappInstanceDeployOrder)))
@@ -222,6 +235,7 @@ public class RappInstanceControllerTest {
         rappInstanceDeployOrder.setDeployOrder(DeployOrder.UNDEPLOY);
         when(acmDeployer.undeployRappInstance(any(), any())).thenReturn(true);
         when(smeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
+        when(dmeDeployer.undeployRappInstance(any(), any())).thenReturn(true);
         mockMvc.perform(MockMvcRequestBuilders.put("/rapps/{rapp_id}/instance/{instance_id}", rappId, rappInstanceId)
                                 .contentType(MediaType.APPLICATION_JSON)
                                 .content(objectMapper.writeValueAsString(rappInstanceDeployOrder)))