Config. allowed instances in component composition

During the creation of Resource and Services components,
the allowed types to add in its composition are hard-coded.
This change allows those types to be configurable using the
configuration.yaml backend file.

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

9 files changed, 198 insertions, 164 deletions

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 e9fc6a04cc..b0c9b308ab 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
@@ -61,7 +61,7 @@ import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
 import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
-import org.openecomp.sdc.be.datamodel.utils.ContainerInstanceTypesData;
+import org.openecomp.sdc.be.model.jsonjanusgraph.config.ContainerInstanceTypesData;
 import org.openecomp.sdc.be.datatypes.elements.CINodeFilterDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.ForwardingPathDataDefinition;
@@ -184,7 +184,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
     private ContainerInstanceTypesData containerInstanceTypesData;
 
     public ComponentInstance createComponentInstance(String containerComponentParam, String containerComponentId, String userId, ComponentInstance resourceInstance) {
-        return createComponentInstance(containerComponentParam, containerComponentId, userId, resourceInstance, false, true);
+        return createComponentInstance(containerComponentParam, containerComponentId, userId, resourceInstance, true);
     }
 
     public List<ComponentInstanceProperty> getComponentInstancePropertiesByInputId(org.openecomp.sdc.be.model.Component component, String inputId){
@@ -324,55 +324,54 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         }
     }
 
