From c0cd58244635c610c604066e9542058b310a706d Mon Sep 17 00:00:00 2001
From: Sithara Nambiar <sitharav.aredath@huawei.com>
Date: Tue, 29 Sep 2020 23:10:17 +0530
Subject: [PATCH] sdc changes for identifying helm package as a vfm

Issue-ID: REQ-341

Signed-off-by: Sithara Nambiar <sitharav.aredath@huawei.com>
Change-Id: Ide4736655c01dd25dae5afe1207a292a6bcd6951
---
 .../impl/ComponentInstanceBusinessLogic.java       |   2 +-
 .../sdc/be/info/ArtifactTemplateInfo.java          |   4 +++
 .../src/test/resources/Files/VNFs/helm.zip         | Bin 0 -> 40052 bytes
 .../datatypes/structure/HeatStructureTree.java     |   9 ++++++
 .../sdc/heat/services/tree/HeatTreeManager.java    |   5 ++-
 .../heattotosca/to/FileDataCollection.java         |  12 +++++++
 .../services/heattotosca/HeatToToscaUtil.java      |  13 ++++++++
 .../services/heattotosca/TranslationService.java   |  35 +++++++++++++++++++++
 .../types/candidateheat/Module.java                |   2 ++
 .../CandidateServiceImpl.java                      |  11 ++++++-
 .../ManifestCreatorNamingConventionImpl.java       |   6 +++-
 11 files changed, 95 insertions(+), 4 deletions(-)
 create mode 100644 integration-tests/src/test/resources/Files/VNFs/helm.zip

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
index ffccc978db..baa794c6cc 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
@@ -859,7 +859,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
                 if (!type.equalsIgnoreCase(ArtifactTypeEnum.HEAT_ENV.getType())) {
                     finalDeploymentArtifacts.put(artifact.getArtifactLabel(), artifact);
                 }
