X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=rapp-manager-application%2Fsrc%2Ftest%2Fjava%2Fcom%2Foransc%2Frappmanager%2Fservice%2FDeploymentArtifactsServiceTest.java;h=b8364d9056bc9965b316cdc21fe181ec0edb4e17;hb=refs%2Fchanges%2F95%2F12595%2F6;hp=4a3a08a7c709941172ee67cbd102416bcb373df6;hpb=a46c269e0972357c54378520a4bba531bf7bb12d;p=nonrtric%2Fplt%2Frappmanager.git

diff --git a/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/DeploymentArtifactsServiceTest.java b/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/DeploymentArtifactsServiceTest.java
index 4a3a08a..b8364d9 100755
--- a/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/DeploymentArtifactsServiceTest.java
+++ b/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/DeploymentArtifactsServiceTest.java
@@ -80,8 +80,10 @@ class DeploymentArtifactsServiceTest {
     @EnumSource(value = HttpStatus.class, names = {"CREATED", "CONFLICT"})
     void testChartUpload(HttpStatus status) {
         Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
-                            .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
-        List<DeploymentItem> deploymentItems = rappCsarConfigurationHandler.getDeploymentItems(rapp);
+                            .packageLocation(validCsarFileLocation)
+                            .state(RappState.COMMISSIONED).build();
+        rapp.setAsdMetadata(rappCsarConfigurationHandler.getAsdMetadata(rapp));
+        List<DeploymentItem> deploymentItems = rapp.getAsdMetadata().getDeploymentItems();
         deploymentItems.forEach(deploymentItem -> mockServer.expect(ExpectedCount.once(),
                         requestTo(deploymentItem.getTargetServerUri())).andExpect(method(HttpMethod.POST))
                                                           .andRespond(withStatus(status)));
@@ -91,9 +93,10 @@ class DeploymentArtifactsServiceTest {
 
     @Test
     void testChartUploadNoArtifacts() {
-        String invalidRappFile = "invalid-rapp-package.csar";
+        String invalidRappFile = "valid-rapp-package-no-artifacts.csar";
         Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(invalidRappFile)
                             .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
+        rapp.setAsdMetadata(rappCsarConfigurationHandler.getAsdMetadata(rapp));
         assertTrue(deploymentArtifactsService.configureDeploymentArtifacts(rapp));
     }
 
@@ -101,7 +104,8 @@ class DeploymentArtifactsServiceTest {
     void testChartUploadFailure() {
         Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
                             .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
-        List<DeploymentItem> deploymentItems = rappCsarConfigurationHandler.getDeploymentItems(rapp);
+        rapp.setAsdMetadata(rappCsarConfigurationHandler.getAsdMetadata(rapp));
+        List<DeploymentItem> deploymentItems = rapp.getAsdMetadata().getDeploymentItems();
         deploymentItems.stream().findFirst().ifPresent(deploymentItem -> mockServer.expect(ExpectedCount.once(),
                         requestTo(deploymentItem.getTargetServerUri())).andExpect(method(HttpMethod.POST))
                                                                                  .andRespond(withServerError()));
@@ -115,7 +119,8 @@ class DeploymentArtifactsServiceTest {
     void testChartUploadFailureWithNotFound() {
         Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
                             .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
-        List<DeploymentItem> deploymentItems = rappCsarConfigurationHandler.getDeploymentItems(rapp);
+        rapp.setAsdMetadata(rappCsarConfigurationHandler.getAsdMetadata(rapp));
+        List<DeploymentItem> deploymentItems = rapp.getAsdMetadata().getDeploymentItems();
         deploymentItems.stream().findFirst().ifPresent(deploymentItem -> mockServer.expect(ExpectedCount.once(),
                 requestTo(deploymentItem.getTargetServerUri())).andExpect(method(HttpMethod.POST)).andRespond(
                 withStatus(HttpStatus.NOT_FOUND)));
@@ -127,7 +132,8 @@ class DeploymentArtifactsServiceTest {
     void testChartUploadFailureWithException() {
         Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
                             .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
-        List<DeploymentItem> deploymentItems = rappCsarConfigurationHandler.getDeploymentItems(rapp);
+        rapp.setAsdMetadata(rappCsarConfigurationHandler.getAsdMetadata(rapp));
+        List<DeploymentItem> deploymentItems = rapp.getAsdMetadata().getDeploymentItems();
         deploymentItems.stream().findFirst().ifPresent(deploymentItem -> mockServer.expect(ExpectedCount.once(),
                 requestTo(deploymentItem.getTargetServerUri())).andExpect(method(HttpMethod.POST)).andRespond(
                 withException(new IOException())));
@@ -141,7 +147,8 @@ class DeploymentArtifactsServiceTest {
     void testChartUploadFailureWithTooManyRequests() {
         Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
                             .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
-        List<DeploymentItem> deploymentItems = rappCsarConfigurationHandler.getDeploymentItems(rapp);
+        rapp.setAsdMetadata(rappCsarConfigurationHandler.getAsdMetadata(rapp));
+        List<DeploymentItem> deploymentItems = rapp.getAsdMetadata().getDeploymentItems();
         deploymentItems.stream().findFirst().ifPresent(deploymentItem -> mockServer.expect(ExpectedCount.once(),
                         requestTo(deploymentItem.getTargetServerUri())).andExpect(method(HttpMethod.POST))
                                                                                  .andRespond(withTooManyRequests()));