Improve test coverage
[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / components / impl / ComponentInstanceBusinessLogic.java
index e92f5f3..7cb9858 100644 (file)
 
 package org.openecomp.sdc.be.components.impl;
 
+import static org.openecomp.sdc.be.components.attribute.GetOutputUtils.isGetOutputValueForOutput;
+import static org.openecomp.sdc.be.components.property.GetInputUtils.isGetInputValueForInput;
+import static org.openecomp.sdc.be.components.utils.PropertiesUtils.getPropertyCapabilityOfChildInstance;
+
 import com.google.common.collect.Sets;
 import fj.data.Either;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.text.StringEscapeUtils;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.onap.sdc.tosca.datatypes.model.PropertyType;
+import org.openecomp.sdc.be.components.impl.exceptions.BusinessLogicException;
+import org.openecomp.sdc.be.components.impl.exceptions.ByActionStatusComponentException;
+import org.openecomp.sdc.be.components.impl.exceptions.ByResponseFormatComponentException;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
+import org.openecomp.sdc.be.components.impl.exceptions.ToscaGetFunctionExceptionSupplier;
 import org.openecomp.sdc.be.components.impl.instance.ComponentInstanceChangeOperationOrchestrator;
+import org.openecomp.sdc.be.components.impl.utils.DirectivesUtil;
 import org.openecomp.sdc.be.components.merge.instance.ComponentInstanceMergeDataBusinessLogic;
 import org.openecomp.sdc.be.components.merge.instance.DataForMergeHolder;
+import org.openecomp.sdc.be.components.utils.PropertiesUtils;
 import org.openecomp.sdc.be.components.validation.ComponentValidations;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.config.BeEcompErrorManager.ErrorSeverity;
+import org.openecomp.sdc.be.config.ConfigurationManager;
 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.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.datamodel.utils.PropertyValueConstraintValidationUtil;
+import org.openecomp.sdc.be.datatypes.elements.CINodeFilterDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.ForwardingPathDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.GetInputValueDataDefinition;
-import org.openecomp.sdc.be.datatypes.elements.GroupDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.GetOutputValueDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.GetPolicyValueDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.RequirementDataDefinition;
-import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
-import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ToscaFunctionType;
+import org.openecomp.sdc.be.datatypes.elements.ToscaGetFunctionDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.PropertySource;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.datatypes.tosca.ToscaGetFunctionType;
+import org.openecomp.sdc.be.exception.BusinessException;
+import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.impl.ForwardingPathUtils;
+import org.openecomp.sdc.be.impl.ServiceFilterUtils;
 import org.openecomp.sdc.be.info.CreateAndAssotiateInfo;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentParametersView;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+import org.openecomp.sdc.be.model.AttributeDefinition;
 import org.openecomp.sdc.be.model.CapabilityDefinition;
-import org.openecomp.sdc.be.model.RequirementDefinition;
-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.Component;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.ComponentInstanceAttribute;
+import org.openecomp.sdc.be.model.ComponentInstanceInput;
+import org.openecomp.sdc.be.model.ComponentInstanceOutput;
 import org.openecomp.sdc.be.model.ComponentInstancePropInput;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
+import org.openecomp.sdc.be.model.ComponentInstanceProperty;
+import org.openecomp.sdc.be.model.ComponentParametersView;
 import org.openecomp.sdc.be.model.DataTypeDefinition;
-import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.GroupDefinition;
 import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.model.InterfaceDefinition;
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.OutputDefinition;
+import org.openecomp.sdc.be.model.PolicyDefinition;
+import org.openecomp.sdc.be.model.PropertyConstraint;
+import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.RelationshipInfo;
 import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.ComponentInstanceInput;
-import org.openecomp.sdc.be.model.ComponentInstanceProperty;
-import org.openecomp.sdc.be.model.PropertyDefinition.PropertyNames;
-import org.openecomp.sdc.be.model.jsontitan.operations.ForwardingPathOperation;
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
-import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
-import org.openecomp.sdc.be.model.operations.api.IComponentInstanceOperation;
+import org.openecomp.sdc.be.model.RequirementDefinition;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.ToscaPropertyData;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.jsonjanusgraph.config.ContainerInstanceTypesData;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ArtifactsOperations;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ForwardingPathOperation;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.InterfaceOperation;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.NodeFilterOperation;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.NodeTemplateOperation;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.ModelConverter;
+import org.openecomp.sdc.be.model.operations.StorageException;
+import org.openecomp.sdc.be.model.operations.api.IElementOperation;
+import org.openecomp.sdc.be.model.operations.api.IGroupInstanceOperation;
+import org.openecomp.sdc.be.model.operations.api.IGroupOperation;
+import org.openecomp.sdc.be.model.operations.api.IGroupTypeOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
+import org.openecomp.sdc.be.model.operations.impl.ComponentInstanceOperation;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
+import org.openecomp.sdc.be.model.operations.impl.InterfaceLifecycleOperation;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
 import org.openecomp.sdc.be.model.operations.utils.ComponentValidationUtils;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
+import org.openecomp.sdc.be.model.validation.ToscaFunctionValidator;
 import org.openecomp.sdc.be.resources.data.ComponentInstanceData;
+import org.openecomp.sdc.be.user.Role;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
 import org.openecomp.sdc.common.api.ArtifactTypeEnum;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.datastructure.Wrapper;
 import org.openecomp.sdc.common.jsongraph.util.CommonUtility;
 import org.openecomp.sdc.common.jsongraph.util.CommonUtility.LogLevelEnum;
+import org.openecomp.sdc.common.log.elements.ErrorLogOptionalData;
+import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ValidationUtils;
 import org.openecomp.sdc.exception.ResponseFormat;
 import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.BiConsumer;
-import java.util.stream.Collectors;
-
-import static org.openecomp.sdc.be.components.property.GetInputUtils.isGetInputValueForInput;
+import org.yaml.snakeyaml.Yaml;
 
 @org.springframework.stereotype.Component
 public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
-    private static final Logger log = Logger.getLogger(ComponentInstanceBusinessLogic.class.getName());
+    private static final Logger log = Logger.getLogger(ComponentInstanceBusinessLogic.class);
     private static final String VF_MODULE = "org.openecomp.groups.VfModule";
-    public static final String TRY_TO_CREATE_ENTRY_ON_GRAPH = "Try to create entry on graph";
-    public static final String FAILED_TO_CREATE_ENTRY_ON_GRAPH_FOR_COMPONENT_INSTANCE = "Failed to create entry on graph for component instance {}";
-    public static final String ENTITY_ON_GRAPH_IS_CREATED = "Entity on graph is created.";
-    public static final String INVALID_COMPONENT_TYPE = "invalid component type";
-    public static final String FAILED_TO_RETRIEVE_COMPONENT_COMPONENT_ID = "Failed to retrieve component, component id {}";
-    public static final String FAILED_TO_LOCK_SERVICE = "Failed to lock service {}";
-    public static final String CREATE_OR_UPDATE_PROPERTY_VALUE = "CreateOrUpdatePropertyValue";
-    public static final String FAILED_TO_COPY_COMP_INSTANCE_TO_CANVAS = "Failed to copy the component instance to the canvas";
-    public static final String COPY_COMPONENT_INSTANCE_OK = "Copy component instance OK";
-
+    private static final String TRY_TO_CREATE_ENTRY_ON_GRAPH = "Try to create entry on graph";
+    private static final String CLOUD_SPECIFIC_FIXED_KEY_WORD = "cloudtech";
+    private static final String[][] CLOUD_SPECIFIC_KEY_WORDS = {{"k8s", "azure", "aws"}, /* cloud specific technology */
+        {"charts", "day0", "configtemplate"} /*cloud specific sub type*/};
+    private static final String FAILED_TO_CREATE_ENTRY_ON_GRAPH_FOR_COMPONENT_INSTANCE = "Failed to create entry on graph for component instance {}";
+    private static final String ENTITY_ON_GRAPH_IS_CREATED = "Entity on graph is created.";
+    private static final String INVALID_COMPONENT_TYPE = "invalid component type";
+    private static final String FAILED_TO_RETRIEVE_COMPONENT_COMPONENT_ID = "Failed to retrieve component, component id {}";
+    private static final String FAILED_TO_LOCK_SERVICE = "Failed to lock service {}";
+    private static final String CREATE_OR_UPDATE_PROPERTY_VALUE = "CreateOrUpdatePropertyValue";
+    private static final String FAILED_TO_COPY_COMP_INSTANCE_TO_CANVAS = "Failed to copy the component instance to the canvas";
+    private static final String COPY_COMPONENT_INSTANCE_OK = "Copy component instance OK";
+    private static final String CANNOT_ATTACH_RESOURCE_INSTANCES_TO_CONTAINER_RESOURCE_OF_TYPE =
+        "Cannot attach resource instances to container resource of type {}";
+    private static final String FAILED_TO_UPDATE_COMPONENT_INSTANCE_CAPABILITY = "Failed to update component instance capability on instance {} in "
+        + "container {}";
+    private static final String SERVICE_PROXY = "serviceProxy";
+    private static final String ASSOCIATE_RI_TO_RI = "associateRIToRI";
+    private static final String COMPONENT_ARCHIVED = "Component is archived. Component id: {}";
+    private static final String RESTRICTED_OPERATION_ON_SERVIVE = "Restricted operation for user: {} on service {}";
+    private static final String FAILED_TO_LOCK_COMPONENT = "Failed to lock component {}";
+    private static final String RESTRICTED_OPERATION_ON_COMPONENT = "Restricted operation for user: {} on component {}";
+    private static final String RESOURCE_INSTANCE = "resource instance";
+    private static final String SERVICE = "service";
+
+    private final ComponentInstanceOperation componentInstanceOperation;
+    private final ArtifactsBusinessLogic artifactBusinessLogic;
+    private final ComponentInstanceMergeDataBusinessLogic compInstMergeDataBL;
+    private final ComponentInstanceChangeOperationOrchestrator onChangeInstanceOperationOrchestrator;
+    private final ForwardingPathOperation forwardingPathOperation;
+    private final NodeFilterOperation nodeFilterOperation;
+    private final ToscaFunctionValidator toscaFunctionValidator;
+    private final PropertyBusinessLogic propertyBusinessLogic;
     @Autowired
-    private IComponentInstanceOperation componentInstanceOperation;
-
+    private CompositionBusinessLogic compositionBusinessLogic;
     @Autowired
-    private ArtifactsBusinessLogic artifactBusinessLogic;
+    private ContainerInstanceTypesData containerInstanceTypesData;
 
     @Autowired
-    private ComponentInstanceMergeDataBusinessLogic compInstMergeDataBL;
+    public ComponentInstanceBusinessLogic(IElementOperation elementDao, IGroupOperation groupOperation,
+                                          IGroupInstanceOperation groupInstanceOperation, IGroupTypeOperation groupTypeOperation,
+                                          InterfaceOperation interfaceOperation, InterfaceLifecycleOperation interfaceLifecycleTypeOperation,
+                                          ComponentInstanceOperation componentInstanceOperation, ArtifactsBusinessLogic artifactBusinessLogic,
+                                          ComponentInstanceMergeDataBusinessLogic compInstMergeDataBL,
+                                          ComponentInstanceChangeOperationOrchestrator onChangeInstanceOperationOrchestrator,
+                                          ForwardingPathOperation forwardingPathOperation, NodeFilterOperation nodeFilterOperation,
+                                          ArtifactsOperations artifactToscaOperation, final ToscaFunctionValidator toscaFunctionValidator,
+                                          PropertyBusinessLogic propertyBusinessLogic) {
+        super(elementDao, groupOperation, groupInstanceOperation, groupTypeOperation, interfaceOperation, interfaceLifecycleTypeOperation,
+            artifactToscaOperation);
+        this.componentInstanceOperation = componentInstanceOperation;
+        this.artifactBusinessLogic = artifactBusinessLogic;
+        this.compInstMergeDataBL = compInstMergeDataBL;
+        this.onChangeInstanceOperationOrchestrator = onChangeInstanceOperationOrchestrator;
+        this.forwardingPathOperation = forwardingPathOperation;
+        this.nodeFilterOperation = nodeFilterOperation;
+        this.toscaFunctionValidator = toscaFunctionValidator;
+        this.propertyBusinessLogic = propertyBusinessLogic;
+    }
+
+    public ComponentInstance createComponentInstance(String containerComponentParam, String containerComponentId, String userId,
+                                                     ComponentInstance resourceInstance) {
+        return createComponentInstance(containerComponentParam, containerComponentId, userId, resourceInstance, true);
+    }
+
+    public List<ComponentInstanceProperty> getComponentInstancePropertiesByInputId(org.openecomp.sdc.be.model.Component component, String inputId) {
+        List<ComponentInstanceProperty> resList = new ArrayList<>();
+        Map<String, List<ComponentInstanceProperty>> ciPropertiesMap = component.getComponentInstancesProperties();
+        if (ciPropertiesMap != null && !ciPropertiesMap.isEmpty()) {
+            ciPropertiesMap.forEach((s, ciPropList) -> {
+                String ciName = "";
+                Optional<ComponentInstance> ciOp = component.getComponentInstances().stream().filter(ci -> ci.getUniqueId().equals(s)).findAny();
+                if (ciOp.isPresent()) {
+                    ciName = ciOp.get().getName();
+                }
+                if (ciPropList != null && !ciPropList.isEmpty()) {
+                    for (ComponentInstanceProperty prop : ciPropList) {
+                        List<GetInputValueDataDefinition> inputsValues = prop.getGetInputValues();
+                        addCompInstanceProperty(s, ciName, prop, inputsValues, inputId, resList);
+                    }
+                }
+            });
+        }
+        return resList;
+    }
 
-    @Autowired
-    private ComponentInstanceChangeOperationOrchestrator onChangeInstanceOperationOrchestrator;
+    public List<ComponentInstanceAttribute> getComponentInstanceAttributesByOutputId(final org.openecomp.sdc.be.model.Component component,
+                                                                                     final String outputId) {
+        final List<ComponentInstanceAttribute> resList = new ArrayList<>();
+        final Map<String, List<ComponentInstanceAttribute>> componentInstancesAttributes = component.getComponentInstancesAttributes();
+        if (org.apache.commons.collections4.MapUtils.isNotEmpty(componentInstancesAttributes)) {
+            componentInstancesAttributes.forEach((s, componentInstanceAttributeList) -> {
+                String ciName = "";
+                final Optional<ComponentInstance> ciOp = component.getComponentInstances().stream().filter(ci -> ci.getUniqueId().equals(s))
+                    .findAny();
+                if (ciOp.isPresent()) {
+                    ciName = ciOp.get().getName();
+                }
+                if (componentInstanceAttributeList != null && !componentInstanceAttributeList.isEmpty()) {
+                    for (final ComponentInstanceAttribute compInstanceAttribute : componentInstanceAttributeList) {
+                        List<GetOutputValueDataDefinition> outputValues = compInstanceAttribute.getGetOutputValues();
+                        addCompInstanceAttribute(s, ciName, compInstanceAttribute, outputValues, outputId, resList);
+                    }
+                }
+            });
+        }
+        return resList;
+    }
 
-    @Autowired
-    private ForwardingPathOperation forwardingPathOperation;
+    private void addCompInstanceProperty(String s, String ciName, ComponentInstanceProperty prop, List<GetInputValueDataDefinition> inputsValues,
+                                         String inputId, List<ComponentInstanceProperty> resList) {
+        if (inputsValues != null && !inputsValues.isEmpty()) {
+            for (GetInputValueDataDefinition inputData : inputsValues) {
+                if (isGetInputValueForInput(inputData, inputId)) {
+                    prop.setComponentInstanceId(s);
+                    prop.setComponentInstanceName(ciName);
+                    resList.add(prop);
+                    break;
+                }
+            }
+        }
+    }
+
+    private void addCompInstanceAttribute(final String s, final String ciName, final ComponentInstanceAttribute attribute,
+                                          final List<GetOutputValueDataDefinition> outputsValues, final String outputId,
+                                          final List<ComponentInstanceAttribute> resList) {
+        if (outputsValues != null && !outputsValues.isEmpty()) {
+            for (final GetOutputValueDataDefinition outputData : outputsValues) {
+                if (isGetOutputValueForOutput(outputData, outputId)) {
+                    attribute.setComponentInstanceId(s);
+                    attribute.setComponentInstanceName(ciName);
+                    resList.add(attribute);
+                    break;
+                }
+            }
+        }
+    }
 
-    public ComponentInstanceBusinessLogic() {
+    public Optional<ComponentInstanceProperty> getComponentInstancePropertyByPolicyId(Component component, PolicyDefinition policy) {
+        Optional<ComponentInstanceProperty> propertyCandidate = getComponentInstancePropertyByPolicy(component, policy);
+        if (propertyCandidate.isPresent()) {
+            ComponentInstanceProperty componentInstanceProperty = propertyCandidate.get();
+            Optional<GetPolicyValueDataDefinition> getPolicyCandidate = getGetPolicyValueDataDefinition(policy, componentInstanceProperty);
+            getPolicyCandidate
+                .ifPresent(getPolicyValue -> updateComponentInstancePropertyAfterUndeclaration(componentInstanceProperty, getPolicyValue, policy));
+            return Optional.of(componentInstanceProperty);
+        }
+        return Optional.empty();
     }
 
-    public Either<ComponentInstance, ResponseFormat> createComponentInstance(
-            String containerComponentParam, String containerComponentId, String userId, ComponentInstance resourceInstance) {
-        return createComponentInstance(containerComponentParam, containerComponentId, userId, resourceInstance, false, true);
+    private void updateComponentInstancePropertyAfterUndeclaration(ComponentInstanceProperty componentInstanceProperty,
+                                                                   GetPolicyValueDataDefinition getPolicyValue, PolicyDefinition policyDefinition) {
+        componentInstanceProperty.setValue(getPolicyValue.getOrigPropertyValue());
+        List<GetPolicyValueDataDefinition> getPolicyValues = componentInstanceProperty.getGetPolicyValues();
+        if (CollectionUtils.isNotEmpty(getPolicyValues)) {
+            getPolicyValues.remove(getPolicyValue);
+            componentInstanceProperty.setGetPolicyValues(getPolicyValues);
+            policyDefinition.setGetPolicyValues(getPolicyValues);
+        }
     }
 
-    public List<ComponentInstanceProperty> getComponentInstancePropertiesByInputId(org.openecomp.sdc.be.model.Component component, String inputId){
-        List<ComponentInstanceProperty> resList = new ArrayList<>();
-        Map<String, List<ComponentInstanceProperty>> ciPropertiesMap = component.getComponentInstancesProperties();
-        if(ciPropertiesMap != null && !ciPropertiesMap.isEmpty()){
-            ciPropertiesMap.forEach(new BiConsumer<String, List<ComponentInstanceProperty>>() {
-                @Override
-                public void accept(String s, List<ComponentInstanceProperty> ciPropList) {
-                    String ciName = "";
-                    Optional<ComponentInstance> ciOp = component.getComponentInstances().stream().filter(ci ->ci.getUniqueId().equals(s)).findAny();
-                    if(ciOp.isPresent())
-                        ciName = ciOp.get().getName();
-                    if (ciPropList != null && !ciPropList.isEmpty()) {
-                        for(ComponentInstanceProperty prop: ciPropList){
-                            List<GetInputValueDataDefinition> inputsValues = prop.getGetInputValues();
-                            if(inputsValues != null && !inputsValues.isEmpty()){
-                                for(GetInputValueDataDefinition inputData: inputsValues){
-                                    if(isGetInputValueForInput(inputData, inputId)){
-                                        prop.setComponentInstanceId(s);
-                                        prop.setComponentInstanceName(ciName);
-                                        resList.add(prop);
-                                        break;
-                                    }
-                                }
-                            }
+    private Optional<GetPolicyValueDataDefinition> getGetPolicyValueDataDefinition(PolicyDefinition policy,
+                                                                                   ComponentInstanceProperty componentInstanceProperty) {
+        List<GetPolicyValueDataDefinition> getPolicyValues = policy.getGetPolicyValues();
+        return getPolicyValues.stream().filter(getPolicyValue -> getPolicyValue.getPropertyName().equals(componentInstanceProperty.getName()))
+            .findAny();
+    }
 
-                        }
+    private Optional<ComponentInstanceProperty> getComponentInstancePropertyByPolicy(Component component, PolicyDefinition policy) {
+        Map<String, List<ComponentInstanceProperty>> componentInstancesProperties = component.getComponentInstancesProperties();
+        if (MapUtils.isEmpty(componentInstancesProperties)) {
+            return Optional.empty();
+        }
+        String instanceUniqueId = policy.getInstanceUniqueId();
+        List<ComponentInstanceProperty> componentInstanceProperties =
+            componentInstancesProperties.containsKey(instanceUniqueId) ? componentInstancesProperties.get(instanceUniqueId) : new ArrayList<>();
+        return componentInstanceProperties.stream().filter(property -> property.getName().equals(policy.getName())).findAny();
+    }
+
+    public List<ComponentInstanceInput> getComponentInstanceInputsByInputId(org.openecomp.sdc.be.model.Component component, String inputId) {
+        List<ComponentInstanceInput> resList = new ArrayList<>();
+        Map<String, List<ComponentInstanceInput>> ciInputsMap = component.getComponentInstancesInputs();
+        if (ciInputsMap != null && !ciInputsMap.isEmpty()) {
+            ciInputsMap.forEach((s, ciPropList) -> {
+                String ciName = "";
+                Optional<ComponentInstance> ciOp = component.getComponentInstances().stream().filter(ci -> ci.getUniqueId().equals(s)).findAny();
+                if (ciOp.isPresent()) {
+                    ciName = ciOp.get().getName();
+                }
+                if (ciPropList != null && !ciPropList.isEmpty()) {
+                    for (ComponentInstanceInput prop : ciPropList) {
+                        List<GetInputValueDataDefinition> inputsValues = prop.getGetInputValues();
+                        addCompInstanceInput(s, ciName, prop, inputsValues, inputId, resList);
                     }
                 }
             });
@@ -177,32 +358,22 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         return resList;
     }
 
-    public List<ComponentInstanceInput> getComponentInstanceInputsByInputId(org.openecomp.sdc.be.model.Component component, String inputId){
-        List<ComponentInstanceInput> resList = new ArrayList<>();
-        Map<String, List<ComponentInstanceInput>> ciInputsMap = component.getComponentInstancesInputs();
-        if(ciInputsMap != null && !ciInputsMap.isEmpty()){
-            ciInputsMap.forEach(new BiConsumer<String, List<ComponentInstanceInput>>() {
-                @Override
-                public void accept(String s, List<ComponentInstanceInput> ciPropList) {
-                    String ciName = "";
-                    Optional<ComponentInstance> ciOp = component.getComponentInstances().stream().filter(ci ->ci.getUniqueId().equals(s)).findAny();
-                    if(ciOp.isPresent())
-                        ciName = ciOp.get().getName();
-                    if (ciPropList != null && !ciPropList.isEmpty()) {
-                        for(ComponentInstanceInput prop: ciPropList){
-                            List<GetInputValueDataDefinition> inputsValues = prop.getGetInputValues();
-                            if(inputsValues != null && !inputsValues.isEmpty()){
-                                for(GetInputValueDataDefinition inputData: inputsValues){
-                                    if(isGetInputValueForInput(inputData, inputId)){
-                                        prop.setComponentInstanceId(s);
-                                        prop.setComponentInstanceName(ciName);
-                                        resList.add(prop);
-                                        break;
-                                    }
-                                }
-                            }
-
-                        }
+    public List<ComponentInstanceOutput> getComponentInstanceOutputsByOutputId(final org.openecomp.sdc.be.model.Component component,
+                                                                               final String outputId) {
+        final List<ComponentInstanceOutput> resList = new ArrayList<>();
+        final Map<String, List<ComponentInstanceOutput>> ciInputsMap = component.getComponentInstancesOutputs();
+        if (ciInputsMap != null && !ciInputsMap.isEmpty()) {
+            ciInputsMap.forEach((s, ciPropList) -> {
+                String ciName = "";
+                final Optional<ComponentInstance> ciOp = component.getComponentInstances().stream().filter(ci -> ci.getUniqueId().equals(s))
+                    .findAny();
+                if (ciOp.isPresent()) {
+                    ciName = ciOp.get().getName();
+                }
+                if (ciPropList != null && !ciPropList.isEmpty()) {
+                    for (final ComponentInstanceOutput prop : ciPropList) {
+                        final List<GetOutputValueDataDefinition> outputValues = prop.getGetOutputValues();
+                        addCompInstanceOutput(s, ciName, prop, outputValues, outputId, resList);
                     }
                 }
             });
@@ -210,263 +381,508 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         return resList;
     }
 
-    public Either<ComponentInstance, ResponseFormat> createComponentInstance(
-            String containerComponentParam, String containerComponentId, String userId, ComponentInstance resourceInstance, boolean inTransaction, boolean needLock) {
-
-        Component origComponent = null;
-        Either<ComponentInstance, ResponseFormat> resultOp = null;
-        User user = null;
-        org.openecomp.sdc.be.model.Component containerComponent = null;
-        ComponentTypeEnum containerComponentType;
-
-        try {
-            user = validateUserExists(userId, "create Component Instance", inTransaction);
-
-            Either<Boolean, ResponseFormat> validateValidJson = validateJsonBody(resourceInstance, ComponentInstance.class);
-            if (validateValidJson.isRight()) {
-                return Either.right(validateValidJson.right().value());
+    private void addCompInstanceInput(String s, String ciName, ComponentInstanceInput prop, List<GetInputValueDataDefinition> inputsValues,
+                                      String inputId, List<ComponentInstanceInput> resList) {
+        if (inputsValues != null && !inputsValues.isEmpty()) {
+            for (GetInputValueDataDefinition inputData : inputsValues) {
+                if (isGetInputValueForInput(inputData, inputId)) {
+                    prop.setComponentInstanceId(s);
+                    prop.setComponentInstanceName(ciName);
+                    resList.add(prop);
+                    break;
+                }
             }
+        }
+    }
 
-            Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentParam);
-            if (validateComponentType.isRight()) {
-                return Either.right(validateComponentType.right().value());
-            } else {
-                containerComponentType = validateComponentType.left().value();
+    private void addCompInstanceOutput(final String s, final String ciName, final ComponentInstanceOutput prop,
+                                       final List<GetOutputValueDataDefinition> outputsValues, final String outputId,
+                                       final List<ComponentInstanceOutput> resList) {
+        if (outputsValues != null && !outputsValues.isEmpty()) {
+            for (final GetOutputValueDataDefinition outputData : outputsValues) {
+                if (isGetOutputValueForOutput(outputData, outputId)) {
+                    prop.setComponentInstanceId(s);
+                    prop.setComponentInstanceName(ciName);
+                    resList.add(prop);
+                    break;
+                }
             }
+        }
+    }
 
-            Either<org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponentExists = validateComponentExists(containerComponentId, containerComponentType, null);
-            if (validateComponentExists.isRight()) {
-                return Either.right(validateComponentExists.right().value());
+    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 (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());
+        }
+        validateCanWorkOnComponent(containerComponent, userId);
+        Component origComponent = null;
+        if (resourceInstance != null && containerComponentType != null) {
+            final OriginTypeEnum originType = resourceInstance.getOriginType();
+            validateInstanceName(resourceInstance);
+            if (originType == OriginTypeEnum.ServiceProxy) {
+                origComponent = getOrigComponentForServiceProxy(containerComponent, resourceInstance);
+            } else if (originType == OriginTypeEnum.ServiceSubstitution) {
+                origComponent = getOrigComponentForServiceSubstitution(resourceInstance);
             } else {
-                containerComponent = validateComponentExists.left().value();
+                origComponent = getAndValidateOriginComponentOfComponentInstance(containerComponent, resourceInstance);
+                validateOriginAndResourceInstanceTypes(containerComponent, origComponent, originType);
             }
+            validateResourceInstanceState(containerComponent, origComponent);
+            overrideFields(origComponent, resourceInstance);
+            compositionBusinessLogic.validateAndSetDefaultCoordinates(resourceInstance);
+        }
+        return createComponent(needLock, containerComponent, origComponent, resourceInstance, user);
+    }
 
-            if (ModelConverter.isAtomicComponent(containerComponent)) {
-                log.debug("Cannot attach resource instances to container resource of type {}", containerComponent.assetType());
-                return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_CANNOT_CONTAIN_RESOURCE_INSTANCES, containerComponent.assetType()));
-            }
+    private Component getOrigComponentForServiceProxy(org.openecomp.sdc.be.model.Component containerComponent, ComponentInstance resourceInstance) {
+        Either<Component, StorageOperationStatus> serviceProxyOrigin = toscaOperationFacade.getLatestByName(SERVICE_PROXY, null);
+        if (isServiceProxyOrigin(serviceProxyOrigin)) {
+            throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(serviceProxyOrigin.right().value()));
+        }
+        Component origComponent = serviceProxyOrigin.left().value();
+        StorageOperationStatus fillProxyRes = fillInstanceData(resourceInstance, origComponent);
+        if (isFillProxyRes(fillProxyRes)) {
+            throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(fillProxyRes));
+        }
+        validateOriginAndResourceInstanceTypes(containerComponent, origComponent, OriginTypeEnum.ServiceProxy);
+        return origComponent;
+    }
+
+    private Component getOrigComponentForServiceSubstitution(ComponentInstance resourceInstance) {
+        final Either<Component, StorageOperationStatus> getServiceResult = toscaOperationFacade
+            .getToscaFullElement(resourceInstance.getComponentUid());
+        if (getServiceResult.isRight()) {
+            throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(getServiceResult.right().value()));
+        }
+        final Component service = getServiceResult.left().value();
+        final Either<Component, StorageOperationStatus> getServiceDerivedFromTypeResult = toscaOperationFacade
+            .getLatestByToscaResourceName(service.getDerivedFromGenericType(), service.getModel());
+        if (getServiceDerivedFromTypeResult.isRight()) {
+            throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(getServiceResult.right().value()));
+        }
+        Component origComponent = getServiceDerivedFromTypeResult.left().value();
+        final StorageOperationStatus fillProxyRes = fillInstanceData(resourceInstance, origComponent);
+        if (isFillProxyRes(fillProxyRes)) {
+            throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(fillProxyRes));
+        }
+        return origComponent;
+    }
 
-            Either<Boolean, ResponseFormat> validateCanWorkOnComponent = validateCanWorkOnComponent(containerComponent, userId);
-            if (validateCanWorkOnComponent.isRight()) {
-                return Either.right(validateCanWorkOnComponent.right().value());
+    private ComponentInstance createComponent(boolean needLock, Component containerComponent, Component origComponent,
+                                              ComponentInstance resourceInstance, User user) {
+        boolean failed = false;
+        try {
+            lockIfNeed(needLock, containerComponent);
+            log.debug(TRY_TO_CREATE_ENTRY_ON_GRAPH);
+            return createComponentInstanceOnGraph(containerComponent, origComponent, resourceInstance, user);
+        } catch (ComponentException e) {
+            failed = true;
+            throw e;
+        } finally {
+            if (needLock) {
+                unlockComponent(failed, containerComponent);
             }
+        }
+    }
 
+    /**
+     * Try using either to make a judgment
+     *
+     * @param containerComponentParam
+     * @param containerComponentId
+     * @param userId
+     * @param resourceInstance
+     * @return
+     */
+    public Either<ComponentInstance, ResponseFormat> createRealComponentInstance(String containerComponentParam, String containerComponentId,
+                                                                                 String userId, ComponentInstance resourceInstance) {
+        log.debug("enter createRealComponentInstance");
+        return createRealComponentInstance(containerComponentParam, containerComponentId, userId, resourceInstance, true);
+    }
+
+    /**
+     * Try using either to make a judgment
+     *
+     * @param needLock
+     * @param containerComponentParam
+     * @param containerComponentId
+     * @param userId
+     * @param resourceInstance
+     * @return
+     */
+    public Either<ComponentInstance, ResponseFormat> createRealComponentInstance(String containerComponentParam, String containerComponentId,
+                                                                                 String userId, ComponentInstance resourceInstance,
+                                                                                 boolean needLock) {
+        log.debug("enter createRealComponentInstance");
+        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);
+            log.debug("enter createRealComponentInstance,validate user json success");
+            if (ModelConverter.isAtomicComponent(containerComponent)) {
+                log.debug(CANNOT_ATTACH_RESOURCE_INSTANCES_TO_CONTAINER_RESOURCE_OF_TYPE, containerComponent.assetType());
+                throw new ByActionStatusComponentException(ActionStatus.RESOURCE_CANNOT_CONTAIN_RESOURCE_INSTANCES, containerComponent.assetType());
+            }
+            validateCanWorkOnComponent(containerComponent, userId);
+            log.debug("enter createRealComponentInstance,validateCanWorkOnComponent success");
             if (resourceInstance != null && containerComponentType != null) {
+                log.debug("enter createRealComponentInstance,start create ComponentInstance");
                 OriginTypeEnum originType = resourceInstance.getOriginType();
+                validateInstanceName(resourceInstance);
                 if (originType == OriginTypeEnum.ServiceProxy) {
-                    Either<Component, StorageOperationStatus> serviceProxyOrigin = toscaOperationFacade.getLatestByName("serviceProxy");
-                    if (serviceProxyOrigin.isRight()) {
-                        log.debug("Failed to fetch normative service proxy resource by tosca name, error {}", serviceProxyOrigin.right().value());
-                        return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(serviceProxyOrigin.right().value())));
+                    log.debug("enter createRealComponentInstance,originType equals ServiceProxy");
+                    Either<Component, StorageOperationStatus> serviceProxyOrigin = toscaOperationFacade.getLatestByName(SERVICE_PROXY, null);
+                    if (isServiceProxyOrigin(serviceProxyOrigin)) {
+                        throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(serviceProxyOrigin.right().value()));
                     }
                     origComponent = serviceProxyOrigin.left().value();
-
-                    StorageOperationStatus fillProxyRes = fillProxyInstanceData(resourceInstance, origComponent);
-                    if (fillProxyRes != StorageOperationStatus.OK) {
-                        log.debug("Failed to fill service proxy resource data with data from service, error {}", fillProxyRes);
-                        return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(fillProxyRes)));
-
+                    StorageOperationStatus fillProxyRes = fillInstanceData(resourceInstance, origComponent);
+                    if (isFillProxyRes(fillProxyRes)) {
+                        throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(fillProxyRes));
                     }
-
                 } else {
-                    Either<Component, ResponseFormat> getOriginComponentRes = getAndValidateOriginComponentOfComponentInstance(containerComponentType, resourceInstance);
-
-                    if (getOriginComponentRes.isRight()) {
-                        return Either.right(getOriginComponentRes.right().value());
-                    } else {
-                        origComponent = getOriginComponentRes.left().value();
-                    }
+                    log.debug("enter createRealComponentInstance,originType is not ServiceProxy");
+                    origComponent = getAndValidateOriginComponentOfComponentInstance(containerComponent, resourceInstance);
                 }
+                validateOriginAndResourceInstanceTypes(containerComponent, origComponent, originType);
+                validateResourceInstanceState(containerComponent, origComponent);
+                overrideFields(origComponent, resourceInstance);
+                compositionBusinessLogic.validateAndSetDefaultCoordinates(resourceInstance);
+                log.debug("enter createRealComponentInstance,final validate success");
             }
+            return createRealComponent(needLock, containerComponent, origComponent, resourceInstance, user);
+        } catch (ComponentException e) {
+            log.debug("create Real Component Instance failed");
+            throw e;
+        }
+    }
+
+    private Either<ComponentInstance, ResponseFormat> createRealComponent(boolean needLock, Component containerComponent, Component origComponent,
+                                                                          ComponentInstance resourceInstance, User user) {
+        log.debug("enter createRealComponent");
+        boolean failed = false;
+        try {
+            lockIfNeed(needLock, containerComponent);
+            log.debug(TRY_TO_CREATE_ENTRY_ON_GRAPH);
+            return createRealComponentInstanceOnGraph(containerComponent, origComponent, resourceInstance, user);
+        } catch (ComponentException e) {
+            failed = true;
+            throw e;
+        } finally {
             if (needLock) {
-                Either<Boolean, ResponseFormat> lockComponent = lockComponent(containerComponent, "createComponentInstance");
-                if (lockComponent.isRight()) {
-                    return Either.right(lockComponent.right().value());
-                }
+                unlockComponent(failed, containerComponent);
             }
-            log.debug(TRY_TO_CREATE_ENTRY_ON_GRAPH);
-            resultOp = createComponentInstanceOnGraph(containerComponent, origComponent, resourceInstance, user);
-            return resultOp;
+        }
+    }
 
-        } finally {
-            if (needLock)
-                unlockComponent(resultOp, containerComponent);
+    private Either<ComponentInstance, ResponseFormat> createRealComponentInstanceOnGraph(org.openecomp.sdc.be.model.Component containerComponent,
+                                                                                         Component originComponent,
+                                                                                         ComponentInstance componentInstance, User user) {
+        log.debug("enter createRealComponentInstanceOnGraph");
+        Either<ImmutablePair<Component, String>, StorageOperationStatus> result = toscaOperationFacade
+            .addComponentInstanceToTopologyTemplate(containerComponent, originComponent, componentInstance, false, user);
+        if (result.isRight()) {
+            log.debug("enter createRealComponentInstanceOnGraph,result is right");
+            ActionStatus status = componentsUtils.convertFromStorageResponse(result.right().value());
+            log.debug(FAILED_TO_CREATE_ENTRY_ON_GRAPH_FOR_COMPONENT_INSTANCE, componentInstance.getName());
+            return Either.right(componentsUtils.getResponseFormat(status));
+        }
+        log.debug(ENTITY_ON_GRAPH_IS_CREATED);
+        log.debug("enter createRealComponentInstanceOnGraph,Entity on graph is created.");
+        Component updatedComponent = result.left().value().getLeft();
+        Map<String, String> existingEnvVersions = new HashMap<>();
+        // TODO existingEnvVersions ??
+        addComponentInstanceArtifacts(updatedComponent, componentInstance, originComponent, user, existingEnvVersions);
+        Optional<ComponentInstance> updatedInstanceOptional = updatedComponent.getComponentInstances().stream()
+            .filter(ci -> ci.getUniqueId().equals(result.left().value().getRight())).findFirst();
+        if (!updatedInstanceOptional.isPresent()) {
+            log.debug("Failed to fetch new added component instance {} from component {}", componentInstance.getName(), containerComponent.getName());
+            throw new ByActionStatusComponentException(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, componentInstance.getName());
         }
+        log.debug("enter createRealComponentInstanceOnGraph,and final success");
+        return Either.left(updatedInstanceOptional.get());
     }
 
-    private StorageOperationStatus fillProxyInstanceData(ComponentInstance resourceInstance, Component proxyTemplate) {
-        resourceInstance.setIsProxy(true);
-        ComponentParametersView filter = new ComponentParametersView(true);
+    private void overrideFields(Component origComponent, ComponentInstance resourceInstance) {
+        resourceInstance.setComponentVersion(origComponent.getVersion());
+        resourceInstance.setIcon(origComponent.getIcon());
+    }
+
+    private void validateInstanceName(ComponentInstance resourceInstance) {
+        String resourceInstanceName = resourceInstance.getName();
+        if (StringUtils.isEmpty(resourceInstanceName)) {
+            log.debug("ComponentInstance name is empty");
+            throw new ByActionStatusComponentException(ActionStatus.INVALID_COMPONENT_NAME, resourceInstance.getName());
+        }
+        if (!ValidationUtils.validateComponentNameLength(resourceInstanceName)) {
+            log.debug("ComponentInstance name exceeds max length {} ", ValidationUtils.COMPONENT_NAME_MAX_LENGTH);
+            throw new ByActionStatusComponentException(ActionStatus.INVALID_COMPONENT_NAME, resourceInstance.getName());
+        }
+        if (!ValidationUtils.validateComponentNamePattern(resourceInstanceName)) {
+            log.debug("ComponentInstance name {} has invalid format", resourceInstanceName);
+            throw new ByActionStatusComponentException(ActionStatus.INVALID_COMPONENT_NAME, resourceInstance.getName());
+        }
+    }
+
+    private void validateResourceInstanceState(Component containerComponent, Component origComponent) {
+        if (origComponent.getLifecycleState() == LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT) {
+            throw new ByActionStatusComponentException(ActionStatus.CONTAINER_CANNOT_CONTAIN_INSTANCE,
+                containerComponent.getComponentType().getValue(), origComponent.getLifecycleState().toString());
+        }
+    }
+
+    private void validateOriginAndResourceInstanceTypes(final Component containerComponent, final Component origComponent,
+                                                        final OriginTypeEnum originType) {
+        final ResourceTypeEnum resourceType = getResourceTypeEnumFromOriginComponent(origComponent);
+        validateOriginType(originType, resourceType);
+        validateOriginComponentIsValidForContainer(containerComponent, resourceType);
+    }
+
+    private void validateOriginComponentIsValidForContainer(Component containerComponent, ResourceTypeEnum resourceType) {
+        switch (containerComponent.getComponentType()) {
+            case SERVICE:
+                if (!containerInstanceTypesData.isAllowedForServiceComponent(resourceType, containerComponent.getModel())) {
+                    throw new ByActionStatusComponentException(ActionStatus.CONTAINER_CANNOT_CONTAIN_INSTANCE,
+                        containerComponent.getComponentType().toString(), resourceType.name());
+                }
+                break;
+            case RESOURCE:
+                final ResourceTypeEnum componentResourceType = ((Resource) containerComponent).getResourceType();
+                if (!containerInstanceTypesData.isAllowedForResourceComponent(componentResourceType, resourceType)) {
+                    throw new ByActionStatusComponentException(ActionStatus.CONTAINER_CANNOT_CONTAIN_INSTANCE,
+                        containerComponent.getComponentType().toString(), resourceType.name());
+                }
+                break;
+            default:
+                throw new ByActionStatusComponentException(ActionStatus.INVALID_CONTENT);
+        }
+    }
+
+    private void validateOriginType(OriginTypeEnum originType, ResourceTypeEnum resourceType) {
+        ResourceTypeEnum convertedOriginType;
+        try {
+            convertedOriginType = ResourceTypeEnum.getTypeIgnoreCase(originType.name());
+        } catch (Exception e) {
+            throw new ByActionStatusComponentException(ActionStatus.INVALID_CONTENT);
+        }
+        if (resourceType != convertedOriginType) {
+            throw new ByActionStatusComponentException(ActionStatus.INVALID_CONTENT);
+        }
+    }
+
+    private ResourceTypeEnum getResourceTypeEnumFromOriginComponent(final Component origComponent) {
+        switch (origComponent.getComponentType()) {
+            case SERVICE:
+                return ResourceTypeEnum.ServiceProxy;
+            case RESOURCE:
+                return ((Resource) origComponent).getResourceType();
+            default:
+                throw new ByActionStatusComponentException(ActionStatus.INVALID_CONTENT);
+        }
+    }
+
+    private void lockIfNeed(boolean needLock, Component containerComponent) {
+        if (needLock) {
+            lockComponent(containerComponent, "createComponentInstance");
+        }
+    }
+
+    private boolean isServiceProxyOrigin(Either<Component, StorageOperationStatus> serviceProxyOrigin) {
+        if (serviceProxyOrigin.isRight()) {
+            log.debug("Failed to fetch normative service proxy resource by tosca name, error {}", serviceProxyOrigin.right().value());
+            return true;
+        }
+        return false;
+    }
+
+    private StorageOperationStatus fillInstanceData(ComponentInstance resourceInstance, Component origComponent) {
+        final ComponentParametersView filter = new ComponentParametersView(true);
         filter.setIgnoreCapabilities(false);
         filter.setIgnoreCapabiltyProperties(false);
         filter.setIgnoreComponentInstances(false);
         filter.setIgnoreRequirements(false);
+        filter.setIgnoreInterfaces(false);
+        filter.setIgnoreProperties(false);
+        filter.setIgnoreAttributes(false);
+        filter.setIgnoreInputs(false);
         Either<Component, StorageOperationStatus> serviceRes = toscaOperationFacade.getToscaElement(resourceInstance.getComponentUid(), filter);
         if (serviceRes.isRight()) {
             return serviceRes.right().value();
         }
-        Component service = serviceRes.left().value();
-        Map<String, List<CapabilityDefinition>> capabilities = service.getCapabilities();
+        final Component service = serviceRes.left().value();
+        final Map<String, List<CapabilityDefinition>> capabilities = service.getCapabilities();
         resourceInstance.setCapabilities(capabilities);
-        Map<String, List<RequirementDefinition>> req = service.getRequirements();
+        final Map<String, List<RequirementDefinition>> req = service.getRequirements();
         resourceInstance.setRequirements(req);
+        final Map<String, InterfaceDefinition> serviceInterfaces = service.getInterfaces();
+        if (MapUtils.isNotEmpty(serviceInterfaces)) {
+            serviceInterfaces.forEach(resourceInstance::addInterface);
+        }
+        resourceInstance.setProperties(PropertiesUtils.getProperties(service));
+        resourceInstance.setAttributes(service.getAttributes());
+        final List<InputDefinition> serviceInputs = service.getInputs();
+        resourceInstance.setInputs(serviceInputs);
+        resourceInstance.setSourceModelInvariant(service.getInvariantUUID());
+        resourceInstance.setSourceModelName(service.getName());
+        resourceInstance.setSourceModelUuid(service.getUUID());
+        resourceInstance.setSourceModelUid(service.getUniqueId());
+        resourceInstance.setComponentUid(origComponent.getUniqueId());
+        resourceInstance.setComponentVersion(service.getVersion());
+        switch (resourceInstance.getOriginType()) {
+            case ServiceProxy:
+                return fillProxyInstanceData(resourceInstance, origComponent, service);
+            case ServiceSubstitution:
+                return fillServiceSubstitutableNodeTypeData(resourceInstance, service);
+            default:
+                return StorageOperationStatus.OK;
+        }
+    }
 
-        String name = service.getNormalizedName() + ToscaOperationFacade.PROXY_SUFFIX;
-        String toscaResourceName = ((Resource) proxyTemplate).getToscaResourceName();
-        int lastIndexOf = toscaResourceName.lastIndexOf('.');
+    private StorageOperationStatus fillProxyInstanceData(final ComponentInstance resourceInstance, final Component origComponent,
+                                                         final Component service) {
+        final String name = ValidationUtils.normalizeComponentInstanceName(service.getName()) + ToscaOperationFacade.PROXY_SUFFIX;
+        final String toscaResourceName = ((Resource) origComponent).getToscaResourceName();
+        final int lastIndexOf = toscaResourceName.lastIndexOf('.');
         if (lastIndexOf != -1) {
-            String proxyToscaName = toscaResourceName.substring(0, lastIndexOf + 1) + name;
+            final String proxyToscaName = toscaResourceName.substring(0, lastIndexOf + 1) + name;
             resourceInstance.setToscaComponentName(proxyToscaName);
         }
         resourceInstance.setName(name);
         resourceInstance.setIsProxy(true);
-        resourceInstance.setSourceModelInvariant(service.getInvariantUUID());
-        resourceInstance.setSourceModelName(service.getName());
-        resourceInstance.setSourceModelUuid(service.getUUID());
-        resourceInstance.setSourceModelUid(service.getUniqueId());
-        resourceInstance.setComponentUid(proxyTemplate.getUniqueId());
         resourceInstance.setDescription("A Proxy for Service " + service.getName());
-        resourceInstance.setComponentVersion(service.getVersion());
-
         return StorageOperationStatus.OK;
     }
 
-    public Either<CreateAndAssotiateInfo, ResponseFormat> createAndAssociateRIToRI(String containerComponentParam, String containerComponentId, String userId, CreateAndAssotiateInfo createAndAssotiateInfo) {
+    private StorageOperationStatus fillServiceSubstitutableNodeTypeData(final ComponentInstance resourceInstance, final Component service) {
+        resourceInstance.setToscaComponentName("org.openecomp.service." + ValidationUtils.convertToSystemName(service.getName()));
+        resourceInstance.setName(ValidationUtils.normalizeComponentInstanceName(service.getName()));
+        resourceInstance.setIsProxy(false);
+        resourceInstance.setDescription("A substitutable node type for service " + service.getName());
+        return StorageOperationStatus.OK;
+    }
 
+    public Either<CreateAndAssotiateInfo, ResponseFormat> createAndAssociateRIToRI(String containerComponentParam, String containerComponentId,
+                                                                                   String userId, CreateAndAssotiateInfo createAndAssotiateInfo) {
         Either<CreateAndAssotiateInfo, ResponseFormat> resultOp = null;
         ComponentInstance resourceInstance = createAndAssotiateInfo.getNode();
         RequirementCapabilityRelDef associationInfo = createAndAssotiateInfo.getAssociate();
-
-        User user = validateUserExists(userId, "create And Associate RI To RI", false);
-
-        Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentParam);
-        if (validateComponentType.isRight()) {
-            return Either.right(validateComponentType.right().value());
-        }
-
-        final ComponentTypeEnum containerComponentType = validateComponentType.left().value();
-
-        Either<org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponentExists = validateComponentExists(containerComponentId, containerComponentType, null);
-        if (validateComponentExists.isRight()) {
-            return Either.right(validateComponentExists.right().value());
-        }
-        org.openecomp.sdc.be.model.Component containerComponent = validateComponentExists.left().value();
-
+        User user = validateUserExists(userId);
+        final ComponentTypeEnum containerComponentType = validateComponentType(containerComponentParam);
+        org.openecomp.sdc.be.model.Component containerComponent = validateComponentExists(containerComponentId, containerComponentType, null);
         if (ModelConverter.isAtomicComponent(containerComponent)) {
-            log.debug("Cannot attach resource instances to container resource of type {}", containerComponent.assetType());
-            return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_CANNOT_CONTAIN_RESOURCE_INSTANCES, containerComponent.assetType()));
-        }
-
-        Either<Boolean, ResponseFormat> validateCanWorkOnComponent = validateCanWorkOnComponent(containerComponent, userId);
-        if (validateCanWorkOnComponent.isRight()) {
-            return Either.right(validateCanWorkOnComponent.right().value());
+            log.debug(CANNOT_ATTACH_RESOURCE_INSTANCES_TO_CONTAINER_RESOURCE_OF_TYPE, containerComponent.assetType());
+            return Either
+                .right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_CANNOT_CONTAIN_RESOURCE_INSTANCES, containerComponent.assetType()));
         }
-
-        Either<Boolean, ResponseFormat> lockComponent = lockComponent(containerComponent, "createAndAssociateRIToRI");
-        if (lockComponent.isRight()) {
-            return Either.right(lockComponent.right().value());
-        }
-
+        validateCanWorkOnComponent(containerComponent, userId);
+        boolean failed = false;
         try {
+            lockComponent(containerComponent, "createAndAssociateRIToRI");
             log.debug(TRY_TO_CREATE_ENTRY_ON_GRAPH);
-            Either<Component, ResponseFormat> eitherResourceName = getOriginComponentFromComponentInstance(resourceInstance);
-
-            if (eitherResourceName.isRight()) {
-                resultOp = Either.right(eitherResourceName.right().value());
-                return resultOp;
-            }
-            Component origComponent = eitherResourceName.left().value();
-
-            Either<ComponentInstance, ResponseFormat> result = createComponentInstanceOnGraph(containerComponent, origComponent, resourceInstance, user);
-            if (result.isRight()) {
-                log.debug("Failed to create resource instance {}", containerComponentId);
-                resultOp = Either.right(result.right().value());
-                return resultOp;
-
-            }
-
+            Component origComponent = getOriginComponentFromComponentInstance(resourceInstance);
             log.debug(ENTITY_ON_GRAPH_IS_CREATED);
-            ComponentInstance resResourceInfo = result.left().value();
+            ComponentInstance resResourceInfo = createComponentInstanceOnGraph(containerComponent, origComponent, resourceInstance, user);
             if (associationInfo.getFromNode() == null || associationInfo.getFromNode().isEmpty()) {
                 associationInfo.setFromNode(resResourceInfo.getUniqueId());
             } else {
                 associationInfo.setToNode(resResourceInfo.getUniqueId());
             }
-
-            RequirementCapabilityRelDef requirementCapabilityRelDef = associationInfo;
-            Either<RequirementCapabilityRelDef, StorageOperationStatus> resultReqCapDef = toscaOperationFacade.associateResourceInstances(containerComponentId, requirementCapabilityRelDef);
+            Either<RequirementCapabilityRelDef, StorageOperationStatus> resultReqCapDef = toscaOperationFacade
+                .associateResourceInstances(containerComponent, containerComponentId, associationInfo);
             if (resultReqCapDef.isLeft()) {
                 log.debug(ENTITY_ON_GRAPH_IS_CREATED);
                 RequirementCapabilityRelDef resReqCapabilityRelDef = resultReqCapDef.left().value();
                 CreateAndAssotiateInfo resInfo = new CreateAndAssotiateInfo(resResourceInfo, resReqCapabilityRelDef);
                 resultOp = Either.left(resInfo);
                 return resultOp;
-
             } else {
                 log.info("Failed to associate node {} with node {}", associationInfo.getFromNode(), associationInfo.getToNode());
-                resultOp = Either.right(componentsUtils.getResponseFormatForResourceInstance(componentsUtils.convertFromStorageResponseForResourceInstance(resultReqCapDef.right().value(), true), "", null));
+                resultOp = Either.right(componentsUtils.getResponseFormatForResourceInstance(
+                    componentsUtils.convertFromStorageResponseForResourceInstance(resultReqCapDef.right().value(), true), "", null));
                 return resultOp;
             }
-
+        } catch (ComponentException e) {
+            failed = true;
+            throw e;
         } finally {
-            unlockComponent(resultOp, containerComponent);
+            unlockComponent(failed, containerComponent);
         }
     }
 
-    private Either<Component, ResponseFormat> getOriginComponentFromComponentInstance(ComponentInstance componentInstance) {
+    private Component getOriginComponentFromComponentInstance(ComponentInstance componentInstance) {
         return getOriginComponentFromComponentInstance(componentInstance.getName(), componentInstance.getComponentUid());
     }
 
-    private Either<Component, ResponseFormat> getInstanceOriginNode(ComponentInstance componentInstance) {
+    private Component getInstanceOriginNode(ComponentInstance componentInstance) {
         return getOriginComponentFromComponentInstance(componentInstance.getName(), componentInstance.getActualComponentUid());
     }
 
-    private Either<Component, ResponseFormat> getOriginComponentFromComponentInstance(String componentInstanceName, String origComponetId) {
-        Either<Component, ResponseFormat> eitherResponse;
+    private Component getOriginComponentFromComponentInstance(String componentInstanceName, String origComponetId) {
         Either<Component, StorageOperationStatus> eitherComponent = toscaOperationFacade.getToscaFullElement(origComponetId);
         if (eitherComponent.isRight()) {
             log.debug("Failed to get origin component with id {} for component instance {} ", origComponetId, componentInstanceName);
-            eitherResponse = Either.right(componentsUtils.getResponseFormatForResourceInstance(componentsUtils.convertFromStorageResponse(eitherComponent.right().value(), ComponentTypeEnum.RESOURCE), "", null));
-        } else {
-            eitherResponse = Either.left(eitherComponent.left().value());
+            throw new ByActionStatusComponentException(
+                componentsUtils.convertFromStorageResponse(eitherComponent.right().value(), ComponentTypeEnum.RESOURCE), "", null);
         }
-        return eitherResponse;
+        return eitherComponent.left().value();
     }
 
-    private Either<ComponentInstance, ResponseFormat> createComponentInstanceOnGraph(org.openecomp.sdc.be.model.Component containerComponent, Component originComponent, ComponentInstance componentInstance, User user) {
-        Either<ComponentInstance, ResponseFormat> resultOp;
-
-        Either<ImmutablePair<Component, String>, StorageOperationStatus> result = toscaOperationFacade.addComponentInstanceToTopologyTemplate(containerComponent, originComponent, componentInstance, false, user);
-
+    private ComponentInstance createComponentInstanceOnGraph(org.openecomp.sdc.be.model.Component containerComponent, Component originComponent,
+                                                             ComponentInstance componentInstance, User user) {
+        Either<ImmutablePair<Component, String>, StorageOperationStatus> result = toscaOperationFacade
+            .addComponentInstanceToTopologyTemplate(containerComponent, originComponent, componentInstance, false, user);
         if (result.isRight()) {
             log.debug(FAILED_TO_CREATE_ENTRY_ON_GRAPH_FOR_COMPONENT_INSTANCE, componentInstance.getName());
-            resultOp = Either.right(componentsUtils.getResponseFormatForResourceInstance(componentsUtils.convertFromStorageResponseForResourceInstance(result.right().value(), true), "", null));
-            return resultOp;
+            throw new ByResponseFormatComponentException(componentsUtils
+                .getResponseFormatForResourceInstance(componentsUtils.convertFromStorageResponseForResourceInstance(result.right().value(), true), "",
+                    null));
         }
-
         log.debug(ENTITY_ON_GRAPH_IS_CREATED);
         Component updatedComponent = result.left().value().getLeft();
         Map<String, String> existingEnvVersions = new HashMap<>();
         // TODO existingEnvVersions ??
-        Either<ActionStatus, ResponseFormat> addComponentInstanceArtifacts = addComponentInstanceArtifacts(updatedComponent, componentInstance, originComponent, user, existingEnvVersions);
-        if (addComponentInstanceArtifacts.isRight()) {
-            log.debug("Failed to create component instance {}", componentInstance.getName());
-            resultOp = Either.right(addComponentInstanceArtifacts.right().value());
-            return resultOp;
-        }
-
-        Optional<ComponentInstance> updatedInstanceOptional = updatedComponent.getComponentInstances().stream().filter(ci -> ci.getUniqueId().equals(result.left().value().getRight())).findFirst();
+        addComponentInstanceArtifacts(updatedComponent, componentInstance, originComponent, user, existingEnvVersions);
+        Optional<ComponentInstance> updatedInstanceOptional = updatedComponent.getComponentInstances().stream()
+            .filter(ci -> ci.getUniqueId().equals(result.left().value().getRight())).findFirst();
         if (!updatedInstanceOptional.isPresent()) {
             log.debug("Failed to fetch new added component instance {} from component {}", componentInstance.getName(), containerComponent.getName());
-            resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, componentInstance.getName()));
-            return resultOp;
+            throw new ByActionStatusComponentException(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, componentInstance.getName());
+        }
+        return updatedInstanceOptional.get();
+    }
+
+    public boolean isCloudSpecificArtifact(String artifact) {
+        if (artifact.contains(CLOUD_SPECIFIC_FIXED_KEY_WORD)) {
+            for (int i = 0; i < CLOUD_SPECIFIC_KEY_WORDS.length; i++) {
+                if (Arrays.stream(CLOUD_SPECIFIC_KEY_WORDS[i]).noneMatch(artifact::contains)) {
+                    return false;
+                }
+            }
+            return true;
+        } else {
+            return false;
         }
-        resultOp = Either.left(updatedInstanceOptional.get());
-        return resultOp;
     }
 
     /**
-     * addResourceInstanceArtifacts - add artifacts (HEAT_ENV) to resource instance The instance artifacts are generated from the resource's artifacts
+     * addResourceInstanceArtifacts - add artifacts (HEAT_ENV) to resource instance The instance artifacts are generated from the resource's
+     * artifacts
+     *
      * @param containerComponent
      * @param componentInstance
      * @param originComponent
@@ -474,100 +890,114 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
      * @param existingEnvVersions
      * @return
      */
-    protected Either<ActionStatus, ResponseFormat> addComponentInstanceArtifacts(org.openecomp.sdc.be.model.Component containerComponent, ComponentInstance componentInstance, org.openecomp.sdc.be.model.Component originComponent, User user,    Map<String, String> existingEnvVersions) {
-
+    protected ActionStatus addComponentInstanceArtifacts(org.openecomp.sdc.be.model.Component containerComponent, ComponentInstance componentInstance,
+                                                         org.openecomp.sdc.be.model.Component originComponent, User user,
+                                                         Map<String, String> existingEnvVersions) {
         log.debug("add artifacts to resource instance");
-        List<GroupDefinition> filteredGroups = null;
+        List<GroupDefinition> filteredGroups = new ArrayList<>();
         ActionStatus status = setResourceArtifactsOnResourceInstance(componentInstance);
-        if (!ActionStatus.OK.equals(status)) {
-            ResponseFormat resultOp = componentsUtils.getResponseFormatForResourceInstance(status, "", null);
-            return Either.right(resultOp);
+        if (ActionStatus.OK != status) {
+            throw new ByResponseFormatComponentException(componentsUtils.getResponseFormatForResourceInstance(status, "", null));
         }
         StorageOperationStatus artStatus;
         // generate heat_env if necessary
         Map<String, ArtifactDefinition> componentDeploymentArtifacts = componentInstance.getDeploymentArtifacts();
         if (MapUtils.isNotEmpty(componentDeploymentArtifacts)) {
-
             Map<String, ArtifactDefinition> finalDeploymentArtifacts = new HashMap<>();
             Map<String, List<ArtifactDefinition>> groupInstancesArtifacts = new HashMap<>();
-
+            Integer defaultHeatTimeout = ConfigurationManager.getConfigurationManager().getConfiguration().getHeatArtifactDeploymentTimeout()
+                .getDefaultMinutes();
+            List<ArtifactDefinition> listOfCloudSpecificArts = new ArrayList<>();
             for (ArtifactDefinition artifact : componentDeploymentArtifacts.values()) {
                 String type = artifact.getArtifactType();
                 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()))) {
+                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;
                 }
                 if (artifact.checkEsIdExist()) {
-                    Either<ArtifactDefinition, ResponseFormat> createHeatEnvPlaceHolder = artifactBusinessLogic.createHeatEnvPlaceHolder(artifact, ArtifactsBusinessLogic.HEAT_ENV_NAME, componentInstance.getUniqueId(), NodeTypeEnum.ResourceInstance,
-                            componentInstance.getName(), user, containerComponent, existingEnvVersions);
-                    if (createHeatEnvPlaceHolder.isRight()) {
-                        return Either.right(createHeatEnvPlaceHolder.right().value());
-                    }
-                    ArtifactDefinition artifactDefinition = createHeatEnvPlaceHolder.left().value();
+                    ArtifactDefinition artifactDefinition = artifactBusinessLogic
+                        .createHeatEnvPlaceHolder(new ArrayList<>(), artifact, ArtifactsBusinessLogic.HEAT_ENV_NAME, componentInstance.getUniqueId(),
+                            NodeTypeEnum.ResourceInstance, componentInstance.getName(), user, containerComponent, existingEnvVersions);
                     // put env
                     finalDeploymentArtifacts.put(artifactDefinition.getArtifactLabel(), artifactDefinition);
-
                     if (CollectionUtils.isNotEmpty(originComponent.getGroups())) {
                         filteredGroups = originComponent.getGroups().stream().filter(g -> g.getType().equals(VF_MODULE)).collect(Collectors.toList());
                     }
+                    if (isCloudSpecificArtifact(artifactDefinition.getArtifactName())) {
+                        listOfCloudSpecificArts.add(artifact);
+                    }
                     if (CollectionUtils.isNotEmpty(filteredGroups)) {
-                        for (GroupDefinition groupInstance : filteredGroups) {
-                            Optional<String> op = groupInstance.getArtifacts().stream().filter(p -> p.equals(artifactDefinition.getGeneratedFromId())).findAny();
-                            if (op.isPresent()) {
-                                List<ArtifactDefinition> artifactsUid;
-                                if (groupInstancesArtifacts.containsKey(groupInstance.getUniqueId())) {
-                                    artifactsUid = groupInstancesArtifacts.get(groupInstance.getUniqueId());
-                                } else {
-                                    artifactsUid = new ArrayList<>();
-                                }
-                                artifactsUid.add(artifactDefinition);
-                                groupInstancesArtifacts.put(groupInstance.getUniqueId(), artifactsUid);
-                                break;
-                            }
-                        }
+                        filteredGroups.stream()
+                            .filter(g -> g.getArtifacts() != null &&
+                                g.getArtifacts().stream().anyMatch(p -> p.equals(artifactDefinition.getGeneratedFromId()))).findFirst()
+                            .ifPresent(g -> fillInstanceArtifactMap(groupInstancesArtifacts, artifactDefinition, g));
                     }
                 }
             }
-            artStatus = toscaOperationFacade.addDeploymentArtifactsToInstance(containerComponent.getUniqueId(), componentInstance, finalDeploymentArtifacts);
+            groupInstancesArtifacts.forEach((k, v) -> v.addAll(listOfCloudSpecificArts));
+            filteredGroups.forEach(g -> listOfCloudSpecificArts.forEach(e -> {
+                g.getArtifactsUuid().add(e.getArtifactUUID());
+                g.getArtifacts().add(e.getUniqueId());
+            }));
+            artStatus = toscaOperationFacade
+                .addDeploymentArtifactsToInstance(containerComponent.getUniqueId(), componentInstance, finalDeploymentArtifacts);
             if (artStatus != StorageOperationStatus.OK) {
-                log.debug("Failed to add instance deployment artifacts for instance {} in conatiner {} error {}", componentInstance.getUniqueId(), containerComponent.getUniqueId(), artStatus);
-                return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponseForResourceInstance(artStatus, false)));
-
+                log.debug("Failed to add instance deployment artifacts for instance {} in conatiner {} error {}", componentInstance.getUniqueId(),
+                    containerComponent.getUniqueId(), artStatus);
+                throw new ByResponseFormatComponentException(
+                    componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponseForResourceInstance(artStatus, false)));
             }
-            StorageOperationStatus result = toscaOperationFacade.addGroupInstancesToComponentInstance(containerComponent, componentInstance, filteredGroups, groupInstancesArtifacts);
+            StorageOperationStatus result = toscaOperationFacade
+                .addGroupInstancesToComponentInstance(containerComponent, componentInstance, filteredGroups, groupInstancesArtifacts);
             if (result != StorageOperationStatus.OK) {
                 log.debug("failed to update group instance for component instance {}", componentInstance.getUniqueId());
-                return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(result)));
+                throw new ByResponseFormatComponentException(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(result)));
             }
             componentInstance.setDeploymentArtifacts(finalDeploymentArtifacts);
         }
