From 8278b79c92f5149813f0161670a0eb76c33db322 Mon Sep 17 00:00:00 2001 From: vasraz Date: Thu, 8 Jul 2021 18:54:19 +0100 Subject: Support handling of 'Large CSARs' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If artifact storage is enabled, stores original onboarded package, leaving a reference in the VSP, instead of the original onboarded package itself. Strips files from configured folders in order to reduce the package size and onboard it. To retrieve the package, one needs to read the reference and go to the artifact storage to retrieve. If disabled, it just goes through the current onboarding process. Change-Id: I3dce0ab8422ea736c8a1ffaeb1136cf8b12a2af4 Signed-off-by: Vasyl Razinkov Signed-off-by: André Schmid Issue-ID: SDC-3635 --- .../sdc/be/csar/storage/CsarSizeReducerTest.java | 87 +++++++++++++++ ...PersistentVolumeArtifactStorageManagerTest.java | 118 +++++++++++++++++++++ .../src/test/resources/csarSizeReducer/dummy.csar | Bin 0 -> 25876 bytes .../dummy.csar | Bin 0 -> 25876 bytes 4 files changed, 205 insertions(+) create mode 100644 common-be/src/test/java/org/openecomp/sdc/be/csar/storage/CsarSizeReducerTest.java create mode 100644 common-be/src/test/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManagerTest.java create mode 100644 common-be/src/test/resources/csarSizeReducer/dummy.csar create mode 100644 common-be/src/test/resources/persistentVolumeArtifactStorageManager/dummy.csar (limited to 'common-be/src/test') diff --git a/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/CsarSizeReducerTest.java b/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/CsarSizeReducerTest.java new file mode 100644 index 0000000000..c7586446f7 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/CsarSizeReducerTest.java @@ -0,0 +1,87 @@ +/* + * - + * ============LICENSE_START======================================================= + * Copyright (C) 2021 Nordix Foundation. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.openecomp.sdc.be.csar.storage; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.when; + +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.openecomp.sdc.common.zip.ZipUtils; +import org.openecomp.sdc.common.zip.exception.ZipException; + +class CsarSizeReducerTest { + + @Mock + private CsarPackageReducerConfiguration csarPackageReducerConfiguration; + @InjectMocks + private CsarSizeReducer csarSizeReducer; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + } + + @Test + void reduceByPathAndSizeTest() throws ZipException { + final var pathToReduce1 = Path.of("Files/images"); + final var pathToReduce2 = Path.of("Files/Scripts/my_script.sh"); + final var sizeLimit = 150000L; + when(csarPackageReducerConfiguration.getSizeLimit()).thenReturn(sizeLimit); + when(csarPackageReducerConfiguration.getFoldersToStrip()).thenReturn(Set.of(pathToReduce1, pathToReduce2)); + + final var csarPath = Path.of("src/test/resources/csarSizeReducer/dummy.csar"); + + final Map originalCsar = ZipUtils.readZip(csarPath.toFile(), false); + + final byte[] reduce = csarSizeReducer.reduce(csarPath); + + final Map reducedCsar = ZipUtils.readZip(reduce, false); + + assertEquals(originalCsar.keySet().size(), reducedCsar.keySet().size(), "No file should be removed"); + for (final Entry originalEntry : originalCsar.entrySet()) { + final var originalFilePath = originalEntry.getKey(); + final byte[] originalBytes = originalEntry.getValue(); + assertTrue(reducedCsar.containsKey(originalFilePath), + String.format("No file should be removed, but it is missing original file '%s'", originalFilePath)); + + if (originalFilePath.startsWith(pathToReduce1.toString()) || originalFilePath.startsWith(pathToReduce2.toString()) + || originalBytes.length > sizeLimit) { + assertArrayEquals("".getBytes(StandardCharsets.UTF_8), reducedCsar.get(originalFilePath), + String.format("File '%s' expected to be reduced to empty string", originalFilePath)); + } else { + assertArrayEquals(originalBytes, reducedCsar.get(originalFilePath), + String.format("File '%s' expected to be equal", originalFilePath)); + } + } + } +} \ No newline at end of file diff --git a/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManagerTest.java b/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManagerTest.java new file mode 100644 index 0000000000..ab8c11c7c1 --- /dev/null +++ b/common-be/src/test/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManagerTest.java @@ -0,0 +1,118 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2021 Nordix Foundation + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.openecomp.sdc.be.csar.storage; + +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Objects; +import javax.activation.DataHandler; +import org.apache.commons.io.IOUtils; +import org.apache.cxf.jaxrs.ext.multipart.Attachment; +import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.mockito.ArgumentMatchers; +import org.mockito.Mockito; + +@TestMethodOrder(OrderAnnotation.class) +class PersistentVolumeArtifactStorageManagerTest { + + private static final String SRC_TEST_RESOURCES = "src/test/resources/"; + + private PersistentVolumeArtifactStorageManager testSubject; + + @BeforeEach + void setUp() { + testSubject = new PersistentVolumeArtifactStorageManager(new PersistentVolumeArtifactStorageConfig(true, Path.of(SRC_TEST_RESOURCES))); + } + + @AfterAll + static void tearDown() throws IOException { + Files.move(Path.of(SRC_TEST_RESOURCES + "vspId/versionId/versionId"), + Path.of(SRC_TEST_RESOURCES + "persistentVolumeArtifactStorageManager/dummy.csar")); + Files.list(Path.of("src/test/resources/vspId/versionId/")).forEach(path -> { + try { + Files.deleteIfExists(path); + } catch (IOException e) { + e.printStackTrace(); + } + }); + Files.deleteIfExists(Path.of(SRC_TEST_RESOURCES + "vspId/versionId/")); + Files.deleteIfExists(Path.of(SRC_TEST_RESOURCES + "vspId/")); + } + + @Test + @Order(1) + void testUpload() throws IOException { + final Attachment attachment = mockAttachment("dummy.csar", this.getClass().getResource("/persistentVolumeArtifactStorageManager/dummy.csar")); + final ArtifactInfo result = testSubject.upload("vspId", "versionId", attachment.getDataHandler().getInputStream()); + Assertions.assertNotNull(result); + Assertions.assertNotNull(result.getPath()); + Assertions.assertTrue(result.getPath().startsWith(Path.of(SRC_TEST_RESOURCES + "vspId/versionId/"))); + } + + @Test + @Order(2) + void testPersist() { + final ArtifactInfo result = testSubject.persist("vspId", "versionId", + new PersistentStorageArtifactInfo(Path.of(SRC_TEST_RESOURCES + "persistentVolumeArtifactStorageManager/dummy.csar"))); + Assertions.assertNotNull(result); + Assertions.assertNotNull(result.getPath()); + Assertions.assertTrue(result.getPath().startsWith(Path.of(SRC_TEST_RESOURCES + "vspId/versionId/"))); + } + + @Test + void testIsEnabled() { + Assertions.assertTrue(testSubject.isEnabled()); + } + + private Attachment mockAttachment(final String fileName, final URL fileToUpload) throws IOException { + final Attachment attachment = Mockito.mock(Attachment.class); + when(attachment.getContentDisposition()).thenReturn(new ContentDisposition("test")); + final DataHandler dataHandler = Mockito.mock(DataHandler.class); + when(dataHandler.getName()).thenReturn(fileName); + final InputStream inputStream = Mockito.mock(InputStream.class); + when(dataHandler.getInputStream()).thenReturn(inputStream); + when(attachment.getDataHandler()).thenReturn(dataHandler); + byte[] bytes = "upload package Test".getBytes(); + if (Objects.nonNull(fileToUpload)) { + try { + bytes = IOUtils.toByteArray(fileToUpload); + } catch (final IOException e) { + fail("Not able to convert file to byte array"); + } + } + when(attachment.getObject(ArgumentMatchers.any())).thenReturn(bytes); + return attachment; + } + +} diff --git a/common-be/src/test/resources/csarSizeReducer/dummy.csar b/common-be/src/test/resources/csarSizeReducer/dummy.csar new file mode 100644 index 0000000000..73b28f52fd Binary files /dev/null and b/common-be/src/test/resources/csarSizeReducer/dummy.csar differ diff --git a/common-be/src/test/resources/persistentVolumeArtifactStorageManager/dummy.csar b/common-be/src/test/resources/persistentVolumeArtifactStorageManager/dummy.csar new file mode 100644 index 0000000000..73b28f52fd Binary files /dev/null and b/common-be/src/test/resources/persistentVolumeArtifactStorageManager/dummy.csar differ -- cgit 1.2.3-korg