X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=rapp-manager-dme%2Fsrc%2Ftest%2Fjava%2Fcom%2Foransc%2Frappmanager%2Fdme%2Fservice%2FDmeDeployerTest.java;h=f3080e554e5efd364770eb11a4f580adb5ce3d89;hb=HEAD;hp=d5fb291ae44e7136f70268f10d8326b75e337885;hpb=7c96a8b483bb12318a04433ce36bccff314ddacb;p=nonrtric%2Fplt%2Frappmanager.git

diff --git a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java b/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java
index d5fb291..f3080e5 100755
--- a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java
+++ b/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START======================================================================
  * Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
  * ===============================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +31,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.oransc.rappmanager.dme.configuration.DmeConfiguration;
 import com.oransc.rappmanager.models.cache.RappCacheService;
+import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
 import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
 import com.oransc.rappmanager.models.rapp.Rapp;
 import com.oransc.rappmanager.models.rapp.RappDmeResourceBuilder;
@@ -64,8 +66,8 @@ import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
 @SpringBootTest(classes = {DmeConfiguration.class, DmeDeployer.class, BeanTestConfiguration.class,
-        RappCsarConfigurationHandler.class, RappCacheService.class, RappInstanceStateMachineConfig.class,
-        RappInstanceStateMachine.class})
+        RappsEnvironmentConfiguration.class, RappCsarConfigurationHandler.class, RappCacheService.class,
+        RappInstanceStateMachineConfig.class, RappInstanceStateMachine.class})
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @AutoConfigureMockMvc
 class DmeDeployerTest {
@@ -77,8 +79,6 @@ class DmeDeployerTest {
     RestTemplate restTemplate;
     @Autowired
     DmeConfiguration dmeConfiguration;
-    @SpyBean
-    RappInstanceStateMachine rappInstanceStateMachine;
 
     RappDmeResourceBuilder rappDmeResourceBuilder = new RappDmeResourceBuilder();
 
@@ -147,6 +147,16 @@ class DmeDeployerTest {
         assertNull(rapp.getReason());
     }
 
+    @Test
+    void testPrimeRappWithoutDme() {
+        RappResources rappResources = rappDmeResourceBuilder.getResources();
+        rappResources.setDme(null);
+        Rapp rapp = getRapp(Optional.empty());
+        rapp.setPackageName(validRappFile);
+        rapp.setRappResources(rappResources);
+        assertTrue(dmeDeployer.primeRapp(rapp));
+    }
+
     @Test
     void testPrimeRappFailure() {
         RappResources rappResources = rappDmeResourceBuilder.getResources();
@@ -172,71 +182,7 @@ class DmeDeployerTest {
     void testDeployrAppInstanceSuccess() {
         Rapp rapp = getRapp(Optional.empty());
         RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
-        getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypesProducer().toArray()[0].toString(), true);
-        getMockServerClientCreateInfoProducer(rappInstance.getDme().getInfoProducer(), true);
-        getMockServerClientCreateInfoConsumer(rappInstance.getDme().getInfoConsumer(), true);
-        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
-        assertTrue(dmeDeployer.deployRappInstance(rapp, rappInstance));
-        mockServer.verify();
-    }
-
-    @Test
-    void testDeployrAppInstanceSuccessWithoutConsumer() {
-        Rapp rapp = getRapp(Optional.empty());
-        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
-        rappInstance.getDme().setInfoTypeConsumer(null);
-        rappInstance.getDme().setInfoConsumer(null);
-        getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypesProducer().toArray()[0].toString(), true);
-        getMockServerClientCreateInfoProducer(rappInstance.getDme().getInfoProducer(), true);
-        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
         assertTrue(dmeDeployer.deployRappInstance(rapp, rappInstance));
-        mockServer.verify();
-    }
-
-    @Test
-    void testDeployrAppInstanceWithoutProducer() {
-        Rapp rapp = getRapp(Optional.empty());
-        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
-        rappInstance.getDme().setInfoTypesProducer(null);
-        rappInstance.getDme().setInfoProducer(null);
-        getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypeConsumer(), true);
-        getMockServerClientCreateInfoConsumer(rappInstance.getDme().getInfoConsumer(), true);
-        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
-        assertTrue(dmeDeployer.deployRappInstance(rapp, rappInstance));
-        mockServer.verify();
-    }
-
-    @Test
-    void testDeployrAppInstanceFailureWithInfoType() {
-        Rapp rapp = getRapp(Optional.empty());
-        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
-        getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypesProducer().toArray()[0].toString(), false);
-        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
-        assertFalse(dmeDeployer.deployRappInstance(rapp, rappInstance));
-        mockServer.verify();
-    }
-
-    @Test
-    void testDeployrAppInstanceFailureWithInfoProducer() {
-        Rapp rapp = getRapp(Optional.empty());
-        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
-        getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypesProducer().toArray()[0].toString(), true);
-        getMockServerClientCreateInfoProducer(rappInstance.getDme().getInfoProducer(), false);
-        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
-        assertFalse(dmeDeployer.deployRappInstance(rapp, rappInstance));
-        mockServer.verify();
-    }
-
-    @Test
-    void testDeployrAppInstanceFailureWithInfoConsumer() {
-        Rapp rapp = getRapp(Optional.empty());
-        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
-        getMockServerClientCreateInfoType(rappInstance.getDme().getInfoTypesProducer().toArray()[0].toString(), true);
-        getMockServerClientCreateInfoProducer(rappInstance.getDme().getInfoProducer(), true);
-        getMockServerClientCreateInfoConsumer(rappInstance.getDme().getInfoConsumer(), false);
-        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
-        assertFalse(dmeDeployer.deployRappInstance(rapp, rappInstance));
-        mockServer.verify();
     }
 
     @Test
