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>

8 files changed, 72 insertions, 663 deletions

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java
index 38f2f36ae2..7d4dfa72f4 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Component.java
@@ -321,7 +321,7 @@ public abstract class Component implements PropertiesOwner {
         return safeGetComponentInstanceDeploymentArtifacts(componentInstanceId)
             .values()
             .stream()
-            .filter(artifact -> ArtifactTypeEnum.HEAT_ENV.name().equals(artifact.getArtifactType()))
+            .filter(artifact -> ArtifactTypeEnum.HEAT_ENV.getType().equals(artifact.getArtifactType()))
             .collect(Collectors.toList());
     }
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/GroupInstance.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/GroupInstance.java
index caebf4a275..ca154f3076 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/GroupInstance.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/GroupInstance.java
@@ -116,7 +116,7 @@ public class GroupInstance extends GroupInstanceDataDefinition {
                 String label = artifactId.substring(artifactId.lastIndexOf('.') + 1);
                 ArtifactDefinition artifact = deploymentArtifacts.get(label);
                 log.debug("current artifact id: {}, current artifact definition: {}", artifactId, artifact);
-                ArtifactTypeEnum artifactType = ArtifactTypeEnum.findType(artifact.getArtifactType());
+                ArtifactTypeEnum artifactType = ArtifactTypeEnum.parse(artifact.getArtifactType());
                 if (artifactType != ArtifactTypeEnum.HEAT_ENV){
                     addArtifactsIdToCollection(artifactUuids, artifact);
                 }else{
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ArtifactsOperations.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ArtifactsOperations.java
index 50c165f535..3c8e0ee5cf 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ArtifactsOperations.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/ArtifactsOperations.java
@@ -312,7 +312,11 @@ public class ArtifactsOperations extends BaseOperation {
         String currentChecksum = updateArtifactData.getArtifactChecksum();
 
         if (isUpdate) {
-            ArtifactTypeEnum type = ArtifactTypeEnum.findType(updateArtifactData.getArtifactType());
+            final ArtifactTypeEnum type = ArtifactTypeEnum.parse(updateArtifactData.getArtifactType());
+            if(type == null) {
+                generateUUIDForNonHeatArtifactType(updateArtifactData, oldChecksum, oldVesrion, currentChecksum);
+                return;
+            }
             switch (type) {
                 case HEAT_ENV:
                     if (edgeLabel == EdgeLabelEnum.INST_DEPLOYMENT_ARTIFACTS) {
@@ -384,17 +388,11 @@ public class ArtifactsOperations extends BaseOperation {
         return addArtifactToComponent(artifactHeatEnv, component, parentType, failIfExist, instanceId);
     }
 
-    public Either<ArtifactDefinition, StorageOperationStatus> getHeatArtifactByHeatEnvId(String parentId, ArtifactDefinition heatEnv, NodeTypeEnum parentType, String containerId, ComponentTypeEnum componentType) {
-        String id = heatEnv.getGeneratedFromId();
-        ComponentTypeEnum compType;
-        switch (parentType) {
-            case ResourceInstance:
-                compType = ComponentTypeEnum.RESOURCE_INSTANCE;
-                break;
-            default:
-                compType = componentType;
-        }
-        return getArtifactById(parentId, id, compType, containerId);
+    public Either<ArtifactDefinition, StorageOperationStatus> getHeatArtifactByHeatEnvId(final String parentId,
+                                                                                         final ArtifactDefinition heatEnv,
+                                                                                         final String containerId,
+                                                                                         final ComponentTypeEnum componentType) {
+        return getArtifactById(parentId, heatEnv.getGeneratedFromId(), componentType, containerId);
     }
 
     public Either<ArtifactDefinition, StorageOperationStatus> updateHeatEnvArtifact(Component component, ArtifactDefinition artifactEnvInfo, String artifactId, String newArtifactId, NodeTypeEnum type, String instanceId) {
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IElementOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IElementOperation.java
index 6ecfc1048b..33877add47 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IElementOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/api/IElementOperation.java
@@ -21,6 +21,8 @@
 package org.openecomp.sdc.be.model.operations.api;
 
 import fj.data.Either;
+import java.util.List;
+import java.util.Map;
 import org.openecomp.sdc.be.config.Configuration;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
@@ -33,9 +35,6 @@ import org.openecomp.sdc.be.model.category.GroupingDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
 import org.openecomp.sdc.be.resources.data.CategoryData;
 
-import java.util.List;
-import java.util.Map;
-
 public interface IElementOperation {
 
     Either<List<CategoryDefinition>, ActionStatus> getAllResourceCategories();
@@ -44,21 +43,19 @@ public interface IElementOperation {
 
     Either<List<CategoryDefinition>, ActionStatus> getAllProductCategories();
 
-    public Either<List<Tag>, ActionStatus> getAllTags();
-
-    public Either<List<PropertyScope>, ActionStatus> getAllPropertyScopes();
+    Either<List<Tag>, ActionStatus> getAllTags();
 
-    public Either<List<ArtifactType>, ActionStatus> getAllArtifactTypes();
+    Either<List<PropertyScope>, ActionStatus> getAllPropertyScopes();
 
-    public Either<Map<String, Object>, ActionStatus> getAllDeploymentArtifactTypes();
+    List<ArtifactType> getAllArtifactTypes();
 
-    public Either<Configuration.HeatDeploymentArtifactTimeout, ActionStatus> getDefaultHeatTimeout();
+    Either<Configuration.HeatDeploymentArtifactTimeout, ActionStatus> getDefaultHeatTimeout();
 
-    public <T extends GraphNode> Either<CategoryData, StorageOperationStatus> getCategoryData(String name, NodeTypeEnum type, Class<T> clazz);
+    <T extends GraphNode> Either<CategoryData, StorageOperationStatus> getCategoryData(String name, NodeTypeEnum type, Class<T> clazz);
 
-    public <T extends GraphNode> Either<org.openecomp.sdc.be.resources.data.category.CategoryData, StorageOperationStatus> getNewCategoryData(String name, NodeTypeEnum type, Class<T> clazz);
+    <T extends GraphNode> Either<org.openecomp.sdc.be.resources.data.category.CategoryData, StorageOperationStatus> getNewCategoryData(String name, NodeTypeEnum type, Class<T> clazz);
 
-    public Either<Map<String, String>, ActionStatus> getResourceTypesMap();
+    Either<Map<String, String>, ActionStatus> getResourceTypesMap();
 
     Either<CategoryDefinition, ActionStatus> createCategory(CategoryDefinition category, NodeTypeEnum nodeType);
 
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ElementOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ElementOperation.java
index 402129b8ba..9d0c7b1075 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ElementOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/ElementOperation.java
@@ -20,22 +20,29 @@
 
 package org.openecomp.sdc.be.model.operations.impl;
 
-import org.janusgraph.core.JanusGraph;
-import org.janusgraph.core.JanusGraphVertex;
 import fj.data.Either;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.janusgraph.core.JanusGraph;
+import org.janusgraph.core.JanusGraphVertex;
+import org.openecomp.sdc.be.config.ArtifactConfigManager;
+import org.openecomp.sdc.be.config.ArtifactConfiguration;
 import org.openecomp.sdc.be.config.Configuration;
-import org.openecomp.sdc.be.config.Configuration.ArtifactTypeConfig;
 import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphEdge;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphRelation;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
 import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.neo4j.GraphEdgeLabels;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
 import org.openecomp.sdc.be.datatypes.category.CategoryDataDefinition;
 import org.openecomp.sdc.be.datatypes.category.GroupingDataDefinition;
 import org.openecomp.sdc.be.datatypes.category.SubCategoryDataDefinition;
@@ -58,8 +65,6 @@ import org.openecomp.sdc.common.util.ValidationUtils;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
-
 @Component("element-operation")
 public class ElementOperation implements IElementOperation {
 
@@ -781,32 +786,13 @@ public class ElementOperation implements IElementOperation {
     }
 
     @Override
-    public Either<List<ArtifactType>, ActionStatus> getAllArtifactTypes() {
-        List<ArtifactType> artifactTypes = new ArrayList<>();
-
-        List<String> artifactTypesList = ConfigurationManager.getConfigurationManager().getConfiguration().getArtifactTypes();
-        for (String artifactType : artifactTypesList) {
-            ArtifactType artifactT = new ArtifactType();
-            artifactT.setName(artifactType);
-            artifactTypes.add(artifactT);
-        }
-        return Either.left(artifactTypes);
-    }
-
-    @Override
-    public Either<Map<String, Object>, ActionStatus> getAllDeploymentArtifactTypes() {
-
-        Map<String, Object> artifactTypes = new HashMap<>();
-        Map<String, ArtifactTypeConfig> artifactResourceTypes = ConfigurationManager.getConfigurationManager().getConfiguration().getResourceDeploymentArtifacts();
-        Map<String, ArtifactTypeConfig> artifactServiceTypes = ConfigurationManager.getConfigurationManager().getConfiguration().getServiceDeploymentArtifacts();
-        Map<String, ArtifactTypeConfig> artifactResourceInstanceTypes = ConfigurationManager.getConfigurationManager().getConfiguration().getResourceInstanceDeploymentArtifacts();
-
-        artifactTypes.put("resourceDeploymentArtifacts", artifactResourceTypes);
-        artifactTypes.put("serviceDeploymentArtifacts", artifactServiceTypes);
-        artifactTypes.put("resourceInstanceDeploymentArtifacts", artifactResourceInstanceTypes);
-
-        return Either.left(artifactTypes);
-
+    public List<ArtifactType> getAllArtifactTypes() {
+        final List<ArtifactConfiguration> artifactTypesList = ArtifactConfigManager.getInstance().getConfiguration();
+        return artifactTypesList.stream().map(artifactConfiguration -> {
+            final ArtifactType artifactType = new ArtifactType();
+            artifactType.setName(artifactConfiguration.getType());
+            return artifactType;
+        }).collect(Collectors.toList());
     }
 
     @Override
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ElementOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ElementOperationTest.java
index 17e2430d82..3597d02834 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ElementOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ElementOperationTest.java
@@ -25,6 +25,7 @@ import org.apache.tinkerpop.gremlin.structure.T;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.openecomp.sdc.be.config.ArtifactConfiguration;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.janusgraph.JanusGraphClient;
 import org.openecomp.sdc.be.dao.janusgraph.JanusGraphGenericDao;
@@ -47,6 +48,7 @@ import java.util.List;
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -64,52 +66,44 @@ public class ElementOperationTest extends ModelTestBase {
 
     @BeforeClass
     public static void setupBeforeClass() {
-        // ExternalConfiguration.setAppName("catalog-model");
-        // String appConfigDir = "src/test/resources/config/catalog-model";
-        // ConfigurationSource configurationSource = new
-        // FSConfigurationSource(ExternalConfiguration.getChangeListener(),
-        // appConfigDir);
-
         ModelTestBase.init();
-
     }
 
     @Test
     public void testGetArtifactsTypes() {
-
-        List<String> artifactTypesCfg = new ArrayList<>();
-        artifactTypesCfg.add("type1");
-        artifactTypesCfg.add("type2");
-        artifactTypesCfg.add("type3");
-        artifactTypesCfg.add("type4");
-        configurationManager.getConfiguration().setArtifactTypes(artifactTypesCfg);
-        Either<List<ArtifactType>, ActionStatus> allArtifactTypes = elementOperation.getAllArtifactTypes();
-        assertTrue(allArtifactTypes.isLeft());
-        assertEquals(artifactTypesCfg.size(), allArtifactTypes.left().value().size());
-
-        artifactTypesCfg.remove(0);
-        allArtifactTypes = elementOperation.getAllArtifactTypes();
-        assertTrue(allArtifactTypes.isLeft());
-        assertEquals(artifactTypesCfg.size(), allArtifactTypes.left().value().size());
-
-        artifactTypesCfg.add("type5");
+        final List<ArtifactConfiguration> expectedArtifactConfigurationList = new ArrayList<>();
+		final ArtifactConfiguration artifactConfiguration1 = new ArtifactConfiguration();
+		artifactConfiguration1.setType("type1");
+		expectedArtifactConfigurationList.add(artifactConfiguration1);
+		final ArtifactConfiguration artifactConfiguration2 = new ArtifactConfiguration();
+		artifactConfiguration2.setType("type2");
+		expectedArtifactConfigurationList.add(artifactConfiguration2);
+		final ArtifactConfiguration artifactConfiguration3 = new ArtifactConfiguration();
+		artifactConfiguration3.setType("type3");
+		expectedArtifactConfigurationList.add(artifactConfiguration3);
+		configurationManager.getConfiguration().setArtifacts(expectedArtifactConfigurationList);
+
+        List<ArtifactType> actualArtifactTypes = elementOperation.getAllArtifactTypes();
+		assertNotNull(actualArtifactTypes);
+        assertEquals(expectedArtifactConfigurationList.size(), actualArtifactTypes.size());
+		boolean allMatch = actualArtifactTypes.stream().allMatch(artifactType ->
+			expectedArtifactConfigurationList.stream()
+				.anyMatch(artifactConfiguration -> artifactConfiguration.getType().equals(artifactType.getName()))
+		);
+		assertTrue(allMatch);
+
+        expectedArtifactConfigurationList.remove(0);
+        actualArtifactTypes = elementOperation.getAllArtifactTypes();
+		assertNotNull(actualArtifactTypes);
+        assertEquals(expectedArtifactConfigurationList.size(), actualArtifactTypes.size());
+
+		allMatch = actualArtifactTypes.stream().allMatch(artifactType ->
+			expectedArtifactConfigurationList.stream()
+				.anyMatch(artifactConfiguration -> artifactConfiguration.getType().equals(artifactType.getName()))
+		);
+		assertTrue(allMatch);
     }
 
-	@Test
-	public void testAllDeploymentArtifactTypes() {
-
-		List<String> artifactTypesCfg = new ArrayList<String>();
-		artifactTypesCfg.add("type1");
-		artifactTypesCfg.add("type2");
-		artifactTypesCfg.add("type3");
-		configurationManager.getConfiguration().setArtifactTypes(artifactTypesCfg);
-		Either<Map<String, Object>, ActionStatus> allDeploymentArtifactTypes = elementOperation
-				.getAllDeploymentArtifactTypes();
-		assertTrue(allDeploymentArtifactTypes.isLeft());
-		assertEquals(artifactTypesCfg.size(), allDeploymentArtifactTypes.left().value().size());
-
-	}
-
     // @Test
     public void testGetResourceAndServiceCategoty() {
         String id = OperationTestsUtil.deleteAndCreateResourceCategory(CATEGORY, SUBCATEGORY, janusGraphDao);
@@ -431,29 +425,6 @@ public class ElementOperationTest extends ModelTestBase {
 		testSubject = createTestSubject();
 		result = testSubject.getAllPropertyScopes();
 	}
-
-	
-	@Test
-	public void testGetAllArtifactTypes() throws Exception {
-		ElementOperation testSubject;
-		Either<List<ArtifactType>, ActionStatus> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAllArtifactTypes();
-	}
-
-	
-	@Test
-	public void testGetAllDeploymentArtifactTypes() throws Exception {
-		ElementOperation testSubject;
-		Either<Map<String, Object>, ActionStatus> result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getAllDeploymentArtifactTypes();
-	}
-
 	
 	@Test
 	public void testGetResourceTypesMap() throws Exception {
@@ -465,7 +436,6 @@ public class ElementOperationTest extends ModelTestBase {
 		result = testSubject.getResourceTypesMap();
 	}
 
-	
 	@Test
 	public void testGetNewCategoryData() throws Exception {
 		ElementOperation testSubject;
diff --git a/catalog-model/src/test/resources/config/catalog-model/configuration.yaml b/catalog-model/src/test/resources/config/catalog-model/configuration.yaml
index 052add6a28..8f7f0f8cf8 100644
--- a/catalog-model/src/test/resources/config/catalog-model/configuration.yaml
+++ b/catalog-model/src/test/resources/config/catalog-model/configuration.yaml
@@ -86,31 +86,6 @@ cassandraConfig:
         - { name: sdccomponent, replicationStrategy: SimpleStrategy, replicationInfo: ['1']}
         - { name: sdcrepository, replicationStrategy: SimpleStrategy, replicationInfo: ['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
-   - PNF_SW_INFORMATION
-
 licenseTypes:
    - User
    - Installation
@@ -273,256 +248,6 @@ heatArtifactDeploymentTimeout:
   minMinutes: 1
   maxMinutes: 120
 
-serviceDeploymentArtifacts:
-    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
-    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: *allResourceTypes
-    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:
-          - VFC
-          - CVFC
-          - CP
-          - VL
-          - VF
-          - VFCMT
-          - Abstract
-          - PNF
-    SNMP_POLL:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-    SNMP_TRAP:
-        acceptedTypes:
-        validForResourceTypes: *allResourceTypes
-
-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/catalog-model/src/test/resources/config/configuration.yaml b/catalog-model/src/test/resources/config/configuration.yaml
index adf065ca41..8f7f0f8cf8 100644
--- a/catalog-model/src/test/resources/config/configuration.yaml
+++ b/catalog-model/src/test/resources/config/configuration.yaml
@@ -86,31 +86,6 @@ cassandraConfig:
         - { name: sdccomponent, replicationStrategy: SimpleStrategy, replicationInfo: ['1']}
         - { name: sdcrepository, replicationStrategy: SimpleStrategy, replicationInfo: ['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
-   - PNF_SW_INFORMATION
-
 licenseTypes:
    - User
    - Installation
@@ -273,248 +248,6 @@ heatArtifactDeploymentTimeout:
   minMinutes: 1
   maxMinutes: 120
 
-serviceDeploymentArtifacts:
-    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
-    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: *allResourceTypes
-    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
-
-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