-
-        artStatus = toscaOperationFacade.addInformationalArtifactsToInstance(containerComponent.getUniqueId(), componentInstance, originComponent.getArtifacts());
+        artStatus = toscaOperationFacade
+            .addInformationalArtifactsToInstance(containerComponent.getUniqueId(), componentInstance, originComponent.getArtifacts());
         if (artStatus != StorageOperationStatus.OK) {
-            log.debug("Failed to add informational artifacts to the instance {} belonging to the conatiner {}. Status is {}", componentInstance.getUniqueId(), containerComponent.getUniqueId(), artStatus);
-            return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponseForResourceInstance(artStatus, false)));
-
+            log.debug("Failed to add informational artifacts to the instance {} belonging to the conatiner {}. Status is {}",
+                componentInstance.getUniqueId(), containerComponent.getUniqueId(), artStatus);
+            throw new ByResponseFormatComponentException(
+                componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponseForResourceInstance(artStatus, false)));
         }
         componentInstance.setArtifacts(originComponent.getArtifacts());
-        return Either.left(ActionStatus.OK);
+        return ActionStatus.OK;
     }
 
-    private ActionStatus setResourceArtifactsOnResourceInstance(ComponentInstance resourceInstance) {
-        Either<Map<String, ArtifactDefinition>, StorageOperationStatus> getResourceDeploymentArtifacts = artifactBusinessLogic.getArtifacts(resourceInstance.getComponentUid(), NodeTypeEnum.Resource, ArtifactGroupTypeEnum.DEPLOYMENT, null);
+    private void fillInstanceArtifactMap(Map<String, List<ArtifactDefinition>> groupInstancesArtifacts, ArtifactDefinition artifactDefinition,
+                                         GroupDefinition groupInstance) {
+        List<ArtifactDefinition> artifactsUid;
+        if (groupInstancesArtifacts.containsKey(groupInstance.getUniqueId())) {
+            artifactsUid = groupInstancesArtifacts.get(groupInstance.getUniqueId());
+        } else {
+            artifactsUid = new ArrayList<>();
+        }
+        artifactsUid.add(artifactDefinition);
+        groupInstancesArtifacts.put(groupInstance.getUniqueId(), artifactsUid);
+    }
 
+    private ActionStatus setResourceArtifactsOnResourceInstance(ComponentInstance resourceInstance) {
+        Either<Map<String, ArtifactDefinition>, StorageOperationStatus> getResourceDeploymentArtifacts = artifactBusinessLogic
+            .getArtifacts(resourceInstance.getComponentUid(), NodeTypeEnum.Resource, ArtifactGroupTypeEnum.DEPLOYMENT, null);
         Map<String, ArtifactDefinition> deploymentArtifacts = new HashMap<>();
         if (getResourceDeploymentArtifacts.isRight()) {
             StorageOperationStatus status = getResourceDeploymentArtifacts.right().value();
-            if (!status.equals(StorageOperationStatus.NOT_FOUND)) {
+            if (status != StorageOperationStatus.NOT_FOUND) {
                 log.debug("Failed to fetch resource: {} artifacts. status is {}", resourceInstance.getComponentUid(), status);
                 return componentsUtils.convertFromStorageResponseForResourceInstance(status, true);
             }
         } else {
             deploymentArtifacts = getResourceDeploymentArtifacts.left().value();
         }
-
         if (!deploymentArtifacts.isEmpty()) {
             Map<String, ArtifactDefinition> tempDeploymentArtifacts = new HashMap<>(deploymentArtifacts);
             for (Entry<String, ArtifactDefinition> artifact : deploymentArtifacts.entrySet()) {
@@ -575,178 +1005,135 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
                     tempDeploymentArtifacts.remove(artifact.getKey());
                 }
             }
-
             resourceInstance.setDeploymentArtifacts(tempDeploymentArtifacts);
         }
-
         return ActionStatus.OK;
     }
 
-    public Either<ComponentInstance, ResponseFormat> updateComponentInstanceMetadata(String containerComponentParam, String containerComponentId, String componentInstanceId, String userId, ComponentInstance componentInstance) {
-        return updateComponentInstanceMetadata(containerComponentParam, containerComponentId, componentInstanceId, userId, componentInstance, false, true, true);
+    public Either<ComponentInstance, ResponseFormat> updateComponentInstanceMetadata(String containerComponentParam, String containerComponentId,
+                                                                                     String componentInstanceId, String userId,
+                                                                                     ComponentInstance componentInstance) {
+        return updateComponentInstanceMetadata(containerComponentParam, containerComponentId, componentInstanceId, userId, componentInstance, true);
     }
 
-    public Either<ComponentInstance, ResponseFormat> updateComponentInstanceMetadata(String containerComponentParam, String containerComponentId, String componentInstanceId, String userId, ComponentInstance componentInstance, boolean inTransaction,
-                                                                                     boolean needLock, boolean createNewTransaction) {
-
-        validateUserExists(userId, "update Component Instance", inTransaction);
-
-        Either<ComponentInstance, ResponseFormat> resultOp = null;
-
-        Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentParam);
-        if (validateComponentType.isRight()) {
-            return Either.right(validateComponentType.right().value());
-        }
-
-        final ComponentTypeEnum containerComponentType = validateComponentType.left().value();
-
-        Either<org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponentExists = validateComponentExists(containerComponentId, containerComponentType, null);
-        if (validateComponentExists.isRight()) {
-            return Either.right(validateComponentExists.right().value());
-        }
-        org.openecomp.sdc.be.model.Component containerComponent = validateComponentExists.left().value();
-
-        Either<Boolean, ResponseFormat> validateCanWorkOnComponent = validateCanWorkOnComponent(containerComponent, userId);
-        if (validateCanWorkOnComponent.isRight()) {
-            return Either.right(validateCanWorkOnComponent.right().value());
-        }
+    public Either<ComponentInstance, ResponseFormat> updateComponentInstanceMetadata(final String containerComponentParam,
+                                                                                     final String containerComponentId,
+                                                                                     final String componentInstanceId, final String userId,
+                                                                                     ComponentInstance componentInstance, boolean needLock) {
+        validateUserExists(userId);
+        final ComponentTypeEnum containerComponentType = validateComponentType(containerComponentParam);
+        final Component containerComponent = validateComponentExists(containerComponentId, containerComponentType, null);
+        validateCanWorkOnComponent(containerComponent, userId);
         ComponentTypeEnum instanceType = getComponentType(containerComponentType);
-        Either<Boolean, StorageOperationStatus> validateParentStatus = toscaOperationFacade.validateComponentExists(componentInstance.getComponentUid());
+        Either<Boolean, StorageOperationStatus> validateParentStatus = toscaOperationFacade
+            .validateComponentExists(componentInstance.getComponentUid());
         if (validateParentStatus.isRight()) {
             log.debug("Failed to get component instance {} on service {}", componentInstanceId, containerComponentId);
-            resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND, componentInstance.getName(), instanceType.getValue().toLowerCase()));
-            return resultOp;
+            throw new ByActionStatusComponentException(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND, componentInstance.getName(),
+                instanceType.getValue().toLowerCase());
         }
-        if (!validateParentStatus.left().value()) {
-            resultOp = Either.right(
-                    componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, componentInstance.getName(), instanceType.getValue().toLowerCase(), containerComponentType.getValue().toLowerCase(), containerComponentId));
-            return resultOp;
+        if (!Boolean.TRUE.equals(validateParentStatus.left().value())) {
+            throw new ByActionStatusComponentException(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, componentInstance.getName(),
+                instanceType.getValue().toLowerCase(), containerComponentType.getValue().toLowerCase(), containerComponentId);
         }
-
         if (needLock) {
-            Either<Boolean, ResponseFormat> lockComponent = lockComponent(containerComponent, "updateComponentInstance");
-            if (lockComponent.isRight()) {
-                return Either.right(lockComponent.right().value());
-            }
+            lockComponent(containerComponent, "updateComponentInstance");
         }
+        Component origComponent;
+        boolean failed = false;
         try {
-
-            Either<Component, ResponseFormat> eitherResourceName = getOriginComponentFromComponentInstance(componentInstance);
-
-            if (eitherResourceName.isRight()) {
-                resultOp = Either.right(eitherResourceName.right().value());
-                return resultOp;
-            }
-            Component origComponent = eitherResourceName.left().value();
-
-            resultOp = updateComponentInstanceMetadata(containerComponent, containerComponentType, origComponent, componentInstanceId, componentInstance);
-            return resultOp;
-
+            origComponent = getOriginComponentFromComponentInstance(componentInstance);
+            componentInstance = updateComponentInstanceMetadata(containerComponent, containerComponentType, origComponent, componentInstanceId,
+                componentInstance);
+        } catch (ComponentException e) {
+            failed = true;
+            throw e;
         } finally {
-            if (needLock)
-                unlockComponent(resultOp, containerComponent);
+            if (needLock) {
+                unlockComponent(failed, containerComponent);
+            }
         }
+        return Either.left(componentInstance);
     }
 
     // New Multiple Instance Update API
