X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=rapp-manager-models%2Fsrc%2Ftest%2Fjava%2Fcom%2Foransc%2Frappmanager%2Fmodels%2Fcsar%2FRappCsarConfigurationHandlerTest.java;h=f1d3044b691d7e48593e443514fb35df65ab9e31;hb=1eda1b787de9dedfa5701eabc9d58a7a16f9f3cb;hp=d5e8d425ebbf201357382fdc9cb1047fa1073179;hpb=40a82302ff06348e446a2de3c4a552b1ee9bc61b;p=nonrtric%2Fplt%2Frappmanager.git diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java index d5e8d42..f1d3044 100755 --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java +++ b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.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. @@ -22,82 +23,83 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.JsonSyntaxException; +import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; import com.oransc.rappmanager.models.rapp.Rapp; import com.oransc.rappmanager.models.rapp.RappResources; import com.oransc.rappmanager.models.rappinstance.RappACMInstance; import com.oransc.rappmanager.models.rappinstance.RappDMEInstance; +import com.oransc.rappmanager.models.rappinstance.RappInstance; import com.oransc.rappmanager.models.rappinstance.RappSMEInstance; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.util.Set; import java.util.UUID; -import org.apache.http.entity.ContentType; +import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream; +import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.mock.web.MockMultipartFile; +import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.test.context.ContextConfiguration; -import org.springframework.web.multipart.MultipartFile; @SpringBootTest -@ContextConfiguration(classes = RappCsarConfigurationHandler.class) +@EnableConfigurationProperties +@ContextConfiguration( + classes = {ObjectMapper.class, RappsEnvironmentConfiguration.class, RappCsarConfigurationHandler.class}) class RappCsarConfigurationHandlerTest { - @Autowired + @SpyBean RappCsarConfigurationHandler rappCsarConfigurationHandler; + @Autowired + RappsEnvironmentConfiguration rappsEnvironmentConfiguration; + @Autowired + ObjectMapper objectMapper; String validCsarFileLocation = "src/test/resources/"; - private final String validRappFile = "valid-rapp-package.csar"; - private final String invalidRappFile = "invalid-rapp-package.csar"; - - @Test - void testCsarPackageValidationSuccess() throws IOException { - String rappCsarPath = validCsarFileLocation + File.separator + validRappFile; - MultipartFile multipartFile = - new MockMultipartFile(rappCsarPath, rappCsarPath, ContentType.MULTIPART_FORM_DATA.getMimeType(), - new FileInputStream(rappCsarPath)); - assertEquals(Boolean.TRUE, rappCsarConfigurationHandler.isValidRappPackage(multipartFile)); - } - - @Test - void testCsarPackageValidationFailure() throws IOException { - String rappCsarPath = validCsarFileLocation + File.separator + invalidRappFile; - MultipartFile multipartFile = - new MockMultipartFile(rappCsarPath, rappCsarPath, ContentType.MULTIPART_FORM_DATA.getMimeType(), - new FileInputStream(rappCsarPath)); - assertEquals(Boolean.FALSE, rappCsarConfigurationHandler.isValidRappPackage(multipartFile)); - } - - @Test - void testCsarPackageValidationFailureWithoutOrginalName() throws IOException { - MultipartFile multipartFile = mock(MultipartFile.class); - assertEquals(Boolean.FALSE, rappCsarConfigurationHandler.isValidRappPackage(multipartFile)); - } + private final String invalidRappNoAsdFile = "invalid-rapp-package-no-asd-yaml.csar"; - @Test - void testInvalidCsarFileExist() { - MultipartFile multipartFile = mock(MultipartFile.class); - assertEquals(Boolean.FALSE, rappCsarConfigurationHandler.isFileExistsInCsar(multipartFile, "INVALID_LOCATION")); - } + private final String invalidRappEmptyAsdFile = "invalid-rapp-package-empty-asd-yaml.csar"; @Test - void testCsarInstantiationPayload() throws JSONException { + void testCsarInstantiationPayload() throws JSONException, JsonProcessingException { Rapp rapp = Rapp.builder().name("").packageName(validRappFile).packageLocation(validCsarFileLocation).build(); UUID compositionId = UUID.randomUUID(); - RappACMInstance rappACMInstance = new RappACMInstance(); - rappACMInstance.setInstance("kserve-instance"); - JSONObject jsonObject = new JSONObject( - rappCsarConfigurationHandler.getInstantiationPayload(rapp, rappACMInstance, compositionId)); - assertEquals(jsonObject.get("compositionId"), String.valueOf(compositionId)); + RappInstance rappInstance = new RappInstance(); + RappACMInstance rappKserveACMInstance = new RappACMInstance(); + rappKserveACMInstance.setInstance("kserve-instance"); + rappInstance.setAcm(rappKserveACMInstance); + JSONObject kserveInstanceJsonObject = + new JSONObject(rappCsarConfigurationHandler.getInstantiationPayload(rapp, rappInstance, compositionId)); + assertEquals(kserveInstanceJsonObject.get("compositionId"), String.valueOf(compositionId)); + RappACMInstance rappK8sACMInstance = new RappACMInstance(); + rappK8sACMInstance.setInstance("k8s-instance"); + rappInstance.setAcm(rappK8sACMInstance); + JsonNode jsonNode = objectMapper.readTree( + rappCsarConfigurationHandler.getInstantiationPayload(rapp, rappInstance, compositionId)); + assertEquals(jsonNode.get("compositionId").asText(), String.valueOf(compositionId)); + JsonNode overrideParamsNode = jsonNode.at("/elements").elements().next().at("/properties/chart/overrideParams"); + System.out.println(overrideParamsNode); + assertEquals(overrideParamsNode.get("appId").asText(), rappInstance.getRappInstanceId().toString()); + assertEquals(overrideParamsNode.get("smeDiscoveryEndpoint").asText(), + rappsEnvironmentConfiguration.getSmeDiscoveryEndpoint()); } @Test @@ -121,6 +123,14 @@ class RappCsarConfigurationHandlerTest { assertThat(fileByteArray.size()).isZero(); } + @Test + void testInvalidZipStreamGetFromCsar() throws IOException { + ZipArchiveInputStream zipArchiveInputStream = mock(ZipArchiveInputStream.class); + doThrow(new IOException()).when(zipArchiveInputStream).getNextEntry(); + ByteArrayOutputStream fileByteArray = rappCsarConfigurationHandler.getFileFromCsar(zipArchiveInputStream, null); + assertThat(fileByteArray.size()).isZero(); + } + @Test void testListResources() { UUID rappId = UUID.randomUUID(); @@ -131,10 +141,11 @@ class RappCsarConfigurationHandlerTest { assertThat(rappResources).isNotNull(); assertNotNull(rappResources.getAcm().getCompositionDefinitions()); assertThat(rappResources.getAcm().getCompositionInstances()).hasSize(4); - assertThat(rappResources.getSme().getProviderFunctions()).hasSize(4); + assertThat(rappResources.getSme().getProviderFunctions()).hasSize(3); assertThat(rappResources.getSme().getServiceApis()).hasSize(2); assertThat(rappResources.getSme().getInvokers()).hasSize(2); - assertThat(rappResources.getDme().getInfoTypes()).hasSize(2); + assertThat(rappResources.getDme().getProducerInfoTypes()).hasSize(2); + assertThat(rappResources.getDme().getConsumerInfoTypes()).hasSize(2); assertThat(rappResources.getDme().getInfoProducers()).hasSize(2); assertThat(rappResources.getDme().getInfoConsumers()).hasSize(2); } @@ -142,7 +153,7 @@ class RappCsarConfigurationHandlerTest { @Test void testListInvalidResources() { UUID rappId = UUID.randomUUID(); - Rapp rapp = Rapp.builder().rappId(rappId).name("").build(); + Rapp rapp = Rapp.builder().rappId(rappId).name("").packageName("").packageLocation("").build(); RappResources rappResources = rappCsarConfigurationHandler.getRappResource(rapp); assertThat(rappResources).isNotNull(); assertNull(rappResources.getAcm()); @@ -205,27 +216,45 @@ class RappCsarConfigurationHandlerTest { void testGetSmeInvokerPayload() { UUID rappId = UUID.randomUUID(); RappSMEInstance rappSMEInstance = new RappSMEInstance(); - rappSMEInstance.setServiceApis("invoker-app1"); + rappSMEInstance.setInvokers("invoker-app1"); + RappInstance rappInstance = new RappInstance(); + rappInstance.setSme(rappSMEInstance); Rapp rapp = Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation) .build(); - String smeProviderDomainPayload = rappCsarConfigurationHandler.getSmeInvokerPayload(rapp, rappSMEInstance); - assertNotNull(smeProviderDomainPayload); + JSONArray smeInvokerPayload = + new JSONArray(rappCsarConfigurationHandler.getSmeInvokerPayload(rapp, rappInstance)); + assertNotNull(smeInvokerPayload); + assertEquals(smeInvokerPayload.getJSONObject(0).getString("apiInvokerInformation"), + rappInstance.getRappInstanceId().toString()); } @Test - void testGetDmeInfoTypePayload() { + void testGetDmeProducerInfoTypePayload() { UUID rappId = UUID.randomUUID(); RappDMEInstance rappDMEInstance = new RappDMEInstance(); rappDMEInstance.setInfoTypesProducer(Set.of("json-file-data-from-filestore")); Rapp rapp = Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation) .build(); - String dmeInfoTypePayload = rappCsarConfigurationHandler.getDmeInfoTypePayload(rapp, + String dmeInfoTypePayload = rappCsarConfigurationHandler.getDmeProducerInfoTypePayload(rapp, rappDMEInstance.getInfoTypesProducer().iterator().next()); assertNotNull(dmeInfoTypePayload); } + @Test + void testGetDmeConsumerInfoTypePayload() { + UUID rappId = UUID.randomUUID(); + RappDMEInstance rappDMEInstance = new RappDMEInstance(); + rappDMEInstance.setInfoTypeConsumer("json-file-data-from-filestore"); + Rapp rapp = + Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation) + .build(); + String dmeInfoTypePayload = + rappCsarConfigurationHandler.getDmeConsumerInfoTypePayload(rapp, rappDMEInstance.getInfoTypeConsumer()); + assertNotNull(dmeInfoTypePayload); + } + @Test void testGetDmeInfoProducerPayload() { UUID rappId = UUID.randomUUID(); @@ -252,4 +281,45 @@ class RappCsarConfigurationHandlerTest { assertNotNull(dmeInfoConsumerPayload); } + @Test + void testGetAsdMetadata() { + Rapp rapp = Rapp.builder().name("").packageName(validRappFile).packageLocation(validCsarFileLocation).build(); + AsdMetadata asdMetadata = rappCsarConfigurationHandler.getAsdMetadata(rapp); + assertEquals("123e4567-e89b-12d3-a456-426614174000", asdMetadata.getDescriptorId()); + assertEquals("040eff2a-eb1a-4aff-bd46-37ce38092985", asdMetadata.getDescriptorInvariantId()); + assertEquals(2, asdMetadata.getDeploymentItems().size()); + } + + @ParameterizedTest + @ValueSource(strings = {invalidRappNoAsdFile, invalidRappEmptyAsdFile}) + void testGetAsdMetadataNoAsd(String packageName) { + Rapp rapp = Rapp.builder().name("").packageName(packageName).packageLocation(validCsarFileLocation).build(); + assertThat(rappCsarConfigurationHandler.getAsdMetadata(rapp)).isNotNull(); + } + + @Test + void testGetAsdMetadataException() throws JsonProcessingException { + Rapp rapp = Rapp.builder().name("").packageName(validRappFile).packageLocation(validCsarFileLocation).build(); + doThrow(new JsonSyntaxException("")).when(rappCsarConfigurationHandler).getAsdContentNode(any()); + assertNull(rappCsarConfigurationHandler.getAsdMetadata(rapp).getDescriptorId()); + assertNull(rappCsarConfigurationHandler.getAsdMetadata(rapp).getDescriptorInvariantId()); + assertThat(rappCsarConfigurationHandler.getAsdMetadata(rapp).getDeploymentItems()).isNull(); + } + + @Test + void testGetAsdMetadataNullAsdContent() throws JsonProcessingException { + Rapp rapp = Rapp.builder().name("").packageName(validRappFile).packageLocation(validCsarFileLocation).build(); + doReturn(null).when(rappCsarConfigurationHandler).getAsdContentNode(any()); + assertNull(rappCsarConfigurationHandler.getAsdMetadata(rapp).getDescriptorId()); + assertNull(rappCsarConfigurationHandler.getAsdMetadata(rapp).getDescriptorInvariantId()); + assertThat(rappCsarConfigurationHandler.getAsdMetadata(rapp).getDeploymentItems()).isNull(); + } + + @Test + void testGetArtifactPayload() { + Rapp rapp = Rapp.builder().name("").packageName(validRappFile).packageLocation(validCsarFileLocation).build(); + assertNotNull(rappCsarConfigurationHandler.getArtifactPayload(rapp, + "Artifacts/Deployment/HELM/ransliceassurance-1.0.0.tgz")); + + } }