-    public ComponentInstance createComponentInstance(String containerComponentParam, String containerComponentId, String userId, ComponentInstance resourceInstance, boolean inTransaction, boolean needLock) {
-
-        Component origComponent = null;
-        User user;
-        org.openecomp.sdc.be.model.Component containerComponent = null;
-        ComponentTypeEnum containerComponentType;
-        try {
-            user = validateUserExists(userId);
-            validateUserNotEmpty(user, "Create component instance");
-            validateJsonBody(resourceInstance, ComponentInstance.class);
-            containerComponentType = validateComponentType(containerComponentParam);
-            containerComponent = validateComponentExists(containerComponentId, containerComponentType, null);
+    public ComponentInstance createComponentInstance(final String containerComponentParam,
+                                                     final String containerComponentId, final String userId,
+                                                     final ComponentInstance resourceInstance, final boolean needLock) {
+        final User user = validateUserExists(userId);
+        validateUserNotEmpty(user, "Create component instance");
+        validateJsonBody(resourceInstance, ComponentInstance.class);
+        final ComponentTypeEnum containerComponentType = validateComponentType(containerComponentParam);
+        final org.openecomp.sdc.be.model.Component containerComponent =
+            validateComponentExists(containerComponentId, containerComponentType, null);
 
-            if (ModelConverter.isAtomicComponent(containerComponent)) {
+        if (ModelConverter.isAtomicComponent(containerComponent)) {
+            if (log.isDebugEnabled()) {
                 log.debug("Cannot attach resource instances to container resource of type {}", containerComponent.assetType());
-                throw new ByActionStatusComponentException(ActionStatus.RESOURCE_CANNOT_CONTAIN_RESOURCE_INSTANCES, containerComponent.assetType());
             }
+            throw new ByActionStatusComponentException(ActionStatus.RESOURCE_CANNOT_CONTAIN_RESOURCE_INSTANCES, containerComponent.assetType());
+        }
 
-            validateCanWorkOnComponent(containerComponent, userId);
-
-            if (resourceInstance != null && containerComponentType != null) {
-                OriginTypeEnum originType = resourceInstance.getOriginType();
-                validateInstanceName(resourceInstance);
-                if (originType == OriginTypeEnum.ServiceProxy) {
-
-                    Either<Component, StorageOperationStatus> serviceProxyOrigin = toscaOperationFacade.getLatestByName("serviceProxy");
-                    if (isServiceProxyOrigin(serviceProxyOrigin)) {
-                        throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(serviceProxyOrigin.right().value()));
-                    }
-                    origComponent = serviceProxyOrigin.left().value();
+        validateCanWorkOnComponent(containerComponent, userId);
 
-                    StorageOperationStatus fillProxyRes = fillProxyInstanceData(resourceInstance, origComponent);
-                    if (isFillProxyRes(fillProxyRes)) {
-                        throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(fillProxyRes));
-                    }
+        Component origComponent = null;
+        if (resourceInstance != null && containerComponentType != null) {
+            final OriginTypeEnum originType = resourceInstance.getOriginType();
+            validateInstanceName(resourceInstance);
+            if (originType == OriginTypeEnum.ServiceProxy) {
+
+                final Either<Component, StorageOperationStatus> serviceProxyOrigin =
+                    toscaOperationFacade.getLatestByName("serviceProxy");
+                if (isServiceProxyOrigin(serviceProxyOrigin)) {
+                    throw new ByActionStatusComponentException(
+                        componentsUtils.convertFromStorageResponse(serviceProxyOrigin.right().value()));
                 }
-                else {
-                    origComponent = getAndValidateOriginComponentOfComponentInstance(containerComponent, resourceInstance);
+                origComponent = serviceProxyOrigin.left().value();
+
+                final StorageOperationStatus fillProxyRes = fillProxyInstanceData(resourceInstance, origComponent);
+                if (isFillProxyRes(fillProxyRes)) {
+                    throw new ByActionStatusComponentException(
+                        componentsUtils.convertFromStorageResponse(fillProxyRes));
                 }
-                validateOriginAndResourceInstanceTypes(containerComponent, origComponent, originType);
-                validateResourceInstanceState(containerComponent, origComponent);
-                overrideFields(origComponent, resourceInstance);
-                compositionBusinessLogic.validateAndSetDefaultCoordinates(resourceInstance);
+            } else {
+                origComponent = getAndValidateOriginComponentOfComponentInstance(containerComponent,
+                    resourceInstance);
             }
-            return createComponent(needLock, containerComponent,origComponent, resourceInstance, user);
-
-        }catch (ComponentException e){
-            throw e;
+            validateOriginAndResourceInstanceTypes(containerComponent, origComponent, originType);
+            validateResourceInstanceState(containerComponent, origComponent);
+            overrideFields(origComponent, resourceInstance);
+            compositionBusinessLogic.validateAndSetDefaultCoordinates(resourceInstance);
         }
+        return createComponent(needLock, containerComponent, origComponent, resourceInstance, user);
     }
 
     private ComponentInstance createComponent(boolean needLock, Component containerComponent, Component origComponent, ComponentInstance resourceInstance, User user) {
@@ -426,10 +425,10 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         }
     }
 
-    private void validateOriginAndResourceInstanceTypes(Component containerComponent, Component origComponent, OriginTypeEnum originType) {
-        ResourceTypeEnum resourceType = null;
-        ResourceTypeEnum convertedOriginType;
-        resourceType = getResourceTypeEnumFromOriginComponent(origComponent, resourceType);
+    private void validateOriginAndResourceInstanceTypes(final Component containerComponent,
+                                                        final Component origComponent,
+                                                        final OriginTypeEnum originType) {
+        final ResourceTypeEnum resourceType = getResourceTypeEnumFromOriginComponent(origComponent);
         validateOriginType(originType, resourceType);
         validateOriginComponentIsValidForContainer(containerComponent, resourceType);
     }
@@ -437,13 +436,14 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
     private void validateOriginComponentIsValidForContainer(Component containerComponent, ResourceTypeEnum resourceType) {
         switch (containerComponent.getComponentType()) {
             case SERVICE:
-                if (!containerInstanceTypesData.getServiceContainerList().contains((resourceType))) {
+                if (!containerInstanceTypesData.isAllowedForServiceComponent(resourceType)) {
                     throw new ByActionStatusComponentException(ActionStatus.CONTAINER_CANNOT_CONTAIN_INSTANCE,
                             containerComponent.getComponentType().toString(), resourceType.name());
                 }
                 break;
             case RESOURCE:
-                if (!containerInstanceTypesData.getValidInstanceTypesInResourceContainer().get(((Resource) containerComponent).getResourceType()).contains(resourceType)) {
+                final ResourceTypeEnum componentResourceType = ((Resource) containerComponent).getResourceType();
+                if (!containerInstanceTypesData.isAllowedForResourceComponent(componentResourceType, resourceType)) {
                     throw new ByActionStatusComponentException(ActionStatus.CONTAINER_CANNOT_CONTAIN_INSTANCE,
                             containerComponent.getComponentType().toString(), resourceType.name());
                 }
@@ -465,18 +465,15 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         if (resourceType != convertedOriginType)  throw new ByActionStatusComponentException(ActionStatus.INVALID_CONTENT);
     }
 
-    private ResourceTypeEnum getResourceTypeEnumFromOriginComponent(Component origComponent, ResourceTypeEnum resourceType) {
+    private ResourceTypeEnum getResourceTypeEnumFromOriginComponent(final Component origComponent) {
         switch (origComponent.getComponentType()) {
             case SERVICE:
-                resourceType = ResourceTypeEnum.ServiceProxy;
-                break;
+                return ResourceTypeEnum.ServiceProxy;
             case RESOURCE:
-                resourceType = ((Resource) origComponent).getResourceType();
-                break;
+                return ((Resource) origComponent).getResourceType();
             default:
                 throw new ByActionStatusComponentException(ActionStatus.INVALID_CONTENT);
         }
-        return resourceType;
     }
 
     private ComponentInstance isNeedLock(boolean needLock, Component containerComponent) {
@@ -2730,7 +2727,7 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         try {
 
             actionResponse = createComponentInstance(
-                    "services", containerComponentId, userId, inputComponentInstance, true, false);
+                    "services", containerComponentId, userId, inputComponentInstance, false);
 
         } catch (ComponentException e) {
             failed = true;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ContainerInstanceTypesData.java b/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ContainerInstanceTypesData.java
deleted file mode 100644
index 3ee9645cd9..0000000000
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/datamodel/utils/ContainerInstanceTypesData.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.be.datamodel.utils;
-
-import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
-import org.springframework.stereotype.Component;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-public class ContainerInstanceTypesData {
-
-    private List<ResourceTypeEnum> validInstanceTypesInServiceContainer = Arrays.asList(ResourceTypeEnum.PNF,
-            ResourceTypeEnum.VF, ResourceTypeEnum.CP,
-            ResourceTypeEnum.VL, ResourceTypeEnum.CR,
-            ResourceTypeEnum.ServiceProxy,ResourceTypeEnum.Configuration);
-    private Map<ResourceTypeEnum,List<ResourceTypeEnum>> validInstanceTypesInResourceContainer = new HashMap<>();
-
-    private ContainerInstanceTypesData() {
-        List<ResourceTypeEnum> vfContainerInstances = Arrays.asList(ResourceTypeEnum.CP,
-                ResourceTypeEnum.VL, ResourceTypeEnum.Configuration,
-                ResourceTypeEnum.VFC);
-        List<ResourceTypeEnum> crContainerInstances = Arrays.asList(ResourceTypeEnum.CP,
-                ResourceTypeEnum.VL, ResourceTypeEnum.Configuration,
-                ResourceTypeEnum.VFC);
-        List<ResourceTypeEnum> pnfContainerInstances = Arrays.asList(ResourceTypeEnum.CP,
-                ResourceTypeEnum.VL, ResourceTypeEnum.Configuration,
-                ResourceTypeEnum.VFC);
-        validInstanceTypesInResourceContainer.put(ResourceTypeEnum.VF, vfContainerInstances);
-        validInstanceTypesInResourceContainer.put(ResourceTypeEnum.CR, crContainerInstances);
-        validInstanceTypesInResourceContainer.put(ResourceTypeEnum.PNF, pnfContainerInstances);
-    }
-
-    public List<ResourceTypeEnum> getServiceContainerList() {
-        return validInstanceTypesInServiceContainer;
-    }
-
-    public Map<ResourceTypeEnum, List<ResourceTypeEnum>> getValidInstanceTypesInResourceContainer() {
-        return validInstanceTypesInResourceContainer;
-    }
-}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentInstanceServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentInstanceServlet.java
index 34b261b106..4f3120aba2 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentInstanceServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ComponentInstanceServlet.java
@@ -166,24 +166,30 @@ public class ComponentInstanceServlet extends AbstractValidationsServlet {
             @Context final HttpServletRequest request) {
 
         validateNotEmptyBody(data);
-        ComponentInstance componentInstance = null;
+        final ComponentInstance componentInstance;
         try {
             componentInstance = RepresentationUtils.fromRepresentation(data, ComponentInstance.class);
             componentInstance.setInvariantName(null);
             componentInstance.setCreatedFrom(CreatedFrom.UI);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Create Component Instance");
             log.debug("create component instance failed with exception", e);
             throw new ByActionStatusComponentException(ActionStatus.INVALID_CONTENT);
         }
-            loggerSupportability.log(LoggerSupportabilityActions.CREATE_INSTANCE, StatusCode.STARTED,"Starting to create component instance by {}",userId);
-            if (componentInstanceBusinessLogic == null) {
-                log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
-                return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
-            }
-            ComponentInstance actionResponse = componentInstanceBusinessLogic.createComponentInstance(containerComponentType, containerComponentId, userId, componentInstance);
-            loggerSupportability.log(LoggerSupportabilityActions.CREATE_INSTANCE,actionResponse.getComponentMetadataForSupportLog(),StatusCode.COMPLETE,"Ending to create component instance by user {}",userId);
-            return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.CREATED), actionResponse);
+
+        loggerSupportability.log(LoggerSupportabilityActions.CREATE_INSTANCE, StatusCode.STARTED,
+            "Starting to create component instance by {}", userId);
+        if (componentInstanceBusinessLogic == null) {
+            log.debug(UNSUPPORTED_COMPONENT_TYPE, containerComponentType);
+            return buildErrorResponse(
+                getComponentsUtils().getResponseFormat(ActionStatus.UNSUPPORTED_ERROR, containerComponentType));
+        }
+        final ComponentInstance actionResponse = componentInstanceBusinessLogic.
+            createComponentInstance(containerComponentType, containerComponentId, userId, componentInstance);
+        loggerSupportability
+            .log(LoggerSupportabilityActions.CREATE_INSTANCE, actionResponse.getComponentMetadataForSupportLog(),
+                StatusCode.COMPLETE, "Ending to create component instance by user {}", userId);
+        return buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.CREATED), actionResponse);
 
     }
 
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogicTest.java
index c51456547c..d6995d1750 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogicTest.java
@@ -1182,7 +1182,7 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock {
         assertThat(artifactConfiguration1.getCategories()).contains(ArtifactGroupTypeEnum.INFORMATIONAL);
         assertThat(artifactConfiguration1.getComponentTypes()).hasSize(1);
         assertThat(artifactConfiguration1.getComponentTypes()).contains(ComponentType.RESOURCE);
-        assertThat(artifactConfiguration1.getResourceTypes()).hasSize(7);
+        assertThat(artifactConfiguration1.getResourceTypes()).hasSize(11);
         assertThat(artifactConfiguration1.getResourceTypes())
             .contains(ResourceTypeEnum.VFC.getValue(), ResourceTypeEnum.CP.getValue(), ResourceTypeEnum.VL.getValue(),
                 ResourceTypeEnum.VF.getValue(), ResourceTypeEnum.VFCMT.getValue(), "Abstract",
@@ -1946,8 +1946,8 @@ public class ArtifactsBusinessLogicTest extends BaseBusinessLogicMock {
     @Test(expected = ComponentException.class)
     public void validateDeploymentArtifact_unsupportedResourceType() {
         final ArtifactDefinition artifactDefinition = new ArtifactDefinition();
-        artifactDefinition.setArtifactType(ArtifactTypeEnum.YANG.getType());
-        artifactDefinition.setArtifactGroupType(ArtifactGroupTypeEnum.INFORMATIONAL);
+        artifactDefinition.setArtifactType(ArtifactTypeEnum.ANSIBLE_PLAYBOOK.getType());
+        artifactDefinition.setArtifactGroupType(ArtifactGroupTypeEnum.DEPLOYMENT);
         final Resource resourceComponent = new Resource();
         resourceComponent.setComponentType(ComponentTypeEnum.RESOURCE);
         resourceComponent.setResourceType(ResourceTypeEnum.ServiceProxy);
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogicTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogicTest.java
index 8a005ff9aa..127e1d9aba 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogicTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogicTest.java
@@ -66,7 +66,6 @@ import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
-import org.openecomp.sdc.be.datamodel.utils.ContainerInstanceTypesData;
 import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.ForwardingPathDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.ForwardingPathElementDataDefinition;
@@ -102,6 +101,7 @@ import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;
+import org.openecomp.sdc.be.model.jsonjanusgraph.config.ContainerInstanceTypesData;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ForwardingPathOperation;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
@@ -653,11 +653,11 @@ class ComponentInstanceBusinessLogicTest {
         createProperties();
         createInputs();
         createService();
-        createResource();
+        resource = createResource();
     }
 
-    private void createResource() {
-        resource = new Resource();
+    private Resource createResource() {
+        final Resource resource = new Resource();
         resource.setUniqueId(COMPONENT_ID);
         resource.setComponentInstancesRelations(Lists.newArrayList(relation));
         resource.setComponentInstances(Lists.newArrayList(toInstance, fromInstance));
@@ -665,6 +665,7 @@ class ComponentInstanceBusinessLogicTest {
         resource.setRequirements(fromInstance.getRequirements());
         resource.setComponentType(ComponentTypeEnum.RESOURCE);
         resource.setState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
+        return resource;
     }
 
     private void createService() {
@@ -879,7 +880,7 @@ class ComponentInstanceBusinessLogicTest {
     @Test
     void testValidateParent() {
         ComponentInstanceBusinessLogic testSubject;
-        createResource();
+        resource = createResource();
         String nodeTemplateId = "";
         boolean result;
 
@@ -945,7 +946,7 @@ class ComponentInstanceBusinessLogicTest {
     void testCreateOrUpdatePropertiesValues() {
         ComponentInstanceBusinessLogic testSubject;
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.RESOURCE;
-        createResource();
+        resource = createResource();
         String componentId = resource.getUniqueId();
         String resourceInstanceId = "";
         List<ComponentInstanceProperty> properties = new ArrayList<>();
@@ -979,7 +980,7 @@ class ComponentInstanceBusinessLogicTest {
         ComponentInstanceBusinessLogic testSubject;
         ComponentInstanceProperty property = new ComponentInstanceProperty();
         String newValue = "";
-        createResource();
+        resource = createResource();
         createInstances();
         String capabilityType = "";
         String capabilityName = "";
@@ -995,7 +996,7 @@ class ComponentInstanceBusinessLogicTest {
     void testCreateOrUpdateInstanceInputValues() {
         ComponentInstanceBusinessLogic testSubject;
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.RESOURCE;
-        createResource();
+        resource = createResource();
         String componentId = resource.getUniqueId();
         String resourceInstanceId = "";
         List<ComponentInstanceInput> inputs = new ArrayList<>();
@@ -1027,7 +1028,7 @@ class ComponentInstanceBusinessLogicTest {
     void testCreateOrUpdateGroupInstancePropertyValue() {
         ComponentInstanceBusinessLogic testSubject;
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.RESOURCE;
-        createResource();
+        resource = createResource();
         String componentId = resource.getUniqueId();
         String resourceInstanceId = "";
         String groupInstanceId = "";
@@ -1099,7 +1100,7 @@ class ComponentInstanceBusinessLogicTest {
     @Test
     void testGetResourceInstanceById() {
         ComponentInstanceBusinessLogic testSubject;
-        createResource();
+        resource = createResource();
         String instanceId = "";
         Either<ComponentInstance, StorageOperationStatus> result;
 
@@ -1113,7 +1114,7 @@ class ComponentInstanceBusinessLogicTest {
     void testUpdateInstanceCapabilityProperties_1() {
         ComponentInstanceBusinessLogic testSubject;
         ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.RESOURCE;
-        createResource();
+        resource = createResource();
         String containerComponentId = resource.getUniqueId();
         String componentInstanceUniqueId = "";
         String capabilityType = "";
@@ -1664,7 +1665,7 @@ class ComponentInstanceBusinessLogicTest {
         when(toscaOperationFacade.getToscaFullElement(eq(ORIGIN_COMPONENT_ID)))
             .thenReturn(Either.left(originComponent));
 
-        ByActionStatusComponentException e = assertThrows(ByActionStatusComponentException.class, () -> {
+        final ByActionStatusComponentException e = assertThrows(ByActionStatusComponentException.class, () -> {
             componentInstanceBusinessLogic.createComponentInstance(ComponentTypeEnum.SERVICE_PARAM_NAME, COMPONENT_ID, USER_ID, ci);
         });
         assertThat(e.getActionStatus()).isEqualTo(ActionStatus.INVALID_CONTENT);
@@ -1672,9 +1673,9 @@ class ComponentInstanceBusinessLogicTest {
 
     @Test
     void testCreateComponentInstanceFailureCannotContainInstance() {
-        Pair<ComponentInstance, Resource> p = prepareResourcesForCreateComponentInstanceTest();
-        ComponentInstance ci = p.getLeft();
-        Resource originComponent = p.getRight();
+        final Pair<ComponentInstance, Resource> p = prepareResourcesForCreateComponentInstanceTest();
+        final ComponentInstance ci = p.getLeft();
+        final Resource originComponent = p.getRight();
 
         // Stub for getting component
         when(toscaOperationFacade.getToscaElement(eq(COMPONENT_ID), any(ComponentParametersView.class)))
@@ -1682,21 +1683,38 @@ class ComponentInstanceBusinessLogicTest {
         when(toscaOperationFacade.getToscaFullElement(eq(ORIGIN_COMPONENT_ID)))
             .thenReturn(Either.left(originComponent));
         // Assume services cannot contain VF resource
-        when(containerInstanceTypeData.getServiceContainerList())
-            .thenReturn(Collections.singletonList(ResourceTypeEnum.VL));
+        when(containerInstanceTypeData.isAllowedForServiceComponent(eq(ResourceTypeEnum.VF)))
+            .thenReturn(false);
 
-        ByActionStatusComponentException e = assertThrows(ByActionStatusComponentException.class, () -> {
+        ByActionStatusComponentException actualException = assertThrows(ByActionStatusComponentException.class, () -> {
             componentInstanceBusinessLogic.createComponentInstance(ComponentTypeEnum.SERVICE_PARAM_NAME, COMPONENT_ID, USER_ID, ci);
         });
-        assertThat(e.getActionStatus()).isEqualTo(ActionStatus.CONTAINER_CANNOT_CONTAIN_INSTANCE);
-        verify(containerInstanceTypeData, times(1)).getServiceContainerList();
+        assertThat(actualException.getActionStatus()).isEqualTo(ActionStatus.CONTAINER_CANNOT_CONTAIN_INSTANCE);
+        verify(containerInstanceTypeData, times(1)).isAllowedForServiceComponent(eq(ResourceTypeEnum.VF));
+
+        //given
+        final Resource resource = createResource();
+        resource.setResourceType(ResourceTypeEnum.VF);
+        resource.setLastUpdaterUserId(USER_ID);
+        //when
+        when(toscaOperationFacade.getToscaElement(eq(COMPONENT_ID), any(ComponentParametersView.class)))
+            .thenReturn(Either.left(resource));
+        when(toscaOperationFacade.getToscaFullElement(eq(ORIGIN_COMPONENT_ID)))
+            .thenReturn(Either.left(originComponent));
+        when(containerInstanceTypeData.isAllowedForResourceComponent(eq(ResourceTypeEnum.VF), eq(ResourceTypeEnum.VF)))
+            .thenReturn(false);
+        actualException = assertThrows(ByActionStatusComponentException.class, () -> {
+            componentInstanceBusinessLogic.createComponentInstance(ComponentTypeEnum.RESOURCE_PARAM_NAME, COMPONENT_ID, USER_ID, ci);
+        });
+        //then
+        assertThat(actualException.getActionStatus()).isEqualTo(ActionStatus.CONTAINER_CANNOT_CONTAIN_INSTANCE);
     }
 
     @Test
     void testCreateComponentInstanceFailureAddToGraph() {
-        Pair<ComponentInstance, Resource> p = prepareResourcesForCreateComponentInstanceTest();
-        ComponentInstance ci = p.getLeft();
-        Resource originComponent = p.getRight();
+        final Pair<ComponentInstance, Resource> p = prepareResourcesForCreateComponentInstanceTest();
+        final ComponentInstance ci = p.getLeft();
+        final Resource originComponent = p.getRight();
 
         // TODO Refactor createComponentInstance() method and reduce these mocks
         //      not to target the internal details too much
@@ -1704,8 +1722,8 @@ class ComponentInstanceBusinessLogicTest {
             .thenReturn(Either.left(service));
         when(toscaOperationFacade.getToscaFullElement(eq(ORIGIN_COMPONENT_ID)))
             .thenReturn(Either.left(originComponent));
-        when(containerInstanceTypeData.getServiceContainerList())
-            .thenReturn(Collections.singletonList(ResourceTypeEnum.VF));
+        when(containerInstanceTypeData.isAllowedForServiceComponent(eq(ResourceTypeEnum.VF)))
+            .thenReturn(true);
         Mockito.doNothing().when(compositionBusinessLogic).validateAndSetDefaultCoordinates(ci);
         when(graphLockOperation.lockComponent(COMPONENT_ID, NodeTypeEnum.Service))
             .thenReturn(StorageOperationStatus.OK);
@@ -1722,7 +1740,8 @@ class ComponentInstanceBusinessLogicTest {
         assertThrows(ByResponseFormatComponentException.class, () -> {
             componentInstanceBusinessLogic.createComponentInstance(ComponentTypeEnum.SERVICE_PARAM_NAME, COMPONENT_ID, USER_ID, ci);
         });
-        verify(containerInstanceTypeData, times(1)).getServiceContainerList();
+        verify(containerInstanceTypeData, times(1))
+            .isAllowedForServiceComponent(eq(ResourceTypeEnum.VF));
         verify(compositionBusinessLogic, times(1)).validateAndSetDefaultCoordinates(ci);
         verify(toscaOperationFacade, times(1))
             .addComponentInstanceToTopologyTemplate(service, originComponent, ci, false, user);
@@ -1731,11 +1750,11 @@ class ComponentInstanceBusinessLogicTest {
 
     @Test
     void testCreateComponentInstanceSuccess() {
-        Pair<ComponentInstance, Resource> p = prepareResourcesForCreateComponentInstanceTest();
-        ComponentInstance instanceToBeCreated = p.getLeft();
-        Resource originComponent = p.getRight();
+        final Pair<ComponentInstance, Resource> p = prepareResourcesForCreateComponentInstanceTest();
+        final ComponentInstance instanceToBeCreated = p.getLeft();
+        final Resource originComponent = p.getRight();
 
-        Service updatedService = new Service();
+        final Service updatedService = new Service();
         updatedService.setComponentInstances(Collections.singletonList(instanceToBeCreated));
         updatedService.setUniqueId(service.getUniqueId());
 
@@ -1745,8 +1764,8 @@ class ComponentInstanceBusinessLogicTest {
             .thenReturn(Either.left(service));
         when(toscaOperationFacade.getToscaFullElement(eq(ORIGIN_COMPONENT_ID)))
             .thenReturn(Either.left(originComponent));
-        when(containerInstanceTypeData.getServiceContainerList())
-            .thenReturn(Collections.singletonList(ResourceTypeEnum.VF));
+        when(containerInstanceTypeData.isAllowedForServiceComponent(eq(ResourceTypeEnum.VF)))
+            .thenReturn(true);
         Mockito.doNothing().when(compositionBusinessLogic).validateAndSetDefaultCoordinates(instanceToBeCreated);
         when(graphLockOperation.lockComponent(COMPONENT_ID, NodeTypeEnum.Service))
             .thenReturn(StorageOperationStatus.OK);
@@ -1762,12 +1781,13 @@ class ComponentInstanceBusinessLogicTest {
         when(graphLockOperation.unlockComponent(COMPONENT_ID, NodeTypeEnum.Service))
             .thenReturn(StorageOperationStatus.OK);
 
-        ComponentInstance result = componentInstanceBusinessLogic.createComponentInstance(
+        final ComponentInstance result = componentInstanceBusinessLogic.createComponentInstance(
             ComponentTypeEnum.SERVICE_PARAM_NAME, COMPONENT_ID, USER_ID, instanceToBeCreated);
         assertThat(result).isEqualTo(instanceToBeCreated);
         assertThat(instanceToBeCreated.getComponentVersion()).isEqualTo(originComponent.getVersion());
         assertThat(instanceToBeCreated.getIcon()).isEqualTo(originComponent.getIcon());
-        verify(containerInstanceTypeData, times(1)).getServiceContainerList();
+        verify(containerInstanceTypeData, times(1))
+            .isAllowedForServiceComponent(eq(ResourceTypeEnum.VF));
         verify(compositionBusinessLogic, times(1)).validateAndSetDefaultCoordinates(instanceToBeCreated);
         verify(toscaOperationFacade, times(1))
             .addComponentInstanceToTopologyTemplate(service, originComponent, instanceToBeCreated, false, user);
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java
index bdf986cc07..7482c69c05 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/ExternalRefServletTest.java
@@ -52,6 +52,7 @@ import org.openecomp.sdc.be.impl.ServletUtils;
 import org.openecomp.sdc.be.impl.WebAppContextWrapper;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.jsonjanusgraph.config.ContainerInstanceTypesData;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ArchiveOperation;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.CategoryOperation;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ExternalReferencesOperation;
@@ -268,6 +269,10 @@ public class ExternalRefServletTest extends JerseyTest {
             return healingPipelineDao;
         }
 
+        @Bean
+        ContainerInstanceTypesData containerInstanceTypesData() {
+            return new ContainerInstanceTypesData();
+        }
 
         private void initGraphForTest() {
             if (!setupDone) {
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ArchiveEndpointTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ArchiveEndpointTest.java
index c670b517ba..009fa82b9e 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ArchiveEndpointTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ArchiveEndpointTest.java
@@ -60,6 +60,7 @@ import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.catalog.CatalogComponent;
+import org.openecomp.sdc.be.model.jsonjanusgraph.config.ContainerInstanceTypesData;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ArchiveOperation;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.CategoryOperation;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.GroupsOperation;
@@ -251,6 +252,11 @@ public class ArchiveEndpointTest extends JerseyTest {
             return HEALING_PIPELINE_DAO;
         }
 
+        @Bean
+        ContainerInstanceTypesData containerInstanceTypesData() {
+            return new ContainerInstanceTypesData();
+        }
+
         private void initGraphForTest() {
             //Create Catalog Root
             catalogVertex = GraphTestUtils.createRootCatalogVertex(janusGraphDao);
diff --git a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
index 484206c39a..0065d7b8a8 100644
--- a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
+++ b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
@@ -110,9 +110,70 @@ resourceTypes: &allResourceTypes
   - CP
   - VL
   - VF
+  - CR
   - VFCMT
   - Abstract
   - CVFC
+  - Configuration
+  - ServiceProxy
+  - PNF
+
+componentAllowedInstanceTypes:
+  Resource:
+    VF:
+      - VFC
+      - VF
+      - CR
+      - CP
+      - PNF
+      - CVFC
+      - VL
+      - Configuration
+      - ServiceProxy
+      - Abstract
+    CVFC:
+      - VFC
+      - VF
+      - CR
+      - CP
+      - PNF
+      - CVFC
+      - VL
+      - ServiceProxy
+      - Abstract
+    PNF:
+      - VF
+      - CR
+      - CP
+      - PNF
+      - CVFC
+      - VL
+      - Configuration
+      - ServiceProxy
+      - Abstract
+    CR:
+      - VF
+      - CR
+      - CP
+      - PNF
+      - CVFC
+      - VL
+      - Configuration
+      - ServiceProxy
+      - Abstract
+    VL:
+      - VL
+  Service:
+    "*":
+      - VF
+      - CR
+      - CP
+      - PNF
+      - CVFC
+      - VL
+      - Configuration
+      - ServiceProxy
+      - Abstract
 
 # validForResourceTypes usage
 #     validForResourceTypes:
diff --git a/catalog-be/src/test/resources/paths/path-context.xml b/catalog-be/src/test/resources/paths/path-context.xml
index 0435d38317..73f53f4e8c 100644
--- a/catalog-be/src/test/resources/paths/path-context.xml
+++ b/catalog-be/src/test/resources/paths/path-context.xml
@@ -51,6 +51,7 @@ Modifications copyright (c) 2018 Nokia
 		org.openecomp.sdc.be.model.operations.impl,
 		org.openecomp.sdc.be.model.jsonjanusgraph.operations,
 		org.openecomp.sdc.be.model.jsonjanusgraph.utils,
+		org.openecomp.sdc.be.model.jsonjanusgraph.config,
 		org.openecomp.sdc.be.components.csar,
 		org.openecomp.sdc.be.datamodel.utils,
 		org.openecomp.sdc.be.model.utils,