-    public Either<List<ComponentInstance>, ResponseFormat> updateComponentInstance(String containerComponentParam, String containerComponentId, String userId, List<ComponentInstance> componentInstanceList, boolean needLock) {
-
-        Either<List<ComponentInstance>, ResponseFormat> resultOp = null;
-        org.openecomp.sdc.be.model.Component containerComponent = null;
+    public List<ComponentInstance> updateComponentInstance(String containerComponentParam, Component containerComponent, String containerComponentId,
+                                                           String userId, List<ComponentInstance> componentInstanceList, boolean needLock) {
+        boolean failed = false;
         try {
-            validateUserExists(userId, "update Component Instance", true);
-
-            Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentParam);
-            if (validateComponentType.isRight()) {
-                return Either.right(validateComponentType.right().value());
-            }
-
-            final ComponentTypeEnum containerComponentType = validateComponentType.left().value();
-
+            validateUserExists(userId);
+            final ComponentTypeEnum containerComponentType = validateComponentType(containerComponentParam);
             ComponentParametersView componentFilter = new ComponentParametersView();
             componentFilter.disableAll();
             componentFilter.setIgnoreUsers(false);
             componentFilter.setIgnoreComponentInstances(false);
-            Either<org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponentExists = validateComponentExistsByFilter(containerComponentId, containerComponentType, componentFilter);
-            if (validateComponentExists.isRight()) {
-                return Either.right(validateComponentExists.right().value());
-            }
-
-            containerComponent = validateComponentExists.left().value();
-
-            Either<Boolean, ResponseFormat> validateCanWorkOnComponent = validateCanWorkOnComponent(containerComponent, userId);
-            if (validateCanWorkOnComponent.isRight()) {
-                return Either.right(validateCanWorkOnComponent.right().value());
+            if (containerComponent == null) {
+                containerComponent = validateComponentExistsByFilter(containerComponentId, containerComponentType, componentFilter);
             }
-
+            validateCanWorkOnComponent(containerComponent, userId);
             ComponentTypeEnum instanceType = getComponentType(containerComponentType);
-
             for (ComponentInstance componentInstance : componentInstanceList) {
                 boolean validateParent = validateParent(containerComponent, componentInstance.getUniqueId());
                 if (!validateParent) {
-                    resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, componentInstance.getName(), instanceType.getValue().toLowerCase(), containerComponentType.getValue().toLowerCase(),
-                            containerComponentId));
-                    return resultOp;
+                    throw new ByActionStatusComponentException(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, componentInstance.getName(),
+                        instanceType.getValue().toLowerCase(), containerComponentType.getValue().toLowerCase(), containerComponentId);
                 }
             }
-
             if (needLock) {
-
-                Either<Boolean, ResponseFormat> lockComponent = lockComponent(containerComponent, "updateComponentInstance");
-                if (lockComponent.isRight()) {
-                    return Either.right(lockComponent.right().value());
-                }
+                lockComponent(containerComponent, "updateComponentInstance");
             }
-
             List<ComponentInstance> updatedList = new ArrayList<>();
             List<ComponentInstance> instancesFromContainerComponent = containerComponent.getComponentInstances();
             List<ComponentInstance> listForUpdate = new ArrayList<>();
-            if (instancesFromContainerComponent == null || instancesFromContainerComponent.isEmpty())
+            if (instancesFromContainerComponent == null || instancesFromContainerComponent.isEmpty()) {
                 containerComponent.setComponentInstances(componentInstanceList);
-            else {
+            else {
                 Iterator<ComponentInstance> iterator = instancesFromContainerComponent.iterator();
                 while (iterator.hasNext()) {
                     ComponentInstance origInst = iterator.next();
-                    Optional<ComponentInstance> op = componentInstanceList.stream().filter(ci -> ci.getUniqueId().equals(origInst.getUniqueId())).findAny();
+                    Optional<ComponentInstance> op = componentInstanceList.stream().filter(ci -> ci.getUniqueId().equals(origInst.getUniqueId()))
+                        .findAny();
                     if (op.isPresent()) {
                         ComponentInstance updatedCi = op.get();
                         updatedCi = buildComponentInstance(updatedCi, origInst);
-
                         Boolean isUniqueName = validateInstanceNameUniquenessUponUpdate(containerComponent, origInst, updatedCi.getName());
-                        if (!isUniqueName) {
-                            CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update the name of the component instance {} to {}. A component instance with the same name already exists. ", origInst.getName(), updatedCi.getName());
-                            resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_NAME_ALREADY_EXIST, containerComponentType.getValue(), origInst.getName()));
-                            return resultOp;
+                        if (!Boolean.TRUE.equals(isUniqueName)) {
+                            CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG,
+                                "Failed to update the name of the component instance {} to {}. A component instance with the same name already exists. ",
+                                origInst.getName(), updatedCi.getName());
+                            throw new ByResponseFormatComponentException(componentsUtils
+                                .getResponseFormat(ActionStatus.COMPONENT_NAME_ALREADY_EXIST, containerComponentType.getValue(), origInst.getName()));
                         }
-
                         listForUpdate.add(updatedCi);
-                    } else
+                    } else {
                         listForUpdate.add(origInst);
+                    }
                 }
                 containerComponent.setComponentInstances(listForUpdate);
-
-                if (resultOp == null) {
-                    Either<Component, StorageOperationStatus> updateStatus = toscaOperationFacade.updateComponentInstanceMetadataOfTopologyTemplate(containerComponent, componentFilter);
-                    if (updateStatus.isRight()) {
-                        CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update metadata belonging to container component {}. Status is {}. ", containerComponent.getName(), updateStatus.right().value());
-                        resultOp = Either.right(componentsUtils.getResponseFormatForResourceInstance(componentsUtils.convertFromStorageResponseForResourceInstance(updateStatus.right().value(), true), "", null));
-                        return resultOp;
-                    }
-                    for (ComponentInstance updatedInstance : updateStatus.left().value().getComponentInstances()) {
-                        Optional<ComponentInstance> op = componentInstanceList.stream().filter(ci -> ci.getName().equals(updatedInstance.getName())).findAny();
-                        if (op.isPresent()) {
-                            updatedList.add(updatedInstance);
-                        }
+                Either<Component, StorageOperationStatus> updateStatus = toscaOperationFacade
+                    .updateComponentInstanceMetadataOfTopologyTemplate(containerComponent, componentFilter);
+                if (updateStatus.isRight()) {
+                    CommonUtility
+                        .addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update metadata belonging to container component {}. Status is {}. ",
+                            containerComponent.getName(), updateStatus.right().value());
+                    throw new ByResponseFormatComponentException(componentsUtils.getResponseFormatForResourceInstance(
+                        componentsUtils.convertFromStorageResponseForResourceInstance(updateStatus.right().value(), true), "", null));
+                }
+                for (ComponentInstance updatedInstance : updateStatus.left().value().getComponentInstances()) {
+                    Optional<ComponentInstance> op = componentInstanceList.stream().filter(ci -> ci.getName().equals(updatedInstance.getName()))
+                        .findAny();
+                    if (op.isPresent()) {
+                        updatedList.add(updatedInstance);
                     }
                 }
             }
-
-            resultOp = Either.left(updatedList);
-            return resultOp;
-
+            return updatedList;
+        } catch (ComponentException e) {
+            failed = true;
+            throw e;
         } finally {
             if (needLock) {
-                unlockComponent(resultOp, containerComponent);
+                unlockComponent(failed, containerComponent);
             }
         }
     }
@@ -756,90 +1143,138 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
     }
 
     private ComponentTypeEnum getComponentType(ComponentTypeEnum containerComponentType) {
-        if (ComponentTypeEnum.PRODUCT.equals(containerComponentType)) {
+        if (ComponentTypeEnum.PRODUCT == containerComponentType) {
             return ComponentTypeEnum.SERVICE_INSTANCE;
         } else {
             return ComponentTypeEnum.RESOURCE_INSTANCE;
         }
     }
 
-    private Either<ComponentInstance, ResponseFormat> updateComponentInstanceMetadata(Component containerComponent, ComponentTypeEnum containerComponentType, org.openecomp.sdc.be.model.Component origComponent, String componentInstanceId,
-                                                                                      ComponentInstance componentInstance) {
-
-        Either<ComponentInstance, ResponseFormat> resultOp = null;
-        Optional<ComponentInstance> componentInstanceOptional = null;
+    private ComponentInstance updateComponentInstanceMetadata(Component containerComponent, ComponentTypeEnum containerComponentType,
+                                                              org.openecomp.sdc.be.model.Component origComponent, String componentInstanceId,
+                                                              ComponentInstance componentInstance) {
+        Optional<ComponentInstance> componentInstanceOptional;
         Either<ImmutablePair<Component, String>, StorageOperationStatus> updateRes = null;
         ComponentInstance oldComponentInstance = null;
         boolean isNameChanged = false;
-
-        if (resultOp == null) {
-            componentInstanceOptional = containerComponent.getComponentInstances().stream().filter(ci -> ci.getUniqueId().equals(componentInstance.getUniqueId())).findFirst();
-            if (!componentInstanceOptional.isPresent()) {
-                CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to find the component instance {} in container component {}. ", componentInstance.getName(), containerComponent.getName());
-                resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, componentInstance.getName()));
-            }
-        }
-        if (resultOp == null) {
-            oldComponentInstance = componentInstanceOptional.get();
-            String newInstanceName = componentInstance.getName();
-            if (oldComponentInstance != null && oldComponentInstance.getName() != null && !oldComponentInstance.getName().equals(newInstanceName))
-                isNameChanged = true;
-            Boolean isUniqueName = validateInstanceNameUniquenessUponUpdate(containerComponent, oldComponentInstance, newInstanceName);
-            if (!isUniqueName) {
-                CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update the name of the component instance {} to {}. A component instance with the same name already exists. ", oldComponentInstance.getName(), newInstanceName);
-                resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_NAME_ALREADY_EXIST, containerComponentType.getValue(), componentInstance.getName()));
-            }
-        }
-        if (resultOp == null) {
-            updateRes = toscaOperationFacade.updateComponentInstanceMetadataOfTopologyTemplate(containerComponent, origComponent, updateComponentInstanceMetadata(oldComponentInstance, componentInstance));
-            if (updateRes.isRight()) {
-                CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to update metadata of component instance {} belonging to container component {}. Status is {}. ", componentInstance.getName(), containerComponent.getName(),
-                        updateRes.right().value());
-                resultOp = Either.right(componentsUtils.getResponseFormatForResourceInstance(componentsUtils.convertFromStorageResponseForResourceInstance(updateRes.right().value(), true), "", null));
-            } else {
-                // region - Update instance Groups
-                if (isNameChanged) {
-                    Either result = toscaOperationFacade.cleanAndAddGroupInstancesToComponentInstance(containerComponent, oldComponentInstance, componentInstanceId);
-                    if (result.isRight())
-                        CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to rename group instances for container {}. error {} ", componentInstanceId, result.right().value());
+        componentInstanceOptional = containerComponent.getComponentInstances().stream()
+            .filter(ci -> ci.getUniqueId().equals(componentInstance.getUniqueId())).findFirst();
+        if (!componentInstanceOptional.isPresent()) {
+            CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to find the component instance {} in container component {}. ",
+                componentInstance.getName(), containerComponent.getName());
+            throw new ByActionStatusComponentException(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, componentInstance.getName());
+        }
+        String oldComponentName;
+        oldComponentInstance = componentInstanceOptional.get();
+        oldComponentName = oldComponentInstance.getName();
+        String newInstanceName = componentInstance.getName();
+        if (oldComponentName != null && !oldComponentInstance.getName().equals(newInstanceName)) {
+            isNameChanged = true;
+        }
+        Boolean isUniqueName = validateInstanceNameUniquenessUponUpdate(containerComponent, oldComponentInstance, newInstanceName);
+        if (!Boolean.TRUE.equals(isUniqueName)) {
+            CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG,
+                "Failed to update the name of the component instance {} to {}. A component instance with the same name already exists. ",
+                oldComponentInstance.getName(), newInstanceName);
+            throw new ByActionStatusComponentException(ActionStatus.COMPONENT_NAME_ALREADY_EXIST, containerComponentType.getValue(),
+                componentInstance.getName());
+        }
+        if (!DirectivesUtil.isValid(componentInstance.getDirectives())) {
+            final String directivesStr = componentInstance.getDirectives().stream().collect(Collectors.joining(" , ", " [ ", " ] "));
+            CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG,
+                "Failed to update the directives of the component instance {} to {}. Directives data {} is invalid. ", oldComponentInstance.getName(),
+                newInstanceName, directivesStr);
+            throw new ByActionStatusComponentException(ActionStatus.DIRECTIVES_INVALID_VALUE, containerComponentType.getValue(),
+                componentInstance.getName());
+        }
+        updateRes = toscaOperationFacade.updateComponentInstanceMetadataOfTopologyTemplate(containerComponent, origComponent,
+            updateComponentInstanceMetadata(oldComponentInstance, componentInstance));
+        if (updateRes.isRight()) {
+            CommonUtility.addRecordToLog(log, LogLevelEnum.DEBUG,
+                "Failed to update metadata of component instance {} belonging to container component {}. Status is {}. ", componentInstance.getName(),
+                containerComponent.getName(), updateRes.right().value());
+            throw new ByResponseFormatComponentException(componentsUtils
+                .getResponseFormatForResourceInstance(componentsUtils.convertFromStorageResponseForResourceInstance(updateRes.right().value(), true),
+                    "", null));
+        } else {
+            // region - Update instance Groups
+            if (isNameChanged) {
+                Either<StorageOperationStatus, StorageOperationStatus> result = toscaOperationFacade
+                    .cleanAndAddGroupInstancesToComponentInstance(containerComponent, oldComponentInstance, componentInstanceId);
+                if (result.isRight()) {
+                    CommonUtility
+                        .addRecordToLog(log, LogLevelEnum.DEBUG, "Failed to rename group instances for container {}. error {} ", componentInstanceId,
+                            result.right().value());
+                }
+                if (containerComponent instanceof Service) {
+                    Either<ComponentInstance, ResponseFormat> renameEither = renameServiceFilter((Service) containerComponent, newInstanceName,
+                        oldComponentInstance.getName());
+                    if (renameEither.isRight()) {
+                        throw new ByResponseFormatComponentException(renameEither.right().value());
+                    }
+                    updateForwardingPathDefinition(containerComponent, componentInstance, oldComponentName);
                 }
-                // endregion
             }
+            // endregion
+        }
+        String newInstanceId = updateRes.left().value().getRight();
+        Optional<ComponentInstance> updatedInstanceOptional = updateRes.left().value().getLeft().getComponentInstances().stream()
+            .filter(ci -> ci.getUniqueId().equals(newInstanceId)).findFirst();
+        if (!updatedInstanceOptional.isPresent()) {
+            log.debug("Failed to update metadata of component instance {} of container component {}", componentInstance.getName(),
+                containerComponent.getName());
+            throw new ByResponseFormatComponentException(
+                componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, componentInstance.getName()));
         }
-        if (resultOp == null) {
-            String newInstanceId = updateRes.left().value().getRight();
-            Optional<ComponentInstance> updatedInstanceOptional = updateRes.left().value().getLeft().getComponentInstances().stream().filter(ci -> ci.getUniqueId().equals(newInstanceId)).findFirst();
+        return componentInstanceOptional.get();
+    }
 
-            if (!updatedInstanceOptional.isPresent()) {
-                log.debug("Failed to update metadata of component instance {} of container component {}", componentInstance.getName(), containerComponent.getName());
-                resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, componentInstance.getName()));
-            } else {
-                resultOp = Either.left(updatedInstanceOptional.get());
+    private void updateForwardingPathDefinition(Component containerComponent, ComponentInstance componentInstance, String oldComponentName) {
+        Collection<ForwardingPathDataDefinition> forwardingPathDataDefinitions = getForwardingPathDataDefinitions(containerComponent.getUniqueId());
+        Set<ForwardingPathDataDefinition> updated = new ForwardingPathUtils()
+            .updateComponentInstanceName(forwardingPathDataDefinitions, oldComponentName, componentInstance.getName());
+        updated.forEach(fp -> {
+            Either<ForwardingPathDataDefinition, StorageOperationStatus> resultEither = forwardingPathOperation
+                .updateForwardingPath(containerComponent.getUniqueId(), fp);
+            if (resultEither.isRight()) {
+                CommonUtility.addRecordToLog(log, LogLevelEnum.ERROR, "Failed to rename forwarding path for container {}. error {} ",
+                    containerComponent.getName(), resultEither.right().value());
             }
+        });
+    }
 
+    public Either<ComponentInstance, ResponseFormat> renameServiceFilter(final Service containerComponent, final String newInstanceName,
+                                                                         final String oldInstanceName) {
+        Map<String, CINodeFilterDataDefinition> renamedNodesFilter = ServiceFilterUtils
+            .getRenamedNodesFilter(containerComponent, oldInstanceName, newInstanceName);
+        for (Entry<String, CINodeFilterDataDefinition> entry : renamedNodesFilter.entrySet()) {
+            Either<CINodeFilterDataDefinition, StorageOperationStatus> renameEither = nodeFilterOperation
+                .updateNodeFilter(containerComponent.getUniqueId(), entry.getKey(), entry.getValue());
+            if (renameEither.isRight()) {
+                return Either.right(componentsUtils.getResponseFormatForResourceInstance(
+                    componentsUtils.convertFromStorageResponse(renameEither.right().value(), ComponentTypeEnum.SERVICE), containerComponent.getName(),
+                    null));
+            }
         }
-        if (resultOp == null) {
-            resultOp = Either.left(componentInstanceOptional.get());
-        }
-        return resultOp;
+        return Either.left(null);
     }
 
     /**
-     * @param oldPrefix-
-     *            The normalized old vf name
-     * @param newNormailzedPrefix-
-     *            The normalized new vf name
-     * @param qualifiedGroupInstanceName-
-     *            old Group Instance Name
+     * @param oldPrefix-                  The normalized old vf name
+     * @param newNormailzedPrefix-        The normalized new vf name
+     * @param qualifiedGroupInstanceName- old Group Instance Name
      **/
+
     // modify group names
     private String getNewGroupName(String oldPrefix, String newNormailzedPrefix, String qualifiedGroupInstanceName) {
         if (qualifiedGroupInstanceName == null) {
             log.info("CANNOT change group name ");
             return null;
         }
-        if (qualifiedGroupInstanceName.startsWith(oldPrefix) || qualifiedGroupInstanceName.startsWith(ValidationUtils.normalizeComponentInstanceName(oldPrefix)))
+        if (qualifiedGroupInstanceName.startsWith(oldPrefix) || qualifiedGroupInstanceName
+            .startsWith(ValidationUtils.normalizeComponentInstanceName(oldPrefix))) {
             return qualifiedGroupInstanceName.replaceFirst(oldPrefix, newNormailzedPrefix);
+        }
         return qualifiedGroupInstanceName;
     }
 
@@ -847,153 +1282,249 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         oldComponentInstance.setName(newComponentInstance.getName());
         oldComponentInstance.setModificationTime(System.currentTimeMillis());
         oldComponentInstance.setCustomizationUUID(UUID.randomUUID().toString());
-        if (oldComponentInstance.getGroupInstances() != null)
-            oldComponentInstance.getGroupInstances().forEach(group -> group.setName(getNewGroupName(oldComponentInstance.getNormalizedName(), ValidationUtils.normalizeComponentInstanceName(newComponentInstance.getName()), group.getName())));
+        oldComponentInstance.setDirectives(newComponentInstance.getDirectives());
+        oldComponentInstance.setMaxOccurrences(newComponentInstance.getMaxOccurrences());
+        oldComponentInstance.setMinOccurrences(newComponentInstance.getMinOccurrences());
+        oldComponentInstance.setInstanceCount(newComponentInstance.getInstanceCount());
+        if (oldComponentInstance.getGroupInstances() != null) {
+            oldComponentInstance.getGroupInstances().forEach(group -> group.setName(getNewGroupName(oldComponentInstance.getNormalizedName(),
+                ValidationUtils.normalizeComponentInstanceName(newComponentInstance.getName()), group.getName())));
+        }
         return oldComponentInstance;
     }
 
