From 9534496497b037f4bfb26603f91b54f41e65774a Mon Sep 17 00:00:00 2001
From: "andre.schmid" <andre.schmid@est.tech>
Date: Wed, 1 Sep 2021 17:37:19 +0100
Subject: Fix CSAR generation default imports file conflict

When generating a CSAR for a resource that is associated with a
derived model, the default imports for the derived and parent model
can conflict in path, therefore causing an issue during the CSAR
zip generation which can't stand two entries with the same path.

The fix adds a logic to rename a file when conflicting, by adding
the model id as the file prefix.

Change-Id: Ife7168f1c69f90be9c2cfd8ba75efad316c477f6
Issue-ID: SDC-3710
Signed-off-by: andre.schmid <andre.schmid@est.tech>
---
 .../sdc/be/tosca/ToscaDefaultImportHelperTest.java | 53 ++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaDefaultImportHelperTest.java

(limited to 'catalog-be/src/test/java')

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaDefaultImportHelperTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaDefaultImportHelperTest.java
new file mode 100644
index 0000000000..675af36b04
--- /dev/null
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaDefaultImportHelperTest.java
@@ -0,0 +1,53 @@
+/*
+ * -
+ *  ============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.tosca;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.nio.file.Path;
+import org.junit.jupiter.api.Test;
+
+class ToscaDefaultImportHelperTest {
+
+    @Test
+    void addModelAsFilePrefix_pathWithoutParent() {
+        final Path originalPath = Path.of("anImport");
+        final var modelId = "modelId";
+        final Path actualPath = ToscaDefaultImportHelper.addModelAsFilePrefix(originalPath, modelId);
+        assertEquals(Path.of("modelId-anImport"), actualPath);
+    }
+
+    @Test
+    void addModelAsFilePrefix_pathWithParent() {
+        final Path originalPath = Path.of("parent/anImport");
+        final var modelId = "modelId";
+        final Path actualPath = ToscaDefaultImportHelper.addModelAsFilePrefix(originalPath, modelId);
+        assertEquals(Path.of("parent/modelId-anImport"), actualPath);
+    }
+
+    @Test
+    void addModelAsFilePrefix_nullOrEmptyModel() {
+        final Path originalPath = Path.of("parent/anImport");
+        assertEquals(originalPath, ToscaDefaultImportHelper.addModelAsFilePrefix(originalPath, null));
+        assertEquals(originalPath, ToscaDefaultImportHelper.addModelAsFilePrefix(originalPath, ""));
+    }
+}
\ No newline at end of file
-- 
cgit 1.2.3-korg