aboutsummaryrefslogtreecommitdiffstats
path: root/common-be/src
diff options
context:
space:
mode:
Diffstat (limited to 'common-be/src')
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/csar/storage/CsarPackageReducerConfiguration.java33
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/csar/storage/CsarSizeReducer.java109
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentStorageArtifactInfo.java33
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageConfig.java32
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManager.java161
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/csar/storage/exception/CsarSizeReducerException.java30
-rw-r--r--common-be/src/main/java/org/openecomp/sdc/be/csar/storage/exception/PersistentVolumeArtifactStorageException.java34
-rw-r--r--common-be/src/test/java/org/openecomp/sdc/be/csar/storage/CsarSizeReducerTest.java87
-rw-r--r--common-be/src/test/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManagerTest.java118
-rw-r--r--common-be/src/test/resources/csarSizeReducer/dummy.csarbin0 -> 25876 bytes
-rw-r--r--common-be/src/test/resources/persistentVolumeArtifactStorageManager/dummy.csarbin0 -> 25876 bytes
11 files changed, 637 insertions, 0 deletions
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/CsarPackageReducerConfiguration.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/CsarPackageReducerConfiguration.java
new file mode 100644
index 0000000000..a14222ab17
--- /dev/null
+++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/CsarPackageReducerConfiguration.java
@@ -0,0 +1,33 @@
+/*
+ * ============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 java.nio.file.Path;
+import java.util.Set;
+import lombok.Data;
+
+@Data
+public class CsarPackageReducerConfiguration implements PackageSizeReducerConfig {
+
+ private final Set<Path> foldersToStrip;
+ private final long sizeLimit;
+
+}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/CsarSizeReducer.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/CsarSizeReducer.java
new file mode 100644
index 0000000000..cf35c8c4d7
--- /dev/null
+++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/CsarSizeReducer.java
@@ -0,0 +1,109 @@
+/*
+ * ============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 java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.UUID;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+import org.openecomp.sdc.be.csar.storage.exception.CsarSizeReducerException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CsarSizeReducer implements PackageSizeReducer {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(CsarSizeReducer.class);
+
+ private final CsarPackageReducerConfiguration configuration;
+
+ public CsarSizeReducer(final CsarPackageReducerConfiguration configuration) {
+ this.configuration = configuration;
+ }
+
+ @Override
+ public byte[] reduce(final Path csarPackagePath) {
+ final var reducedCsarPath = Path.of(csarPackagePath + "." + UUID.randomUUID());
+
+ try (final var zf = new ZipFile(csarPackagePath.toString());
+ final var zos = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(reducedCsarPath)))) {
+
+ zf.entries().asIterator().forEachRemaining(entry -> {
+ final var entryName = entry.getName();
+ try {
+ if (!entry.isDirectory()) {
+ zos.putNextEntry(new ZipEntry(entryName));
+ if (isCandidateToRemove(entry)) {
+ // replace with EMPTY string to avoid package description inconsistency/validation errors
+ zos.write("".getBytes());
+ } else {
+ zos.write(zf.getInputStream(entry).readAllBytes());
+ }
+ }
+ zos.closeEntry();
+ } catch (final IOException ei) {
+ final var errorMsg = String.format("Failed to extract '%s' from zip '%s'", entryName, csarPackagePath);
+ throw new CsarSizeReducerException(errorMsg, ei);
+ }
+ });
+
+ } catch (final IOException ex1) {
+ rollback(reducedCsarPath);
+ final var errorMsg = String.format("An unexpected problem happened while reading the CSAR '%s'", csarPackagePath);
+ throw new CsarSizeReducerException(errorMsg, ex1);
+ }
+ final byte[] reducedCsarBytes;
+ try {
+ reducedCsarBytes = Files.readAllBytes(reducedCsarPath);
+ } catch (final IOException e) {
+ final var errorMsg = String.format("Could not read bytes of file '%s'", csarPackagePath);
+ throw new CsarSizeReducerException(errorMsg, e);
+ }
+ try {
+ Files.delete(reducedCsarPath);
+ } catch (final IOException e) {
+ final var errorMsg = String.format("Could not delete temporary file '%s'", reducedCsarPath);
+ throw new CsarSizeReducerException(errorMsg, e);
+ }
+
+ return reducedCsarBytes;
+ }
+
+ private void rollback(final Path reducedCsarPath) {
+ if (Files.exists(reducedCsarPath)) {
+ try {
+ Files.delete(reducedCsarPath);
+ } catch (final Exception ex2) {
+ LOGGER.warn("Could not delete temporary file '{}'", reducedCsarPath, ex2);
+ }
+ }
+ }
+
+ private boolean isCandidateToRemove(final ZipEntry zipEntry) {
+ final String zipEntryName = zipEntry.getName();
+ return configuration.getFoldersToStrip().stream().anyMatch(Path.of(zipEntryName)::startsWith)
+ || zipEntry.getSize() > configuration.getSizeLimit();
+ }
+
+}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentStorageArtifactInfo.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentStorageArtifactInfo.java
new file mode 100644
index 0000000000..0472661fd9
--- /dev/null
+++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentStorageArtifactInfo.java
@@ -0,0 +1,33 @@
+/*
+ * ============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 java.nio.file.Path;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+public class PersistentStorageArtifactInfo implements ArtifactInfo {
+
+ @Getter
+ private final Path path;
+
+}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageConfig.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageConfig.java
new file mode 100644
index 0000000000..d3cd6fb302
--- /dev/null
+++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageConfig.java
@@ -0,0 +1,32 @@
+/*
+ * ============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 java.nio.file.Path;
+import lombok.Data;
+
+@Data
+public class PersistentVolumeArtifactStorageConfig implements ArtifactStorageConfig {
+
+ private final boolean isEnabled;
+ private final Path storagePath;
+
+}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManager.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManager.java
new file mode 100644
index 0000000000..10629b3edb
--- /dev/null
+++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/PersistentVolumeArtifactStorageManager.java
@@ -0,0 +1,161 @@
+/*
+ * ============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 java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.util.Optional;
+import java.util.UUID;
+import org.openecomp.sdc.be.csar.storage.exception.PersistentVolumeArtifactStorageException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PersistentVolumeArtifactStorageManager implements ArtifactStorageManager {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(PersistentVolumeArtifactStorageManager.class);
+
+ private final PersistentVolumeArtifactStorageConfig storageConfiguration;
+
+ public PersistentVolumeArtifactStorageManager(final ArtifactStorageConfig storageConfiguration) {
+ this.storageConfiguration = (PersistentVolumeArtifactStorageConfig) storageConfiguration;
+ }
+
+ @Override
+ public ArtifactInfo persist(final String vspId, final String versionId, final ArtifactInfo uploadedArtifactInfo) {
+ final var temporaryPath = uploadedArtifactInfo.getPath();
+ if (!Files.exists(temporaryPath)) {
+ throw new PersistentVolumeArtifactStorageException(String.format("Given artifact does not exist '%s'", uploadedArtifactInfo.getPath()));
+ }
+
+ final var filePath = buildFilePath(vspId, versionId);
+ final var backupPath = backupPreviousVersion(filePath).orElse(null);
+ try {
+ moveFile(temporaryPath, filePath);
+ } catch (final Exception e) {
+ rollback(backupPath, filePath);
+ final var errorMsg = String.format("Could not persist artifact for VSP '%s', version '%s'", vspId, versionId);
+ throw new PersistentVolumeArtifactStorageException(errorMsg, e);
+ }
+
+ removePreviousVersion(backupPath);
+
+ return new PersistentStorageArtifactInfo(filePath);
+ }
+
+ @Override
+ public ArtifactInfo upload(final String vspId, final String versionId, final InputStream artifactInputStream) {
+ final var destinationFolder = buildDestinationFolder(vspId, versionId);
+ try {
+ Files.createDirectories(destinationFolder);
+ } catch (final IOException e) {
+ throw new PersistentVolumeArtifactStorageException(String.format("Could not create directory '%s'", destinationFolder), e);
+ }
+
+ final var filePath = createTempFilePath(destinationFolder);
+ try {
+ persist(artifactInputStream, filePath);
+ } catch (final IOException e) {
+ throw new PersistentVolumeArtifactStorageException(String.format("Could not persist artifact '%s'", filePath), e);
+ }
+
+ return new PersistentStorageArtifactInfo(filePath);
+ }
+
+ private Path buildFilePath(final String vspId, final String versionId) {
+ return buildDestinationFolder(vspId, versionId).resolve(versionId);
+ }
+
+ @Override
+ public boolean isEnabled() {
+ return storageConfiguration != null && storageConfiguration.isEnabled();
+ }
+
+ private Optional<Path> backupPreviousVersion(final Path filePath) {
+ if (!Files.exists(filePath)) {
+ return Optional.empty();
+ }
+
+ final var backupPath = Path.of(filePath + UUID.randomUUID().toString());
+ moveFile(filePath, backupPath);
+ return Optional.ofNullable(backupPath);
+ }
+
+ private void rollback(final Path backupPath, final Path filePath) {
+ try {
+ moveFile(backupPath, filePath);
+ } catch (final Exception ex) {
+ LOGGER.warn("Could not rollback the backup file '{}' to the original '{}'", backupPath, filePath, ex);
+ }
+ }
+
+ private void removePreviousVersion(final Path filePath) {
+ if (filePath == null || !Files.exists(filePath)) {
+ return;
+ }
+
+ try {
+ Files.delete(filePath);
+ } catch (final IOException e) {
+ throw new PersistentVolumeArtifactStorageException(String.format("Could not delete previous version '%s'", filePath), e);
+ }
+ }
+
+ private Path createTempFilePath(final Path destinationFolder) {
+ final var retries = 10;
+ return createTempFilePath(destinationFolder, retries).orElseThrow(() -> {
+ throw new PersistentVolumeArtifactStorageException(String.format("Could not generate upload file path after '%s' retries", retries));
+ });
+ }
+
+ private Optional<Path> createTempFilePath(final Path destinationFolder, int retries) {
+ for (var i = 0; i < retries; i++) {
+ final var filePath = destinationFolder.resolve(UUID.randomUUID().toString());
+ if (Files.notExists(filePath)) {
+ return Optional.of(filePath);
+ }
+ }
+ return Optional.empty();
+ }
+
+ private Path buildDestinationFolder(final String vspId, final String versionId) {
+ return storageConfiguration.getStoragePath().resolve(vspId).resolve(versionId);
+ }
+
+ private void persist(final InputStream artifactInputStream, final Path filePath) throws IOException {
+ try (final var inputStream = artifactInputStream;
+ final var fileOutputStream = new FileOutputStream(filePath.toFile());) {
+ inputStream.transferTo(fileOutputStream);
+ }
+ }
+
+ private void moveFile(final Path from, final Path to) {
+ try {
+ Files.move(from, to, StandardCopyOption.REPLACE_EXISTING);
+ } catch (final IOException e) {
+ throw new PersistentVolumeArtifactStorageException(String.format("Could not move file '%s' to '%s'", from, to), e);
+ }
+ }
+
+}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/exception/CsarSizeReducerException.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/exception/CsarSizeReducerException.java
new file mode 100644
index 0000000000..f57666ac70
--- /dev/null
+++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/exception/CsarSizeReducerException.java
@@ -0,0 +1,30 @@
+/*
+ * ============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.exception;
+
+import org.openecomp.sdc.be.exception.BusinessException;
+
+public class CsarSizeReducerException extends BusinessException {
+
+ public CsarSizeReducerException(final String message, final Throwable cause) {
+ super(message, cause);
+ }
+}
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/exception/PersistentVolumeArtifactStorageException.java b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/exception/PersistentVolumeArtifactStorageException.java
new file mode 100644
index 0000000000..28fff65bb6
--- /dev/null
+++ b/common-be/src/main/java/org/openecomp/sdc/be/csar/storage/exception/PersistentVolumeArtifactStorageException.java
@@ -0,0 +1,34 @@
+/*
+ * ============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.exception;
+
+import org.openecomp.sdc.be.exception.BusinessException;
+
+public class PersistentVolumeArtifactStorageException extends BusinessException {
+
+ public PersistentVolumeArtifactStorageException(final String message, final Throwable cause) {
+ super(message, cause);
+ }
+
+ public PersistentVolumeArtifactStorageException(final String message) {
+ super(message);
+ }
+}
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<String, byte[]> originalCsar = ZipUtils.readZip(csarPath.toFile(), false);
+
+ final byte[] reduce = csarSizeReducer.reduce(csarPath);
+
+ final Map<String, byte[]> reducedCsar = ZipUtils.readZip(reduce, false);
+
+ assertEquals(originalCsar.keySet().size(), reducedCsar.keySet().size(), "No file should be removed");
+ for (final Entry<String, byte[]> 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
--- /dev/null
+++ b/common-be/src/test/resources/csarSizeReducer/dummy.csar
Binary files 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
--- /dev/null
+++ b/common-be/src/test/resources/persistentVolumeArtifactStorageManager/dummy.csar
Binary files differ