-    public Either<ComponentInstance, ResponseFormat> deleteComponentInstance(String containerComponentParam, String containerComponentId, String componentInstanceId, String userId) {
-
-        validateUserExists(userId, "delete Component Instance", false);
-
-        Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentParam);
-        if (validateComponentType.isRight()) {
-            return Either.right(validateComponentType.right().value());
-        }
-
-        final ComponentTypeEnum containerComponentType = validateComponentType.left().value();
-        Either<org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponentExists = validateComponentExists(containerComponentId, containerComponentType, null);
-        if (validateComponentExists.isRight()) {
-            return Either.right(validateComponentExists.right().value());
-        }
-        org.openecomp.sdc.be.model.Component containerComponent = validateComponentExists.left().value();
-        Either<Boolean, ResponseFormat> validateCanWorkOnComponent = validateCanWorkOnComponent(containerComponent, userId);
-        if (validateCanWorkOnComponent.isRight()) {
-            return Either.right(validateCanWorkOnComponent.right().value());
+    public ComponentInstance deleteComponentInstance(final String containerComponentParam, final String containerComponentId,
+                                                     final String componentInstanceId, String userId) throws BusinessLogicException {
+        validateUserExists(userId);
+        final ComponentTypeEnum containerComponentType = validateComponentType(containerComponentParam);
+        final Component containerComponent = validateComponentExists(containerComponentId, containerComponentType, null);
+        validateCanWorkOnComponent(containerComponent, userId);
+        boolean failed = false;
+        final Optional<ComponentInstance> componentInstanceOptional = containerComponent.getComponentInstanceById(componentInstanceId);
+        if (!componentInstanceOptional.isPresent()) {
+            throw new BusinessLogicException(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND));
         }
-
-        Either<Boolean, ResponseFormat> lockComponent = lockComponent(containerComponent, "deleteComponentInstance");
-        if (lockComponent.isRight()) {
-            return Either.right(lockComponent.right().value());
+        ComponentInstance componentInstance = componentInstanceOptional.get();
+        try {
+            if (containerComponent instanceof Service || containerComponent instanceof Resource) {
+                final Either<String, StorageOperationStatus> deleteServiceFilterEither = nodeFilterOperation
+                    .deleteNodeFilter(containerComponent, componentInstanceId);
+                if (deleteServiceFilterEither.isRight()) {
+                    final ActionStatus status = componentsUtils
+                        .convertFromStorageResponse(deleteServiceFilterEither.right().value(), containerComponentType);
+                    janusGraphDao.rollback();
+                    throw new ByResponseFormatComponentException(componentsUtils.getResponseFormat(status, componentInstanceId));
+                }
+                final Either<ComponentInstance, ResponseFormat> resultOp = deleteNodeFiltersFromComponentInstance(containerComponent,
+                    componentInstance, containerComponentType, userId);
+                if (resultOp.isRight()) {
+                    janusGraphDao.rollback();
+                    throw new ByResponseFormatComponentException(resultOp.right().value());
+                }
+            }
+            lockComponent(containerComponent, "deleteComponentInstance");
+            final ComponentInstance deletedCompInstance = deleteComponentInstance(containerComponent, componentInstanceId, containerComponentType);
+            componentInstance = deleteForwardingPathsRelatedTobeDeletedComponentInstance(containerComponentId, containerComponentType,
+                deletedCompInstance);
+            final ActionStatus onDeleteOperationsStatus = onChangeInstanceOperationOrchestrator
+                .doOnDeleteInstanceOperations(containerComponent, componentInstanceId);
+            if (ActionStatus.OK != onDeleteOperationsStatus) {
+                throw new ByActionStatusComponentException(onDeleteOperationsStatus);
+            }
+        } catch (final ComponentException e) {
+            failed = true;
+            throw e;
+        } finally {
+            unlockComponent(failed, containerComponent);
         }
+        return componentInstance;
+    }
 
-        Either<ComponentInstance, ResponseFormat> resultOp = null;
+    /**
+     * Try to modify the delete and return two cases
+     *
+     * @param containerComponentParam
+     * @param containerComponentId
+     * @param componentInstanceId
+     * @param userId
+     * @return
+     */
+    public Either<ComponentInstance, ResponseFormat> deleteAbstractComponentInstance(String containerComponentParam, String containerComponentId,
+                                                                                     String componentInstanceId, String userId) {
+        log.debug("enter deleteAbstractComponentInstance");
+        validateUserExists(userId);
+        final ComponentTypeEnum containerComponentType = validateComponentType(containerComponentParam);
+        org.openecomp.sdc.be.model.Component containerComponent = validateComponentExists(containerComponentId, containerComponentType, null);
+        validateCanWorkOnComponent(containerComponent, userId);
+        boolean failed = false;
+        ComponentInstance deletedRelatedInst;
         try {
-            resultOp = deleteComponentInstance(containerComponent, componentInstanceId, containerComponentType);
-            if (resultOp.isRight()){
-                return resultOp;
-            }
-            Either<ComponentInstance, ResponseFormat> deleteEither = deleteForwardingPathsRelatedTobeDeletedComponentInstance(containerComponentId,
-                    containerComponentType, resultOp);
-            if (deleteEither.isRight()){
-                return deleteEither;
+            if (containerComponent instanceof Service) {
+                final Optional<ComponentInstance> componentInstanceById = containerComponent.getComponentInstanceById(componentInstanceId);
+                if (componentInstanceById.isPresent()) {
+                    ComponentInstance componentInstance = componentInstanceById.get();
+                    Either<String, StorageOperationStatus> deleteServiceFilterEither = nodeFilterOperation
+                        .deleteNodeFilter(containerComponent, componentInstanceId);
+                    if (deleteServiceFilterEither.isRight()) {
+                        log.debug("enter deleteAbstractComponentInstance:deleteServiceFilterEither is right, filed");
+                        ActionStatus status = componentsUtils
+                            .convertFromStorageResponse(deleteServiceFilterEither.right().value(), containerComponentType);
+                        janusGraphDao.rollback();
+                        return Either.right(componentsUtils.getResponseFormat(status, componentInstance.getName()));
+                    }
+                    Either<ComponentInstance, ResponseFormat> resultOp = deleteNodeFiltersFromComponentInstance(containerComponent, componentInstance,
+                        ComponentTypeEnum.SERVICE, userId);
+                    if (resultOp.isRight()) {
+                        log.debug("enter deleteAbstractComponentInstance:resultOp is right, filed");
+                        janusGraphDao.rollback();
+                        return resultOp;
+                    }
+                }
             }
-            return deleteEither;
-
+            log.debug("enter deleteAbstractComponentInstance:");
+            lockComponent(containerComponent, "deleteComponentInstance");
+            ComponentInstance deletedCompInstance = deleteComponentInstance(containerComponent, componentInstanceId, containerComponentType);
+            deletedRelatedInst = deleteForwardingPathsRelatedTobeDeletedComponentInstance(containerComponentId, containerComponentType,
+                deletedCompInstance);
+            ActionStatus onDeleteOperationsStatus = onChangeInstanceOperationOrchestrator
+                .doOnDeleteInstanceOperations(containerComponent, componentInstanceId);
+            log.debug("enter deleteAbstractComponentInstance,get onDeleteOperationsStatus:{}", onDeleteOperationsStatus);
+            if (ActionStatus.OK != onDeleteOperationsStatus) {
+                throw new ByActionStatusComponentException(onDeleteOperationsStatus);
+            }
+        } catch (ComponentException e) {
+            failed = true;
+            throw e;
         } finally {
-            unlockComponent(resultOp, containerComponent);
+            unlockComponent(failed, containerComponent);
+        }
+        log.debug("enter deleteAbstractComponentInstance,deleted RelatedInst success");
+        return Either.left(deletedRelatedInst);
+    }
+
+    public Either<ComponentInstance, ResponseFormat> deleteNodeFiltersFromComponentInstance(final Component component,
+                                                                                            final ComponentInstance componentInstance,
+                                                                                            final ComponentTypeEnum containerComponentType,
+                                                                                            final String userId) {
+        final Set<String> componentFiltersIDsToBeDeleted = getComponentFiltersRelatedToComponentInstance(component.getUniqueId(), componentInstance);
+        if (!componentFiltersIDsToBeDeleted.isEmpty()) {
+            final Set<String> ids = component.getComponentInstances().stream().filter(ci -> componentFiltersIDsToBeDeleted.contains(ci.getName()))
+                .map(ComponentInstance::getUniqueId).collect(Collectors.toSet());
+            final Either<Set<String>, StorageOperationStatus> deleteComponentNodeFiltersEither = nodeFilterOperation
+                .deleteNodeFilters(component, ids);
+            if (deleteComponentNodeFiltersEither.isRight()) {
+                final ActionStatus status = componentsUtils
+                    .convertFromStorageResponse(deleteComponentNodeFiltersEither.right().value(), containerComponentType);
+                return Either.right(componentsUtils.getResponseFormat(status, componentInstance.getName()));
+            }
+            for (final String id : ids) {
+                final Optional<ComponentInstance> componentInstanceById = component.getComponentInstanceById(id);
+                if (!componentInstanceById.isPresent()) {
+                    return Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
+                }
+                final ComponentInstance componentInstanceToBeUpdated = componentInstanceById.get();
+                componentInstanceToBeUpdated.setDirectives(Collections.emptyList());
+                final Either<ComponentInstance, ResponseFormat> componentInstanceResponseFormatEither = updateComponentInstanceMetadata(
+                    containerComponentType.getValue(), component.getUniqueId(), componentInstanceToBeUpdated.getUniqueId(), userId,
+                    componentInstanceToBeUpdated, false);
+                if (componentInstanceResponseFormatEither.isRight()) {
+                    return componentInstanceResponseFormatEither;
+                }
+            }
         }
+        return Either.left(componentInstance);
+    }
+
+    private Set<String> getComponentFiltersRelatedToComponentInstance(String containerComponentId, ComponentInstance componentInstance) {
+        ComponentParametersView filter = new ComponentParametersView(true);
+        filter.setIgnoreComponentInstances(false);
+        Either<Component, StorageOperationStatus> componentFilterOrigin = toscaOperationFacade.getToscaElement(containerComponentId, filter);
+        final Component component = componentFilterOrigin.left().value();
+        return ComponentsUtils.getNodesFiltersToBeDeleted(component, componentInstance);
     }
 
-    public Either<ComponentInstance, ResponseFormat> deleteForwardingPathsRelatedTobeDeletedComponentInstance(String containerComponentId, ComponentTypeEnum containerComponentType,
-                                                                                                              Either<ComponentInstance, ResponseFormat> resultOp) {
-        if(containerComponentType.equals(ComponentTypeEnum.SERVICE) && resultOp.isLeft() ){
-            final ComponentInstance componentInstance = resultOp.left().value();
+    ComponentInstance deleteForwardingPathsRelatedTobeDeletedComponentInstance(String containerComponentId, ComponentTypeEnum containerComponentType,
+                                                                               ComponentInstance componentInstance) {
+        if (containerComponentType == ComponentTypeEnum.SERVICE) {
             List<String> pathIDsToBeDeleted = getForwardingPathsRelatedToComponentInstance(containerComponentId, componentInstance.getName());
             if (!pathIDsToBeDeleted.isEmpty()) {
-                Either<Set<String>, ResponseFormat> deleteForwardingPathsEither = deleteForwardingPaths(containerComponentId,
-                        pathIDsToBeDeleted);
-                if(deleteForwardingPathsEither.isRight()) {
-                    resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
-                }
-
+                deleteForwardingPaths(containerComponentId, pathIDsToBeDeleted);
             }
         }
-        return resultOp;
+        return componentInstance;
     }
 
-
-    private Either<Set<String>, ResponseFormat> deleteForwardingPaths(String serviceId,  List<String> pathIdsToDelete){
-
+    private void deleteForwardingPaths(String serviceId, List<String> pathIdsToDelete) {
         Either<Service, StorageOperationStatus> storageStatus = toscaOperationFacade.getToscaElement(serviceId);
-        if(storageStatus.isRight()) {
-            return Either.right(componentsUtils.getResponseFormat(storageStatus.right().value()));
+        if (storageStatus.isRight()) {
+            throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(storageStatus.right().value()));
         }
-        Either<Set<String>, StorageOperationStatus> result = forwardingPathOperation.deleteForwardingPath(storageStatus.left().value(),
-                Sets.newHashSet(pathIdsToDelete));
-
-        if(result.isRight()) {
-            return Either.right(componentsUtils.getResponseFormat(result.right().value()));
+        Either<Set<String>, StorageOperationStatus> result = forwardingPathOperation
+            .deleteForwardingPath(storageStatus.left().value(), Sets.newHashSet(pathIdsToDelete));
+        if (result.isRight()) {
+            throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(result.right().value()));
         }
-        return  Either.left(result.left().value());
     }
 
-    private List<String> getForwardingPathsRelatedToComponentInstance(String containerComponentId, String componentInstanceId){
-        ComponentParametersView filter = new ComponentParametersView(true);
-        filter.setIgnoreForwardingPath(false);
-        Either<Service, StorageOperationStatus> forwardingPathOrigin = toscaOperationFacade
-                .getToscaElement(containerComponentId, filter);
-        Collection<ForwardingPathDataDefinition> allPaths = forwardingPathOrigin.left().value().getForwardingPaths().values();
+    private List<String> getForwardingPathsRelatedToComponentInstance(String containerComponentId, String componentInstanceId) {
+        Collection<ForwardingPathDataDefinition> allPaths = getForwardingPathDataDefinitions(containerComponentId);
         List<String> pathIDsToBeDeleted = new ArrayList<>();
-
-        allPaths.stream().filter(path -> isPathRelatedToComponent(path,componentInstanceId ))
-                .forEach(path -> pathIDsToBeDeleted.add(path.getUniqueId()));
-
+        allPaths.stream().filter(path -> isPathRelatedToComponent(path, componentInstanceId))
+            .forEach(path -> pathIDsToBeDeleted.add(path.getUniqueId()));
         return pathIDsToBeDeleted;
     }
 
-    private boolean isPathRelatedToComponent(ForwardingPathDataDefinition pathDataDefinition,
-                                             String componentInstanceId){
-        return pathDataDefinition.getPathElements().getListToscaDataDefinition()
-                .stream().anyMatch(elementDataDefinition -> elementDataDefinition.getFromNode().equalsIgnoreCase(componentInstanceId) ||
-                        elementDataDefinition.getToNode()
-                                .equalsIgnoreCase(componentInstanceId));
+    private Collection<ForwardingPathDataDefinition> getForwardingPathDataDefinitions(String containerComponentId) {
+        ComponentParametersView filter = new ComponentParametersView(true);
+        filter.setIgnoreServicePath(false);
+        Either<Service, StorageOperationStatus> forwardingPathOrigin = toscaOperationFacade.getToscaElement(containerComponentId, filter);
+        return forwardingPathOrigin.left().value().getForwardingPaths().values();
     }
 
+    private boolean isPathRelatedToComponent(ForwardingPathDataDefinition pathDataDefinition, String componentInstanceId) {
+        return pathDataDefinition.getPathElements().getListToscaDataDefinition().stream().anyMatch(
+            elementDataDefinition -> elementDataDefinition.getFromNode().equalsIgnoreCase(componentInstanceId) || elementDataDefinition.getToNode()
+                .equalsIgnoreCase(componentInstanceId));
+    }
 
-    private Either<ComponentInstance, ResponseFormat> deleteComponentInstance(Component containerComponent, String componentInstanceId, ComponentTypeEnum containerComponentType) {
-
-        Either<ComponentInstance, ResponseFormat> resultOp = null;
-        ComponentInstance deletedInstance = null;
-        Either<ImmutablePair<Component, String>, StorageOperationStatus> deleteRes = toscaOperationFacade.deleteComponentInstanceFromTopologyTemplate(containerComponent, componentInstanceId);
-
+    private ComponentInstance deleteComponentInstance(Component containerComponent, String componentInstanceId,
+                                                      ComponentTypeEnum containerComponentType) {
+        Either<ImmutablePair<Component, String>, StorageOperationStatus> deleteRes = toscaOperationFacade
+            .deleteComponentInstanceFromTopologyTemplate(containerComponent, componentInstanceId);
         if (deleteRes.isRight()) {
             log.debug("Failed to delete entry on graph for resourceInstance {}", componentInstanceId);
             ActionStatus status = componentsUtils.convertFromStorageResponse(deleteRes.right().value(), containerComponentType);
-            resultOp = Either.right(componentsUtils.getResponseFormat(status, componentInstanceId));
-        }
-        if (resultOp == null) {
-            log.debug("The component instance {} has been removed from container component {}. ", componentInstanceId, containerComponent);
-            deletedInstance = findAndRemoveComponentInstanceFromContainerComponent(componentInstanceId, containerComponent);
-            resultOp = Either.left(deletedInstance);
-        }
-        if (resultOp.isLeft() && CollectionUtils.isNotEmpty(containerComponent.getGroups())) {
-            List<GroupDataDefinition> groupsToUpdate = new ArrayList<>();
-            for (GroupDataDefinition currGroup : containerComponent.getGroups()) {
-                Map<String, String> members = currGroup.getMembers();
-                if (members != null && members.containsKey(deletedInstance.getName())) {
-                    members.remove(deletedInstance.getName());
-                    groupsToUpdate.add(currGroup);
-                }
-            }
-            Either<List<GroupDefinition>, StorageOperationStatus> updateGroupsRes = toscaOperationFacade.updateGroupsOnComponent(containerComponent, groupsToUpdate);
-            if (updateGroupsRes.isRight()) {
-                log.debug("Failed to delete component instance {} from group members. ", componentInstanceId);
-                ActionStatus status = componentsUtils.convertFromStorageResponse(updateGroupsRes.right().value(), containerComponentType);
-                resultOp = Either.right(componentsUtils.getResponseFormat(status, componentInstanceId));
-            }
+            throw new ByActionStatusComponentException(status, componentInstanceId);
         }
-        if (resultOp.isLeft() && CollectionUtils.isNotEmpty(containerComponent.getInputs())) {
-            List<InputDefinition> inputsToDelete = containerComponent.getInputs().stream().filter(i -> i.getInstanceUniqueId() != null && i.getInstanceUniqueId().equals(componentInstanceId)).collect(Collectors.toList());
+        log.debug("The component instance {} has been removed from container component {}. ", componentInstanceId, containerComponent);
+        ComponentInstance deletedInstance = findAndRemoveComponentInstanceFromContainerComponent(componentInstanceId, containerComponent);
+        if (CollectionUtils.isNotEmpty(containerComponent.getInputs())) {
+            List<InputDefinition> inputsToDelete = containerComponent.getInputs().stream()
+                .filter(i -> i.getInstanceUniqueId() != null && i.getInstanceUniqueId().equals(componentInstanceId)).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(inputsToDelete)) {
-                StorageOperationStatus deleteInputsRes = toscaOperationFacade.deleteComponentInstanceInputsFromTopologyTemplate(containerComponent, inputsToDelete);
+                StorageOperationStatus deleteInputsRes = toscaOperationFacade
+                    .deleteComponentInstanceInputsFromTopologyTemplate(containerComponent, inputsToDelete);
                 if (deleteInputsRes != StorageOperationStatus.OK) {
                     log.debug("Failed to delete inputs of the component instance {} from container component. ", componentInstanceId);
-                    resultOp = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(deleteInputsRes, containerComponentType), componentInstanceId));
+                    throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(deleteInputsRes, containerComponentType),
+                        componentInstanceId);
                 }
             }
         }
-        return resultOp;
+        if (CollectionUtils.isNotEmpty(containerComponent.getOutputs())) {
+            final List<OutputDefinition> outputsToDelete = containerComponent.getOutputs().stream()
+                .filter(i -> i.getInstanceUniqueId() != null && i.getInstanceUniqueId().equals(componentInstanceId)).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(outputsToDelete)) {
+                final StorageOperationStatus deleteOutputsRes = toscaOperationFacade
+                    .deleteComponentInstanceOutputsFromTopologyTemplate(containerComponent, outputsToDelete);
+                if (deleteOutputsRes != StorageOperationStatus.OK) {
+                    log.debug("Failed to delete outputs of the component instance {} from container component. ", componentInstanceId);
+                    throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(deleteOutputsRes, containerComponentType),
+                        componentInstanceId);
+                }
+            }
+        }
+        return deletedInstance;
     }
 
     private ComponentInstance findAndRemoveComponentInstanceFromContainerComponent(String componentInstanceId, Component containerComponent) {
@@ -1010,8 +1541,10 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
     }
 
     private void findAndRemoveComponentInstanceRelations(String componentInstanceId, Component containerComponent) {
-        if(CollectionUtils.isNotEmpty(containerComponent.getComponentInstancesRelations())){
-            containerComponent.setComponentInstancesRelations(containerComponent.getComponentInstancesRelations().stream().filter(r -> isNotBelongingRelation(componentInstanceId, r)).collect(Collectors.toList()));
+        if (CollectionUtils.isNotEmpty(containerComponent.getComponentInstancesRelations())) {
+            containerComponent.setComponentInstancesRelations(
+                containerComponent.getComponentInstancesRelations().stream().filter(r -> isNotBelongingRelation(componentInstanceId, r))
+                    .collect(Collectors.toList()));
         }
     }
 
@@ -1019,67 +1552,47 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         return !relation.getToNode().equals(componentInstanceId) && !relation.getFromNode().equals(componentInstanceId);
     }
 
-    public Either<RequirementCapabilityRelDef, ResponseFormat> associateRIToRI(String componentId, String userId, RequirementCapabilityRelDef requirementDef, ComponentTypeEnum componentTypeEnum) {
-        return associateRIToRI(componentId, userId, requirementDef, componentTypeEnum, false, true, true);
+    public RequirementCapabilityRelDef associateRIToRI(String componentId, String userId, RequirementCapabilityRelDef requirementDef,
+                                                       ComponentTypeEnum componentTypeEnum) {
+        return associateRIToRI(componentId, userId, requirementDef, componentTypeEnum, true);
     }
 
-    public Either<RequirementCapabilityRelDef, ResponseFormat> associateRIToRI(String componentId, String userId, RequirementCapabilityRelDef requirementDef, ComponentTypeEnum componentTypeEnum, boolean inTransaction, boolean needLock,
-                                                                               boolean createNewTransaction) {
-
-        validateUserExists(userId, "associate Ri To RI", inTransaction);
-
-        Either<RequirementCapabilityRelDef, ResponseFormat> resultOp = null;
-
-        Either<org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponentExists = validateComponentExists(componentId, componentTypeEnum, null);
-        if (validateComponentExists.isRight()) {
-            return Either.right(validateComponentExists.right().value());
-        }
-        org.openecomp.sdc.be.model.Component containerComponent = validateComponentExists.left().value();
-
-        Either<Boolean, ResponseFormat> validateCanWorkOnComponent = validateCanWorkOnComponent(containerComponent, userId);
-        if (validateCanWorkOnComponent.isRight()) {
-            return Either.right(validateCanWorkOnComponent.right().value());
-        }
-        if (needLock) {
-            Either<Boolean, ResponseFormat> lockComponent = lockComponent(containerComponent, "associateRIToRI");
-
-            if (lockComponent.isRight()) {
-                return Either.right(lockComponent.right().value());
-            }
-        }
-
+    public RequirementCapabilityRelDef associateRIToRI(String componentId, String userId, RequirementCapabilityRelDef requirementDef,
+                                                       ComponentTypeEnum componentTypeEnum, boolean needLock) {
+        validateUserExists(userId);
+        RequirementCapabilityRelDef requirementCapabilityRelDef;
+        org.openecomp.sdc.be.model.Component containerComponent = validateComponentExists(componentId, componentTypeEnum, null);
+        validateCanWorkOnComponent(containerComponent, userId);
+        boolean failed = false;
         try {
-
-            resultOp = associateRIToRIOnGraph(validateComponentExists.left().value(), requirementDef, componentTypeEnum, inTransaction);
-
-            return resultOp;
-
+            if (needLock) {
+                lockComponent(containerComponent, ASSOCIATE_RI_TO_RI);
+            }
+            requirementCapabilityRelDef = associateRIToRIOnGraph(containerComponent, requirementDef);
+        } catch (ComponentException e) {
+            failed = true;
+            throw e;
         } finally {
-            if (needLock)
-                unlockComponent(resultOp, containerComponent);
+            if (needLock) {
+                unlockComponent(failed, containerComponent);
+            }
         }
+        return requirementCapabilityRelDef;
     }
 
-    public Either<RequirementCapabilityRelDef, ResponseFormat> associateRIToRIOnGraph(Component containerComponent, RequirementCapabilityRelDef requirementDef, ComponentTypeEnum componentTypeEnum, boolean inTransaction) {
-
+    public RequirementCapabilityRelDef associateRIToRIOnGraph(Component containerComponent, RequirementCapabilityRelDef requirementDef) {
         log.debug(TRY_TO_CREATE_ENTRY_ON_GRAPH);
-        Either<RequirementCapabilityRelDef, ResponseFormat> resultOp = null;
-
-        Either<RequirementCapabilityRelDef, StorageOperationStatus> result = toscaOperationFacade.associateResourceInstances(containerComponent.getUniqueId(), requirementDef);
-
+        Either<RequirementCapabilityRelDef, StorageOperationStatus> result = toscaOperationFacade
+            .associateResourceInstances(null, containerComponent.getUniqueId(), requirementDef);
         if (result.isLeft()) {
-            log.debug("Enty on graph is created.");
-            RequirementCapabilityRelDef requirementCapabilityRelDef = result.left().value();
-            resultOp = Either.left(requirementCapabilityRelDef);
-            return resultOp;
-
+            log.debug(ENTITY_ON_GRAPH_IS_CREATED);
+            return result.left().value();
         } else {
             log.debug("Failed to associate node: {} with node {}", requirementDef.getFromNode(), requirementDef.getToNode());
             String fromNameOrId = "";
             String toNameOrId = "";
             Either<ComponentInstance, StorageOperationStatus> fromResult = getResourceInstanceById(containerComponent, requirementDef.getFromNode());
             Either<ComponentInstance, StorageOperationStatus> toResult = getResourceInstanceById(containerComponent, requirementDef.getToNode());
-
             toNameOrId = requirementDef.getFromNode();
             fromNameOrId = requirementDef.getFromNode();
             if (fromResult.isLeft()) {
@@ -1088,12 +1601,9 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
             if (toResult.isLeft()) {
                 toNameOrId = toResult.left().value().getName();
             }
-
-            resultOp = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponseForResourceInstance(result.right().value(), true), fromNameOrId, toNameOrId, requirementDef.getRelationships().get(0).getRelation().getRequirement()));
-
-            return resultOp;
+            throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponseForResourceInstance(result.right().value(), true),
+                fromNameOrId, toNameOrId, requirementDef.getRelationships().get(0).getRelation().getRequirement());
         }
-
     }
 
     /**
@@ -1103,302 +1613,266 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
      * @param componentTypeEnum
      * @return
      */
-    public List<RequirementCapabilityRelDef> batchDissociateRIFromRI(
-            String componentId,
-            String userId,
-            List<RequirementCapabilityRelDef> requirementDefList,
-            ComponentTypeEnum componentTypeEnum) {
-
+    public List<RequirementCapabilityRelDef> batchDissociateRIFromRI(String componentId, String userId,
+                                                                     List<RequirementCapabilityRelDef> requirementDefList,
+                                                                     ComponentTypeEnum componentTypeEnum) {
+        validateUserExists(userId);
+        org.openecomp.sdc.be.model.Component containerComponent = validateComponentExists(componentId, componentTypeEnum, null);
+        validateCanWorkOnComponent(containerComponent, userId);
+        boolean failed = false;
         List<RequirementCapabilityRelDef> delOkResult = new ArrayList<>();
-        Either<Component, ResponseFormat> validateResponse = validateDissociateRI(componentId, userId, componentTypeEnum);
-        if (validateResponse.isRight()) {
-
-            return delOkResult;
-        }
-        Component containerComponent = validateResponse.left().value();
-        Either<Boolean, ResponseFormat> lockComponent = lockComponent(containerComponent, "associateRIToRI");
-        if (lockComponent.isRight()) {
-            return delOkResult;
-        }
         try {
+            lockComponent(containerComponent, ASSOCIATE_RI_TO_RI);
             for (RequirementCapabilityRelDef requirementDef : requirementDefList) {
-                Either<RequirementCapabilityRelDef, ResponseFormat> actionResponse = dissociateRIFromRI(
-                        componentId, requirementDef, containerComponent);
-
-                if (actionResponse.isLeft()) {
-                    delOkResult.add(actionResponse.left().value());
-                }
+                RequirementCapabilityRelDef requirementCapabilityRelDef = dissociateRIFromRI(componentId, userId, requirementDef,
+                    containerComponent.getComponentType());
+                delOkResult.add(requirementCapabilityRelDef);
             }
+        } catch (ComponentException e) {
+            failed = true;
+            throw e;
         } finally {
-            unlockComponent(validateResponse, containerComponent);
+            unlockComponent(failed, containerComponent);
         }
         return delOkResult;
     }
 
-    public Either<RequirementCapabilityRelDef, ResponseFormat> dissociateRIFromRI(
-            String componentId, String userId, RequirementCapabilityRelDef requirementDef, ComponentTypeEnum componentTypeEnum) {
-        Either<Component, ResponseFormat> validateResponse = validateDissociateRI(componentId,  userId,  componentTypeEnum);
-        if(validateResponse.isRight())
-        {
-            return Either.right(validateResponse.right().value());
-        }
-        Either<RequirementCapabilityRelDef, ResponseFormat> actionResponse = null;
-        Component containerComponent = validateResponse.left().value();
-        Either<Boolean, ResponseFormat> lockComponent = lockComponent(containerComponent, "associateRIToRI");
-        if (lockComponent.isRight()) {
-            return Either.right(lockComponent.right().value());
-        }
+    public RequirementCapabilityRelDef dissociateRIFromRI(String componentId, String userId, RequirementCapabilityRelDef requirementDef,
+                                                          ComponentTypeEnum componentTypeEnum) {
+        validateUserExists(userId);
+        org.openecomp.sdc.be.model.Component containerComponent = validateComponentExists(componentId, componentTypeEnum, null);
+        validateCanWorkOnComponent(containerComponent, userId);
+        boolean failed = false;
         try {
-            actionResponse = dissociateRIFromRI(
-                    componentId, requirementDef,containerComponent);
-        } finally {
-            unlockComponent(validateResponse, containerComponent);
-        }
-        return actionResponse;
-    }
-
-    private Either<Component, ResponseFormat> validateDissociateRI(
-            String componentId, String userId, ComponentTypeEnum componentTypeEnum) {
-        validateUserExists(userId, "dissociate RI From RI", false);
-
-
-        Either<org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponentExists = validateComponentExists(componentId, componentTypeEnum, null);
-        if (validateComponentExists.isRight()) {
-            return Either.right(validateComponentExists.right().value());
-        }
-        org.openecomp.sdc.be.model.Component containerComponent = validateComponentExists.left().value();
-
-        Either<Boolean, ResponseFormat> validateCanWorkOnComponent = validateCanWorkOnComponent(containerComponent, userId);
-        if (validateCanWorkOnComponent.isRight()) {
-            return Either.right(validateCanWorkOnComponent.right().value());
-        }
-        return Either.left(containerComponent);
-
-    }
-    private Either<RequirementCapabilityRelDef, ResponseFormat> dissociateRIFromRI(
-            String componentId, RequirementCapabilityRelDef requirementDef, Component containerComponent) {
-
-        Either<RequirementCapabilityRelDef, ResponseFormat> resultOp = null;
-        log.debug(TRY_TO_CREATE_ENTRY_ON_GRAPH);
-        Either<RequirementCapabilityRelDef, StorageOperationStatus> result = toscaOperationFacade.dissociateResourceInstances(
-                componentId, requirementDef);
-        if (result.isLeft()) {
-            log.debug("Enty on graph is created.");
-            RequirementCapabilityRelDef requirementCapabilityRelDef = result.left().value();
-            resultOp = Either.left(requirementCapabilityRelDef);
-            return resultOp;
-
-        } else {
-
-            log.debug("Failed to dissocaite node  {} from node {}", requirementDef.getFromNode(), requirementDef.getToNode());
-            String fromNameOrId = "";
-            String toNameOrId = "";
-            Either<ComponentInstance, StorageOperationStatus> fromResult = getResourceInstanceById(
-                    containerComponent, requirementDef.getFromNode());
-            Either<ComponentInstance, StorageOperationStatus> toResult = getResourceInstanceById(
-                    containerComponent, requirementDef.getToNode());
-
-            toNameOrId = requirementDef.getFromNode();
-            fromNameOrId = requirementDef.getFromNode();
-            if (fromResult.isLeft()) {
-                fromNameOrId = fromResult.left().value().getName();
-            }
-            if (toResult.isLeft()) {
-                toNameOrId = toResult.left().value().getName();
+            lockComponent(containerComponent, ASSOCIATE_RI_TO_RI);
+            log.debug(TRY_TO_CREATE_ENTRY_ON_GRAPH);
+            Either<RequirementCapabilityRelDef, StorageOperationStatus> result = toscaOperationFacade
+                .dissociateResourceInstances(componentId, requirementDef);
+            if (result.isLeft()) {
+                log.debug(ENTITY_ON_GRAPH_IS_CREATED);
+                return result.left().value();
+            } else {
+                log.debug("Failed to dissocaite node  {} from node {}", requirementDef.getFromNode(), requirementDef.getToNode());
+                String fromNameOrId = "";
+                String toNameOrId = "";
+                Either<ComponentInstance, StorageOperationStatus> fromResult = getResourceInstanceById(containerComponent,
+                    requirementDef.getFromNode());
+                Either<ComponentInstance, StorageOperationStatus> toResult = getResourceInstanceById(containerComponent, requirementDef.getToNode());
+                toNameOrId = requirementDef.getFromNode();
+                fromNameOrId = requirementDef.getFromNode();
+                if (fromResult.isLeft()) {
+                    fromNameOrId = fromResult.left().value().getName();
+                }
+                if (toResult.isLeft()) {
+                    toNameOrId = toResult.left().value().getName();
+                }
+                throw new ByActionStatusComponentException(
+                    componentsUtils.convertFromStorageResponseForResourceInstance(result.right().value(), true), fromNameOrId, toNameOrId,
+                    requirementDef.getRelationships().get(0).getRelation().getRequirement());
             }
-
-            resultOp = Either
-                    .right(componentsUtils.getResponseFormat(
-                            componentsUtils.convertFromStorageResponseForResourceInstance(
-                                    result.right().value(), true), fromNameOrId, toNameOrId, requirementDef.getRelationships().get(0).getRelation().getRequirement()));
-            return resultOp;
+        } catch (ComponentException e) {
+            failed = true;
+            throw e;
+        } finally {
+            unlockComponent(failed, containerComponent);
         }
     }
 
     /**
      * Allows to get relation contained in specified component according to received Id
+     *
      * @param componentId
      * @param relationId
      * @param userId
      * @param componentTypeEnum
      * @return
      */
-    public Either<RequirementCapabilityRelDef, ResponseFormat> getRelationById(String componentId, String relationId, String userId, ComponentTypeEnum componentTypeEnum) {
-
+    public Either<RequirementCapabilityRelDef, ResponseFormat> getRelationById(String componentId, String relationId, String userId,
+                                                                               ComponentTypeEnum componentTypeEnum) {
         Either<RequirementCapabilityRelDef, ResponseFormat> resultOp = null;
         try {
             org.openecomp.sdc.be.model.Component containerComponent = null;
-            Either<org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponentExists = null;
             RequirementCapabilityRelDef foundRelation = null;
-
-            validateUserExists(userId, "get relation by Id", false);
-
-            if(resultOp == null){
-                validateComponentExists = validateComponentExists(componentId, componentTypeEnum, null);
-                if (validateComponentExists.isRight()) {
-                    resultOp = Either.right(validateComponentExists.right().value());
-                }
-            }
-            if(resultOp == null){
-                containerComponent = validateComponentExists.left().value();
-                List<RequirementCapabilityRelDef> requirementCapabilityRelations = containerComponent.getComponentInstancesRelations();
-                foundRelation = findRelation(relationId, requirementCapabilityRelations);
-                if(foundRelation == null){
-                    ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.RELATION_NOT_FOUND, relationId, componentId);
-                    log.debug("Relation with id {} was not found on the component", relationId, componentId);
-                    resultOp = Either.right(responseFormat);
-                }
-            }
-            if(resultOp == null){
+            validateUserExists(userId);
+            containerComponent = validateComponentExists(componentId, componentTypeEnum, null);
+            List<RequirementCapabilityRelDef> requirementCapabilityRelations = containerComponent.getComponentInstancesRelations();
+            foundRelation = findRelation(relationId, requirementCapabilityRelations);
+            if (foundRelation == null) {
+                ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.RELATION_NOT_FOUND, relationId, componentId);
+                log.debug("Relation with id {} was not found on the component", relationId, componentId);
+                resultOp = Either.right(responseFormat);
+            }
+            if (resultOp == null) {
                 resultOp = setRelatedCapability(foundRelation, containerComponent);
             }
-            if(resultOp.isLeft()){
+            if (resultOp.isLeft()) {
                 resultOp = setRelatedRequirement(foundRelation, containerComponent);
             }
         } catch (Exception e) {
             log.error("The exception {} occured upon get relation {} of the component {} ", e, relationId, componentId);
-            resultOp =  Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
+            resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
         }
         return resultOp;
     }
 
     private RequirementCapabilityRelDef findRelation(String relationId, List<RequirementCapabilityRelDef> requirementCapabilityRelations) {
-        for(RequirementCapabilityRelDef relationship : requirementCapabilityRelations){
-            if(relationship.getRelationships().stream().filter(r -> r.getRelation().getId().equals(relationId)).findFirst().isPresent()){
+        for (RequirementCapabilityRelDef relationship : requirementCapabilityRelations) {
+            if (relationship.getRelationships().stream().anyMatch(r -> r.getRelation().getId().equals(relationId))) {
                 return relationship;
             }
         }
         return null;
     }
 
-    private Either<RequirementCapabilityRelDef, ResponseFormat> setRelatedRequirement(RequirementCapabilityRelDef foundRelation, Component containerComponent) {
+    private Either<RequirementCapabilityRelDef, ResponseFormat> setRelatedRequirement(RequirementCapabilityRelDef foundRelation,
+                                                                                      Component containerComponent) {
         Either<RequirementCapabilityRelDef, ResponseFormat> result = null;
         RelationshipInfo relationshipInfo = foundRelation.resolveSingleRelationship().getRelation();
         String instanceId = foundRelation.getFromNode();
         Optional<RequirementDefinition> foundRequirement;
-        Optional<ComponentInstance> instance = containerComponent.getComponentInstances().stream().filter(i -> i.getUniqueId().equals(instanceId)).findFirst();
-        if(!instance.isPresent()){
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, instanceId, "instance", containerComponent.getComponentType().getValue(), containerComponent.getName());
+        Optional<ComponentInstance> instance = containerComponent.getComponentInstances().stream().filter(i -> i.getUniqueId().equals(instanceId))
+            .findFirst();
+        if (!instance.isPresent()) {
+            ResponseFormat responseFormat = componentsUtils
+                .getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, instanceId, "instance",
+                    containerComponent.getComponentType().getValue(), containerComponent.getName());
             log.debug("Component instance with id {} was not found on the component", instanceId, containerComponent.getUniqueId());
             result = Either.right(responseFormat);
         }
-        if(result == null){
-            for(List<RequirementDefinition> requirements : instance.get().getRequirements().values()){
-                foundRequirement = requirements.stream().filter(r -> isBelongingRequirement(relationshipInfo, r)).findFirst();
-                if(foundRequirement.isPresent()){
+        if (result == null && instance.isPresent()) {
+            for (List<RequirementDefinition> requirements : instance.get().getRequirements().values()) {
+                foundRequirement = requirements.stream()
+                    .filter(r -> isBelongingCalcRequirement(relationshipInfo, r, containerComponent.getLifecycleState())).findFirst();
+                if (foundRequirement.isPresent()) {
                     foundRelation.resolveSingleRelationship().setRequirement(foundRequirement.get());
                     result = Either.left(foundRelation);
                 }
             }
         }
-        if(result == null){
-            Either<RequirementDataDefinition, StorageOperationStatus> getfulfilledRequirementRes = toscaOperationFacade.getFulfilledRequirementByRelation(containerComponent.getUniqueId(), instanceId, foundRelation, (rel, req)->isBelongingRequirement(rel, req));
-            if(getfulfilledRequirementRes.isRight()){
-                ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.REQUIREMENT_OF_INSTANCE_NOT_FOUND_ON_CONTAINER, relationshipInfo.getRequirement(), instanceId, containerComponent.getUniqueId());
-                log.debug("Requirement {} of instance {} was not found on the container {}. ", relationshipInfo.getCapability(), instanceId, containerComponent.getUniqueId());
+        if (result == null) {
+            Either<RequirementDataDefinition, StorageOperationStatus> getfulfilledRequirementRes = toscaOperationFacade
+                .getFulfilledRequirementByRelation(containerComponent.getUniqueId(), instanceId, foundRelation, this::isBelongingFullRequirement);
+            if (getfulfilledRequirementRes.isRight()) {
+                ResponseFormat responseFormat = componentsUtils
+                    .getResponseFormat(ActionStatus.REQUIREMENT_OF_INSTANCE_NOT_FOUND_ON_CONTAINER, relationshipInfo.getRequirement(), instanceId,
+                        containerComponent.getUniqueId());
+                log.debug("Requirement {} of instance {} was not found on the container {}. ", relationshipInfo.getCapability(), instanceId,
+                    containerComponent.getUniqueId());
                 result = Either.right(responseFormat);
             } else {
                 foundRelation.resolveSingleRelationship().setRequirement(getfulfilledRequirementRes.left().value());
             }
         }
-        if(result == null){
+        if (result == null) {
             result = Either.left(foundRelation);
         }
         return result;
     }
 
-    private boolean isBelongingRequirement(RelationshipInfo relationshipInfo, RequirementDataDefinition req) {
-        return  req.getName().equals(relationshipInfo.getRequirement()) &&
-                req.getUniqueId().equals(relationshipInfo.getRequirementUid()) &&
-                req.getOwnerId().equals(relationshipInfo.getRequirementOwnerId());
+    private boolean isBelongingFullRequirement(RelationshipInfo relationshipInfo, RequirementDataDefinition req) {
+        return req.getName().equals(relationshipInfo.getRequirement()) && req.getUniqueId().equals(relationshipInfo.getRequirementUid()) && req
+            .getOwnerId().equals(relationshipInfo.getRequirementOwnerId());
+    }
+
+    private boolean isBelongingCalcRequirement(RelationshipInfo relationshipInfo, RequirementDataDefinition req, LifecycleStateEnum state) {
+        return nameMatches(relationshipInfo.getRequirement(), req.getName(), req.getPreviousName(), state) && req.getUniqueId()
+            .equals(relationshipInfo.getRequirementUid()) && req.getOwnerId().equals(relationshipInfo.getRequirementOwnerId());
     }
 
-    private Either<RequirementCapabilityRelDef, ResponseFormat> setRelatedCapability(RequirementCapabilityRelDef foundRelation, Component containerComponent) {
+    private Either<RequirementCapabilityRelDef, ResponseFormat> setRelatedCapability(RequirementCapabilityRelDef foundRelation,
+                                                                                     Component containerComponent) {
         Either<RequirementCapabilityRelDef, ResponseFormat> result = null;
         RelationshipInfo relationshipInfo = foundRelation.resolveSingleRelationship().getRelation();
         String instanceId = foundRelation.getToNode();
         Optional<CapabilityDefinition> foundCapability;
-        Optional<ComponentInstance> instance = containerComponent.getComponentInstances().stream().filter(i -> i.getUniqueId().equals(instanceId)).findFirst();
-        if(!instance.isPresent()){
-            ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, instanceId, "instance", containerComponent.getComponentType().getValue(), containerComponent.getName());
+        Optional<ComponentInstance> instance = containerComponent.getComponentInstances().stream().filter(i -> i.getUniqueId().equals(instanceId))
+            .findFirst();
+        if (!instance.isPresent()) {
+            ResponseFormat responseFormat = componentsUtils
+                .getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER, instanceId, "instance",
+                    containerComponent.getComponentType().getValue(), containerComponent.getName());
             log.debug("Component instance with id {} was not found on the component", instanceId, containerComponent.getUniqueId());
             result = Either.right(responseFormat);
         }
-        if(result == null){
-            for(List<CapabilityDefinition> capabilities : instance.get().getCapabilities().values()){
-                foundCapability = capabilities.stream().filter(c -> isBelongingCapability(relationshipInfo, c)).findFirst();
-                if(foundCapability.isPresent()){
+        if (result == null && instance.isPresent()) {
+            for (List<CapabilityDefinition> capabilities : instance.get().getCapabilities().values()) {
+                foundCapability = capabilities.stream()
+                    .filter(c -> isBelongingCalcCapability(relationshipInfo, c, containerComponent.getLifecycleState())).findFirst();
+                if (foundCapability.isPresent()) {
                     foundRelation.resolveSingleRelationship().setCapability(foundCapability.get());
                     result = Either.left(foundRelation);
                 }
             }
         }
-        if(result == null){
-            Either<CapabilityDataDefinition, StorageOperationStatus> getfulfilledRequirementRes =
-                    toscaOperationFacade.getFulfilledCapabilityByRelation(containerComponent.getUniqueId(), instanceId, foundRelation, (rel, cap)->isBelongingCapability(rel, cap));
-            if(getfulfilledRequirementRes.isRight()){
-                ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.CAPABILITY_OF_INSTANCE_NOT_FOUND_ON_CONTAINER, relationshipInfo.getCapability(), instanceId, containerComponent.getUniqueId());
-                log.debug("Capability {} of instance {} was not found on the container {}. ", relationshipInfo.getCapability(), instanceId, containerComponent.getUniqueId());
+        if (result == null) {
+            Either<CapabilityDataDefinition, StorageOperationStatus> getfulfilledRequirementRes = toscaOperationFacade
+                .getFulfilledCapabilityByRelation(containerComponent.getUniqueId(), instanceId, foundRelation, this::isBelongingFullCapability);
+            if (getfulfilledRequirementRes.isRight()) {
+                ResponseFormat responseFormat = componentsUtils
+                    .getResponseFormat(ActionStatus.CAPABILITY_OF_INSTANCE_NOT_FOUND_ON_CONTAINER, relationshipInfo.getCapability(), instanceId,
+                        containerComponent.getUniqueId());
+                log.debug("Capability {} of instance {} was not found on the container {}. ", relationshipInfo.getCapability(), instanceId,
+                    containerComponent.getUniqueId());
                 result = Either.right(responseFormat);
             } else {
                 foundRelation.resolveSingleRelationship().setCapability(getfulfilledRequirementRes.left().value());
             }
         }
-        if(result == null){
+        if (result == null) {
             result = Either.left(foundRelation);
         }
         return result;
     }
 
-    private boolean isBelongingCapability(RelationshipInfo relationshipInfo, CapabilityDataDefinition cap) {
-        return     cap.getName().equals(relationshipInfo.getCapability()) &&
-                cap.getUniqueId().equals(relationshipInfo.getCapabilityUid()) &&
-                cap.getOwnerId().equals(relationshipInfo.getCapabilityOwnerId());
+    private boolean isBelongingFullCapability(RelationshipInfo relationshipInfo, CapabilityDataDefinition cap) {
+        return cap.getName().equals(relationshipInfo.getCapability()) && cap.getUniqueId().equals(relationshipInfo.getCapabilityUid()) && cap
+            .getOwnerId().equals(relationshipInfo.getCapabilityOwnerId());
+    }
+
+    private boolean isBelongingCalcCapability(RelationshipInfo relationshipInfo, CapabilityDataDefinition cap, LifecycleStateEnum state) {
+        return nameMatches(relationshipInfo.getCapability(), cap.getName(), cap.getPreviousName(), state) && cap.getUniqueId()
+            .equals(relationshipInfo.getCapabilityUid()) && cap.getOwnerId().equals(relationshipInfo.getCapabilityOwnerId());
+    }
+
+    private boolean nameMatches(String nameFromRelationship, String currName, String previousName, LifecycleStateEnum state) {
+        return state == LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT ? currName.equals(nameFromRelationship)
+            : previousName != null && previousName.equals(nameFromRelationship);
     }
 
     private Either<ComponentInstanceProperty, ResponseFormat> updateAttributeValue(ComponentInstanceProperty attribute, String resourceInstanceId) {
-        Either<ComponentInstanceProperty, StorageOperationStatus> eitherAttribute = componentInstanceOperation.updateAttributeValueInResourceInstance(attribute, resourceInstanceId, true);
+        Either<ComponentInstanceProperty, StorageOperationStatus> eitherAttribute = componentInstanceOperation
+            .updateAttributeValueInResourceInstance(attribute, resourceInstanceId, true);
         Either<ComponentInstanceProperty, ResponseFormat> result;
         if (eitherAttribute.isLeft()) {
             log.debug("Attribute value {} was updated on graph.", attribute.getValueUniqueUid());
             ComponentInstanceProperty instanceAttribute = eitherAttribute.left().value();
-
             result = Either.left(instanceAttribute);
-
         } else {
             log.debug("Failed to update attribute value {} in resource instance {}", attribute, resourceInstanceId);
-
             ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(eitherAttribute.right().value());
-
             result = Either.right(componentsUtils.getResponseFormat(actionStatus, ""));
-
         }
         return result;
     }
 
     private Either<ComponentInstanceProperty, ResponseFormat> createAttributeValue(ComponentInstanceProperty attribute, String resourceInstanceId) {
-
         Either<ComponentInstanceProperty, ResponseFormat> result;
-
         Wrapper<Integer> indexCounterWrapper = new Wrapper<>();
         Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
         validateIncrementCounter(resourceInstanceId, GraphPropertiesDictionary.ATTRIBUTE_COUNTER, indexCounterWrapper, errorWrapper);
-
         if (!errorWrapper.isEmpty()) {
             result = Either.right(errorWrapper.getInnerElement());
         } else {
-            Either<ComponentInstanceProperty, StorageOperationStatus> eitherAttribute = componentInstanceOperation.addAttributeValueToResourceInstance(attribute, resourceInstanceId, indexCounterWrapper.getInnerElement(), true);
+            Either<ComponentInstanceProperty, StorageOperationStatus> eitherAttribute = componentInstanceOperation
+                .addAttributeValueToResourceInstance(attribute, resourceInstanceId, indexCounterWrapper.getInnerElement(), true);
             if (eitherAttribute.isLeft()) {
                 log.debug("Attribute value was added to resource instance {}", resourceInstanceId);
                 ComponentInstanceProperty instanceAttribute = eitherAttribute.left().value();
                 result = Either.left(instanceAttribute);
-
             } else {
                 log.debug("Failed to add attribute value {}  to resource instance {}", attribute, resourceInstanceId);
-
                 ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(eitherAttribute.right().value());
                 result = Either.right(componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, ""));
-
             }
         }
         return result;
@@ -1414,177 +1888,412 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
      * @param userId
      * @return
      */
-    public Either<ComponentInstanceProperty, ResponseFormat> createOrUpdateAttributeValue(ComponentTypeEnum componentTypeEnum, String componentId, String resourceInstanceId, ComponentInstanceProperty attribute, String userId) {
-        Either<ComponentInstanceProperty, ResponseFormat> result = null;
-        Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
 
-        validateUserExist(userId, "create Or Update Attribute Value");
-        if (errorWrapper.isEmpty()) {
-            validateComponentTypeEnum(componentTypeEnum, "CreateOrUpdateAttributeValue", errorWrapper);
+    public Either<List<ComponentInstanceProperty>, ResponseFormat> createOrUpdatePropertiesValues(ComponentTypeEnum componentTypeEnum,
+                                                                                                  String componentId, String resourceInstanceId,
+                                                                                                  List<ComponentInstanceProperty> properties,
+                                                                                                  String userId) {
+        Either<List<ComponentInstanceProperty>, ResponseFormat> resultOp = null;
+        /*-------------------------------Validations---------------------------------*/
+        validateUserExists(userId);
+
+        if (componentTypeEnum == null) {
+            BeEcompErrorManager.getInstance().logInvalidInputError("CreateOrUpdatePropertiesValues", INVALID_COMPONENT_TYPE, ErrorSeverity.INFO);
+            resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.NOT_ALLOWED));
+            return resultOp;
+        }
+        Either<Component, StorageOperationStatus> getResourceResult = toscaOperationFacade.getToscaElement(componentId, JsonParseFlagEnum.ParseAll);
+
+        if (getResourceResult.isRight()) {
+            log.debug(FAILED_TO_RETRIEVE_COMPONENT_COMPONENT_ID, componentId);
+            ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getResourceResult.right().value(), componentTypeEnum);
+            return Either.right(componentsUtils.getResponseFormat(actionStatus, componentId));
         }
-        if (errorWrapper.isEmpty()) {
-            validateCanWorkOnComponent(componentId, componentTypeEnum, userId, errorWrapper);
+        Component containerComponent = getResourceResult.left().value();
+
+        if (!ComponentValidationUtils.canWorkOnComponent(containerComponent, userId)) {
+            if (Boolean.TRUE.equals(containerComponent.isArchived())) {
+                log.info(COMPONENT_ARCHIVED, componentId);
+                return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_IS_ARCHIVED, containerComponent.getName()));
+            }
+            log.info(RESTRICTED_OPERATION_ON_SERVIVE, userId, componentId);
+            return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
         }
-        if (errorWrapper.isEmpty()) {
-            validateComponentLock(componentId, componentTypeEnum, errorWrapper);
+
+        Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus = getResourceInstanceById(containerComponent, resourceInstanceId);
+        if (resourceInstanceStatus.isRight()) {
+            return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER,
+                resourceInstanceId, RESOURCE_INSTANCE, SERVICE, componentId));
         }
+        ComponentInstance foundResourceInstance = resourceInstanceStatus.left().value();
 
+        // Validate instance property against it's constrains
+        Either<Boolean, ResponseFormat> constraintValidatorResponse = validatePropertyValueConstraint(properties, componentId);
+        if (constraintValidatorResponse.isRight()) {
+            log.error("Failed validation value and constraint of property: {}", constraintValidatorResponse.right().value());
+            return Either.right(constraintValidatorResponse.right().value());
+        }
+        // lock resource
+        StorageOperationStatus lockStatus = graphLockOperation.lockComponent(componentId, componentTypeEnum.getNodeType());
+        if (lockStatus != StorageOperationStatus.OK) {
+            log.debug(FAILED_TO_LOCK_SERVICE, componentId);
+            return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(lockStatus)));
+        }
+        List<ComponentInstanceProperty> updatedProperties = new ArrayList<>();
         try {
-            if (errorWrapper.isEmpty()) {
-                final boolean isCreate = Objects.isNull(attribute.getValueUniqueUid());
-                if (isCreate) {
-                    result = createAttributeValue(attribute, resourceInstanceId);
+            for (ComponentInstanceProperty property : properties) {
+                validateMandatoryFields(property);
+                validatePropertyExistsOnComponent(property, containerComponent, foundResourceInstance);
+                validatePropertyConstraintsNotChanged(properties, foundResourceInstance);
+                String propertyParentUniqueId = property.getParentUniqueId();
+                if (property.isToscaFunction()) {
+                    toscaFunctionValidator.validate(property, containerComponent);
+                    property.setValue(StringEscapeUtils.unescapeJava(property.getToscaFunction().getValue()));
+                    if (ToscaFunctionType.GET_INPUT == property.getToscaFunction().getType()) {
+                        property.setGetInputValues(Collections.singletonList(buildGetInputValue(property)));
+                    }
+                }
+                if (CollectionUtils.isNotEmpty(property.getSubPropertyToscaFunctions())) {
+                    ToscaPropertyType type = ToscaPropertyType.isValidType(property.getType());
+                    if (ToscaPropertyType.LIST.equals(type)) {
+                        final JSONArray jsonArray = property.getValue() == null ? new JSONArray() : new JSONArray(property.getValue());
+                        property.getSubPropertyToscaFunctions().stream().forEach(subToscaFunction -> {
+                            addE(jsonArray, subToscaFunction.getSubPropertyPath(), subToscaFunction.getToscaFunction().getValue());
+                        });
+                        property.setValue(jsonArray.toString());
+                    } else {
+                        final JSONObject jObject = property.getValue() == null ? new JSONObject() : new JSONObject(property.getValue());
+                        property.getSubPropertyToscaFunctions().stream().forEach(subToscaFunction -> {
+                            addE(jObject, subToscaFunction.getSubPropertyPath(), subToscaFunction.getToscaFunction().getValue());
+                        });
+                        property.setValue(jObject.toString());
+                    }
+                }
+                Either<String, ResponseFormat> updatedPropertyValue = updatePropertyObjectValue(property, containerComponent.getModel());
+                if (updatedPropertyValue.isRight()) {
+                    log.error("Failed to update property object value of property: {}",
+                        property);
+                    throw new ByResponseFormatComponentException(updatedPropertyValue.right().value());
+                }
+                Optional<CapabilityDefinition>
+                    capPropDefinition = getPropertyCapabilityOfChildInstance(propertyParentUniqueId, foundResourceInstance.getCapabilities());
+                if (capPropDefinition.isPresent()) {
+                    updatedPropertyValue
+                        .bimap(updatedValue -> updateCapabilityPropFromUpdateInstProp(property, updatedValue,
+                            containerComponent, foundResourceInstance, capPropDefinition.get().getType(),
+                            capPropDefinition.get().getName()), Either::right);
                 } else {
-                    result = updateAttributeValue(attribute, resourceInstanceId);
+                    updatedPropertyValue.bimap(
+                        updatedValue -> updatePropertyOnContainerComponent(property, updatedValue, containerComponent, foundResourceInstance),
+                        Either::right
+                    );
+                    updatedProperties.add(property);
                 }
-            } else {
-                result = Either.right(errorWrapper.getInnerElement());
             }
-            return result;
-        }
 
-        finally {
-            if (result == null || result.isRight()) {
-                titanDao.rollback();
+            Either<Component, StorageOperationStatus> updateContainerRes = toscaOperationFacade
+                .updateComponentInstanceMetadataOfTopologyTemplate(containerComponent);
+            if (updateContainerRes.isRight()) {
+                ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(updateContainerRes.right().value());
+                resultOp = Either.right(componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, ""));
+                return resultOp;
+            }
+            resultOp = Either.left(updatedProperties);
+            return resultOp;
+
+        } catch (final ComponentException e) {
+            return Either.right(e.getResponseFormat());
+        } finally {
+            if (resultOp == null || resultOp.isRight()) {
+                janusGraphDao.rollback();
             } else {
-                titanDao.commit();
+                janusGraphDao.commit();
             }
             // unlock resource
             graphLockOperation.unlockComponent(componentId, componentTypeEnum.getNodeType());
         }
     }
 
-    private boolean isNetworkRoleServiceProperty(ComponentInstanceProperty property, ComponentTypeEnum componentTypeEnum) {
-        return StringUtils.isNotEmpty(property.getValue())
-                && PropertyNames.NETWORK_ROLE.getPropertyName().equalsIgnoreCase(property.getName())
-                && ComponentTypeEnum.SERVICE == componentTypeEnum;
+    private GetInputValueDataDefinition buildGetInputValue(final ComponentInstanceProperty property) {
+        final GetInputValueDataDefinition getInputValueDataDefinition = new GetInputValueDataDefinition();
+        getInputValueDataDefinition.setPropName(property.getName());
+        getInputValueDataDefinition.setInputName(((ToscaGetFunctionDataDefinition) property.getToscaFunction()).getPropertyName());
+        getInputValueDataDefinition.setInputId(((ToscaGetFunctionDataDefinition) property.getToscaFunction()).getPropertyUniqueId());
+        return getInputValueDataDefinition;
     }
 
-    // US833308 VLI in service - specific network_role property value logic
-    private StorageOperationStatus concatServiceNameToVLINetworkRolePropertiesValues(ToscaOperationFacade toscaOperationFacade, ComponentTypeEnum componentTypeEnum, String componentId, String resourceInstanceId, List<ComponentInstanceProperty> properties) {
-        for (ComponentInstanceProperty property: properties) {
-            if (isNetworkRoleServiceProperty(property, componentTypeEnum)) {
-                ComponentParametersView componentParametersView = new ComponentParametersView();
-                componentParametersView.disableAll();
-                componentParametersView.setIgnoreComponentInstances(false);
-                Either<Component, StorageOperationStatus> getServiceResult = toscaOperationFacade.getToscaElement(componentId, componentParametersView);
-                if (getServiceResult.isRight()) {
-                    return getServiceResult.right().value();
-                }
-                Component service = getServiceResult.left().value();
-                Optional<ComponentInstance> getInstance = service.getComponentInstances().stream().filter(p -> p.getUniqueId().equals(resourceInstanceId)).findAny();
-                if (!getInstance.isPresent()) {
-                    return StorageOperationStatus.NOT_FOUND;
-                }
-                String prefix = service.getSystemName() + ".";
-                String value = property.getValue();
-                if (OriginTypeEnum.VL == getInstance.get().getOriginType() && (!value.startsWith(prefix) || value.equalsIgnoreCase(prefix))) {
-                    property.setValue(prefix + value);
+    private void addE(JSONArray jsonArray, List<String> path, String value) {
+        Object objectForPath = jsonArray.opt(Integer.parseInt(path.get(0)));
+        if (objectForPath == null) {
+            if (path.size() > 1) {
+                if (StringUtils.isNumeric(path.get(1))) {
+                    objectForPath = new JSONArray();
+                } else {
+                    objectForPath = new JSONObject();
                 }
+                jsonArray.put(Integer.parseInt(path.get(0)), objectForPath);
+            }
+        }
+
+        if (path.size() == 1) {
+            Object valueAsObject = new Yaml().loadAs(value, Object.class);
+            jsonArray.put(Integer.parseInt(path.get(0)), valueAsObject);
+        } else {
+            if (objectForPath instanceof JSONObject) {
+                addE((JSONObject) objectForPath, path.subList(1, path.size()), value);
+            } else {
+                addE((JSONArray) objectForPath, path.subList(1, path.size()), value);
             }
         }
-        return StorageOperationStatus.OK;
     }
 
-    public Either<List<ComponentInstanceProperty>, ResponseFormat> createOrUpdatePropertiesValues(ComponentTypeEnum componentTypeEnum, String componentId, String resourceInstanceId, List<ComponentInstanceProperty> properties, String userId) {
+    private void addE(JSONObject jsonObject, List<String> path, String value) {
 
-        Either<List<ComponentInstanceProperty>, ResponseFormat> resultOp = null;
+        Object objectForPath = null;
+        if (jsonObject.has(path.get(0))) {
+            objectForPath = jsonObject.get(path.get(0));
+        } else {
+            if (path.size() > 1 && StringUtils.isNumeric(path.get(1))) {
+                objectForPath = new JSONArray();
+            } else {
+                objectForPath = new JSONObject();
+            }
+            jsonObject.put(path.get(0), objectForPath);
+        }
 
-        /*-------------------------------Validations---------------------------------*/
+        if (path.size() == 1) {
+            Object valueAsObject = new Yaml().loadAs(value, Object.class);
+            jsonObject.put(path.get(0), valueAsObject);
+        } else {
+            if (objectForPath instanceof JSONObject) {
+                addE((JSONObject) objectForPath, path.subList(1, path.size()), value);
+            } else {
+                addE((JSONArray) objectForPath, path.subList(1, path.size()), value);
+            }
+        }
+    }
 
-        validateUserExists(userId, "create Or Update Properties Values", false);
+    public Either<List<ComponentInstanceAttribute>, ResponseFormat> createOrUpdateAttributeValues(final ComponentTypeEnum componentTypeEnum,
+                                                                                                  final String componentId,
+                                                                                                  final String resourceInstanceId,
+                                                                                                  final List<ComponentInstanceAttribute> attributes,
+                                                                                                  final String userId) {
+        Either<List<ComponentInstanceAttribute>, ResponseFormat> resultOp = null;
+        /*-------------------------------Validations---------------------------------*/
+        validateUserExists(userId);
 
         if (componentTypeEnum == null) {
             BeEcompErrorManager.getInstance().logInvalidInputError("CreateOrUpdatePropertiesValues", INVALID_COMPONENT_TYPE, ErrorSeverity.INFO);
             resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.NOT_ALLOWED));
             return resultOp;
         }
-        Either<Component, StorageOperationStatus> getResourceResult = toscaOperationFacade.getToscaElement(componentId, JsonParseFlagEnum.ParseAll);
+        final Either<Component, StorageOperationStatus> getResourceResult = toscaOperationFacade
+            .getToscaElement(componentId, JsonParseFlagEnum.ParseAll);
 
         if (getResourceResult.isRight()) {
             log.debug(FAILED_TO_RETRIEVE_COMPONENT_COMPONENT_ID, componentId);
-            resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
-            return resultOp;
+            final ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getResourceResult.right().value(), componentTypeEnum);
+            return Either.right(componentsUtils.getResponseFormat(actionStatus, componentId));
         }
-        Component containerComponent = getResourceResult.left().value();
+        final Component containerComponent = getResourceResult.left().value();
 
         if (!ComponentValidationUtils.canWorkOnComponent(containerComponent, userId)) {
-            log.info("Restricted operation for user: {} on service {}", userId, componentId);
-            resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
-            return resultOp;
+            if (Boolean.TRUE.equals(containerComponent.isArchived())) {
+                log.info(COMPONENT_ARCHIVED, componentId);
+                return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_IS_ARCHIVED, containerComponent.getName()));
+            }
+            log.info(RESTRICTED_OPERATION_ON_SERVIVE, userId, componentId);
+            return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
         }
-        Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus = getResourceInstanceById(containerComponent, resourceInstanceId);
+
+        final Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus = getResourceInstanceById(containerComponent,
+            resourceInstanceId);
         if (resourceInstanceStatus.isRight()) {
-            resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, resourceInstanceId, componentId));
-            return resultOp;
-        }
-        ComponentInstance foundResourceInstance = resourceInstanceStatus.left().value();
-        // specific property value logic US833308
-        StorageOperationStatus fetchByIdsStatus = concatServiceNameToVLINetworkRolePropertiesValues(toscaOperationFacade, componentTypeEnum, componentId, resourceInstanceId, properties);
-        if (StorageOperationStatus.OK != fetchByIdsStatus) {
-            resultOp = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(fetchByIdsStatus)));
-            return resultOp;
+            return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER,
+                resourceInstanceId, RESOURCE_INSTANCE, SERVICE, componentId));
+        }
+        final ComponentInstance foundResourceInstance = resourceInstanceStatus.left().value();
+
+        // Validate instance attributes against it's constraints
+        List<PropertyDefinition> attributesToValidate = new ArrayList<>();
+        attributes.forEach((componentInstanceAttribute) -> {
+            PropertyDefinition propertyDefinition = new PropertyDefinition();
+            propertyDefinition.setValue(componentInstanceAttribute.getValue());
+            propertyDefinition.setType(componentInstanceAttribute.getType());
+            propertyDefinition.setName(componentInstanceAttribute.getName());
+            propertyDefinition.setUniqueId(componentInstanceAttribute.getUniqueId());
+            attributesToValidate.add(propertyDefinition);
+        });
+        Either<Boolean, ResponseFormat> constraintValidatorResponse = validatePropertyValueConstraint(attributesToValidate, componentId);
+        if (constraintValidatorResponse.isRight()) {
+            log.error("Failed validation value and constraint of attribute: {}", constraintValidatorResponse.right().value());
+            return Either.right(constraintValidatorResponse.right().value());
         }
+
         // lock resource
-        StorageOperationStatus lockStatus = graphLockOperation.lockComponent(componentId, componentTypeEnum.getNodeType());
+        final StorageOperationStatus lockStatus = graphLockOperation.lockComponent(componentId, componentTypeEnum.getNodeType());
         if (lockStatus != StorageOperationStatus.OK) {
             log.debug(FAILED_TO_LOCK_SERVICE, componentId);
-            resultOp = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(lockStatus)));
-            return resultOp;
+            return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(lockStatus)));
         }
-
+        final List<ComponentInstanceAttribute> updatedProperties = new ArrayList<>();
         try {
-            for (ComponentInstanceProperty property: properties) {
-                Either<String, ResponseFormat> updatedPropertyValue = updatePropertyObjectValue(property, false);
-                updatedPropertyValue.bimap(updatedValue -> updatePropertyOnContainerComponent(property,updatedValue, containerComponent, foundResourceInstance),
-                        responseFormat -> Either.right(responseFormat));
+            for (final ComponentInstanceAttribute attribute : attributes) {
+                final ComponentInstanceAttribute componentInstanceProperty = validateAttributeExistsOnComponent(attribute, containerComponent,
+                    foundResourceInstance);
+                final Either<String, ResponseFormat> updatedPropertyValue = updateAttributeObjectValue(attribute);
+                if (updatedPropertyValue.isRight()) {
+                    log.error("Failed to update attribute object value of attribute: {}", attribute);
+                    throw new ByResponseFormatComponentException(updatedPropertyValue.right().value());
+                }
+                updatedPropertyValue.bimap(
+                    updatedValue -> {
+                        componentInstanceProperty.setValue(updatedValue);
+                        return updateAttributeOnContainerComponent(attribute, updatedValue,
+                            containerComponent, foundResourceInstance);
+                    }, Either::right);
+                updatedProperties.add(componentInstanceProperty);
             }
 
-            Either<Component, StorageOperationStatus> updateContainerRes = toscaOperationFacade.updateComponentInstanceMetadataOfTopologyTemplate(containerComponent);
+            final Either<Component, StorageOperationStatus> updateContainerRes = toscaOperationFacade
+                .updateComponentInstanceMetadataOfTopologyTemplate(containerComponent);
             if (updateContainerRes.isRight()) {
-                ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(updateContainerRes.right().value());
+                final ActionStatus actionStatus = componentsUtils
+                    .convertFromStorageResponseForResourceInstanceProperty(updateContainerRes.right().value());
                 resultOp = Either.right(componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, ""));
                 return resultOp;
             }
-            resultOp = Either.left(properties);
+            resultOp = Either.left(updatedProperties);
             return resultOp;
 
+        } catch (final ComponentException e) {
+            return Either.right(e.getResponseFormat());
         } finally {
             if (resultOp == null || resultOp.isRight()) {
-                titanDao.rollback();
+                janusGraphDao.rollback();
             } else {
-                titanDao.commit();
+                janusGraphDao.commit();
             }
             // unlock resource
             graphLockOperation.unlockComponent(componentId, componentTypeEnum.getNodeType());
         }
     }
 
-    private ResponseFormat updateCapabilityPropertyOnContainerComponent(ComponentInstanceProperty property, String newValue, Component containerComponent, ComponentInstance foundResourceInstance,
+    private void validateMandatoryFields(PropertyDataDefinition property) {
+        if (StringUtils.isEmpty(property.getName())) {
+            throw new ByActionStatusComponentException(ActionStatus.MISSING_PROPERTY_NAME);
+        }
+    }
+
+    private void validatePropertyExistsOnComponent(ComponentInstanceProperty property, Component containerComponent,
+                                                   ComponentInstance foundResourceInstance) {
+        List<ComponentInstanceProperty> instanceProperties = containerComponent.getComponentInstancesProperties()
+            .get(foundResourceInstance.getUniqueId());
+        final boolean hasProperty = instanceProperties.stream().anyMatch(p -> p.getName().equals(property.getName()));
+        if (!hasProperty) {
+            throw new ByActionStatusComponentException(ActionStatus.PROPERTY_NOT_FOUND, property.getName());
+        }
+    }
+
+    private ComponentInstanceAttribute validateAttributeExistsOnComponent(final ComponentInstanceAttribute attribute,
+                                                                          final Component containerComponent,
+                                                                          final ComponentInstance foundResourceInstance) {
+        final List<ComponentInstanceAttribute> instanceAttributes =
+            containerComponent.getComponentInstancesAttributes().get(foundResourceInstance.getUniqueId());
+        final List<ComponentInstanceProperty> instanceProperties =
+            containerComponent.getComponentInstancesProperties().get(foundResourceInstance.getUniqueId());
+        final Optional<ComponentInstanceAttribute> instanceAttribute =
+            instanceAttributes.stream().filter(p -> p.getName().equals(attribute.getName())).findAny();
+        final Optional<ComponentInstanceProperty> instanceProperty =
+            instanceProperties.stream().filter(p -> p.getName().equals(attribute.getName())).findAny();
+        if (instanceAttribute.isPresent()) {
+            return instanceAttribute.get();
+        }
+        if (instanceProperty.isPresent()) {
+            ComponentInstanceAttribute propAttribute = getComponentInstanceAttribute(instanceProperty.get());
+            return propAttribute;
+        }
+        throw new ByActionStatusComponentException(ActionStatus.PROPERTY_NOT_FOUND, attribute.getName());
+    }
+
+    private ComponentInstanceAttribute getComponentInstanceAttribute(ComponentInstanceProperty property) {
+        ComponentInstanceAttribute attribute = new ComponentInstanceAttribute();
+        attribute.setParentUniqueId(property.getParentUniqueId());
+        attribute.setName(property.getName());
+        attribute.setOwnerId(property.getOwnerId());
+        attribute.setType(property.getType());
+        attribute.setSchema(property.getSchema());
+        attribute.setUniqueId(property.getUniqueId());
+        attribute.setValue(property.getValue());
+        attribute.setDefaultValue(property.getDefaultValue());
+        return attribute;
+    }
+
+    private ResponseFormat updateCapabilityPropertyOnContainerComponent(ComponentInstanceProperty property,
+                                                                        String newValue, Component containerComponent,
+                                                                        ComponentInstance foundResourceInstance,
                                                                         String capabilityType, String capabilityName) {
         String componentInstanceUniqueId = foundResourceInstance.getUniqueId();
-        StringBuilder sb = new StringBuilder(componentInstanceUniqueId);
-        sb.append(ModelConverter.CAP_PROP_DELIM).append(property.getOwnerId()).append(ModelConverter.CAP_PROP_DELIM).append(capabilityType).append(ModelConverter.CAP_PROP_DELIM).append(capabilityName);
-        String capKey = sb.toString();
-
-        Map<String, List<CapabilityDefinition>> capabilities = Optional.ofNullable(foundResourceInstance.getCapabilities())
-                .orElse(Collections.emptyMap());
-        List<CapabilityDefinition> capPerType = Optional.ofNullable(capabilities.get(capabilityType)).orElse(Collections.emptyList());
-        Optional<CapabilityDefinition> cap = capPerType.stream().filter(c -> c.getName().equals(capabilityName)).findAny();
+        ResponseFormat actionStatus = updateCapPropOnContainerComponent(property, newValue, containerComponent,
+            foundResourceInstance, capabilityType, capabilityName, componentInstanceUniqueId);
+        if (actionStatus != null) {
+            return actionStatus;
+        }
+
+        return componentsUtils.getResponseFormat(ActionStatus.OK);
+    }
+
+    private ResponseFormat updateCapabilityPropFromUpdateInstProp(ComponentInstanceProperty property,
+                                                                  String newValue, Component containerComponent,
+                                                                  ComponentInstance foundResourceInstance,
+                                                                  String capabilityType, String capabilityName) {
+        String componentInstanceUniqueId = foundResourceInstance.getUniqueId();
+        Either<Component, StorageOperationStatus> getComponentRes =
+            toscaOperationFacade.getToscaFullElement(foundResourceInstance.getComponentUid());
+        if (getComponentRes.isRight()) {
+            return componentsUtils.getResponseFormat(getComponentRes.right().value());
+        }
+
+        ResponseFormat actionStatus = updateCapPropOnContainerComponent(property, newValue, containerComponent,
+            foundResourceInstance, capabilityType, capabilityName, componentInstanceUniqueId);
+        if (actionStatus != null) {
+            return actionStatus;
+        }
+
+        return componentsUtils.getResponseFormat(ActionStatus.OK);
+    }
+
+    private ResponseFormat updateCapPropOnContainerComponent(ComponentInstanceProperty property, String newValue,
+                                                             Component containerComponent,
+                                                             ComponentInstance foundResourceInstance,
+                                                             String capabilityType, String capabilityName,
+                                                             String componentInstanceUniqueId) {
+        Map<String, List<CapabilityDefinition>> capabilities =
+            Optional.ofNullable(foundResourceInstance.getCapabilities()).orElse(Collections.emptyMap());
+        List<CapabilityDefinition> capPerType =
+            Optional.ofNullable(capabilities.get(capabilityType)).orElse(Collections.emptyList());
+        Optional<CapabilityDefinition> cap =
+            capPerType.stream().filter(c -> c.getName().equals(capabilityName)).findAny();
         if (cap.isPresent()) {
             List<ComponentInstanceProperty> capProperties = cap.get().getProperties();
             if (capProperties != null) {
-                Optional<ComponentInstanceProperty> instanceProperty = capProperties.stream().filter(p -> p.getUniqueId().equals(property.getUniqueId())).findAny();
+                Optional<ComponentInstanceProperty> instanceProperty =
+                    capProperties.stream().filter(p -> p.getUniqueId().equals(property.getUniqueId())).findAny();
                 StorageOperationStatus status;
                 if (instanceProperty.isPresent()) {
+                    String capKey = ModelConverter
+                        .buildCapabilityPropertyKey(foundResourceInstance.getOriginType().isAtomicType(), capabilityType, capabilityName,
+                            componentInstanceUniqueId, cap.get());
                     instanceProperty.get().setValue(newValue);
                     List<String> path = new ArrayList<>();
                     path.add(componentInstanceUniqueId);
                     path.add(capKey);
                     instanceProperty.get().setPath(path);
-                    status = toscaOperationFacade.updateComponentInstanceCapabiltyProperty(containerComponent, componentInstanceUniqueId, capKey, instanceProperty.get());
+                    status = toscaOperationFacade.updateComponentInstanceCapabiltyProperty(containerComponent,
+                        componentInstanceUniqueId, capKey, instanceProperty.get());
                     if (status != StorageOperationStatus.OK) {
-                        ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(status);
+                        ActionStatus actionStatus =
+                            componentsUtils.convertFromStorageResponseForResourceInstanceProperty(status);
                         return componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, "");
 
                     }
@@ -1592,66 +2301,114 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
                 }
             }
         }
-
-
-        return componentsUtils.getResponseFormat(ActionStatus.OK);
+        return null;
     }
 
-    private ResponseFormat updatePropertyOnContainerComponent(ComponentInstanceProperty property, String newValue, Component containerComponent, ComponentInstance foundResourceInstance) {
-        List<ComponentInstanceProperty> instanceProperties = containerComponent.getComponentInstancesProperties().get(foundResourceInstance.getUniqueId());
-        Optional<ComponentInstanceProperty> instanceProperty = instanceProperties.stream().filter(p -> p.getUniqueId().equals(property.getUniqueId())).findAny();
+    private ResponseFormat updatePropertyOnContainerComponent(ComponentInstanceProperty instanceProperty, String newValue,
+                                                              Component containerComponent, ComponentInstance foundResourceInstance) {
         StorageOperationStatus status;
-        instanceProperty.get().setValue(newValue);
-        if (instanceProperty.isPresent()) {
-            status = toscaOperationFacade.updateComponentInstanceProperty(containerComponent, foundResourceInstance.getUniqueId(), property);
-        } else {
-            status = toscaOperationFacade.addComponentInstanceProperty(containerComponent, foundResourceInstance.getUniqueId(), property);
-        }
+        instanceProperty.setValue(newValue);
+        status = toscaOperationFacade.updateComponentInstanceProperty(containerComponent, foundResourceInstance.getUniqueId(), instanceProperty);
         if (status != StorageOperationStatus.OK) {
             ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(status);
             return componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, "");
         }
-        List<String> path = new ArrayList<>();
-        path.add(foundResourceInstance.getUniqueId());
-        property.setPath(path);
+        foundResourceInstance.setCustomizationUUID(UUID.randomUUID().toString());
+        return componentsUtils.getResponseFormat(ActionStatus.OK);
+    }
+
+    private ResponseFormat updateAttributeOnContainerComponent(final ComponentInstanceAttribute instanceAttribute,
+                                                               final String newValue,
+                                                               final Component containerComponent,
+                                                               final ComponentInstance foundResourceInstance) {
 
+        instanceAttribute.setValue(newValue);
+        final StorageOperationStatus status =
+            toscaOperationFacade.updateComponentInstanceAttribute(containerComponent, foundResourceInstance.getUniqueId(), instanceAttribute);
+        if (status != StorageOperationStatus.OK) {
+            final ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(status);
+            return componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, "");
+        }
         foundResourceInstance.setCustomizationUUID(UUID.randomUUID().toString());
         return componentsUtils.getResponseFormat(ActionStatus.OK);
     }
 
-    private <T extends PropertyDefinition> Either<String,ResponseFormat> updatePropertyObjectValue(T property, boolean isInput) {
-        Either<Map<String, DataTypeDefinition>, TitanOperationStatus> allDataTypesEither = dataTypeCache.getAll();
-        if (allDataTypesEither.isRight()) {
-            TitanOperationStatus status = allDataTypesEither.right().value();
-            BeEcompErrorManager.getInstance().logInternalFlowError("UpdatePropertyValueOnComponentInstance", "Failed to update property value on instance. Status is " + status, ErrorSeverity.ERROR);
-            return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(DaoStatusConverter.convertTitanStatusToStorageStatus(status))));
+    private <T extends PropertyDefinition> Either<String, ResponseFormat> validatePropertyObjectValue(T property, String newValue, boolean isInput) {
+        final Map<String, DataTypeDefinition> allDataTypes = componentsUtils.getAllDataTypes(applicationDataTypeCache, property.getModel());
+        String propertyType = property.getType();
+        String innerType = getInnerType(property);
+
+        // Specific Update Logic
+        Either<Object, Boolean> isValid = propertyOperation
+            .validateAndUpdatePropertyValue(property.getType(), newValue, true, innerType, allDataTypes);
+        if (isValid.isRight()) {
+            if (!Boolean.TRUE.equals(isValid.right().value())) {
+                log.error("Invalid value {} of property {} ", newValue, property.getName());
+                return Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT));
+            }
+        } else {
+            Object object = isValid.left().value();
+            if (object != null) {
+                newValue = object.toString();
+            }
+        }
+        if (validateAndUpdateRules(property, isInput, allDataTypes, innerType, propertyType)) {
+            return Either.right(componentsUtils.getResponseFormat(componentsUtils
+                .convertFromStorageResponse(DaoStatusConverter.convertJanusGraphStatusToStorageStatus(JanusGraphOperationStatus.ILLEGAL_ARGUMENT))));
+        }
+        return Either.left(newValue);
+    }
+
+    private <T extends PropertyDefinition> boolean validateAndUpdateRules(T property, boolean isInput, Map<String, DataTypeDefinition> allDataTypes,
+                                                                          String innerType, String propertyType) {
+        if (!isInput) {
+            ImmutablePair<String, Boolean> pair = propertyOperation
+                .validateAndUpdateRules(propertyType, ((ComponentInstanceProperty) property).getRules(), innerType, allDataTypes, true);
+            if (pair.getRight() != null && !pair.getRight()) {
+                BeEcompErrorManager.getInstance().logBeInvalidValueError("Add property value", pair.getLeft(), property.getName(), propertyType);
+                return true;
+            }
         }
-        Map<String, DataTypeDefinition> allDataTypes = allDataTypesEither.left().value();
+        return false;
+    }
+
+    private <T extends PropertyDefinition> Either<String, ResponseFormat> updatePropertyObjectValue(T property, final String model) {
+        final Map<String, DataTypeDefinition> allDataTypes = componentsUtils.getAllDataTypes(applicationDataTypeCache, model);
         String innerType = null;
         String propertyType = property.getType();
         ToscaPropertyType type = ToscaPropertyType.isValidType(propertyType);
         log.debug("The type of the property {} is {}", property.getUniqueId(), propertyType);
 
         if (type == ToscaPropertyType.LIST || type == ToscaPropertyType.MAP) {
-            SchemaDefinition def = property.getSchema();
-            if (def == null) {
+            SchemaDefinition schema = property.getSchema();
+            if (schema == null) {
                 log.debug("Schema doesn't exists for property of type {}", type);
-                return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE)));
+                return Either
+                    .right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE)));
             }
-            PropertyDataDefinition propDef = def.getProperty();
+            PropertyDataDefinition propDef = schema.getProperty();
             if (propDef == null) {
                 log.debug("Property in Schema Definition inside property of type {} doesn't exist", type);
-                return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE)));
+                return Either
+                    .right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE)));
             }
             innerType = propDef.getType();
         }