@@ -244,108 +190,11 @@ class DmeDeployerTest {
         Rapp rapp = getRapp(Optional.empty());
         rapp.setState(RappState.PRIMED);
         RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
-        getMockServerClientDeleteInfoConsumer(rappInstance.getDme().getInfoConsumer(), true);
-        getMockServerClientDeleteInfoProducer(rappInstance.getDme().getInfoProducer(), true);
-        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
         assertTrue(dmeDeployer.undeployRappInstance(rapp, rappInstance));
-        mockServer.verify();
-    }
-
-
-    @Test
-    void testUndeployrAppInstanceFailureWithInfoProducer() {
-        Rapp rapp = getRapp(Optional.empty());
-        rapp.setState(RappState.PRIMED);
-        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
-        getMockServerClientDeleteInfoConsumer(rappInstance.getDme().getInfoConsumer(), true);
-        getMockServerClientDeleteInfoProducer(rappInstance.getDme().getInfoProducer(), false);
-        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
-        assertFalse(dmeDeployer.undeployRappInstance(rapp, rappInstance));
-        mockServer.verify();
-    }
-
-    @Test
-    void testUndeployrAppInstanceFailureWithInfoConsumer() {
-        Rapp rapp = getRapp(Optional.empty());
-        rapp.setState(RappState.PRIMED);
-        RappInstance rappInstance = rappDmeResourceBuilder.getRappInstance();
-        getMockServerClientDeleteInfoConsumer(rappInstance.getDme().getInfoConsumer(), false);
-        rappInstanceStateMachine.onboardRappInstance(rappInstance.getRappInstanceId());
-        assertFalse(dmeDeployer.undeployRappInstance(rapp, rappInstance));
-        mockServer.verify();
-    }
-
-    @Test
-    void testCreateInfoTypeFailureInvalidInfoType() {
-        Rapp rapp = getRapp(Optional.empty());
-        assertFalse(dmeDeployer.createInfoTypes(rapp, null));
-    }
-
-    @Test
-    void testCreateInfoTypeFailureInvalidInfoProducer() {
-        Rapp rapp = getRapp(Optional.empty());
-        assertFalse(dmeDeployer.createInfoProducer(rapp, ""));
-    }
-
-    @Test
-    void testCreateInfoTypeFailureInvalidInfoConsumer() {
-        Rapp rapp = getRapp(Optional.empty());
-        assertFalse(dmeDeployer.createInfoConsumer(rapp, ""));
     }
 
     Rapp getRapp(Optional<UUID> rappOptional) {
         return Rapp.builder().rappId(rappOptional.orElse(UUID.randomUUID())).name("").packageName(validRappFile)
                        .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
     }
-
-    void getMockServerClientCreateInfoType(String infoType, boolean isSuccess) {
-        if (isSuccess) {
-            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_TYPE, infoType)))
-                    .andExpect(method(HttpMethod.PUT)).andRespond(withStatus(HttpStatus.CREATED));
-        } else {
-            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_TYPE, infoType)))
-                    .andExpect(method(HttpMethod.PUT)).andRespond(withStatus(HttpStatus.BAD_GATEWAY));
-        }
-    }
-
-    void getMockServerClientCreateInfoProducer(String infoProducer, boolean isSuccess) {
-        if (isSuccess) {
-            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_PRODUCER, infoProducer)))
-                    .andExpect(method(HttpMethod.PUT)).andRespond(withStatus(HttpStatus.CREATED));
-        } else {
-            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_PRODUCER, infoProducer)))
-                    .andExpect(method(HttpMethod.PUT)).andRespond(withStatus(HttpStatus.BAD_GATEWAY));
-        }
-    }
-
-    void getMockServerClientCreateInfoConsumer(String infoConsumer, boolean isSuccess) {
-        if (isSuccess) {
-            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_CONSUMER, infoConsumer)))
-                    .andExpect(method(HttpMethod.PUT)).andRespond(withStatus(HttpStatus.CREATED));
-        } else {
-            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_CONSUMER, infoConsumer)))
-                    .andExpect(method(HttpMethod.PUT)).andRespond(withStatus(HttpStatus.BAD_GATEWAY));
-        }
-    }
-
-    void getMockServerClientDeleteInfoProducer(String infoProducer, boolean isSuccess) {
-        if (isSuccess) {
-            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_PRODUCER, infoProducer)))
-                    .andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.NO_CONTENT));
-        } else {
-            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_PRODUCER, infoProducer)))
-                    .andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.BAD_GATEWAY));
-        }
-    }
-
-    void getMockServerClientDeleteInfoConsumer(String infoConsumer, boolean isSuccess) {
-        if (isSuccess) {
-            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_CONSUMER, infoConsumer)))
-                    .andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.NO_CONTENT));
-        } else {
-            mockServer.expect(ExpectedCount.once(), requestTo(String.format(URI_INFO_CONSUMER, infoConsumer)))
-                    .andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.BAD_GATEWAY));
-        }
-    }
-
 }