X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=rapp-manager-sme%2Fsrc%2Ftest%2Fjava%2Fcom%2Foransc%2Frappmanager%2Fsme%2Fservice%2FSmeDeployerTest.java;h=4574adaaa816db2bcab8c424db09cbaa845fd4eb;hb=fc63eb0da4e4426fbfbecdd4f95bec68ca3ceded;hp=ffa545722ead97ecb2036049f6e47b4b753206f3;hpb=54dca75507277ff5bf3009d482e6bf0c8a053743;p=nonrtric%2Fplt%2Frappmanager.git 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 --- 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");