+
         // Specific Update Logic
-        Either<Object, Boolean> isValid = propertyOperation.validateAndUpdatePropertyValue(propertyType, property.getValue(), true, innerType, allDataTypes);
         String newValue = property.getValue();
+
+        if (property.hasToscaFunction() || CollectionUtils.isNotEmpty(property.getSubPropertyToscaFunctions())) {
+            return Either.left(newValue);
+        }
+
+        Either<Object, Boolean> isValid = propertyOperation
+            .validateAndUpdatePropertyValue(propertyType, property.getValue(), true, innerType, allDataTypes);
         if (isValid.isRight()) {
-            Boolean res = isValid.right().value();
-            if (!res) {
-                return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT))));
+            if (!Boolean.TRUE.equals(isValid.right().value())) {
+                log.debug("validate and update property value has failed with value: {}", property.getValue());
+                throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(
+                    DaoStatusConverter.convertJanusGraphStatusToStorageStatus(JanusGraphOperationStatus.ILLEGAL_ARGUMENT)));
             }
         } else {
             Object object = isValid.left().value();
@@ -1659,26 +2416,172 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
                 newValue = object.toString();
             }
         }
-        if (!isInput) {
-            ImmutablePair<String, Boolean> pair = propertyOperation.validateAndUpdateRules(propertyType, ((ComponentInstanceProperty) property).getRules(), innerType, allDataTypes, true);
-            if (pair.getRight() != null && pair.getRight() == false) {
-                BeEcompErrorManager.getInstance().logBeInvalidValueError("Add property value", pair.getLeft(), property.getName(), propertyType);
-                return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT))));
-            }
+        ImmutablePair<String, Boolean> pair = propertyOperation
+            .validateAndUpdateRules(propertyType, ((ComponentInstanceProperty) property).getRules(), innerType, allDataTypes, true);
+        if (pair.getRight() != null && Boolean.FALSE.equals(pair.getRight())) {
+            BeEcompErrorManager.getInstance().logBeInvalidValueError("Add property value", pair.getLeft(), property.getName(), propertyType);
+            return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(
+                DaoStatusConverter.convertJanusGraphStatusToStorageStatus(JanusGraphOperationStatus.ILLEGAL_ARGUMENT))));
         }
         return Either.left(newValue);
     }
 
