From: imamSidero <imam.hussain@est.tech>
Date: Tue, 30 Aug 2022 18:10:31 +0000 (+0100)
Subject: Service-import sub import path fixed
X-Git-Tag: 1.11.8~14
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F23%2F130523%2F3;p=sdc.git

Service-import sub import path fixed

sub imported files path are fixed in importing a service

Issue-ID: SDC-4150
Signed-off-by: Imam hussain <imam.hussain@est.tech>
Change-Id: Ibec3fd25f8316b678cfa76fe6c688d89701787d8
---

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/ServiceCsarInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/ServiceCsarInfo.java
index 8dfe106713..5c948323a4 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/ServiceCsarInfo.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/ServiceCsarInfo.java
@@ -103,7 +103,8 @@ public class ServiceCsarInfo extends CsarInfo {
             if (CollectionUtils.isNotEmpty(importsList)) {
                 if (importsList.get(0) instanceof String) {
                     List<Path> importPaths = new ArrayList<>();
-                    importsList.stream().forEach(importPath -> importPaths.add(Paths.get((String) importPath)));
+                    importsList.stream()
+                        .forEach(importPath -> importPaths.add(fileParentDir == null ? Paths.get((String) importPath) : fileParentDir.resolve(Paths.get((String) importPath)).normalize()));
                     return importPaths;
                 } else if (importsList.get(0) instanceof Map) {
                     return getTemplateImportFilePathsMultiLineGrammar(importsList, fileParentDir);