-                if (type.equalsIgnoreCase(ArtifactTypeEnum.HEAT.getType()) || type.equalsIgnoreCase(ArtifactTypeEnum.HEAT_NET.getType()) || type.equalsIgnoreCase(ArtifactTypeEnum.HEAT_VOL.getType()) || type.equalsIgnoreCase(ArtifactTypeEnum.CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT.getType())) {
+                if (type.equalsIgnoreCase(ArtifactTypeEnum.HEAT.getType()) || type.equalsIgnoreCase(ArtifactTypeEnum.HELM.getType())|| type.equalsIgnoreCase(ArtifactTypeEnum.HEAT_NET.getType()) || type.equalsIgnoreCase(ArtifactTypeEnum.HEAT_VOL.getType()) || type.equalsIgnoreCase(ArtifactTypeEnum.CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT.getType())) {
                     artifact.setTimeout(defaultHeatTimeout);
                 } else {
                     continue;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTemplateInfo.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTemplateInfo.java
index 21589e0723..ab088ec3d8 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTemplateInfo.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/ArtifactTemplateInfo.java
@@ -59,6 +59,7 @@ public class ArtifactTemplateInfo {
     private static final String ARTIFACT_TEMPLATE_ENV = "env";
     private static final String IS_BASE = "isBase";
     private static final String CSAR_HEAT = "HEAT";
+    private static final String CSAR_HELM = "HELM";
     private static final String CSAR_NETWORK = "network";
     private static final String CSAR_VOLUME = "volume";
     private static final String CSAR_NESTED = "nested";
@@ -140,6 +141,9 @@ public class ArtifactTemplateInfo {
         else if (type.equalsIgnoreCase(CSAR_HEAT)) {
             correctType = ArtifactTypeEnum.HEAT.getType();
         }
+        else if (type.equalsIgnoreCase(CSAR_HELM)) {
+            correctType = ArtifactTypeEnum.HELM.getType();
+        }
         else {
             correctType = ArtifactTypeEnum.OTHER.getType();
         }
diff --git a/integration-tests/src/test/resources/Files/VNFs/helm.zip b/integration-tests/src/test/resources/Files/VNFs/helm.zip
new file mode 100644
index 0000000000000000000000000000000000000000..225143b873f6f33aa801b579d2fce40c98b365af
GIT binary patch
literal 40052
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

literal 0
HcmV?d00001

diff --git a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/structure/HeatStructureTree.java b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/structure/HeatStructureTree.java
index 8d1b5912df..a65db6f2ea 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/structure/HeatStructureTree.java
+++ b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/structure/HeatStructureTree.java
@@ -50,6 +50,7 @@ public class HeatStructureTree implements Comparable<HeatStructureTree> {
     private Set<HeatStructureTree> nested;
     private Set<HeatStructureTree> other;
     private Set<Artifact> artifacts;
+    private Set<HeatStructureTree> helm;
 
     public HeatStructureTree() {
     }
@@ -165,6 +166,14 @@ public class HeatStructureTree implements Comparable<HeatStructureTree> {
         this.other.add(other);
     }
 
+    public void addToHelmList(HeatStructureTree helm){
+        if (this.helm == null) {
+            this.helm = new TreeSet<>();
+        }
+
+        this.helm.add(helm);
+    }
+
     /**
      * Find item in set by name boolean.
      *
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/tree/HeatTreeManager.java b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/tree/HeatTreeManager.java
index 4ac09fbddd..b441fc8660 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/tree/HeatTreeManager.java
+++ b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/tree/HeatTreeManager.java
@@ -251,7 +251,10 @@ public class HeatTreeManager {
                         }
                         parentHeatStructureTree.getOther().add(childHeatStructureTree);
                     }
-                } else {
+                } else if (FileData.Type.HELM.equals(type)) {
+                    parentHeatStructureTree.addToHelmList(childHeatStructureTree);
+                    }
+                else {
                     artifact = new Artifact(fileName, type);
                     if (!artifactRef.keySet().contains(fileName)) {
                         artifactRef.put(fileName, artifact);
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/to/FileDataCollection.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/to/FileDataCollection.java
index a9147b838f..b156078430 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/to/FileDataCollection.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/to/FileDataCollection.java
@@ -32,11 +32,16 @@ public class FileDataCollection {
   Collection<FileData> addOnFiles;
   Collection<FileData> nestedFiles;
   Collection<FileData> artifactFiles;
+  Collection<FileData> HelmFiles;
 
   public Collection<FileData> getBaseFile() {
     return baseFiles;
   }
 
+  public Collection<FileData> getHelmFile() {
+    return HelmFiles;
+  }
+
   public void setBaseFile(Collection<FileData> baseFiles) {
     this.baseFiles = baseFiles;
   }
@@ -109,6 +114,13 @@ public class FileDataCollection {
     this.baseFiles.add(baseFile);
   }
 
+  public void addHelmFiles(FileData helmFile) {
+    if (this.HelmFiles == null) {
+      this.HelmFiles = new ArrayList<>();
+    }
+    this.HelmFiles.add(helmFile);
+  }
+
   /**
    * Add artifact files.
    *
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java
index 6649c90adb..d204281d6b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java
@@ -220,6 +220,19 @@ public class HeatToToscaUtil {
         return null;
     }
 
+    static FileDataCollection getFileCollectionsByHelmFilter(List<FileData> fileDataList, Set<FileData.Type> typeFilter) {
+        FileDataCollection fileDataCollection = new FileDataCollection();
+        Map<String, FileData> filteredFiles = filterFileDataListByType(fileDataList, typeFilter);
+        for (FileData fileData : filteredFiles.values()) {
+            String fileName = fileData.getFile();
+            if((fileData.getType().equals(FileData.Type.HELM)))
+            {
+                fileDataCollection.addHelmFiles(fileData);
+            }
+        }
+        return fileDataCollection;
+    }
+
     static FileDataCollection getFileCollectionsByFilter(List<FileData> fileDataList, Set<FileData.Type> typeFilter,
                                                                 TranslationContext translationContext) {
         FileDataCollection fileDataCollection = new FileDataCollection();
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java
index 339d6ff023..6d22a3602c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/TranslationService.java
@@ -70,6 +70,12 @@ public class TranslationService {
         return types;
     }
 
+    public static Set<FileData.Type> getTypesToProcessByHelmTranslator() {
+        Set<FileData.Type> types = new HashSet<>();
+        types.add(FileData.Type.HELM);
+        return types;
+    }
+
     /**
      * Translate heat files translator output.
      *
@@ -81,6 +87,8 @@ public class TranslationService {
         List<FileData> fileDataList = translationContext.getManifest().getContent().getData();
         FileDataCollection fileDataCollection = HeatToToscaUtil.getFileCollectionsByFilter(fileDataList,
                 TranslationService.getTypesToProcessByTranslator(), translationContext);
+        FileDataCollection fileDataCollectionHelm = HeatToToscaUtil.getFileCollectionsByHelmFilter(fileDataList,
+                TranslationService.getTypesToProcessByHelmTranslator());
 
         if (fileDataCollection.getBaseFile() != null) {
             for (FileData fileData : fileDataCollection.getBaseFile()) {
@@ -93,6 +101,13 @@ public class TranslationService {
             }
         }
 
+        if (fileDataCollectionHelm.getHelmFile() !=null) {
+            for (FileData fileData : fileDataCollectionHelm.getHelmFile()) {
+                translateHelmFile(mainServiceTemplate, fileData, translationContext);
+
+            }
+        }
+
         ToscaServiceModel toscaServiceModel =
                 HeatToToscaUtil.createToscaServiceModel(mainServiceTemplate, translationContext);
 
@@ -145,6 +160,26 @@ public class TranslationService {
         }
     }
 
+
+    public void translateHelmFile(ServiceTemplate serviceTemplate, FileData heatFileData,
+                                  TranslationContext context) {
+        String heatFileName = heatFileData.getFile();
+        Map<String, ParameterDefinition> inputs = serviceTemplate.getTopology_template().getInputs();
+        if (!Objects.isNull(inputs)) {
+
+            inputs.entrySet().forEach(
+                    stringParameterDefinitionEntry -> {
+                        List inputParamVFModuleList = getVFModulesList(
+                                inputs.get(stringParameterDefinitionEntry.getKey()));
+                        if (!inputParamVFModuleList.contains(FileUtils.getFileWithoutExtention(heatFileName)) ){
+                            inputParamVFModuleList.add(FileUtils.getFileWithoutExtention(heatFileName));
+                        }
+                    }
+            );
+        }
+        inputs.putAll(inputs);
+    }
+
     private void handleHeatPseudoParam(String heatFileName, ServiceTemplate serviceTemplate,
                                        TranslationContext context) {
         Map<String, String> translatedHeatPseudoParam =
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/Module.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/Module.java
index d25341469f..25a004e890 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/Module.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/types/candidateheat/Module.java
@@ -23,6 +23,7 @@ package org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.openecomp.sdc.heat.datatypes.manifest.FileData;
 
 @Getter
 @Setter
@@ -35,5 +36,6 @@ public class Module {
     private String env;
     private String vol;
     private String volEnv;
+    private FileData.Type type;
 
 }
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/CandidateServiceImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/CandidateServiceImpl.java
index 5535416838..8bae5e8193 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/CandidateServiceImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/CandidateServiceImpl.java
@@ -262,11 +262,20 @@ public class CandidateServiceImpl implements CandidateService {
       if (Objects.nonNull(fileData.getType()) &&
           fileData.getType().equals(FileData.Type.HEAT)) {
         Module module = new Module();
+        module.setType(FileData.Type.HEAT);
         module.setYaml(fileData.getFile());
         module.setIsBase(fileData.getBase());
         addHeatDependenciesToModule(module, fileData.getData());
         structure.getModules().add(module);
-      } else if (HeatFileAnalyzer.isYamlOrEnvFile(fileData.getFile()) &&
+      }else if (Objects.nonNull(fileData.getType()) &&
+              fileData.getType().equals(FileData.Type.HELM)) {
+        Module module = new Module();
+        module.setType(FileData.Type.HELM);
+        module.setYaml(fileData.getFile());
+        module.setIsBase(fileData.getBase());
+        structure.getModules().add(module);
+      }
+      else if (HeatFileAnalyzer.isYamlOrEnvFile(fileData.getFile()) &&
           !FileData.Type.isArtifact(fileData.getType())) {
         structure.getUnassigned().add(fileData.getFile());
       } else {
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/ManifestCreatorNamingConventionImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/ManifestCreatorNamingConventionImpl.java
index 539e98df5a..3f061b059c 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/ManifestCreatorNamingConventionImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/filedatastructuremodule/ManifestCreatorNamingConventionImpl.java
@@ -184,7 +184,11 @@ public class ManifestCreatorNamingConventionImpl implements ManifestCreator {
       FilesDataStructure filesDataStructure, List<FileData> fileDataList) {
     if (CollectionUtils.isNotEmpty(filesDataStructure.getModules())) {
       for (Module module : filesDataStructure.getModules()) {
-        FileData fileData = createBaseFileData(FileData.Type.HEAT, module.getYaml());
+        FileData.Type type = module.getType();
+        if (type == null) {
+          type = FileData.Type.HEAT;
+        }
+        FileData fileData = createBaseFileData(type, module.getYaml());
         fileData.setBase(module.getIsBase());
         addEnv(module, fileData);
         addVolume(module, fileData);
-- 
2.16.6