-    private ResponseFormat updateInputOnContainerComponent(ComponentInstanceInput input, String newValue, Component containerComponent, ComponentInstance foundResourceInstance) {
-        List<ComponentInstanceInput> instanceProperties = containerComponent.getComponentInstancesInputs().get(foundResourceInstance.getUniqueId());
-        Optional<ComponentInstanceInput> instanceProperty = instanceProperties.stream().filter(p -> p.getUniqueId().equals(input.getUniqueId())).findAny();
-        StorageOperationStatus status;
-        if (instanceProperty.isPresent()) {
-            instanceProperty.get().setValue(input.getValue());
-            status = toscaOperationFacade.updateComponentInstanceInput(containerComponent, foundResourceInstance.getUniqueId(), input);
+    private <T extends AttributeDefinition> Either<String, ResponseFormat> updateAttributeObjectValue(final T attribute) {
+        String innerType = null;
+        final String attributeType = attribute.getType();
+        final ToscaPropertyType type = ToscaPropertyType.isValidType(attributeType);
+        log.debug("The type of the attribute {} is {}", attribute.getUniqueId(), attributeType);
+
+        if (type == ToscaPropertyType.LIST || type == ToscaPropertyType.MAP) {
+            final SchemaDefinition def = attribute.getSchema();
+            if (def == null) {
+                log.debug("Schema doesn't exists for attribute of type {}", type);
+                return Either
+                    .right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE)));
+            }
+            PropertyDataDefinition propDef = def.getProperty();
+            if (propDef == null) {
+                log.debug("Property in Schema Definition inside attribute of type {} doesn't exist", type);
+                return Either
+                    .right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE)));
+            }
+            innerType = propDef.getType();
+        }
+
+        // Specific Update Logic
+        String newValue = attribute.getValue();
+
+        final var isValid = attributeOperation.validateAndUpdateAttributeValue(attribute, innerType,
+            componentsUtils.getAllDataTypes(applicationDataTypeCache, attribute.getModel()));
+        if (isValid.isRight()) {
+            final Boolean res = isValid.right().value();
+            if (!Boolean.TRUE.equals(res)) {
+                log.debug("validate and update attribute value has failed with value: {}", newValue);
+                throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(
+                    DaoStatusConverter.convertJanusGraphStatusToStorageStatus(JanusGraphOperationStatus.ILLEGAL_ARGUMENT)));
+            }
         } else {
-            status = toscaOperationFacade.addComponentInstanceInput(containerComponent, foundResourceInstance.getUniqueId(), input);
+            final Object object = isValid.left().value();
+            if (object != null) {
+                newValue = object.toString();
+            }
+        }
+        return Either.left(newValue);
+    }
+
+    private <T extends PropertyDefinition> void validateGetFunction(final T property,
+                                                                    final List<? extends ToscaPropertyData> parentProperties,
+                                                                    final String model) {
+        final ToscaGetFunctionDataDefinition toscaGetFunction = (ToscaGetFunctionDataDefinition) property.getToscaFunction();
+        if (CollectionUtils.isEmpty(parentProperties)) {
+            throw ToscaGetFunctionExceptionSupplier
+                .propertyNotFoundOnTarget(toscaGetFunction.getPropertyName(), toscaGetFunction.getPropertySource(),
+                    toscaGetFunction.getFunctionType()
+                ).get();
+        }
+        final String getFunctionPropertyUniqueId = toscaGetFunction.getPropertyUniqueId();
+        ToscaPropertyData referredProperty = parentProperties.stream()
+            .filter(property1 -> getFunctionPropertyUniqueId.equals(property1.getUniqueId()))
+            .findFirst()
+            .orElseThrow(ToscaGetFunctionExceptionSupplier
+                .propertyNotFoundOnTarget(toscaGetFunction.getPropertyName(), toscaGetFunction.getPropertySource()
+                    , toscaGetFunction.getFunctionType())
+            );
+        if (toscaGetFunction.isSubProperty()) {
+            referredProperty = findSubProperty(referredProperty, toscaGetFunction, model);
+        }
+
+        if (!property.getType().equals(referredProperty.getType()) && !"list".equalsIgnoreCase(referredProperty.getType())) {
+            throw ToscaGetFunctionExceptionSupplier
+                .propertyTypeDiverge(toscaGetFunction.getType(), referredProperty.getType(), property.getType()).get();
+        }
+        if (PropertyType.typeHasSchema(referredProperty.getType()) && !referredProperty.getSchemaType().equals(property.getType())
+            && !"list".equalsIgnoreCase(referredProperty.getType()) && !referredProperty.getSchemaType().equals(property.getSchemaType())) {
+            throw ToscaGetFunctionExceptionSupplier
+                .propertySchemaDiverge(toscaGetFunction.getType(), referredProperty.getSchemaType(), property.getSchemaType()).get();
+        }
+    }
+
+    private ToscaPropertyData findSubProperty(final ToscaPropertyData referredProperty,
+                                              final ToscaGetFunctionDataDefinition toscaGetFunction,
+                                              final String model) {
+        final Map<String, DataTypeDefinition> dataTypeMap = loadDataTypes(model);
+        final List<String> propertyPathFromSource = toscaGetFunction.getPropertyPathFromSource();
+        DataTypeDefinition dataType = dataTypeMap.get(referredProperty.getType());
+        if (dataType == null) {
+            throw ToscaGetFunctionExceptionSupplier
+                .propertyDataTypeNotFound(propertyPathFromSource.get(0), referredProperty.getType(), toscaGetFunction.getFunctionType()).get();
+        }
+        ToscaPropertyData foundProperty = referredProperty;
+        for (int i = 1; i < propertyPathFromSource.size(); i++) {
+            final String currentPropertyName = propertyPathFromSource.get(i);
+            foundProperty = dataType.getProperties().stream()
+                .filter(propertyDefinition -> currentPropertyName.equals(propertyDefinition.getName())).findFirst()
+                .orElseThrow(
+                    ToscaGetFunctionExceptionSupplier
+                        .propertyNotFoundOnTarget(propertyPathFromSource.subList(0, i), toscaGetFunction.getPropertySource(),
+                            toscaGetFunction.getFunctionType())
+                );
+            dataType = dataTypeMap.get(foundProperty.getType());
+            if (dataType == null) {
+                throw ToscaGetFunctionExceptionSupplier
+                    .propertyDataTypeNotFound(propertyPathFromSource.subList(0, i), foundProperty.getType(),
+                        toscaGetFunction.getFunctionType()).get();
+            }
+        }
+        return foundProperty;
+    }
+
+    private Map<String, DataTypeDefinition> loadDataTypes(String model) {
+        final Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> dataTypeEither =
+            applicationDataTypeCache.getAll(model);
+        if (dataTypeEither.isRight()) {
+            throw ToscaGetFunctionExceptionSupplier.couldNotLoadDataTypes(model).get();
+        }
+        return dataTypeEither.left().value();
+    }
+
+    private void validateGetPropertySource(final ToscaGetFunctionType functionType, final PropertySource propertySource) {
+        if (functionType == ToscaGetFunctionType.GET_INPUT && propertySource != PropertySource.SELF) {
+            throw ToscaGetFunctionExceptionSupplier
+                .targetSourceNotSupported(functionType, propertySource).get();
+        }
+        if (functionType == ToscaGetFunctionType.GET_PROPERTY && !List.of(PropertySource.SELF, PropertySource.INSTANCE).contains(propertySource)) {
+            throw ToscaGetFunctionExceptionSupplier
+                .targetSourceNotSupported(functionType, propertySource).get();
+        }
+    }
+
+    private void validateGetToscaFunctionAttributes(final ToscaGetFunctionDataDefinition toscaGetFunction) {
+        if (toscaGetFunction.getFunctionType() == null) {
+            throw ToscaGetFunctionExceptionSupplier.targetFunctionTypeNotFound().get();
         }
+        if (toscaGetFunction.getPropertySource() == null) {
+            throw ToscaGetFunctionExceptionSupplier.targetPropertySourceNotFound(toscaGetFunction.getFunctionType()).get();
+        }
+        if (CollectionUtils.isEmpty(toscaGetFunction.getPropertyPathFromSource())) {
+            throw ToscaGetFunctionExceptionSupplier
+                .targetSourcePathNotFound(toscaGetFunction.getFunctionType()).get();
+        }
+        if (StringUtils.isEmpty(toscaGetFunction.getSourceName()) || StringUtils.isBlank(toscaGetFunction.getSourceName())) {
+            throw ToscaGetFunctionExceptionSupplier.sourceNameNotFound(toscaGetFunction.getPropertySource()).get();
+        }
+        if (StringUtils.isEmpty(toscaGetFunction.getSourceUniqueId()) || StringUtils.isBlank(toscaGetFunction.getSourceUniqueId())) {
+            throw ToscaGetFunctionExceptionSupplier.sourceIdNotFound(toscaGetFunction.getPropertySource()).get();
+        }
+        if (StringUtils.isEmpty(toscaGetFunction.getPropertyName()) || StringUtils.isBlank(toscaGetFunction.getPropertyName())) {
+            throw ToscaGetFunctionExceptionSupplier.propertyNameNotFound(toscaGetFunction.getPropertySource()).get();
+        }
+        if (StringUtils.isEmpty(toscaGetFunction.getPropertyUniqueId()) || StringUtils.isBlank(toscaGetFunction.getPropertyUniqueId())) {
+            throw ToscaGetFunctionExceptionSupplier.propertyIdNotFound(toscaGetFunction.getPropertySource()).get();
+        }
+    }
+
+    private ResponseFormat updateInputOnContainerComponent(ComponentInstanceInput input, String newValue, Component containerComponent,
+                                                           ComponentInstance foundResourceInstance) {
+        StorageOperationStatus status;
+        input.setValue(newValue);
+        status = toscaOperationFacade.updateComponentInstanceInput(containerComponent, foundResourceInstance.getUniqueId(), input);
         if (status != StorageOperationStatus.OK) {
             ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(status);
             return componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, "");
@@ -1687,11 +2590,14 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         return componentsUtils.getResponseFormat(ActionStatus.OK);
     }
 
-    public Either<List<ComponentInstanceInput>, ResponseFormat> createOrUpdateInstanceInputValues(ComponentTypeEnum componentTypeEnum, String componentId, String resourceInstanceId, List<ComponentInstanceInput> inputs, String userId) {
+    public Either<List<ComponentInstanceInput>, ResponseFormat> createOrUpdateInstanceInputValues(ComponentTypeEnum componentTypeEnum,
+                                                                                                  String componentId, String resourceInstanceId,
+                                                                                                  List<ComponentInstanceInput> inputs,
+                                                                                                  String userId) {
 
         Either<List<ComponentInstanceInput>, ResponseFormat> resultOp = null;
 
-        validateUserExists(userId, "create Or Update Property Value", false);
+        validateUserExists(userId);
 
         if (componentTypeEnum == null) {
             BeEcompErrorManager.getInstance().logInvalidInputError(CREATE_OR_UPDATE_PROPERTY_VALUE, INVALID_COMPONENT_TYPE, ErrorSeverity.INFO);
@@ -1702,20 +2608,24 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
         if (getResourceResult.isRight()) {
             log.debug(FAILED_TO_RETRIEVE_COMPONENT_COMPONENT_ID, componentId);
-            resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
-            return resultOp;
+            ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getResourceResult.right().value(), componentTypeEnum);
+            return Either.right(componentsUtils.getResponseFormat(actionStatus, componentId));
         }
         Component containerComponent = getResourceResult.left().value();
 
         if (!ComponentValidationUtils.canWorkOnComponent(containerComponent, userId)) {
-            log.info("Restricted operation for user: {} on service {}", userId, componentId);
+            if (Boolean.TRUE.equals(containerComponent.isArchived())) {
+                log.info(COMPONENT_ARCHIVED, componentId);
+                return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_IS_ARCHIVED, containerComponent.getName()));
+            }
+            log.info(RESTRICTED_OPERATION_ON_SERVIVE, userId, componentId);
             resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
             return resultOp;
         }
         Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus = getResourceInstanceById(containerComponent, resourceInstanceId);
         if (resourceInstanceStatus.isRight()) {
-            resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, resourceInstanceId, componentId));
-            return resultOp;
+            return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_INSTANCE_NOT_FOUND_ON_CONTAINER,
+                resourceInstanceId, RESOURCE_INSTANCE, SERVICE, componentId));
         }
 
         ComponentInstance foundResourceInstance = resourceInstanceStatus.left().value();
@@ -1724,31 +2634,36 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         StorageOperationStatus lockStatus = graphLockOperation.lockComponent(componentId, componentTypeEnum.getNodeType());
         if (lockStatus != StorageOperationStatus.OK) {
             log.debug(FAILED_TO_LOCK_SERVICE, componentId);
-            resultOp = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(lockStatus)));
-            return resultOp;
+            return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(lockStatus)));
         }
+        List<ComponentInstanceInput> updatedInputs = new ArrayList<>();
         try {
-            for (ComponentInstanceInput input: inputs) {
-                Either<String, ResponseFormat> updatedInputValue = updatePropertyObjectValue(input, true);
-                updatedInputValue.bimap(updatedValue -> updateInputOnContainerComponent(input,updatedValue, containerComponent, foundResourceInstance),
-                        Either::right);
-
+            for (ComponentInstanceInput input : inputs) {
+                validateMandatoryFields(input);
+                ComponentInstanceInput componentInstanceInput = validateInputExistsOnComponent(input, containerComponent, foundResourceInstance);
+                Either<String, ResponseFormat> validatedInputValue = validatePropertyObjectValue(componentInstanceInput, input.getValue(), true);
+                if (validatedInputValue.isRight()) {
+                    throw new ByActionStatusComponentException(ActionStatus.INVALID_CONTENT, input.getName());
+                }
+                updateInputOnContainerComponent(componentInstanceInput, validatedInputValue.left().value(), containerComponent,
+                    foundResourceInstance);
+                updatedInputs.add(componentInstanceInput);
             }
-            Either<Component, StorageOperationStatus> updateContainerRes = toscaOperationFacade.updateComponentInstanceMetadataOfTopologyTemplate(containerComponent);
-
+            Either<Component, StorageOperationStatus> updateContainerRes = toscaOperationFacade
+                .updateComponentInstanceMetadataOfTopologyTemplate(containerComponent);
             if (updateContainerRes.isRight()) {
                 ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(updateContainerRes.right().value());
                 resultOp = Either.right(componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, ""));
                 return resultOp;
             }
-            resultOp = Either.left(inputs);
+            resultOp = Either.left(updatedInputs);
             return resultOp;
 
         } finally {
             if (resultOp == null || resultOp.isRight()) {
-                titanDao.rollback();
+                janusGraphDao.rollback();
             } else {
-                titanDao.commit();
+                janusGraphDao.commit();
             }
             // unlock resource
             graphLockOperation.unlockComponent(componentId, componentTypeEnum.getNodeType());
@@ -1756,12 +2671,25 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
     }
 
-    public Either<ComponentInstanceProperty, ResponseFormat> createOrUpdateGroupInstancePropertyValue(ComponentTypeEnum componentTypeEnum, String componentId, String resourceInstanceId, String groupInstanceId, ComponentInstanceProperty property,
+    private ComponentInstanceInput validateInputExistsOnComponent(ComponentInstanceInput input, Component containerComponent,
+                                                                  ComponentInstance foundResourceInstance) {
+        List<ComponentInstanceInput> instanceProperties = containerComponent.getComponentInstancesInputs().get(foundResourceInstance.getUniqueId());
+        Optional<ComponentInstanceInput> instanceInput = instanceProperties.stream().filter(p -> p.getName().equals(input.getName())).findAny();
+        if (!instanceInput.isPresent()) {
+            throw new ByActionStatusComponentException(ActionStatus.PROPERTY_NOT_FOUND, input.getName());
+        }
+        return instanceInput.get();
+    }
+
+    public Either<ComponentInstanceProperty, ResponseFormat> createOrUpdateGroupInstancePropertyValue(ComponentTypeEnum componentTypeEnum,
+                                                                                                      String componentId, String resourceInstanceId,
+                                                                                                      String groupInstanceId,
+                                                                                                      ComponentInstanceProperty property,
                                                                                                       String userId) {
 
         Either<ComponentInstanceProperty, ResponseFormat> resultOp = null;
 
-        validateUserExists(userId, "create Or Update Property Value", false);
+        validateUserExists(userId);
 
         if (componentTypeEnum == null) {
             BeEcompErrorManager.getInstance().logInvalidInputError(CREATE_OR_UPDATE_PROPERTY_VALUE, INVALID_COMPONENT_TYPE, ErrorSeverity.INFO);
@@ -1786,7 +2714,8 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
             if (propertyValueUid == null) {
 
-                Either<Integer, StorageOperationStatus> counterRes = groupInstanceOperation.increaseAndGetGroupInstancePropertyCounter(groupInstanceId);
+                Either<Integer, StorageOperationStatus> counterRes = groupInstanceOperation
+                    .increaseAndGetGroupInstancePropertyCounter(groupInstanceId);
 
                 if (counterRes.isRight()) {
                     log.debug("increaseAndGetResourcePropertyCounter failed resource instance: {} property: {}", resourceInstanceId, property);
@@ -1795,7 +2724,8 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
                     resultOp = Either.right(componentsUtils.getResponseFormat(actionStatus));
                 }
                 Integer index = counterRes.left().value();
-                Either<ComponentInstanceProperty, StorageOperationStatus> result = groupInstanceOperation.addPropertyValueToGroupInstance(property, resourceInstanceId, index, true);
+                Either<ComponentInstanceProperty, StorageOperationStatus> result = groupInstanceOperation
+                    .addPropertyValueToGroupInstance(property, resourceInstanceId, index, true);
 
                 if (result.isLeft()) {
                     log.trace("Property value was added to resource instance {}", resourceInstanceId);
@@ -1812,7 +2742,8 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
                 }
 
             } else {
-                Either<ComponentInstanceProperty, StorageOperationStatus> result = groupInstanceOperation.updatePropertyValueInGroupInstance(property, resourceInstanceId, true);
+                Either<ComponentInstanceProperty, StorageOperationStatus> result = groupInstanceOperation
+                    .updatePropertyValueInGroupInstance(property, resourceInstanceId, true);
 
                 if (result.isLeft()) {
                     log.debug("Property value {} was updated on graph.", property.getValueUniqueUid());
@@ -1841,98 +2772,9 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
         } finally {
             if (resultOp == null || resultOp.isRight()) {
-                titanDao.rollback();
-            } else {
-                titanDao.commit();
-            }
-            // unlock resource
-            graphLockOperation.unlockComponent(componentId, componentTypeEnum.getNodeType());
-        }
-
-    }
-
-    public Either<ComponentInstanceInput, ResponseFormat> createOrUpdateInputValue(ComponentTypeEnum componentTypeEnum, String componentId, String resourceInstanceId, ComponentInstanceInput inputProperty, String userId) {
-
-        Either<ComponentInstanceInput, ResponseFormat> resultOp = null;
-
-        validateUserExists(userId, "create Or Update Input Value", false);
-
-        if (componentTypeEnum == null) {
-            BeEcompErrorManager.getInstance().logInvalidInputError("createOrUpdateInputValue", INVALID_COMPONENT_TYPE, ErrorSeverity.INFO);
-            resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.NOT_ALLOWED));
-            return resultOp;
-        }
-
-        if (!ComponentValidationUtils.canWorkOnComponent(componentId, toscaOperationFacade, userId)) {
-            log.info("Restricted operation for user: {} on service: {}", userId, componentId);
-            resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
-            return resultOp;
-        }
-        // lock resource
-        StorageOperationStatus lockStatus = graphLockOperation.lockComponent(componentId, componentTypeEnum.getNodeType());
-        if (lockStatus != StorageOperationStatus.OK) {
-            log.debug(FAILED_TO_LOCK_SERVICE, componentId);
-            resultOp = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(lockStatus)));
-            return resultOp;
-        }
-        try {
-            String propertyValueUid = inputProperty.getValueUniqueUid();
-            if (propertyValueUid == null) {
-
-                Either<Integer, StorageOperationStatus> counterRes = componentInstanceOperation.increaseAndGetResourceInstanceSpecificCounter(resourceInstanceId, GraphPropertiesDictionary.INPUT_COUNTER, true);
-
-                if (counterRes.isRight()) {
-                    log.debug("increaseAndGetResourceInputCounter failed resource instance {} inputProperty {}", resourceInstanceId, inputProperty);
-                    StorageOperationStatus status = counterRes.right().value();
-                    ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(status);
-                    resultOp = Either.right(componentsUtils.getResponseFormat(actionStatus));
-                }
-                Integer index = counterRes.left().value();
-                Either<ComponentInstanceInput, StorageOperationStatus> result = componentInstanceOperation.addInputValueToResourceInstance(inputProperty, resourceInstanceId, index, true);
-
-                if (result.isLeft()) {
-                    log.debug("Property value was added to resource instance {}", resourceInstanceId);
-                    ComponentInstanceInput instanceProperty = result.left().value();
-
-                    resultOp = Either.left(instanceProperty);
-                    return resultOp;
-
-                } else {
-                    log.debug("Failed to add input value {} to resource instance {}", inputProperty, resourceInstanceId);
-
-                    ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(result.right().value());
-
-                    resultOp = Either.right(componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, ""));
-
-                    return resultOp;
-                }
-
-            } else {
-                Either<ComponentInstanceInput, StorageOperationStatus> result = componentInstanceOperation.updateInputValueInResourceInstance(inputProperty, resourceInstanceId, true);
-
-                if (result.isLeft()) {
-                    log.debug("Input value {} was updated on graph.", inputProperty.getValueUniqueUid());
-                    ComponentInstanceInput instanceProperty = result.left().value();
-
-                    resultOp = Either.left(instanceProperty);
-                    return resultOp;
-
-                } else {
-                    log.debug("Failed to update property value {} in resource instance {}", inputProperty, resourceInstanceId);
-
-                    ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(result.right().value());
-
-                    resultOp = Either.right(componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, ""));
-
-                    return resultOp;
-                }
-            }
-
-        } finally {
-            if (resultOp == null || resultOp.isRight()) {
-                titanDao.rollback();
+                janusGraphDao.rollback();
             } else {
-                titanDao.commit();
+                janusGraphDao.commit();
             }
             // unlock resource
             graphLockOperation.unlockComponent(componentId, componentTypeEnum.getNodeType());
@@ -1940,9 +2782,10 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
     }
 
-    public Either<ComponentInstanceProperty, ResponseFormat> deletePropertyValue(ComponentTypeEnum componentTypeEnum, String serviceId, String resourceInstanceId, String propertyValueId, String userId) {
+    public Either<ComponentInstanceProperty, ResponseFormat> deletePropertyValue(ComponentTypeEnum componentTypeEnum, String serviceId,
+                                                                                 String resourceInstanceId, String propertyValueId, String userId) {
 
-        validateUserExists(userId, "delete Property Value", false);
+        validateUserExists(userId);
 
         Either<ComponentInstanceProperty, ResponseFormat> resultOp = null;
 
@@ -1965,7 +2808,8 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
             return resultOp;
         }
         try {
-            Either<ComponentInstanceProperty, StorageOperationStatus> result = propertyOperation.removePropertyValueFromResourceInstance(propertyValueId, resourceInstanceId, true);
+            Either<ComponentInstanceProperty, StorageOperationStatus> result = propertyOperation
+                .removePropertyValueFromResourceInstance(propertyValueId, resourceInstanceId, true);
 
             if (result.isLeft()) {
                 log.debug("Property value {} was removed from graph.", propertyValueId);
@@ -1986,9 +2830,9 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
         } finally {
             if (resultOp == null || resultOp.isRight()) {
-                titanDao.rollback();
+                janusGraphDao.rollback();
             } else {
-                titanDao.commit();
+                janusGraphDao.commit();
             }
             // unlock resource
             graphLockOperation.unlockComponent(serviceId, componentTypeEnum.getNodeType());
@@ -1996,32 +2840,32 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
     }
 
-    private Either<Component, ResponseFormat> getAndValidateOriginComponentOfComponentInstance(ComponentTypeEnum containerComponentType, ComponentInstance componentInstance) {
+    private Component getAndValidateOriginComponentOfComponentInstance(Component containerComponent, ComponentInstance componentInstance) {
 
-        Either<Component, ResponseFormat> eitherResponse = null;
-        ComponentTypeEnum componentType = getComponentTypeByParentComponentType(containerComponentType);
+        ComponentTypeEnum componentType = getComponentTypeByParentComponentType(containerComponent.getComponentType());
         Component component;
-        ResponseFormat errorResponse;
         Either<Component, StorageOperationStatus> getComponentRes = toscaOperationFacade.getToscaFullElement(componentInstance.getComponentUid());
         if (getComponentRes.isRight()) {
-            log.debug("Failed to get the component with id {} for component instance {} creation. ", componentInstance.getComponentUid(), componentInstance.getName());
+            log.debug("Failed to get the component with id {} for component instance {} creation. ", componentInstance.getComponentUid(),
+                componentInstance.getName());
             ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentRes.right().value(), componentType);
-            errorResponse = componentsUtils.getResponseFormat(actionStatus, Constants.EMPTY_STRING);
-            eitherResponse = Either.right(errorResponse);
+            throw new ByActionStatusComponentException(actionStatus, Constants.EMPTY_STRING);
         }
-        if (eitherResponse == null) {
-            component = getComponentRes.left().value();
-            LifecycleStateEnum resourceCurrState = component.getLifecycleState();
-            if (resourceCurrState == LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT) {
-                ActionStatus actionStatus = ActionStatus.ILLEGAL_COMPONENT_STATE;
-                errorResponse = componentsUtils.getResponseFormat(actionStatus, component.getComponentType().toString(), component.getName(), resourceCurrState.toString());
-                eitherResponse = Either.right(errorResponse);
-            }
+        component = getComponentRes.left().value();
+        LifecycleStateEnum resourceCurrState = component.getLifecycleState();
+        if (resourceCurrState == LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT) {
+            ActionStatus actionStatus = ActionStatus.CONTAINER_CANNOT_CONTAIN_COMPONENT_IN_STATE;
+            throw new ByActionStatusComponentException(actionStatus, containerComponent.getComponentType().toString(), resourceCurrState.toString());
         }
-        if (eitherResponse == null) {
-            eitherResponse = Either.left(getComponentRes.left().value());
+        if (Boolean.TRUE.equals(component.isArchived())) {
+            ActionStatus actionStatus = ActionStatus.COMPONENT_IS_ARCHIVED;
+            throw new ByActionStatusComponentException(actionStatus, component.getName());
         }
-        return eitherResponse;
+        final Map<String, InterfaceDefinition> componentInterfaces = component.getInterfaces();
+        if (MapUtils.isNotEmpty(componentInterfaces)) {
+            componentInterfaces.forEach(componentInstance::addInterface);
+        }
+        return component;
     }
 
     public Either<Set<String>, ResponseFormat> forwardingPathOnVersionChange(String containerComponentParam,
@@ -2029,27 +2873,18 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
                                                                              String componentInstanceId,
                                                                              ComponentInstance newComponentInstance) {
         Either<Set<String>, ResponseFormat> resultOp;
-        Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentParam);
-        if (validateComponentType.isRight()) {
-            return Either.right(validateComponentType.right().value());
-        }
-        final ComponentTypeEnum containerComponentType = validateComponentType.left().value();
+        final ComponentTypeEnum containerComponentType = validateComponentType(containerComponentParam);
         ComponentParametersView componentParametersView = getComponentParametersViewForForwardingPath();
 
         //Fetch Component
-        Either<org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponentExists =
-                validateComponentExists(containerComponentId, containerComponentType, componentParametersView);
-        if (validateComponentExists.isRight()) {
-            return Either.right(validateComponentExists.right().value());
-        }
-        Component containerComponent = validateComponentExists.left().value();
+        Component containerComponent = validateComponentExists(containerComponentId, containerComponentType, componentParametersView);
 
         //Fetch current component instance
         Either<ComponentInstance, StorageOperationStatus> eitherResourceInstance =
-                getResourceInstanceById(containerComponent, componentInstanceId);
+            getResourceInstanceById(containerComponent, componentInstanceId);
         if (eitherResourceInstance.isRight()) {
             resultOp = Either.right(componentsUtils.getResponseFormat(
-                    ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, componentInstanceId, containerComponentId));
+                ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, componentInstanceId, containerComponentId));
             return resultOp;
         }
         ComponentInstance currentResourceInstance = eitherResourceInstance.left().value();
@@ -2058,258 +2893,339 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         String resourceId = newComponentInstance.getComponentUid();
         Either<Boolean, StorageOperationStatus> componentExistsRes = toscaOperationFacade.validateComponentExists(resourceId);
         if (componentExistsRes.isRight()) {
-            log.debug("Failed to find resource {} ", resourceId);
+            log.debug("Failed to find resource {}", resourceId);
             resultOp = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse
-                    (componentExistsRes.right().value()), resourceId));
+                (componentExistsRes.right().value()), resourceId));
             return resultOp;
-        } else if (!componentExistsRes.left().value()) {
+        } else if (!Boolean.TRUE.equals(componentExistsRes.left().value())) {
             log.debug("The resource {} not found ", resourceId);
             resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resourceId));
             return resultOp;
         }
 
         //Fetch component using new component instance uid
-        Either<Component, ResponseFormat> eitherResourceName = getOriginComponentFromComponentInstance(newComponentInstance);
-        if (eitherResourceName.isRight()) {
-            resultOp = Either.right(eitherResourceName.right().value());
-            return resultOp;
-        }
-        Component updatedContainerComponent=eitherResourceName.left().value();
+        Component updatedContainerComponent = getOriginComponentFromComponentInstance(newComponentInstance);
         Set<String> toDeleteForwardingPaths = getForwardingPaths(containerComponent,
-                currentResourceInstance, updatedContainerComponent);
-        resultOp=Either.left(toDeleteForwardingPaths);
+            currentResourceInstance, updatedContainerComponent);
+        resultOp = Either.left(toDeleteForwardingPaths);
 
         return resultOp;
     }
 
     private Set<String> getForwardingPaths(Component containerComponent, ComponentInstance currentResourceInstance,
                                            Component updatedContainerComponent) {
-        DataForMergeHolder dataForMergeHolder=new DataForMergeHolder();
-        dataForMergeHolder.setOrigComponentInstId(currentResourceInstance.getUniqueId());
+        DataForMergeHolder dataForMergeHolder = new DataForMergeHolder();
+        dataForMergeHolder.setOrigComponentInstId(currentResourceInstance.getName());
 
         Service service = (Service) containerComponent;
         ForwardingPathUtils forwardingPathUtils = new ForwardingPathUtils();
 
         return forwardingPathUtils.
-                getForwardingPathsToBeDeletedOnVersionChange(service,dataForMergeHolder,updatedContainerComponent);
+            getForwardingPathsToBeDeletedOnVersionChange(service, dataForMergeHolder, updatedContainerComponent);
     }
 
     private ComponentParametersView getComponentParametersViewForForwardingPath() {
         ComponentParametersView componentParametersView = new ComponentParametersView();
         componentParametersView.setIgnoreCapabiltyProperties(false);
-        componentParametersView.setIgnoreForwardingPath(false);
+        componentParametersView.setIgnoreServicePath(false);
         return componentParametersView;
     }
 
-    public Either<ComponentInstance, ResponseFormat> changeComponentInstanceVersion(String containerComponentParam, String containerComponentId, String componentInstanceId, String userId, ComponentInstance newComponentInstance) {
-
-        User user = validateUserExists(userId, "change Component Instance Version", false);
-
-        Either<ComponentInstance, ResponseFormat> resultOp = null;
-
-        Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentParam);
-        if (validateComponentType.isRight()) {
-            return Either.right(validateComponentType.right().value());
-        }
+    public ComponentInstance changeComponentInstanceVersion(String containerComponentParam, String containerComponentId, String componentInstanceId,
+                                                            String userId, ComponentInstance newComponentInstance) {
 
-        final ComponentTypeEnum containerComponentType = validateComponentType.left().value();
+        User user = validateUserExists(userId);
+        final ComponentTypeEnum containerComponentType = validateComponentType(containerComponentParam);
         ComponentParametersView componentParametersView = new ComponentParametersView();
         componentParametersView.setIgnoreCapabiltyProperties(false);
-        Either<org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponentExists = validateComponentExists(containerComponentId, containerComponentType, componentParametersView);
-        if (validateComponentExists.isRight()) {
-            return Either.right(validateComponentExists.right().value());
-        }
-        org.openecomp.sdc.be.model.Component containerComponent = validateComponentExists.left().value();
 
-        Either<Boolean, ResponseFormat> validateCanWorkOnComponent = validateCanWorkOnComponent(containerComponent, userId);
-        if (validateCanWorkOnComponent.isRight()) {
-            return Either.right(validateCanWorkOnComponent.right().value());
-        }
+        org.openecomp.sdc.be.model.Component containerComponent = validateComponentExists(containerComponentId, containerComponentType,
+            componentParametersView);
+
+        validateCanWorkOnComponent(containerComponent, userId);
 
         Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus = getResourceInstanceById(containerComponent, componentInstanceId);
         if (resourceInstanceStatus.isRight()) {
-            resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, componentInstanceId, containerComponentId));
-            return resultOp;
+            throw new ByActionStatusComponentException(ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, componentInstanceId,
+                containerComponentId);
         }
 
         ComponentInstance currentResourceInstance = resourceInstanceStatus.left().value();
 
-        return changeInstanceVersion(containerComponent, currentResourceInstance, newComponentInstance, user, containerComponentType );
+        return changeInstanceVersion(containerComponent, currentResourceInstance, newComponentInstance, user, containerComponentType);
     }
 
-    public Either<ComponentInstance, ResponseFormat> changeInstanceVersion(org.openecomp.sdc.be.model.Component containerComponent, ComponentInstance currentResourceInstance,
-                                                                           ComponentInstance newComponentInstance, User user, final ComponentTypeEnum containerComponentType    ) {
-        Either<ComponentInstance, ResponseFormat> resultOp = null;
+    public ComponentInstance changeInstanceVersion(org.openecomp.sdc.be.model.Component containerComponent,
+                                                   ComponentInstance currentResourceInstance,
+                                                   ComponentInstance newComponentInstance,
+                                                   User user,
+                                                   final ComponentTypeEnum containerComponentType) {
+        boolean failed = false;
         Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus;
 
-        Either<Boolean, ResponseFormat> lockComponent = lockComponent(containerComponent, "changeComponentInstanceVersion");
-        String containerComponentId = containerComponent.getUniqueId();
-        String componentInstanceId = currentResourceInstance.getUniqueId();
-        if (lockComponent.isRight()) {
-            return Either.right(lockComponent.right().value());
-        }
-
         try {
-
-
+            lockComponent(containerComponent, "changeComponentInstanceVersion");
+            String containerComponentId = containerComponent.getUniqueId();
+            String componentInstanceId = currentResourceInstance.getUniqueId();
             if (currentResourceInstance.getComponentUid().equals(newComponentInstance.getComponentUid())) {
-                resultOp = Either.left(currentResourceInstance);
-                return resultOp;
-
+                return currentResourceInstance;
             }
             String resourceId = newComponentInstance.getComponentUid();
 
-
-
-            Either<Boolean, StorageOperationStatus> componentExistsRes = toscaOperationFacade.validateComponentExists(resourceId);
+            Either<Boolean, StorageOperationStatus> componentExistsRes = toscaOperationFacade
+                .validateComponentExists(resourceId);
             if (componentExistsRes.isRight()) {
-                log.debug("Failed to validate existing of the component {}. Status is {} ", resourceId);
-                resultOp = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(componentExistsRes.right().value()), resourceId));
-                return resultOp;
-            } else if (!componentExistsRes.left().value()) {
+                StorageOperationStatus errorStatus = componentExistsRes.right().value();
+
+                log.debug("Failed to validate existing of the component {}. Status is {} ", resourceId, errorStatus);
+                throw new ByActionStatusComponentException(
+                    componentsUtils.convertFromStorageResponse(errorStatus), resourceId);
+            } else if (!Boolean.TRUE.equals(componentExistsRes.left().value())) {
                 log.debug("The resource {} not found ", resourceId);
-                resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resourceId));
-                return resultOp;
+                throw new ByActionStatusComponentException(ActionStatus.RESOURCE_NOT_FOUND, resourceId);
             }
 
-            Either<Component, ResponseFormat> eitherOriginComponent = getInstanceOriginNode(currentResourceInstance);
-
-            if (eitherOriginComponent.isRight()) {
-                resultOp = Either.right(eitherOriginComponent.right().value());
-                return resultOp;
-            }
-            DataForMergeHolder dataHolder = compInstMergeDataBL.saveAllDataBeforeDeleting(containerComponent, currentResourceInstance, eitherOriginComponent.left().value());
-            resultOp = deleteComponentInstance(containerComponent, componentInstanceId, containerComponentType);
-            if (resultOp.isRight()) {
-                log.debug("failed to delete resource instance {}", resourceId);
-                return resultOp;
-            }
-            ComponentInstance resResourceInfo = resultOp.left().value();
-            Component origComponent = null;
-            OriginTypeEnum originType = currentResourceInstance.getOriginType();
-            if (originType == OriginTypeEnum.ServiceProxy) {
-                Either<Component, StorageOperationStatus> serviceProxyOrigin = toscaOperationFacade.getLatestByName("serviceProxy");
-                if (serviceProxyOrigin.isRight()) {
-                    log.debug("Failed to fetch normative service proxy resource by tosca name, error {}", serviceProxyOrigin.right().value());
-                    return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(serviceProxyOrigin.right().value())));
-                }
-                origComponent = serviceProxyOrigin.left().value();
+            Component eitherOriginComponent = getInstanceOriginNode(currentResourceInstance);
+            DataForMergeHolder dataHolder =
+                compInstMergeDataBL.saveAllDataBeforeDeleting(containerComponent, currentResourceInstance, eitherOriginComponent);
+            ComponentInstance resResourceInfo = deleteComponentInstance(containerComponent, componentInstanceId,
+                containerComponentType);
 
-                StorageOperationStatus fillProxyRes = fillProxyInstanceData(newComponentInstance, origComponent);
+            if (resResourceInfo == null) {
+                log.error("Calling `deleteComponentInstance` for the resource {} returned a null", resourceId);
+                throw new ByActionStatusComponentException(ActionStatus.RESOURCE_NOT_FOUND, resourceId);
+            } else {
+                Component origComponent = null;
+                OriginTypeEnum originType = currentResourceInstance.getOriginType();
+                newComponentInstance.setOriginType(originType);
+                if (originType == OriginTypeEnum.ServiceProxy) {
+                    Either<Component, StorageOperationStatus> serviceProxyOrigin = toscaOperationFacade
+                        .getLatestByName(SERVICE_PROXY, null);
+                    if (isServiceProxyOrigin(serviceProxyOrigin)) {
+                        throw new ByActionStatusComponentException(
+                            componentsUtils.convertFromStorageResponse(serviceProxyOrigin.right().value()));
+                    }
+                    origComponent = serviceProxyOrigin.left().value();
 
-                if (fillProxyRes != StorageOperationStatus.OK) {
-                    log.debug("Failed to fill service proxy resource data with data from service, error {}", fillProxyRes);
-                    return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(fillProxyRes)));
+                    StorageOperationStatus fillProxyRes = fillInstanceData(newComponentInstance, origComponent);
 
-                }
-                newComponentInstance.setOriginType(originType);
-            }else{
+                    if (isFillProxyRes(fillProxyRes)) {
+                        throw new ByActionStatusComponentException(
+                            componentsUtils.convertFromStorageResponse(fillProxyRes));
+                    }
+                } else if (originType == OriginTypeEnum.ServiceSubstitution) {
+                    final Either<Component, StorageOperationStatus> getServiceResult = toscaOperationFacade
+                        .getToscaFullElement(newComponentInstance.getComponentUid());
+                    if (getServiceResult.isRight()) {
+                        throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(getServiceResult.right().value()));
+                    }
+                    final Component service = getServiceResult.left().value();
 
+                    final Either<Component, StorageOperationStatus> getServiceDerivedFromTypeResult = toscaOperationFacade
+                        .getLatestByToscaResourceName(service.getDerivedFromGenericType(), service.getModel());
+                    if (getServiceDerivedFromTypeResult.isRight()) {
+                        throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(getServiceResult.right().value()));
+                    }
 
-                Either<Component, ResponseFormat> eitherResourceName = getOriginComponentFromComponentInstance(newComponentInstance);
+                    origComponent = getServiceDerivedFromTypeResult.left().value();
 
-                if (eitherResourceName.isRight()) {
-                    resultOp = Either.right(eitherResourceName.right().value());
-                    return resultOp;
+                    final StorageOperationStatus fillProxyRes = fillInstanceData(newComponentInstance, origComponent);
+                    if (isFillProxyRes(fillProxyRes)) {
+                        throw new ByActionStatusComponentException(
+                            componentsUtils.convertFromStorageResponse(fillProxyRes));
+                    }
+                } else {
+                    origComponent = getOriginComponentFromComponentInstance(newComponentInstance);
+                    newComponentInstance.setName(resResourceInfo.getName());
+                    final Map<String, InterfaceDefinition> componentInterfaces = origComponent.getInterfaces();
+                    if (MapUtils.isNotEmpty(componentInterfaces)) {
+                        componentInterfaces.forEach(newComponentInstance::addInterface);
+                    }
                 }
 
