Support for optional rApp and rApp instance parameters

[nonrtric/plt/rappmanager.git] / rapp-manager-sme / src / test / java / com / oransc / rappmanager / sme / service / SmeDeployerTest.java

diff --git a/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeDeployerTest.java b/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeDeployerTest.java
index ffa5457..4574ada 100755 (executable)
--- a/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeDeployerTest.java
+++ b/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeDeployerTest.java
@@ -28,12 +28,12 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.models.rapp.Rapp;
+import com.oransc.rappmanager.models.cache.RappCacheService;
 import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import com.oransc.rappmanager.models.rapp.Rapp;
+import com.oransc.rappmanager.models.rapp.RappState;
 import com.oransc.rappmanager.models.rappinstance.RappInstance;
 import com.oransc.rappmanager.models.rappinstance.RappSMEInstance;
-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.models.statemachine.RappInstanceStateMachineConfig;
 import com.oransc.rappmanager.sme.configuration.SmeConfiguration;
@@ -243,7 +243,7 @@ class SmeDeployerTest {
     }
 
     @Test
-    void testCreateInvokerFailure() throws Exception {
+    void testCreateInvokerFailure() {
         UUID rappId = UUID.randomUUID();
         Rapp rapp =
                 Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
@@ -297,6 +297,18 @@ class SmeDeployerTest {
         assertTrue(deployRapp);
     }
 
+    @Test
+    void testDeployRappInstanceWithoutSme() throws Exception {
+        UUID rappId = UUID.randomUUID();
+        Rapp rapp =
+                Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
+                        .state(RappState.PRIMED).build();
+        RappInstance rappInstance = getRappInstance();
+        rappInstance.setSme(null);
+        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
+        assertTrue(smeDeployer.deployRappInstance(rapp, rappInstance));
+    }
+
     @Test
     void testDeployRappFailure() throws Exception {
         UUID rappId = UUID.randomUUID();
@@ -362,6 +374,16 @@ class SmeDeployerTest {
         assertTrue(undeployRapp);
     }
 
+    @Test
+    void testUndeployRappInstanceWithoutSme() {
+        UUID rappId = UUID.randomUUID();
+        Rapp rapp = Rapp.builder().rappId(rappId).name(rappId.toString()).packageName(validRappFile)
+                            .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
+        RappInstance rappInstance = getRappInstance();
+        rappInstance.setSme(null);
+        assertTrue(smeDeployer.undeployRappInstance(rapp, rappInstance));
+    }
+
     @Test
     void testUndeployRappInstanceFailure() {
         UUID rappId = UUID.randomUUID();
@@ -397,6 +419,12 @@ class SmeDeployerTest {
         assertFalse(undeployRapp);
     }
 
+    @Test
+    void testPrimingAndDeprimingDoesNothing() {
+        assertTrue(smeDeployer.primeRapp(null));
+        assertTrue(smeDeployer.deprimeRapp(null));
+    }
+
     RappInstance getRappInstance() {
         RappSMEInstance rappSMEInstance = new RappSMEInstance();
         rappSMEInstance.setInvokers("invoker-app1");