Configure a new Artifact Type

Centralizes artifact configuration in one yaml entry.
Allow the configuration of a new artifact type without
the need of code changes.
The configuration file now is used as a source of
artifacts types instead the artifact type enum.
The enum will be used as a source of base artifact types
and also in hard coded business rules.

Change-Id: Id0383d9fca9bce0519a4d52a4ecb3a68c8713f0f
Issue-ID: SDC-2754
Signed-off-by: andre.schmid <andre.schmid@est.tech>

3 files changed, 7 insertions, 323 deletions

diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFix.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFix.java
index 4ad90b884c..e21594db46 100644
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFix.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFix.java
@@ -358,7 +358,7 @@ public class ArtifactUuidFix {
 			List<VfModuleArtifactPayloadEx> vfModules = null;
 			if(isCheckVFModules){
 				Optional<ArtifactDefinition> optionalVfModuleArtifact = deploymentArtifacts.values().stream()
-						.filter(p -> p.getArtifactType().equals(ArtifactTypeEnum.VF_MODULES_METADATA.name())).findAny();
+						.filter(p -> p.getArtifactType().equals(ArtifactTypeEnum.VF_MODULES_METADATA.getType())).findAny();
 
 				if(!optionalVfModuleArtifact.isPresent())
 					return true;
@@ -436,7 +436,7 @@ public class ArtifactUuidFix {
 						resourceName);
 				return true;
 			}
-			ArtifactTypeEnum artifactType = ArtifactTypeEnum.findType(artifactDefinition.getArtifactType());
+			ArtifactTypeEnum artifactType = ArtifactTypeEnum.parse(artifactDefinition.getArtifactType());
 			if (artifactType != ArtifactTypeEnum.HEAT_ENV) {
 				if (!artifactId.equals(artifactDefinition.getUniqueId())) {
 					log.info(
@@ -520,7 +520,7 @@ public class ArtifactUuidFix {
 						servicename);
 				return true;
 			}
-			ArtifactTypeEnum artifactType = ArtifactTypeEnum.findType(artifactDefinition.getArtifactType());
+			ArtifactTypeEnum artifactType = ArtifactTypeEnum.parse(artifactDefinition.getArtifactType());
 			if (artifactType != ArtifactTypeEnum.HEAT_ENV) {
 				if (!artifactId.equals(artifactDefinition.getUniqueId())) {
 					log.info(
@@ -856,7 +856,7 @@ public class ArtifactUuidFix {
 			}
 
 			Optional<ArtifactDefinition> optionalVfModuleArtifact = artifactsMap.values().stream()
-					.filter(p -> p.getArtifactType().equals(ArtifactTypeEnum.VF_MODULES_METADATA.name())).findAny();
+					.filter(p -> p.getArtifactType().equals(ArtifactTypeEnum.VF_MODULES_METADATA.getType())).findAny();
 			ArtifactDefinition vfModuleArtifact;
 			if(!optionalVfModuleArtifact.isPresent()){
 				vfModuleArtifact = createVfModuleArtifact(instance, service);
@@ -925,7 +925,7 @@ public class ArtifactUuidFix {
 				group.getName(), artifactId, artifactlabel);
 		if (!artifactlabel.isEmpty() && artifactsMap.containsKey(artifactlabel)) {
 			ArtifactDefinition artifact = artifactsMap.get(artifactlabel);
-			ArtifactTypeEnum artifactType = ArtifactTypeEnum.findType(artifact.getArtifactType());
+			ArtifactTypeEnum artifactType = ArtifactTypeEnum.parse(artifact.getArtifactType());
 			String correctArtifactId = artifact.getUniqueId();
 			String correctArtifactUUID = artifact.getArtifactUUID();
 			if (artifactType != ArtifactTypeEnum.HEAT_ENV) {
@@ -1018,7 +1018,7 @@ public class ArtifactUuidFix {
 			String correctArtifactUUID = artifact.getArtifactUUID();
 			boolean isAddToGroup = true;
 			if (groupArtifacts.size() == 1) {
-				ArtifactTypeEnum artifactType = ArtifactTypeEnum.findType(artifact.getArtifactType());
+				ArtifactTypeEnum artifactType = ArtifactTypeEnum.parse(artifact.getArtifactType());
 				if (artifactType == ArtifactTypeEnum.HEAT_ARTIFACT) {
 					isAddToGroup = false;
 					artifact.setArtifactType(ArtifactTypeEnum.OTHER.getType());
diff --git a/asdctool/src/main/resources/config/configuration.yaml b/asdctool/src/main/resources/config/configuration.yaml
index 5a88cf040a..78869a7111 100644
--- a/asdctool/src/main/resources/config/configuration.yaml
+++ b/asdctool/src/main/resources/config/configuration.yaml
@@ -107,31 +107,6 @@ cassandraConfig:
         - { name: sdccomponent, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['DC-AIO-Ubuntu1', '1']}       
         - { name: sdcrepository, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['DC-AIO-Ubuntu1', '1']}
 
-artifactTypes:
-   - CHEF
-   - PUPPET
-   - SHELL
-   - YANG
-   - YANG_XML
-   - HEAT
-   - BPEL
-   - DG_XML
-   - MURANO_PKG
-   - WORKFLOW
-   - NETWORK_CALL_FLOW
-   - TOSCA_TEMPLATE
-   - TOSCA_CSAR
-   - AAI_SERVICE_MODEL
-   - AAI_VF_MODEL
-   - AAI_VF_MODULE_MODEL
-   - AAI_VF_INSTANCE_MODEL
-   - OTHER
-   - SNMP_POLL
-   - SNMP_TRAP
-   - GUIDE
-   - CONTROLLER_BLUEPRINT_ARCHIVE
-   - PNF_SW_INFORMATION
-
 licenseTypes:
    - User
    - Installation
@@ -294,297 +269,6 @@ heatArtifactDeploymentTimeout:
   minMinutes: 1
   maxMinutes: 120
 
-serviceDeploymentArtifacts:
-    CONTROLLER_BLUEPRINT_ARCHIVE:
-        acceptedTypes:
-            - zip
-    YANG_XML:
-        acceptedTypes:
-            - xml
-    VNF_CATALOG:
-        acceptedTypes:
-            - xml
-    MODEL_INVENTORY_PROFILE:
-        acceptedTypes:
-            - xml
-    MODEL_QUERY_SPEC:
-        acceptedTypes:
-            - xml
-    UCPE_LAYER_2_CONFIGURATION:
-        acceptedTypes:
-            - xml
-
-#AAI Artifacts
-    AAI_SERVICE_MODEL:
-        acceptedTypes:
-            - xml
-    AAI_VF_MODULE_MODEL:
-        acceptedTypes:
-            - xml
-    AAI_VF_INSTANCE_MODEL:
-        acceptedTypes:
-            - xml 
-    OTHER:
-        acceptedTypes:
-
-resourceDeploymentArtifacts:
-    HEAT:
-        acceptedTypes:
-            - yaml
-            - yml
-        validForResourceTypes: *allResourceTypes
-    HEAT_VOL:
-        acceptedTypes:
-            - yaml
-            - yml
-        validForResourceTypes: *allResourceTypes
-    HEAT_NET:
-        acceptedTypes:
-            - yaml
-            - yml
-        validForResourceTypes: *allResourceTypes
-    HEAT_NESTED:
-        acceptedTypes:
-            - yaml
-            - yml
-        validForResourceTypes: *allResourceTypes
-    HEAT_ARTIFACT:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT:
-        acceptedTypes:
-            - zip
-            - tgz
-            - csar
-        validForResourceTypes: *allResourceTypes
-    YANG_XML:
-        acceptedTypes:
-            - xml
-        validForResourceTypes: *allResourceTypes
-    VNF_CATALOG:
-        acceptedTypes:
-            - xml
-        validForResourceTypes: *allResourceTypes
-    VF_LICENSE:
-        acceptedTypes:
-            - xml
-        validForResourceTypes: *allResourceTypes
-    VENDOR_LICENSE:
-        acceptedTypes:
-            - xml
-        validForResourceTypes: *allResourceTypes
-    MODEL_INVENTORY_PROFILE:
-        acceptedTypes:
-            - xml
-        validForResourceTypes: *allResourceTypes
-    MODEL_QUERY_SPEC:
-        acceptedTypes:
-            - xml
-        validForResourceTypes: *allResourceTypes
-    LIFECYCLE_OPERATIONS:
-        acceptedTypes:
-            - yaml
-            - yml
-        validForResourceTypes:
-            - VF
-            - VFC
-    VES_EVENTS:
-        acceptedTypes:
-            - yaml
-            - yml
-        validForResourceTypes:
-            - VFC
-            - CP
-            - VL
-            - VF
-            - VFCMT
-            - Abstract
-            - CVFC
-            - PNF
-    PERFORMANCE_COUNTER:
-        acceptedTypes:
-            - csv
-        validForResourceTypes: *allResourceTypes
-    APPC_CONFIG:
-        acceptedTypes:
-        validForResourceTypes:
-            - VF
-    DCAE_TOSCA:
-        acceptedTypes:
-            - yml
-            - yaml
-        validForResourceTypes:
-            - VF
-            - VFCMT
-    DCAE_JSON:
-        acceptedTypes:
-            - json
-        validForResourceTypes:
-            - VF
-            - VFCMT
-    DCAE_POLICY:
-        acceptedTypes:
-            - emf
-        validForResourceTypes:
-            - VF
-            - VFCMT
-    DCAE_DOC:
-        acceptedTypes:
-        validForResourceTypes:
-            - VF 
-            - VFCMT       
-    DCAE_EVENT:
-        acceptedTypes:
-        validForResourceTypes:
-            - VF
-            - VFCMT
-    AAI_VF_MODEL:
-        acceptedTypes:
-            - xml
-        validForResourceTypes:
-            - VF
-    AAI_VF_MODULE_MODEL:
-        acceptedTypes:
-            - xml
-        validForResourceTypes:
-            - VF
-    OTHER:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    SNMP_POLL:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    SNMP_TRAP:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    PM_DICTIONARY:
-        acceptedTypes:
-            - yaml
-            - yml
-        validForResourceTypes:
-            - VF
-            - PNF
-    YANG_MODULE:
-        acceptedTypes:
-            - yang
-        validForResourceTypes:
-            - VF
-            - PNF
-    ANSIBLE_PLAYBOOK:
-        acceptedTypes:
-            - yaml
-            - yml
-        validForResourceTypes:
-            - VF
-            - PNF
-    ONBOARDED_PACKAGE:
-        acceptedTypes:
-            - csar
-        validForResourceTypes:
-            - VF
-            - PNF
-    CONTROLLER_BLUEPRINT_ARCHIVE:
-        acceptedTypes:
-            - zip
-        validForResourceTypes:
-            - VF
-            - PNF
-
-resourceInstanceDeploymentArtifacts:
-    HEAT_ENV:
-        acceptedTypes:
-            - env
-    VF_MODULES_METADATA:
-        acceptedTypes:
-            - json
-    VES_EVENTS:
-        acceptedTypes:
-            - yaml
-            - yml
-    PERFORMANCE_COUNTER:
-        acceptedTypes:
-            - csv
-    DCAE_INVENTORY_TOSCA:
-        acceptedTypes:
-            - yml
-            - yaml
-    DCAE_INVENTORY_JSON:
-        acceptedTypes:
-            - json
-    DCAE_INVENTORY_POLICY:
-      acceptedTypes:
-            - emf
-    DCAE_INVENTORY_DOC:
-      acceptedTypes:
-    DCAE_INVENTORY_BLUEPRINT:
-      acceptedTypes:
-    DCAE_INVENTORY_EVENT:
-      acceptedTypes:
-    SNMP_POLL:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    SNMP_TRAP:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-
-resourceInformationalArtifacts:
-    CHEF:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    PUPPET:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    SHELL:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    YANG:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    YANG_XML:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    HEAT:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    BPEL:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    DG_XML:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    MURANO_PKG:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    OTHER:
-        acceptedTypes:
-        validForResourceTypes: 
-            - VFC
-            - CVFC
-            - CP
-            - VL
-            - VF
-            - VFCMT
-            - Abstract
-            - PNF
-    PNF_SW_INFORMATION:
-        acceptedTypes:
-            - yml
-            - yaml
-        validForResourceTypes:
-            - PNF
-    SNMP_POLL:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    SNMP_TRAP:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    GUIDE:
-        acceptedTypes:
-        validForResourceTypes:
-            - VF
-            - VFC
-            - CVFC
-
 unLoggedUrls:
    - /sdc2/rest/healthCheck
 
diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFixTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFixTest.java
index 8d599e587a..4e17123bd7 100644
--- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFixTest.java
+++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/ArtifactUuidFixTest.java
@@ -174,7 +174,7 @@ public class ArtifactUuidFixTest {
 
 		Map<String, ArtifactDefinition> deploymentArtifacts = new HashMap<>();
 		ArtifactDefinition artifactDefinition = new ArtifactDefinition();
-		artifactDefinition.setArtifactType(ArtifactTypeEnum.VF_MODULES_METADATA.name());
+		artifactDefinition.setArtifactType(ArtifactTypeEnum.VF_MODULES_METADATA.getType());
 		artifactDefinition.setEsId("esID");
 		deploymentArtifacts.put("1",artifactDefinition);
 		List<GroupInstance> groupInstances = new ArrayList<>();