-                origComponent = eitherResourceName.left().value();
+                newComponentInstance.setInvariantName(resResourceInfo.getInvariantName());
+                newComponentInstance.setPosX(resResourceInfo.getPosX());
+                newComponentInstance.setPosY(resResourceInfo.getPosY());
+                newComponentInstance.setDescription(resResourceInfo.getDescription());
+                newComponentInstance.setInstanceCount(resResourceInfo.getInstanceCount());
+                newComponentInstance.setMaxOccurrences(resResourceInfo.getMaxOccurrences());
+                newComponentInstance.setMinOccurrences(resResourceInfo.getMinOccurrences());
+                newComponentInstance.setDirectives(resResourceInfo.getDirectives());
+                checkForExternalReqAndCapabilities(origComponent, resResourceInfo);
+
+                ComponentInstance updatedComponentInstance =
+                    createComponentInstanceOnGraph(containerComponent, origComponent, newComponentInstance, user);
+                dataHolder.setCurrInstanceNode(origComponent);
+                compInstMergeDataBL
+                    .mergeComponentUserOrigData(user, dataHolder, containerComponent, containerComponentId, newComponentInstance.getUniqueId());
+
+                ActionStatus postChangeVersionResult = onChangeInstanceOperationOrchestrator
+                    .doPostChangeVersionOperations(containerComponent, currentResourceInstance, newComponentInstance);
+                if (postChangeVersionResult != ActionStatus.OK) {
+                    throw new ByActionStatusComponentException(postChangeVersionResult);
+                }
 
-                newComponentInstance.setName(resResourceInfo.getName());
-            }
+                ComponentParametersView filter = new ComponentParametersView(true);
+                filter.setIgnoreComponentInstances(false);
+                Either<Component, StorageOperationStatus> updatedComponentRes = toscaOperationFacade.getToscaElement(containerComponentId, filter);
+                if (updatedComponentRes.isRight()) {
+                    StorageOperationStatus storageOperationStatus = updatedComponentRes.right().value();
+                    ActionStatus actionStatus = componentsUtils
+                        .convertFromStorageResponse(storageOperationStatus, containerComponent.getComponentType());
+                    log.debug("Component with id {} was not found", containerComponentId);
+                    throw new ByActionStatusComponentException(actionStatus, Constants.EMPTY_STRING);
+                }
 
-            newComponentInstance.setInvariantName(resResourceInfo.getInvariantName());
-            newComponentInstance.setPosX(resResourceInfo.getPosX());
-            newComponentInstance.setPosY(resResourceInfo.getPosY());
-            newComponentInstance.setDescription(resResourceInfo.getDescription());
+                maintainNodeFilters(currentResourceInstance, newComponentInstance, containerComponentId);
 
-            resultOp = createComponentInstanceOnGraph(containerComponent, origComponent, newComponentInstance, user);
+                resourceInstanceStatus = getResourceInstanceById(updatedComponentRes.left().value(), updatedComponentInstance.getUniqueId());
+                if (resourceInstanceStatus.isRight()) {
+                    throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse
+                        (resourceInstanceStatus.right().value()), updatedComponentInstance.getUniqueId());
+                }
+                return resourceInstanceStatus.left().value();
+            }
+        } catch (ComponentException e) {
+            failed = true;
+            throw e;
+        } finally {
+            unlockComponent(failed, containerComponent);
+        }
+    }
+
+    private void maintainNodeFilters(
+        ComponentInstance currentResourceInstance,
+        ComponentInstance newComponentInstance,
+        String containerComponentId) {
+        CINodeFilterDataDefinition filterToMaintain = currentResourceInstance.getNodeFilter();
+        if (null != filterToMaintain) {
+            nodeFilterOperation.addNodeFilterData(
+                containerComponentId.toLowerCase(),
+                newComponentInstance.getUniqueId(),
+                filterToMaintain);
+        }
+    }
+
+    private void checkForExternalReqAndCapabilities(Component component, ComponentInstance resResourceInfo) {
+        if (MapUtils.isNotEmpty(component.getRequirements())) {
+            component.getRequirements().entrySet().forEach(requirementsMap -> {
+                if (MapUtils.isNotEmpty(resResourceInfo.getRequirements()) &&
+                    resResourceInfo.getRequirements().containsKey(requirementsMap.getKey())) {
+                    List<RequirementDefinition> resourceReqList = resResourceInfo.getRequirements().get(requirementsMap.getKey());
+                    for (RequirementDefinition requirements : requirementsMap.getValue()) {
+                        String requirementName = requirements.getName();
+                        resourceReqList.forEach(requirementDefinition -> {
+                            if (requirementName.equals(requirementDefinition.getName()) && requirementDefinition.isExternal()) {
+                                requirements.setExternal(requirementDefinition.isExternal());
+                            }
+                        });
+                    }
+                }
+            });
+        }
+        if (MapUtils.isNotEmpty(component.getCapabilities())) {
+            component.getCapabilities().entrySet().forEach(capabilityMap -> {
+                if (MapUtils.isNotEmpty(resResourceInfo.getCapabilities()) && resResourceInfo.getCapabilities().containsKey(capabilityMap.getKey())) {
+                    List<CapabilityDefinition> resourceCapList = resResourceInfo.getCapabilities().get(capabilityMap.getKey());
+                    capabilityMap.getValue().forEach(capabilities -> {
+                        String capabilityName = capabilities.getName();
+                        for (CapabilityDefinition capDef : resourceCapList) {
+                            if (capabilityName.equals(capDef.getName()) && capDef.isExternal()) {
+                                capabilities.setExternal(capDef.isExternal());
+                            }
+                        }
+                    });
+                }
+            });
+        }
+    }
 
-            if (resultOp.isRight()) {
-                log.debug("failed to create resource instance {}", resourceId);
-                return resultOp;
-            }
+    private boolean isFillProxyRes(StorageOperationStatus fillProxyRes) {
+        if (fillProxyRes != StorageOperationStatus.OK) {
+            log.debug("Failed to fill service proxy resource data with data from service, error {}", fillProxyRes);
+            return true;
+        }
+        return false;
+    }
 
-            ComponentInstance updatedComponentInstance = resultOp.left().value();
-            if (resultOp.isRight()) {
-                log.debug("failed to create resource instance {}", resourceId);
-                return resultOp;
-            }
+    // US831698
+    public List<ComponentInstanceProperty> getComponentInstancePropertiesById(String containerComponentTypeParam, String containerComponentId,
+                                                                              String componentInstanceUniqueId, String userId) {
+        Component containerComponent = null;
 
-            Either<Component, ResponseFormat> mergeStatusEither = compInstMergeDataBL.mergeComponentUserOrigData(user, dataHolder, containerComponent, containerComponentId, newComponentInstance.getUniqueId());
-            if (mergeStatusEither.isRight()) {
-                return Either.right(mergeStatusEither.right().value());
-            }
+        boolean failed = false;
+        try {
+            validateUserExists(userId);
+            validateComponentType(containerComponentTypeParam);
 
-            ActionStatus postChangeVersionResult = onChangeInstanceOperationOrchestrator.doPostChangeVersionOperations(containerComponent, currentResourceInstance, newComponentInstance);
-            if (postChangeVersionResult != ActionStatus.OK) {
-                return Either.right(componentsUtils.getResponseFormat(postChangeVersionResult));
+            Either<Component, StorageOperationStatus> validateContainerComponentExists = toscaOperationFacade.getToscaElement(containerComponentId);
+            if (validateContainerComponentExists.isRight()) {
+                throw new ByActionStatusComponentException(
+                    componentsUtils.convertFromStorageResponse(validateContainerComponentExists.right().value()));
             }
+            containerComponent = validateContainerComponentExists.left().value();
 
-            ComponentParametersView filter = new ComponentParametersView(true);
-            filter.setIgnoreComponentInstances(false);
-            Either<Component, StorageOperationStatus> updatedComponentRes = toscaOperationFacade.getToscaElement(containerComponentId, filter);
-            if (updatedComponentRes.isRight()) {
-                StorageOperationStatus storageOperationStatus = updatedComponentRes.right().value();
-                ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(storageOperationStatus, containerComponent.getComponentType());
-                ResponseFormat responseFormat = componentsUtils.getResponseFormat(actionStatus, Constants.EMPTY_STRING);
-                log.debug("Component with id {} was not found", containerComponentId);
-                return Either.right(responseFormat);
-            }
-            resourceInstanceStatus = getResourceInstanceById(updatedComponentRes.left().value(), updatedComponentInstance.getUniqueId());
+            Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus = getResourceInstanceById(containerComponent,
+                componentInstanceUniqueId);
             if (resourceInstanceStatus.isRight()) {
-                resultOp = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(resourceInstanceStatus.right().value()), updatedComponentInstance.getUniqueId()));
-                return resultOp;
+                throw new ByActionStatusComponentException(ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, componentInstanceUniqueId,
+                    containerComponentId);
             }
-            resultOp = Either.left(resourceInstanceStatus.left().value());
-            return resultOp;
 
+            List<ComponentInstanceProperty> instanceProperties = new ArrayList<>();
+            if (MapUtils.isNotEmpty(containerComponent.getComponentInstancesProperties())) {
+                instanceProperties = containerComponent.getComponentInstancesProperties()
+                    .get(componentInstanceUniqueId);
+            }
+            return instanceProperties;
+        } catch (ComponentException e) {
+            failed = true;
+            throw e;
         } finally {
-            unlockComponent(resultOp, containerComponent);
+            unlockComponent(failed, containerComponent);
         }
     }
 
-    // US831698
-    public Either<List<ComponentInstanceProperty>, ResponseFormat> getComponentInstancePropertiesById(String containerComponentTypeParam, String containerComponentId, String componentInstanceUniqueId, String userId) {
-        final String ECOMP_ERROR_CONTEXT = "Get Component Instance Properties By Id";
+    public List<ComponentInstanceAttribute> getComponentInstanceAttributesById(final String containerComponentTypeParam,
+                                                                               final String containerComponentId,
+                                                                               final String componentInstanceUniqueId,
+                                                                               final String userId) {
         Component containerComponent = null;
 
-        Either<List<ComponentInstanceProperty>, ResponseFormat> resultOp = null;
+        boolean failed = false;
         try {
-            validateUserExists(userId, ECOMP_ERROR_CONTEXT, false);
-
-            Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentTypeParam);
-            if (validateComponentType.isRight()) {
-                resultOp = Either.right(validateComponentType.right().value());
-                return resultOp;
-            }
+            validateUserExists(userId);
+            validateComponentType(containerComponentTypeParam);
 
-            Either<Component, StorageOperationStatus> validateContainerComponentExists = toscaOperationFacade.getToscaElement(containerComponentId);
+            final Either<Component, StorageOperationStatus> validateContainerComponentExists =
+                toscaOperationFacade.getToscaElement(containerComponentId);
             if (validateContainerComponentExists.isRight()) {
-                resultOp = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(validateContainerComponentExists.right().value())));
-                return resultOp;
+                throw new ByActionStatusComponentException(
+                    componentsUtils.convertFromStorageResponse(validateContainerComponentExists.right().value()));
             }
             containerComponent = validateContainerComponentExists.left().value();
 
-            Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus = getResourceInstanceById(containerComponent, componentInstanceUniqueId);
-            if (resourceInstanceStatus.isRight()) {
-                resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, componentInstanceUniqueId, containerComponentId));
-                return resultOp;
+            if (getResourceInstanceById(containerComponent, componentInstanceUniqueId).isRight()) {
+                throw new ByActionStatusComponentException(
+                    ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, componentInstanceUniqueId, containerComponentId);
             }
 
-            List<ComponentInstanceProperty> instanceProperties = containerComponent.getComponentInstancesProperties().get(componentInstanceUniqueId);
-            if (CollectionUtils.isEmpty(instanceProperties)) {
-                instanceProperties = new ArrayList<>();
-            }
-            resultOp = Either.left(instanceProperties);
-            return resultOp;
+            final Map<String, List<ComponentInstanceAttribute>> componentInstancesAttributes = containerComponent.getComponentInstancesAttributes();
+            return componentInstancesAttributes == null ? new ArrayList<>()
+                : componentInstancesAttributes.getOrDefault(componentInstanceUniqueId, new ArrayList<>());
+        } catch (final ComponentException e) {
+            failed = true;
+            throw e;
         } finally {
-            unlockComponent(resultOp, containerComponent);
+            unlockComponent(failed, containerComponent);
         }
     }
 
-    protected void validateIncrementCounter(String resourceInstanceId, GraphPropertiesDictionary counterType, Wrapper<Integer> instaceCounterWrapper, Wrapper<ResponseFormat> errorWrapper) {
-        Either<Integer, StorageOperationStatus> counterRes = componentInstanceOperation.increaseAndGetResourceInstanceSpecificCounter(resourceInstanceId, counterType, true);
+    protected void validateIncrementCounter(String resourceInstanceId, GraphPropertiesDictionary counterType,
+                                            Wrapper<Integer> instaceCounterWrapper,
+                                            Wrapper<ResponseFormat> errorWrapper) {
+        Either<Integer, StorageOperationStatus> counterRes = componentInstanceOperation
+            .increaseAndGetResourceInstanceSpecificCounter(resourceInstanceId, counterType, true);
 
         if (counterRes.isRight()) {
             log.debug("increase And Get {} failed resource instance {}", counterType, resourceInstanceId);
@@ -2331,13 +3247,17 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
      * @param inTransaction
      * @return
      */
-    public Either<ComponentInstanceData, ResponseFormat> updateComponentInstanceModificationTimeAndCustomizationUuid(ComponentInstance componentInstance, NodeTypeEnum componentInstanceType, Long modificationTime, boolean inTransaction) {
+    public Either<ComponentInstanceData, ResponseFormat> updateComponentInstanceModificationTimeAndCustomizationUuid(
+        ComponentInstance componentInstance, NodeTypeEnum componentInstanceType, Long modificationTime, boolean inTransaction) {
         Either<ComponentInstanceData, ResponseFormat> result;
-        Either<ComponentInstanceData, StorageOperationStatus> updateComponentInstanceRes = componentInstanceOperation.updateComponentInstanceModificationTimeAndCustomizationUuidOnGraph(componentInstance, componentInstanceType, modificationTime,
+        Either<ComponentInstanceData, StorageOperationStatus> updateComponentInstanceRes = componentInstanceOperation
+            .updateComponentInstanceModificationTimeAndCustomizationUuidOnGraph(componentInstance, componentInstanceType, modificationTime,
                 inTransaction);
         if (updateComponentInstanceRes.isRight()) {
-            log.debug("Failed to update component instance {} with new last update date and mofifier. Status is {}. ", componentInstance.getName(), updateComponentInstanceRes.right().value());
-            result = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(updateComponentInstanceRes.right().value())));
+            log.debug("Failed to update component instance {} with new last update date and mofifier. Status is {}. ", componentInstance.getName(),
+                updateComponentInstanceRes.right().value());
+            result = Either
+                .right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(updateComponentInstanceRes.right().value())));
         } else {
             result = Either.left(updateComponentInstanceRes.left().value());
         }
@@ -2346,79 +3266,66 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
 
     public Either<ComponentInstance, ResponseFormat> deleteServiceProxy() {
         // TODO Add implementation
-        Either<ComponentInstance, ResponseFormat> result = Either.left(new ComponentInstance());
-        return result;
+        return Either.left(new ComponentInstance());
     }
 
     public Either<ComponentInstance, ResponseFormat> createServiceProxy() {
         // TODO Add implementation
-        Either<ComponentInstance, ResponseFormat> result = Either.left(new ComponentInstance());
-        return result;
+        return Either.left(new ComponentInstance());
     }
 
     public Either<ComponentInstance, ResponseFormat> changeServiceProxyVersion() {
         // TODO Add implementation
-        Either<ComponentInstance, ResponseFormat> result = Either.left(new ComponentInstance());
-        return result;
+        return Either.left(new ComponentInstance());
     }
 
-    private Boolean validateInstanceNameUniquenessUponUpdate(Component containerComponent, ComponentInstance oldComponentInstance, String newInstanceName) {
+    private Boolean validateInstanceNameUniquenessUponUpdate(Component containerComponent, ComponentInstance oldComponentInstance,
+                                                             String newInstanceName) {
         return ComponentValidations.validateNameIsUniqueInComponent(oldComponentInstance.getName(), newInstanceName, containerComponent);
     }
 
-    private Either<ComponentInstance, StorageOperationStatus> getResourceInstanceById(Component containerComponent, String instanceId) {
-
-        Either<ComponentInstance, StorageOperationStatus> result = null;
-        List<ComponentInstance> instances = containerComponent.getComponentInstances();
-        Optional<ComponentInstance> foundInstance = null;
+    private Either<ComponentInstance, StorageOperationStatus> getResourceInstanceById(final Component containerComponent, final String instanceId) {
+        final List<ComponentInstance> instances = containerComponent.getComponentInstances();
         if (CollectionUtils.isEmpty(instances)) {
-            result = Either.right(StorageOperationStatus.NOT_FOUND);
-        }
-        if (result == null) {
-            foundInstance = instances.stream().filter(i -> i.getUniqueId().equals(instanceId)).findFirst();
-            if (!foundInstance.isPresent()) {
-                result = Either.right(StorageOperationStatus.NOT_FOUND);
-            }
+            return Either.right(StorageOperationStatus.NOT_FOUND);
         }
-        if (result == null) {
-            result = Either.left(foundInstance.get());
+
+        final Optional<ComponentInstance> foundInstance = instances.stream().filter(i -> i.getUniqueId().equals(instanceId)).findFirst();
+        if (foundInstance.isEmpty()) {
+            return Either.right(StorageOperationStatus.NOT_FOUND);
         }
-        return result;
+
+        return Either.left(foundInstance.get());
     }
 
     private ComponentInstance buildComponentInstance(ComponentInstance resourceInstanceForUpdate, ComponentInstance origInstanceForUpdate) {
-
         Long creationDate = origInstanceForUpdate.getCreationTime();
-
         Long modificationTime = System.currentTimeMillis();
         resourceInstanceForUpdate.setCreationTime(creationDate);
         resourceInstanceForUpdate.setModificationTime(modificationTime);
-
         resourceInstanceForUpdate.setCustomizationUUID(origInstanceForUpdate.getCustomizationUUID());
-
         if (StringUtils.isEmpty(resourceInstanceForUpdate.getName()) && StringUtils.isNotEmpty(origInstanceForUpdate.getName())) {
             resourceInstanceForUpdate.setName(origInstanceForUpdate.getName());
         }
-
         resourceInstanceForUpdate.setNormalizedName(ValidationUtils.normalizeComponentInstanceName(resourceInstanceForUpdate.getName()));
-
-        if (StringUtils.isEmpty(resourceInstanceForUpdate.getIcon()))
+        if (StringUtils.isEmpty(resourceInstanceForUpdate.getIcon())) {
             resourceInstanceForUpdate.setIcon(origInstanceForUpdate.getIcon());
-
-        if (StringUtils.isEmpty(resourceInstanceForUpdate.getComponentVersion()))
+        }
+        if (StringUtils.isEmpty(resourceInstanceForUpdate.getComponentVersion())) {
             resourceInstanceForUpdate.setComponentVersion(origInstanceForUpdate.getComponentVersion());
-
-        if (StringUtils.isEmpty(resourceInstanceForUpdate.getComponentName()))
+        }
+        if (StringUtils.isEmpty(resourceInstanceForUpdate.getComponentName())) {
             resourceInstanceForUpdate.setComponentName(origInstanceForUpdate.getComponentName());
-
-        if (StringUtils.isEmpty(resourceInstanceForUpdate.getToscaComponentName()))
+        }
+        if (StringUtils.isEmpty(resourceInstanceForUpdate.getToscaComponentName())) {
             resourceInstanceForUpdate.setToscaComponentName(origInstanceForUpdate.getToscaComponentName());
-
+        }
         if (resourceInstanceForUpdate.getOriginType() == null) {
             resourceInstanceForUpdate.setOriginType(origInstanceForUpdate.getOriginType());
         }
-        if(resourceInstanceForUpdate.getOriginType()  == OriginTypeEnum.ServiceProxy)
+        if (resourceInstanceForUpdate.getOriginType() == OriginTypeEnum.ServiceProxy) {
             resourceInstanceForUpdate.setIsProxy(true);
+        }
         if (resourceInstanceForUpdate.getSourceModelInvariant() == null) {
             resourceInstanceForUpdate.setSourceModelInvariant(origInstanceForUpdate.getSourceModelInvariant());
         }
@@ -2431,10 +3338,15 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         if (resourceInstanceForUpdate.getSourceModelUid() == null) {
             resourceInstanceForUpdate.setSourceModelUid(origInstanceForUpdate.getSourceModelUid());
         }
+        if (resourceInstanceForUpdate.getCreatedFrom() == null) {
+            resourceInstanceForUpdate.setCreatedFrom(origInstanceForUpdate.getCreatedFrom());
+        }
         return resourceInstanceForUpdate;
     }
+
     /**
      * Returns list of ComponentInstanceProperty belonging to component instance capability specified by name, type and ownerId
+     *
      * @param containerComponentType
      * @param containerComponentId
      * @param componentInstanceUniqueId
@@ -2444,223 +3356,224 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
      * @param ownerId
      * @return
      */
-    public Either<List<ComponentInstanceProperty>, ResponseFormat> getComponentInstanceCapabilityPropertiesById(String containerComponentType, String containerComponentId, String componentInstanceUniqueId, String capabilityType, String capabilityName, String ownerId, String userId) {
-
+    public List<ComponentInstanceProperty> getComponentInstanceCapabilityPropertiesById(String containerComponentType, String containerComponentId,
+                                                                                        String componentInstanceUniqueId, String capabilityType,
+                                                                                        String capabilityName, String ownerId, String userId) {
         Component containerComponent = null;
-
-        Either<List<ComponentInstanceProperty>, ResponseFormat> resultOp = null;
+        List<ComponentInstanceProperty> resultOp = null;
         try {
-            validateUserExists(userId, "Get Component Instance Properties By Id", false);
-            if(resultOp == null){
-                Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentType);
-                if (validateComponentType.isRight()) {
-                    resultOp = Either.right(validateComponentType.right().value());
-                }
-            }
-            if(resultOp == null){
-                Either<Component, StorageOperationStatus> validateContainerComponentExists = toscaOperationFacade.getToscaFullElement(containerComponentId);
-                if (validateContainerComponentExists.isRight()) {
-                    resultOp = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(validateContainerComponentExists.right().value())));
-                } else {
-                    containerComponent = validateContainerComponentExists.left().value();
-                }
-            }
-            if(resultOp == null){
-                Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus = getResourceInstanceById(containerComponent, componentInstanceUniqueId);
-                if (resourceInstanceStatus.isRight()) {
-                    resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, componentInstanceUniqueId, containerComponentId));
-                } else {
-                    resultOp = findCapabilityOfInstance(containerComponentId, componentInstanceUniqueId, capabilityType, capabilityName, ownerId, resourceInstanceStatus.left().value().getCapabilities());
-                }
-            }
-            return resultOp;
-        } finally {
-            unlockComponent(resultOp, containerComponent);
+            validateUserExists(userId);
+            validateComponentType(containerComponentType);
+            containerComponent = toscaOperationFacade.getToscaFullElement(containerComponentId).left().on(this::componentException);
+            ComponentInstance resourceInstanceStatus = getResourceInstanceById(containerComponent, componentInstanceUniqueId).left()
+                .on(this::componentInstanceException);
+            resultOp = findCapabilityOfInstance(containerComponentId, componentInstanceUniqueId, capabilityType, capabilityName, ownerId,
+                resourceInstanceStatus.getCapabilities());
+        } catch (StorageException | ComponentException e) {
+            unlockRollbackWithException(containerComponent, e);
+        } catch (Exception e) {
+            unlockRollbackWithException(containerComponent, new ByActionStatusComponentException(ActionStatus.GENERAL_ERROR));
         }
+        unlockWithCommit(containerComponent);
+        return resultOp;
     }
 
-    private Either<List<ComponentInstanceProperty>, ResponseFormat> findCapabilityOfInstance( String componentId, String instanceId, String capabilityType, String capabilityName, String ownerId, Map<String, List<CapabilityDefinition>> instanceCapabilities) {
-        Either<List<ComponentInstanceProperty>, ResponseFormat> result = null;
+    private List<ComponentInstanceProperty> findCapabilityOfInstance(String componentId, String instanceId, String capabilityType,
+                                                                     String capabilityName, String ownerId,
+                                                                     Map<String, List<CapabilityDefinition>> instanceCapabilities) {
         CapabilityDefinition foundCapability;
         if (MapUtils.isNotEmpty(instanceCapabilities)) {
             List<CapabilityDefinition> capabilitiesPerType = instanceCapabilities.get(capabilityType);
             if (capabilitiesPerType != null) {
-                Optional<CapabilityDefinition> capabilityOpt = capabilitiesPerType.stream().filter(c -> c.getName().equals(capabilityName) && c.getOwnerId().equals(ownerId)).findFirst();
+                Optional<CapabilityDefinition> capabilityOpt = capabilitiesPerType.stream()
+                    .filter(c -> c.getName().equals(capabilityName) && c.getOwnerId().equals(ownerId)).findFirst();
                 if (capabilityOpt.isPresent()) {
                     foundCapability = capabilityOpt.get();
-                    result = Either.left(foundCapability.getProperties() == null ? new ArrayList<>() : foundCapability.getProperties());
+                    return foundCapability.getProperties() == null ? new ArrayList<>() : foundCapability.getProperties();
                 }
             }
         }
-        if (result == null) {
-            result = fetchComponentInstanceCapabilityProperties(componentId, instanceId, capabilityType, capabilityName, ownerId);
-        }
-        return result;
+        return fetchComponentInstanceCapabilityProperties(componentId, instanceId, capabilityType, capabilityName, ownerId);
     }
 
-    private Either<List<ComponentInstanceProperty>, ResponseFormat> fetchComponentInstanceCapabilityProperties(String componentId, String instanceId, String capabilityType, String capabilityName, String ownerId) {
-        Either<List<ComponentInstanceProperty>, ResponseFormat> resultOp = null;
+    private List<ComponentInstanceProperty> fetchComponentInstanceCapabilityProperties(String componentId, String instanceId, String capabilityType,
+                                                                                       String capabilityName, String ownerId) {
         try {
-            Either<List<ComponentInstanceProperty>, StorageOperationStatus> getComponentInstanceCapabilityProperties = toscaOperationFacade.getComponentInstanceCapabilityProperties(componentId, instanceId, capabilityName, capabilityType, ownerId);
-            if(getComponentInstanceCapabilityProperties.isRight()){
-                resultOp = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(getComponentInstanceCapabilityProperties.right().value()), capabilityType, instanceId, componentId));
-            } else {
-                resultOp =  Either.left(getComponentInstanceCapabilityProperties.left().value());
-            }
-        } catch(Exception e){
-            log.error("The exception {} occurred upon the component {} instance {} capability {} properties retrieving. ", componentId, instanceId, capabilityName, e);
-            resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
-        }
-        return resultOp;
-    }
-
-    private ResponseFormat updateCapabilityPropertyOnContainerComponent(ComponentInstanceProperty property, String newValue, Component containerComponent, ComponentInstance foundResourceInstance,
-                                                                        String capabilityType, String capabilityName, String ownerId) {
-        String componentInstanceUniqueId = foundResourceInstance.getUniqueId();
-        StringBuilder sb = new StringBuilder(componentInstanceUniqueId);
-        sb.append(ModelConverter.CAP_PROP_DELIM).append(property.getOwnerId()).append(ModelConverter.CAP_PROP_DELIM).append(capabilityType).append(ModelConverter.CAP_PROP_DELIM).append(capabilityName);
-        String capKey = sb.toString();
-
-        Map<String, List<CapabilityDefinition>> capabilities = Optional.ofNullable(foundResourceInstance.getCapabilities())
-                .orElse(Collections.emptyMap());
-        List<CapabilityDefinition> capPerType = Optional.ofNullable(capabilities.get(capabilityType)).orElse(Collections.emptyList());
-        Optional<CapabilityDefinition> cap = capPerType.stream().filter(c -> c.getName().equals(capabilityName) && c.getOwnerId().equals(ownerId)).findAny();
-        if (cap.isPresent()) {
-            List<ComponentInstanceProperty> capProperties = cap.get().getProperties();
-            if (capProperties != null) {
-                Optional<ComponentInstanceProperty> instanceProperty = capProperties.stream().filter(p -> p.getUniqueId().equals(property.getUniqueId())).findAny();
-                StorageOperationStatus status;
-                if (instanceProperty.isPresent()) {
-                    instanceProperty.get().setValue(newValue);
-                    List<String> path = new ArrayList<>();
-                    path.add(componentInstanceUniqueId);
-                    path.add(capKey);
-                    instanceProperty.get().setPath(path);
-                    status = toscaOperationFacade.updateComponentInstanceCapabiltyProperty(containerComponent, componentInstanceUniqueId, capKey, instanceProperty.get());
-                    if (status != StorageOperationStatus.OK) {
-                        ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(status);
-                        return componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, "");
-
-                    }
-                    foundResourceInstance.setCustomizationUUID(UUID.randomUUID().toString());
-                }
-            }
+            return toscaOperationFacade.getComponentInstanceCapabilityProperties(componentId, instanceId, capabilityName, capabilityType, ownerId)
+                .left().on(this::componentInstancePropertyListException);
+        } catch (Exception e) {
+            log.debug("The exception {} occurred upon the component {} instance {} capability {} properties retrieving. ", componentId, instanceId,
+                capabilityName, e);
+            throw new ByActionStatusComponentException(ActionStatus.GENERAL_ERROR);
         }
-        return componentsUtils.getResponseFormat(ActionStatus.OK);
     }
 
-    public Either<List<ComponentInstanceProperty>, ResponseFormat> updateInstanceCapabilityProperties(ComponentTypeEnum componentTypeEnum, String containerComponentId, String componentInstanceUniqueId, String capabilityType, String capabilityName, String ownerId,
-                                                                                                      List<ComponentInstanceProperty> properties, String userId) {
-        Either<List<ComponentInstanceProperty>, ResponseFormat> resultOp = null;
-
-        validateUserExists(userId, "update instance capability property", false);
-
+    public Either<RequirementDefinition, ResponseFormat> updateInstanceRequirement(ComponentTypeEnum componentTypeEnum, String containerComponentId,
+                                                                                   String componentInstanceUniqueId,
+                                                                                   RequirementDefinition requirementDef, String userId) {
+        Either<RequirementDefinition, ResponseFormat> resultOp = null;
+        validateUserExists(userId);
         if (componentTypeEnum == null) {
-            BeEcompErrorManager.getInstance().logInvalidInputError("updateInstanceCapabilityProperty", INVALID_COMPONENT_TYPE, ErrorSeverity.INFO);
+            BeEcompErrorManager.getInstance().logInvalidInputError("updateInstanceRequirement", INVALID_COMPONENT_TYPE, ErrorSeverity.INFO);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.NOT_ALLOWED));
         }
         Either<Component, StorageOperationStatus> getResourceResult = toscaOperationFacade.getToscaFullElement(containerComponentId);
-
         if (getResourceResult.isRight()) {
             log.debug(FAILED_TO_RETRIEVE_COMPONENT_COMPONENT_ID, containerComponentId);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
         }
         Component containerComponent = getResourceResult.left().value();
-
         if (!ComponentValidationUtils.canWorkOnComponent(containerComponent, userId)) {
-            log.info("Restricted operation for user: {sourcePropList} on component {}", userId, containerComponentId);
+            log.info(RESTRICTED_OPERATION_ON_COMPONENT, userId, containerComponentId);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
         }
-        Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus = getResourceInstanceById(containerComponent, componentInstanceUniqueId);
+        Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus = getResourceInstanceById(containerComponent,
+            componentInstanceUniqueId);
         if (resourceInstanceStatus.isRight()) {
-            return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, componentInstanceUniqueId, containerComponentId));
+            return Either.right(componentsUtils
+                .getResponseFormat(ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, componentInstanceUniqueId, containerComponentId));
         }
-        ComponentInstance foundResourceInstance = resourceInstanceStatus.left().value();
         // lock resource
         StorageOperationStatus lockStatus = graphLockOperation.lockComponent(containerComponentId, componentTypeEnum.getNodeType());
         if (lockStatus != StorageOperationStatus.OK) {
-            log.debug("Failed to lock component {}", containerComponentId);
+            log.debug(FAILED_TO_LOCK_COMPONENT, containerComponentId);
             return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(lockStatus)));
         }
-
-        Either<Map<String, DataTypeDefinition>, TitanOperationStatus> allDataTypes = dataTypeCache.getAll();
-        if (allDataTypes.isRight()) {
-            TitanOperationStatus status = allDataTypes.right().value();
-            BeEcompErrorManager.getInstance().logInternalFlowError("UpdatePropertyValueOnComponentInstance", "Failed to update property value on instance. Status is " + status, ErrorSeverity.ERROR);
-            return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(DaoStatusConverter.convertTitanStatusToStorageStatus(status))));
-        }
-
         try {
-            for (ComponentInstanceProperty property : properties) {
-                Either<String, ResponseFormat> newPropertyValueEither = updatePropertyObjectValue(property, false);
-                newPropertyValueEither.bimap(updatedValue ->
-                                updateCapabilityPropertyOnContainerComponent(property, updatedValue, containerComponent, foundResourceInstance, capabilityType, capabilityName, ownerId),
-                        Either::right);
-            }
-            Either<Component, StorageOperationStatus> updateContainerRes = toscaOperationFacade.updateComponentInstanceMetadataOfTopologyTemplate(containerComponent);
-
+            StorageOperationStatus updateRequirementStatus = toscaOperationFacade
+                .updateComponentInstanceRequirement(containerComponentId, componentInstanceUniqueId, requirementDef);
+            if (updateRequirementStatus != StorageOperationStatus.OK) {
+                log.debug("Failed to update component instance requirement on instance {} in container {}", componentInstanceUniqueId,
+                    containerComponentId);
+                return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(updateRequirementStatus)));
+            }
+            Either<Component, StorageOperationStatus> updateContainerRes = toscaOperationFacade
+                .updateComponentInstanceMetadataOfTopologyTemplate(containerComponent);
             if (updateContainerRes.isRight()) {
                 ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(updateContainerRes.right().value());
                 resultOp = Either.right(componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, ""));
                 return resultOp;
             }
-            resultOp = Either.left(properties);
+            resultOp = Either.left(requirementDef);
             return resultOp;
-
         } finally {
             if (resultOp == null || resultOp.isRight()) {
-                titanDao.rollback();
+                janusGraphDao.rollback();
             } else {
-                titanDao.commit();
+                janusGraphDao.commit();
             }
             // unlock resource
             graphLockOperation.unlockComponent(containerComponentId, componentTypeEnum.getNodeType());
         }
     }
 
-    public Either<List<ComponentInstanceProperty>, ResponseFormat> updateInstanceCapabilityProperties(ComponentTypeEnum componentTypeEnum, String containerComponentId, String componentInstanceUniqueId, String capabilityType, String capabilityName,
-                                                                                                      List<ComponentInstanceProperty> properties, String userId) {
-        Either<List<ComponentInstanceProperty>, ResponseFormat> resultOp = null;
-
-        validateUserExists(userId, "update instance capability property", false);
+    public Either<CapabilityDefinition, ResponseFormat> updateInstanceCapability(final ComponentTypeEnum containerComponentType,
+                                                                                 final String containerComponentId,
+                                                                                 final String componentInstanceUniqueId,
+                                                                                 final CapabilityDefinition capabilityDefinition,
+                                                                                 final String userId) {
+        if (containerComponentType == null) {
+            BeEcompErrorManager.getInstance().logInvalidInputError("updateInstanceCapability", INVALID_COMPONENT_TYPE, ErrorSeverity.INFO);
+            return Either.right(componentsUtils.getResponseFormat(ActionStatus.NOT_ALLOWED));
+        }
+        validateUserExists(userId);
+        final Either<Component, StorageOperationStatus> getResourceResult = toscaOperationFacade.getToscaFullElement(containerComponentId);
+        if (getResourceResult.isRight()) {
+            log.debug(FAILED_TO_RETRIEVE_COMPONENT_COMPONENT_ID, containerComponentId);
+            return Either.right(componentsUtils.getResponseFormat(ActionStatus.COMPONENT_NOT_FOUND, containerComponentId));
+        }
+        final Component containerComponent = getResourceResult.left().value();
+        if (!ComponentValidationUtils.canWorkOnComponent(containerComponent, userId)) {
+            log.info(RESTRICTED_OPERATION_ON_COMPONENT, userId, containerComponentId);
+            return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
+        }
+        final Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus =
+            getResourceInstanceById(containerComponent, componentInstanceUniqueId);
+        if (resourceInstanceStatus.isRight()) {
+            return Either.right(componentsUtils
+                .getResponseFormat(ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, componentInstanceUniqueId, containerComponentId));
+        }
+        // lock resource
+        final StorageOperationStatus lockStatus = graphLockOperation.lockComponent(containerComponentId, containerComponentType.getNodeType());
+        if (lockStatus != StorageOperationStatus.OK) {
+            log.debug(FAILED_TO_LOCK_COMPONENT, containerComponentId);
+            return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(lockStatus)));
+        }
+        var success = false;
+        try {
+            final CapabilityDataDefinition updatedCapabilityDefinition = toscaOperationFacade
+                .updateComponentInstanceCapability(containerComponentId, componentInstanceUniqueId, capabilityDefinition);
+            final Either<Component, StorageOperationStatus> updateContainerEither = toscaOperationFacade
+                .updateComponentInstanceMetadataOfTopologyTemplate(containerComponent);
+            if (updateContainerEither.isRight()) {
+                var actionStatus = componentsUtils.convertFromStorageResponse(updateContainerEither.right().value(), containerComponentType);
+                return Either.right(componentsUtils.getResponseFormat(actionStatus));
+            }
+            success = true;
+            return Either.left(new CapabilityDefinition(updatedCapabilityDefinition));
+        } catch (final BusinessException e) {
+            log.error(EcompLoggerErrorCode.BUSINESS_PROCESS_ERROR, NodeTemplateOperation.class.getName(), (ErrorLogOptionalData) null,
+                FAILED_TO_UPDATE_COMPONENT_INSTANCE_CAPABILITY, componentInstanceUniqueId, containerComponentId);
+            throw e;
+        } catch (final Exception e) {
+            log.error(EcompLoggerErrorCode.BUSINESS_PROCESS_ERROR, NodeTemplateOperation.class.getName(), (ErrorLogOptionalData) null,
+                FAILED_TO_UPDATE_COMPONENT_INSTANCE_CAPABILITY, componentInstanceUniqueId, containerComponentId);
+            throw new ByResponseFormatComponentException(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
+        } finally {
+            if (success) {
+                janusGraphDao.commit();
+            } else {
+                janusGraphDao.rollback();
+            }
+            // unlock resource
+            graphLockOperation.unlockComponent(containerComponentId, containerComponentType.getNodeType());
+        }
+    }
 
