From bcee4648917b2442f51a75639708bad4cd0fe4ad Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Mon, 7 Sep 2020 11:36:26 +0100
Subject: Replace artifact folder ONBOARDED_PACKAGE in CSAR

Replace artifact folder ONBOARDED_PACKAGE for ETSI_PACKAGE in TOSCA
CSAR. Also included VF artifacts will also have the same folder
replaced.

Change-Id: If03f13a80894e98a0abe1b849322f86a27dfd3f1
Issue-ID: SDC-3261
Signed-off-by: andre.schmid <andre.schmid@est.tech>
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
---
 .../src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java       | 4 ++++
 .../main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java  | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
index f378ca0288..1f33a2424b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
@@ -1143,6 +1143,10 @@ public class CsarUtils {
                 }
                 if (ArtifactTypeEnum.WORKFLOW.getType().equals(artifactType)) {
                     artifactTypeFolder += OperationArtifactUtil.BPMN_ARTIFACT_PATH + File.separator;
+                } else if (ArtifactTypeEnum.ONBOARDED_PACKAGE.getType().equals(artifactType)) {
+                    // renaming legacy folder ONBOARDED_PACKAGE to the new folder ETSI_PACKAGE
+                    artifactTypeFolder = artifactTypeFolder
+                        .replace(ArtifactTypeEnum.ONBOARDED_PACKAGE.getType(), ArtifactTypeEnum.ETSI_PACKAGE.getType());
                 }
 
                 // TODO: We should not do this but in order to keep this refactoring small enough,
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java b/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java
index d4dcf4fa15..91f158a164 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java
@@ -44,7 +44,6 @@ public enum ArtifactTypeEnum {
     CHEF("CHEF"),
     CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT("CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT"),
     CONTROLLER_BLUEPRINT_ARCHIVE("CONTROLLER_BLUEPRINT_ARCHIVE"),
-    HELM("HELM"),
     DCAE_DOC("DCAE_DOC"),
     DCAE_EVENT("DCAE_EVENT"),
     DCAE_INVENTORY_BLUEPRINT("DCAE_INVENTORY_BLUEPRINT"),
@@ -65,6 +64,7 @@ public enum ArtifactTypeEnum {
     HEAT_NESTED("HEAT_NESTED"),
     HEAT_NET("HEAT_NET"),
     HEAT_VOL("HEAT_VOL"),
+    HELM("HELM"),
     ICON("ICON"),
     LIFECYCLE_OPERATIONS("LIFECYCLE_OPERATIONS"),
     MODEL_INVENTORY_PROFILE("MODEL_INVENTORY_PROFILE"),
@@ -78,8 +78,8 @@ public enum ArtifactTypeEnum {
     PM_DICTIONARY("PM_DICTIONARY"),
     PNF_SW_INFORMATION("PNF_SW_INFORMATION"),
     PUPPET("PUPPET"),
-    SHELL("SHELL"),
     SHELL_SCRIPT("SHELL_SCRIPT"),
+    SHELL("SHELL"),
     SNMP_POLL("SNMP_POLL"),
     SNMP_TRAP("SNMP_TRAP"),
     TOSCA_CSAR("TOSCA_CSAR"),
@@ -91,9 +91,9 @@ public enum ArtifactTypeEnum {
     VF_MODULES_METADATA("VF_MODULES_METADATA"),
     VNF_CATALOG("VNF_CATALOG"),
     WORKFLOW("WORKFLOW"),
-    YANG("YANG"),
     YANG_MODULE("YANG_MODULE"),
-    YANG_XML("YANG_XML");
+    YANG_XML("YANG_XML"),
+    YANG("YANG");
 
     private final String type;
 
-- 
cgit 1.2.3-korg