+    public Either<List<ComponentInstanceProperty>, ResponseFormat> updateInstanceCapabilityProperties(ComponentTypeEnum componentTypeEnum,
+                                                                                                      String containerComponentId,
+                                                                                                      String componentInstanceUniqueId,
+                                                                                                      String capabilityType, String capabilityName,
+                                                                                                      List<ComponentInstanceProperty> properties,
+                                                                                                      String userId) {
+        Either<List<ComponentInstanceProperty>, ResponseFormat> resultOp = null;
+        validateUserExists(userId);
         if (componentTypeEnum == null) {
             BeEcompErrorManager.getInstance().logInvalidInputError("updateInstanceCapabilityProperty", INVALID_COMPONENT_TYPE, ErrorSeverity.INFO);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.NOT_ALLOWED));
         }
         Either<Component, StorageOperationStatus> getResourceResult = toscaOperationFacade.getToscaFullElement(containerComponentId);
-
         if (getResourceResult.isRight()) {
             log.debug(FAILED_TO_RETRIEVE_COMPONENT_COMPONENT_ID, containerComponentId);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
         }
         Component containerComponent = getResourceResult.left().value();
-
         if (!ComponentValidationUtils.canWorkOnComponent(containerComponent, userId)) {
-            log.info("Restricted operation for user: {} on component {}", userId, containerComponentId);
+            log.info(RESTRICTED_OPERATION_ON_COMPONENT, userId, containerComponentId);
             return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
         }
-        Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus = getResourceInstanceById(containerComponent, componentInstanceUniqueId);
+        Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus = getResourceInstanceById(containerComponent,
+            componentInstanceUniqueId);
         if (resourceInstanceStatus.isRight()) {
-            return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, componentInstanceUniqueId, containerComponentId));
+            return Either.right(componentsUtils
+                .getResponseFormat(ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, componentInstanceUniqueId, containerComponentId));
         }
         ComponentInstance foundResourceInstance = resourceInstanceStatus.left().value();
         // lock resource
         StorageOperationStatus lockStatus = graphLockOperation.lockComponent(containerComponentId, componentTypeEnum.getNodeType());
         if (lockStatus != StorageOperationStatus.OK) {
-            log.debug("Failed to lock component {}", containerComponentId);
+            log.debug(FAILED_TO_LOCK_COMPONENT, containerComponentId);
             return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(lockStatus)));
         }
-
         try {
             for (ComponentInstanceProperty property : properties) {
-                Either<String, ResponseFormat> newPropertyValueEither = updatePropertyObjectValue(property, false);
-                newPropertyValueEither.bimap(updatedValue ->
-                                updateCapabilityPropertyOnContainerComponent(property, updatedValue, containerComponent, foundResourceInstance, capabilityType, capabilityName),
-                        Either::right);
+                Either<String, ResponseFormat> newPropertyValueEither = validatePropertyObjectValue(property, property.getValue(), false);
+                newPropertyValueEither.bimap(
+                    updatedValue -> updateCapabilityPropertyOnContainerComponent(property, updatedValue, containerComponent, foundResourceInstance,
+                        capabilityType, capabilityName), Either::right);
             }
-            Either<Component, StorageOperationStatus> updateContainerRes = toscaOperationFacade.updateComponentInstanceMetadataOfTopologyTemplate(containerComponent);
-
+            Either<Component, StorageOperationStatus> updateContainerRes = toscaOperationFacade
+                .updateComponentInstanceMetadataOfTopologyTemplate(containerComponent);
             if (updateContainerRes.isRight()) {
                 ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(updateContainerRes.right().value());
                 resultOp = Either.right(componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, ""));
@@ -2668,12 +3581,11 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
             }
             resultOp = Either.left(properties);
             return resultOp;
-
         } finally {
             if (resultOp == null || resultOp.isRight()) {
-                titanDao.rollback();
+                janusGraphDao.rollback();
             } else {
-                titanDao.commit();
+                janusGraphDao.commit();
             }
             // unlock resource
             graphLockOperation.unlockComponent(containerComponentId, componentTypeEnum.getNodeType());
@@ -2681,132 +3593,109 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
     }
 
     public Either<Map<String, ComponentInstance>, ResponseFormat> copyComponentInstance(ComponentInstance inputComponentInstance,
-                                                                                        String containerComponentId,
-                                                                                        String componentInstanceId,
+                                                                                        String containerComponentId, String componentInstanceId,
                                                                                         String userId) {
-
         Map<String, ComponentInstance> resultMap = new HashMap<>();
         Either<Component, StorageOperationStatus> getOrigComponent = toscaOperationFacade.getToscaElement(containerComponentId);
         if (getOrigComponent.isRight()) {
             log.error("Failed to get the original component information");
-            return Either.right(componentsUtils.getResponseFormat(
-                    ActionStatus.USER_DEFINED, FAILED_TO_COPY_COMP_INSTANCE_TO_CANVAS));
+            return Either.right(componentsUtils.getResponseFormat(ActionStatus.USER_DEFINED, FAILED_TO_COPY_COMP_INSTANCE_TO_CANVAS));
         }
-
         Component origComponent = getOrigComponent.left().value();
-
-        Either<Boolean, ResponseFormat> lockComponent = lockComponent(origComponent, "copyComponentInstance");
-        if (lockComponent.isRight()) {
+        try {
+            lockComponent(origComponent, "copyComponentInstance");
+        } catch (ComponentException e) {
             log.error("destComponentInstance's data is {}", origComponent.toString());
-            return Either.right(lockComponent.right().value());
+            return Either.right(componentsUtils
+                .getResponseFormat(ActionStatus.USER_DEFINED, "Failed to lock component destComponentInstance's data is {}",
+                    origComponent.toString()));
         }
-
-
-        Either<ComponentInstance, ResponseFormat> actionResponse = null;
+        boolean failed = false;
+        ComponentInstance actionResponse = null;
         try {
-            actionResponse = createComponentInstance(
-                    "services", containerComponentId, userId, inputComponentInstance, true, false);
-
-            if (actionResponse.isRight()) {
-                log.error(FAILED_TO_COPY_COMP_INSTANCE_TO_CANVAS);
-                return Either.right(componentsUtils.getResponseFormat(
-                        ActionStatus.USER_DEFINED, FAILED_TO_COPY_COMP_INSTANCE_TO_CANVAS));
-            }
-
+            actionResponse = createComponentInstance("services", containerComponentId, userId, inputComponentInstance, false);
+        } catch (ComponentException e) {
+            failed = true;
+            // on failure of the create instance unlock the resource and rollback the transaction.
+            return Either.right(componentsUtils.getResponseFormat(ActionStatus.USER_DEFINED, FAILED_TO_COPY_COMP_INSTANCE_TO_CANVAS));
         } finally {
-
             // on failure of the create instance unlock the resource and rollback the transaction.
-            if (null == actionResponse || actionResponse.isRight()) {
-                titanDao.rollback();
+            if (null == actionResponse) {
+                log.error(FAILED_TO_COPY_COMP_INSTANCE_TO_CANVAS);
+                unlockComponent(failed, origComponent);
             }
-            unlockComponent(actionResponse, origComponent);
         }
-
         Either<String, ResponseFormat> resultOp = null;
-
         try {
-            ComponentInstance destComponentInstance = actionResponse.left().value();
-            log.debug("destComponentInstance's data is {}", destComponentInstance.toString());
-
-
-            resultOp = deepCopyComponentInstance(
-                    origComponent, containerComponentId, componentInstanceId, destComponentInstance, userId);
-
-            if (resultOp.isRight()) {
-                log.error("Failed to deep copy component instance");
-                return Either.right(componentsUtils.getResponseFormat(
-                        ActionStatus.USER_DEFINED, "Failed to deep copy the component instance to the canvas"));
-            }
+            ComponentInstance destComponentInstance = actionResponse;
+            log.debug("destComponentInstance's data is {}", destComponentInstance);
+            resultOp = deepCopyComponentInstance(origComponent, containerComponentId, componentInstanceId, destComponentInstance, userId);
             resultMap.put("componentInstance", destComponentInstance);
-            return Either.left(resultMap);
         } finally {
-
+            // unlock resource
             if (resultOp == null || resultOp.isRight()) {
-                titanDao.rollback();
-
+                unlockComponent(true, origComponent);
+                janusGraphDao.rollback();
+                log.error("Failed to deep copy component instance");
             } else {
-                titanDao.commit();
+                unlockComponent(false, origComponent);
+                janusGraphDao.commit();
                 log.debug("Success trasaction commit");
             }
-            // unlock resource
-            unlockComponent(resultOp, origComponent);
+        }
+        if (resultOp == null || resultOp.isRight()) {
+            return Either
+                .right(componentsUtils.getResponseFormat(ActionStatus.USER_DEFINED, "Failed to deep copy the component instance to the canvas"));
+        } else {
+            return Either.left(resultMap);
         }
     }
 
-    private Either<String, ResponseFormat> deepCopyComponentInstance(
-            Component sourceComponent, String containerComponentId, String sourceComponentInstanceId,
-            ComponentInstance destComponentInstance, String userId) {
-
+    private Either<String, ResponseFormat> deepCopyComponentInstance(Component sourceComponent, String containerComponentId,
+                                                                     String sourceComponentInstanceId, ComponentInstance destComponentInstance,
+                                                                     String userId) {
         Either<Component, StorageOperationStatus> getDestComponent = toscaOperationFacade.getToscaElement(containerComponentId);
         if (getDestComponent.isRight()) {
             log.error("Failed to get the dest component information");
-            return Either.right(componentsUtils.getResponseFormat(
-                    ActionStatus.USER_DEFINED, "Failed to copy the component instance to the canvas"));
+            return Either.right(componentsUtils.getResponseFormat(ActionStatus.USER_DEFINED, FAILED_TO_COPY_COMP_INSTANCE_TO_CANVAS));
         }
-
         Component destComponent = getDestComponent.left().value();
-
-        Either<String, ResponseFormat> copyComponentInstanceWithPropertiesAndInputs = copyComponentInstanceWithPropertiesAndInputs(
-                sourceComponent, destComponent, sourceComponentInstanceId, destComponentInstance, userId);
+        Either<String, ResponseFormat> copyComponentInstanceWithPropertiesAndInputs = copyComponentInstanceWithPropertiesAndInputs(sourceComponent,
+            destComponent, sourceComponentInstanceId, destComponentInstance);
         if (copyComponentInstanceWithPropertiesAndInputs.isRight()) {
             log.error("Failed to copy component instance with properties and inputs as part of deep copy");
-            return Either.right(componentsUtils.getResponseFormat(
-                    ActionStatus.USER_DEFINED, "Failed to copy the component instance with properties and inputs as part of deep copy"));
+            return Either.right(componentsUtils.getResponseFormat(ActionStatus.USER_DEFINED,
+                "Failed to copy the component instance with properties and inputs as part of deep copy"));
         }
-
-        Either<String, ResponseFormat> copyComponentInstanceWithAttributes = copyComponentInstanceWithAttributes(
-                sourceComponent, destComponent, sourceComponentInstanceId, destComponentInstance, userId);
+        Either<String, ResponseFormat> copyComponentInstanceWithAttributes = copyComponentInstanceWithAttributes(sourceComponent, destComponent,
+            sourceComponentInstanceId, destComponentInstance, userId);
         if (copyComponentInstanceWithAttributes.isRight()) {
             log.error("Failed to copy component instance with attributes as part of deep copy");
-            return Either.right(componentsUtils.getResponseFormat(
-                    ActionStatus.USER_DEFINED, "Failed to copy the component instance with attributes as part of deep copy"));
+            return Either.right(componentsUtils
+                .getResponseFormat(ActionStatus.USER_DEFINED, "Failed to copy the component instance with attributes as part of deep copy"));
         }
         return Either.left(COPY_COMPONENT_INSTANCE_OK);
     }
 
-    private Either<String, ResponseFormat> copyComponentInstanceWithPropertiesAndInputs(
-            Component sourceComponent, Component destComponent, String sourceComponentInstanceId,
-            ComponentInstance destComponentInstance, String userId) {
+    private Either<String, ResponseFormat> copyComponentInstanceWithPropertiesAndInputs(Component sourceComponent, Component destComponent,
+                                                                                        String sourceComponentInstanceId,
+                                                                                        ComponentInstance destComponentInstance) {
         log.debug("start to copy ComponentInstance with properties and inputs");
-
         List<ComponentInstanceProperty> sourcePropList = null;
         if (sourceComponent.getComponentInstancesProperties() != null
-                && sourceComponent.getComponentInstancesProperties().get(sourceComponentInstanceId) != null) {
+            && sourceComponent.getComponentInstancesProperties().get(sourceComponentInstanceId) != null) {
             sourcePropList = sourceComponent.getComponentInstancesProperties().get(sourceComponentInstanceId);
             log.debug("sourcePropList");
         }
-
         List<ComponentInstanceProperty> destPropList = null;
         String destComponentInstanceId = destComponentInstance.getUniqueId();
         log.debug("destComponentInstanceId: {}", destComponentInstance.getUniqueId());
         if (destComponent.getComponentInstancesProperties() != null
-                && destComponent.getComponentInstancesProperties().get(destComponentInstanceId) != null) {
+            && destComponent.getComponentInstancesProperties().get(destComponentInstanceId) != null) {
             destPropList = destComponent.getComponentInstancesProperties().get(destComponentInstanceId);
             log.debug("destPropList {}");
         }
-
         List<ComponentInstancePropInput> componentInstancePropInputList = new ArrayList<>();
-
         if (null != destPropList && null != sourcePropList) {
             log.debug("start to set property and attribute");
             for (ComponentInstanceProperty destProp : destPropList) {
@@ -2816,32 +3705,29 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
                         continue;
                     }
                     log.debug("now set property");
-                    if (sourceProp.getGetInputValues() == null && !StringUtils.isEmpty(sourceProp.getValue())
-                            && (destProp.getValue() == null || !destProp.getValue().equals(sourceProp.getValue()))) {
+                    final List<GetInputValueDataDefinition> getInputValues = sourceProp.getGetInputValues();
+                    if (getInputValues == null && !StringUtils.isEmpty(sourceProp.getValue()) && (destProp.getValue() == null || !destProp.getValue()
+                        .equals(sourceProp.getValue()))) {
                         log.debug("Now starting to copy the property {} in value {}", destPropertyName, sourceProp.getValue());
-
                         destProp.setValue(sourceProp.getValue());
-                        Either<String, ResponseFormat> updatePropertyValueEither = updateComponentInstanceProperty(
-                                destComponent.getUniqueId(), destComponentInstanceId, destProp);
+                        Either<String, ResponseFormat> updatePropertyValueEither = updateComponentInstanceProperty(destComponent.getUniqueId(),
+                            destComponentInstanceId, destProp);
                         if (updatePropertyValueEither.isRight()) {
                             log.error("Failed to copy the property {}", destPropertyName);
-                            return Either.right(componentsUtils.getResponseFormat(
-                                    ActionStatus.INVALID_CONTENT_PARAM, "Failed to paste component instance to the canvas, property copy"));
+                            return Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT_PARAM,
+                                "Failed to paste component instance to the canvas, property copy"));
                         }
                         break;
                     }
-
                     log.debug("Now start to update inputs");
-
-                    if (sourceProp.getGetInputValues() != null) {
-                        if (sourceProp.getGetInputValues().isEmpty()) {
-                            log.debug("source property input values empty");
+                    if (getInputValues != null) {
+                        if (getInputValues.isEmpty()) {
+                            log.debug("property is return from input, set by man");
                             break;
                         }
                         log.debug("Now starting to copy the {} property", destPropertyName);
-
-                        Either<String, ResponseFormat> getSourceInputDefaultValue = getInputListDefaultValue(
-                                sourceComponent, sourceProp.getGetInputValues().get(0).getInputId());
+                        Either<String, ResponseFormat> getSourceInputDefaultValue = getInputListDefaultValue(sourceComponent,
+                            getInputValues.get(0).getInputId());
                         if (getSourceInputDefaultValue.isRight()) {
                             return Either.right(getSourceInputDefaultValue.right().value());
                         }
@@ -2853,125 +3739,94 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         return Either.left(COPY_COMPONENT_INSTANCE_OK);
     }
 
-    private Either<String, ResponseFormat> copyComponentInstanceWithAttributes(Component sourceComponent,
-                                                                               Component destComponent,
+    private Either<String, ResponseFormat> copyComponentInstanceWithAttributes(Component sourceComponent, Component destComponent,
                                                                                String sourceComponentInstanceId,
-                                                                               ComponentInstance destComponentInstance,
-                                                                               String userId) {
+                                                                               ComponentInstance destComponentInstance, String userId) {
         String destComponentInstanceId = destComponentInstance.getUniqueId();
-
         log.info("start to copy component instance with attributes");
-
-        List<ComponentInstanceProperty> sourceAttributeList = null;
+        List<ComponentInstanceAttribute> sourceAttributeList = null;
         if (sourceComponent.getComponentInstancesAttributes() != null
-                && sourceComponent.getComponentInstancesAttributes().get(sourceComponentInstanceId) != null) {
+            && sourceComponent.getComponentInstancesAttributes().get(sourceComponentInstanceId) != null) {
             sourceAttributeList = sourceComponent.getComponentInstancesAttributes().get(sourceComponentInstanceId);
             log.info("sourceAttributes {}");
         }
-
-        List<ComponentInstanceProperty> destAttributeList = null;
+        List<ComponentInstanceAttribute> destAttributeList = null;
         if (destComponent.getComponentInstancesAttributes() != null
-                && destComponent.getComponentInstancesAttributes().get(destComponentInstanceId) != null) {
+            && destComponent.getComponentInstancesAttributes().get(destComponentInstanceId) != null) {
             destAttributeList = destComponent.getComponentInstancesAttributes().get(destComponentInstanceId);
             log.info("destAttributeList {}");
         }
         if (null != sourceAttributeList && null != destAttributeList) {
             log.info("set attribute");
-
-            for (ComponentInstanceProperty sourceAttribute : sourceAttributeList) {
+            for (ComponentInstanceAttribute sourceAttribute : sourceAttributeList) {
                 String sourceAttributeName = sourceAttribute.getName();
-                for (ComponentInstanceProperty destAttribute : destAttributeList) {
+                for (ComponentInstanceAttribute destAttribute : destAttributeList) {
                     if (sourceAttributeName.equals(destAttribute.getName())) {
-                        if (sourceAttribute.getValue() != null && !sourceAttribute.getValue().isEmpty()) {
-                            log.debug("Start to copy the attribute exists {}", sourceAttributeName);
-
-                            sourceAttribute.setUniqueId(
-                                    UniqueIdBuilder.buildResourceInstanceUniuqeId(
-                                            "attribute" , destComponentInstanceId.split("\\.")[1] , sourceAttributeName));
-
-                            Either<ComponentInstanceProperty, ResponseFormat> updateAttributeValueEither =
-                                    createOrUpdateAttributeValueForCopyPaste(ComponentTypeEnum.SERVICE,
-                                            destComponent.getUniqueId(), destComponentInstanceId, sourceAttribute,
-                                            userId);
-                            if (updateAttributeValueEither.isRight()) {
-                                log.error("Failed to copy the attribute");
-                                return Either.right(componentsUtils
-                                        .getResponseFormat(ActionStatus.INVALID_CONTENT_PARAM,
-                                                "Failed to paste component instance to the canvas, attribute copy"));
-                            }
-                            break;
+                        log.debug("Start to copy the attribute exists {}", sourceAttributeName);
+                        sourceAttribute.setUniqueId(
+                            UniqueIdBuilder.buildResourceInstanceUniqueId("attribute", destComponentInstanceId.split("\\.")[1], sourceAttributeName));
+                        Either<ComponentInstanceAttribute, ResponseFormat> updateAttributeValueEither = createOrUpdateAttributeValueForCopyPaste(
+                            ComponentTypeEnum.SERVICE, destComponent.getUniqueId(), destComponentInstanceId, sourceAttribute, userId);
+                        if (updateAttributeValueEither.isRight()) {
+                            log.error("Failed to copy the attribute");
+                            return Either.right(componentsUtils.getResponseFormat(ActionStatus.INVALID_CONTENT_PARAM,
+                                "Failed to paste component instance to the canvas, attribute copy"));
                         }
+                        break;
                     }
                 }
             }
         }
-
         return Either.left(COPY_COMPONENT_INSTANCE_OK);
     }
 
-    private Either<ComponentInstanceProperty, ResponseFormat> createOrUpdateAttributeValueForCopyPaste(ComponentTypeEnum componentTypeEnum,
-                                                                                                       String componentId,
-                                                                                                       String resourceInstanceId,
-                                                                                                       ComponentInstanceProperty attribute,
-                                                                                                       String userId) {
-
-        Either<ComponentInstanceProperty, ResponseFormat> resultOp = null;
-
-        validateUserExists(userId, "Create or Update attribute value", false);
-
+    private Either<ComponentInstanceAttribute, ResponseFormat> createOrUpdateAttributeValueForCopyPaste(ComponentTypeEnum componentTypeEnum,
+                                                                                                        String componentId, String resourceInstanceId,
+                                                                                                        ComponentInstanceAttribute attribute,
+                                                                                                        String userId) {
+        Either<ComponentInstanceAttribute, ResponseFormat> resultOp = null;
+        validateUserExists(userId);
         if (componentTypeEnum == null) {
-            BeEcompErrorManager.getInstance().logInvalidInputError(
-                    "createOrUpdateAttributeValue", INVALID_COMPONENT_TYPE, ErrorSeverity.INFO);
+            BeEcompErrorManager.getInstance()
+                .logInvalidInputError("createOrUpdateAttributeValueForCopyPaste", INVALID_COMPONENT_TYPE, ErrorSeverity.INFO);
             resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.NOT_ALLOWED));
             return resultOp;
         }
-
         Either<Component, StorageOperationStatus> getResourceResult = toscaOperationFacade.getToscaElement(componentId, JsonParseFlagEnum.ParseAll);
-
         if (getResourceResult.isRight()) {
             log.info("Failed to retrieve component id {}", componentId);
             resultOp = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
             return resultOp;
         }
-
         Component containerComponent = getResourceResult.left().value();
-
         Either<ComponentInstance, StorageOperationStatus> resourceInstanceStatus = getResourceInstanceById(containerComponent, resourceInstanceId);
-
         if (resourceInstanceStatus.isRight()) {
-            resultOp = Either.right(componentsUtils.getResponseFormat(
-                    ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, resourceInstanceId, componentId));
+            resultOp = Either
+                .right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_INSTANCE_NOT_FOUND_ON_SERVICE, resourceInstanceId, componentId));
             return resultOp;
         }
-
         ComponentInstance foundResourceInstance = resourceInstanceStatus.left().value();
-
-
         String propertyType = attribute.getType();
         ToscaPropertyType type = ToscaPropertyType.isValidType(propertyType);
         log.info("The type of attribute id{},is {} ", attribute.getUniqueId(), propertyType);
-
         if (type == ToscaPropertyType.LIST || type == ToscaPropertyType.MAP) {
             SchemaDefinition def = attribute.getSchema();
             if (def == null) {
                 log.info("Schema doesn't exists for attribute of type {}", type);
-                return Either.right(componentsUtils.getResponseFormat(
-                        componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE)));
+                return Either
+                    .right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE)));
             }
             PropertyDataDefinition propDef = def.getProperty();
             if (propDef == null) {
                 log.info("Attribute in Schema Definition inside attribute of type {} doesn't exist", type);
-                return Either.right(componentsUtils.getResponseFormat(
-                        componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE)));
+                return Either
+                    .right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE)));
             }
         }
-
-        List<ComponentInstanceProperty> instanceAttributes = containerComponent.
-                getComponentInstancesAttributes().get(resourceInstanceId);
-        Optional<ComponentInstanceProperty> instanceAttribute =
-                instanceAttributes.stream().filter(p -> p.getUniqueId().equals(attribute.getUniqueId())).findAny();
+        List<ComponentInstanceAttribute> instanceAttributes = containerComponent.getComponentInstancesAttributes().get(resourceInstanceId);
+        Optional<ComponentInstanceAttribute> instanceAttribute = instanceAttributes.stream()
+            .filter(p -> p.getUniqueId().equals(attribute.getUniqueId())).findAny();
         StorageOperationStatus status;
-
         if (instanceAttribute.isPresent()) {
             log.info("updateComponentInstanceAttribute");
             status = toscaOperationFacade.updateComponentInstanceAttribute(containerComponent, foundResourceInstance.getUniqueId(), attribute);
@@ -2987,57 +3842,41 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
         List<String> path = new ArrayList<>();
         path.add(foundResourceInstance.getUniqueId());
         attribute.setPath(path);
-
         foundResourceInstance.setCustomizationUUID(UUID.randomUUID().toString());
-        Either<Component, StorageOperationStatus> updateContainerRes = toscaOperationFacade.
-                updateComponentInstanceMetadataOfTopologyTemplate(containerComponent);
-
+        Either<Component, StorageOperationStatus> updateContainerRes = toscaOperationFacade
+            .updateComponentInstanceMetadataOfTopologyTemplate(containerComponent);
         if (updateContainerRes.isRight()) {
-            ActionStatus actionStatus = componentsUtils.
-                    convertFromStorageResponseForResourceInstanceProperty(updateContainerRes.right().value());
-            resultOp = Either.right(componentsUtils.
-                    getResponseFormatForResourceInstanceProperty(actionStatus, ""));
+            ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(updateContainerRes.right().value());
+            resultOp = Either.right(componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, ""));
             return resultOp;
         }
         resultOp = Either.left(attribute);
         return resultOp;
-
-
-
     }
 
-    private Either<String, ResponseFormat> updateComponentInstanceProperty(String containerComponentId,
-                                                                           String componentInstanceId,
+    private Either<String, ResponseFormat> updateComponentInstanceProperty(String containerComponentId, String componentInstanceId,
                                                                            ComponentInstanceProperty property) {
         Either<String, ResponseFormat> resultOp;
         Either<Component, StorageOperationStatus> getComponent = toscaOperationFacade.getToscaElement(containerComponentId);
-
         if (getComponent.isRight()) {
             log.error("Failed to get the component information");
-            return Either.right(componentsUtils.getResponseFormatForResourceInstanceProperty(
-                    ActionStatus.INVALID_CONTENT_PARAM, "Failed to get the component information"));
+            return Either.right(componentsUtils
+                .getResponseFormatForResourceInstanceProperty(ActionStatus.INVALID_CONTENT_PARAM, "Failed to get the component information"));
         }
-
         Component containerComponent = getComponent.left().value();
-
-        StorageOperationStatus status = toscaOperationFacade.updateComponentInstanceProperty(
-                containerComponent, componentInstanceId, property);
+        StorageOperationStatus status = toscaOperationFacade.updateComponentInstanceProperty(containerComponent, componentInstanceId, property);
         if (status != StorageOperationStatus.OK) {
             ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(status);
             resultOp = Either.right(componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, ""));
             return resultOp;
         }
-
-        Either<Component, StorageOperationStatus> updateContainerRes = toscaOperationFacade.
-                updateComponentInstanceMetadataOfTopologyTemplate(containerComponent);
-
+        Either<Component, StorageOperationStatus> updateContainerRes = toscaOperationFacade
+            .updateComponentInstanceMetadataOfTopologyTemplate(containerComponent);
         if (updateContainerRes.isRight()) {
-            ActionStatus actionStatus = componentsUtils.
-                    convertFromStorageResponseForResourceInstanceProperty(updateContainerRes.right().value());
+            ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(updateContainerRes.right().value());
             resultOp = Either.right(componentsUtils.getResponseFormatForResourceInstanceProperty(actionStatus, ""));
             return resultOp;
         }
-
         return Either.left("Update OK");
     }
 
@@ -3053,44 +3892,31 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
             }
         }
         log.error("The input's default value with id {} is not found", inputId);
-        return Either.right(componentsUtils.getResponseFormat(
-                ActionStatus.USER_DEFINED, "Failed to paste component instance to the canvas"));
+        return Either.right(componentsUtils.getResponseFormat(ActionStatus.USER_DEFINED, "Failed to paste component instance to the canvas"));
     }
 
     /**
      * Method to delete selected nodes and edges on composition page
+     *
      * @param containerComponentType
      * @param componentId
      * @param componentInstanceIdList
      * @param userId
      * @return
      */
-    public Map<String, List<String>> batchDeleteComponentInstance(String containerComponentType,
-                                                                  String componentId,
-                                                                  List<String> componentInstanceIdList,
-                                                                  String userId) {
-
+    public Map<String, List<String>> batchDeleteComponentInstance(String containerComponentType, String componentId,
+                                                                  List<String> componentInstanceIdList, String userId) {
         List<String> deleteErrorIds = new ArrayList<>();
         Map<String, List<String>> deleteErrorMap = new HashMap<>();
-        Either<Component, ResponseFormat> validateResponse = validateUser(containerComponentType, componentId, userId);
-        if (validateResponse.isRight()) {
-            deleteErrorMap.put("deleteFailedIds", componentInstanceIdList);
-            return deleteErrorMap;
-        }
-        Component containerComponent = validateResponse.left().value();
-
-        Either<Boolean, ResponseFormat> lockComponent = lockComponent(
-                containerComponent, "batchDeleteComponentInstance");
-        if (lockComponent.isRight()) {
-            log.error("Failed to lockComponent containerComponent");
-            deleteErrorMap.put("deleteFailedIds", componentInstanceIdList);
-            return deleteErrorMap;
-        }
-
+        validateUserExists(userId);
+        org.openecomp.sdc.be.model.Component containerComponent = validateComponentExists(componentId,
+            ComponentTypeEnum.findByParamName(containerComponentType), null);
+        boolean failed = false;
         try {
+            lockComponent(containerComponent, "batchDeleteComponentInstance");
             for (String eachInstanceId : componentInstanceIdList) {
-                Either<ComponentInstance, ResponseFormat> actionResponse = batchDeleteComponentInstance(
-                        containerComponent, containerComponentType, componentId, eachInstanceId);
+                Either<ComponentInstance, ResponseFormat> actionResponse = batchDeleteComponentInstance(containerComponent, containerComponentType,
+                    eachInstanceId);
                 log.debug("batchDeleteResourceInstances actionResponse is {}", actionResponse);
                 if (actionResponse.isRight()) {
                     log.error("Failed to delete ComponentInstance [{}]", eachInstanceId);
@@ -3100,53 +3926,65 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
             //sending the ids of the error nodes that were not deleted to UI
             deleteErrorMap.put("deleteFailedIds", deleteErrorIds);
             return deleteErrorMap;
+        } catch (ComponentException e) {
+            failed = true;
+            throw e;
         } finally {
-            unlockComponent(validateResponse, containerComponent);
+            unlockComponent(failed, containerComponent);
         }
     }
 
-    private Either<Component, ResponseFormat> validateUser(String containerComponentParam,
-                                                           String containerComponentId,
-                                                           String userId) {
-        validateUserExists(userId, "delete Component Instance", false);
-        Either<ComponentTypeEnum, ResponseFormat> validateComponentType = validateComponentType(containerComponentParam);
-        if (validateComponentType.isRight()) {
-            log.error("ComponentType[{}] doesn't support", containerComponentParam);
-            return Either.right(validateComponentType.right().value());
+    private Either<ComponentInstance, ResponseFormat> batchDeleteComponentInstance(Component containerComponent, String containerComponentType,
+                                                                                   String componentInstanceId) {
+        ComponentInstance resultOp;
+        final ComponentTypeEnum containerComponentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
+        try {
+            resultOp = deleteComponentInstance(containerComponent, componentInstanceId, containerComponentTypeEnum);
+            log.info("Successfully deleted instance with id {}", componentInstanceId);
+            return Either.left(resultOp);
+        } catch (ComponentException e) {
+            log.error("Failed to deleteComponentInstance with instanceId[{}]", componentInstanceId);
+            return Either.right(new ResponseFormat());
         }
+    }
 
-        final ComponentTypeEnum containerComponentType = validateComponentType.left().value();
-        Either<Component, ResponseFormat> validateComponentExists = validateComponentExists(
-                containerComponentId, containerComponentType, null);
-        if (validateComponentExists.isRight()) {
-            log.error("Component Id[{}] doesn't exist", containerComponentId);
-            return Either.right(validateComponentExists.right().value());
+    private void validatePropertyConstraintsNotChanged(List<ComponentInstanceProperty> newProperties, ComponentInstance originalResourceInstance) {
+        for (ComponentInstanceProperty newProperty : newProperties) {
+            Optional<PropertyDefinition> originalProperty = originalResourceInstance.getProperties().stream()
+                .filter(prop -> prop.getUniqueId().equals(newProperty.getUniqueId())).findAny();
+            if (originalProperty.isPresent()) {
+                List<PropertyConstraint> originalConstraints = originalProperty.get().getConstraints();
+                List<PropertyConstraint> newConstraints = newProperty.getConstraints();
+                if (!Objects.equals(originalConstraints, newConstraints)) {
+                    throw new ByActionStatusComponentException(ActionStatus.CANNOT_CHANGE_CONSTRAINTS);
+                }
+            } else {
+                throw new ByActionStatusComponentException(ActionStatus.PROPERTY_NOT_FOUND, newProperty.getUniqueId());
+            }
         }
+    }
 
-        Component containerComponent = validateComponentExists.left().value();
-        Either<Boolean, ResponseFormat> validateCanWorkOnComponent = validateCanWorkOnComponent(containerComponent, userId);
-        if (validateCanWorkOnComponent.isRight()) {
-            return Either.right(validateCanWorkOnComponent.right().value());
+    private Either<Boolean, ResponseFormat> validatePropertyValueConstraint(List<? extends PropertyDefinition> properties, final String componentId) {
+        try {
+            String propertyModel = propertyBusinessLogic.getComponentModelByComponentId(componentId);
+            PropertyValueConstraintValidationUtil propertyValueConstraintValidationUtil = new PropertyValueConstraintValidationUtil();
+            return propertyValueConstraintValidationUtil.validatePropertyConstraints(properties, applicationDataTypeCache, propertyModel);
+        } catch (BusinessLogicException e) {
+            return Either.right(e.getResponseFormat());
         }
-        return Either.left(containerComponent);
     }
 
-    private Either<ComponentInstance, ResponseFormat> batchDeleteComponentInstance(Component containerComponent,
-                                                                                   String containerComponentType,
-                                                                                   String containerComponentId,
-                                                                                   String componentInstanceId) {
-
-        Either<ComponentInstance, ResponseFormat> resultOp;
-        final ComponentTypeEnum containerComponentTypeEnum = ComponentTypeEnum.findByParamName(containerComponentType);
-
-        resultOp = deleteComponentInstance(containerComponent, componentInstanceId, containerComponentTypeEnum);
+    public void validateUser(final String userId) {
+        final User user = userValidations.validateUserExists(userId);
+        userValidations.validateUserRole(user, Arrays.asList(Role.DESIGNER, Role.ADMIN));
+    }
 
-        if (resultOp.isRight()) {
-            log.error("Failed to deleteComponentInstance with instanceId[{}]", componentInstanceId);
-            return Either.right(resultOp.right().value());
-        }
+    public void setCompositionBusinessLogic(CompositionBusinessLogic compositionBusinessLogic) {
+        this.compositionBusinessLogic = compositionBusinessLogic;
+    }
 
-        log.info("Successfully deleted instance with id {}", componentInstanceId);
-        return Either.left(resultOp.left().value());
+    public void setContainerInstanceTypesData(ContainerInstanceTypesData containerInstanceTypesData) {
+        this.containerInstanceTypesData = containerInstanceTypesData;
     }
+
 }