Increase junit TCs
[sdc.git] / catalog-be / src / test / java / org / openecomp / sdc / be / components / impl / ComponentInstanceBusinessLogicTest.java
index 360f125..1bbe0fa 100644 (file)
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.openecomp.sdc.be.components.impl;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import fj.data.Either;
-
-import java.util.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anySet;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
 
+import fj.data.Either;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import mockit.Deencapsulation;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.assertj.core.util.Lists;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.openecomp.sdc.be.components.impl.exceptions.ByActionStatusComponentException;
 import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.components.validation.UserValidations;
+import org.openecomp.sdc.be.config.ConfigurationManager;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.JsonParseFlagEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
-import org.openecomp.sdc.be.datatypes.elements.*;
+import org.openecomp.sdc.be.datatypes.elements.CapabilityDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ForwardingPathDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ForwardingPathElementDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.GetPolicyValueDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ListDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.RequirementDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.impl.ComponentsUtils;
 import org.openecomp.sdc.be.impl.ServletUtils;
-import org.openecomp.sdc.be.info.CreateAndAssotiateInfo;
-import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+import org.openecomp.sdc.be.model.CapabilityDefinition;
+import org.openecomp.sdc.be.model.CapabilityRequirementRelationship;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.ComponentInstanceInput;
+import org.openecomp.sdc.be.model.ComponentInstancePropInput;
+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.InputDefinition;
 import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.jsontitan.operations.ForwardingPathOperation;
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.PolicyDefinition;
+import org.openecomp.sdc.be.model.RelationshipImpl;
+import org.openecomp.sdc.be.model.RelationshipInfo;
+import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
+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.cache.ApplicationDataTypeCache;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ForwardingPathOperation;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.GraphLockOperation;
+import org.openecomp.sdc.be.model.operations.impl.PropertyOperation;
 import org.openecomp.sdc.be.user.UserBusinessLogic;
 import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum;
+import org.openecomp.sdc.common.api.ArtifactTypeEnum;
+import org.openecomp.sdc.common.api.ConfigurationSource;
+import org.openecomp.sdc.common.impl.ExternalConfiguration;
+import org.openecomp.sdc.common.impl.FSConfigurationSource;
 import org.openecomp.sdc.exception.ResponseFormat;
 
-import java.util.function.BiPredicate;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anySet;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.when;
-
-import static org.mockito.ArgumentMatchers.*;
-
 /**
  * The test suite designed for test functionality of ComponentInstanceBusinessLogic class
  */
@@ -81,7 +116,11 @@ public class ComponentInstanceBusinessLogicTest {
 
     private final static String USER_ID = "jh0003";
     private final static String COMPONENT_ID = "componentId";
+    private final static String ORIGIN_COMPONENT_ID = "originComponentId";
+    private final static String COMPONENT_INST_ID = "componentInstId";
     private final static String TO_INSTANCE_ID = "toInstanceId";
+    private final static String TO_INSTANCE_NAME = "toInstanceName";
+    private final static String COMPONENT_INSTANCE_ID = "componentInstanceId";
     private final static String FROM_INSTANCE_ID = "fromInstanceId";
     private final static String RELATION_ID = "relationId";
     private final static String CAPABILITY_OWNER_ID = "capabilityOwnerId";
@@ -96,10 +135,21 @@ public class ComponentInstanceBusinessLogicTest {
     private final static String ARTIFACT_3 = "cloudtech_aws_configtemplate.zip";
     private final static String ARTIFACT_4 = "k8s_charts.zip";
     private final static String ARTIFACT_5 = "cloudtech_openstack_configtemplate.zip";
+    private final static String PROP_NAME = "propName";
+    private final static String NON_EXIST_NAME = "nonExistName";
+
+    static ConfigurationSource configurationSource = new FSConfigurationSource(
+        ExternalConfiguration.getChangeListener(),
+        "src/test/resources/config/catalog-be");
+    static ConfigurationManager configurationManager = new ConfigurationManager(configurationSource);
 
     @InjectMocks
     private static ComponentInstanceBusinessLogic componentInstanceBusinessLogic;
     @Mock
+    private ComponentInstancePropInput componentInstancePropInput;
+    @Mock
+    ArtifactsBusinessLogic artifactsBusinessLogic;
+    @Mock
     private ComponentsUtils componentsUtils;
     @Mock
     private ServletUtils servletUtils;
@@ -116,11 +166,15 @@ public class ComponentInstanceBusinessLogicTest {
     @Mock
     private UserValidations userValidations;
     @Mock
-    private TitanDao titanDao;
+    GraphLockOperation graphLockOperation;
+    @Mock
+    private JanusGraphDao janusGraphDao;
+    @Mock
+    ApplicationDataTypeCache dataTypeCache;
     @Mock
-    private ArtifactsBusinessLogic artifactBusinessLogic;
+    PropertyOperation propertyOperation;
     @Mock
-    private GraphLockOperation graphLockOperation;
+    ApplicationDataTypeCache applicationDataTypeCache;
 
     private Component service;
     private Component resource;
@@ -130,33 +184,33 @@ public class ComponentInstanceBusinessLogicTest {
     private RequirementDataDefinition requirement;
     private RequirementCapabilityRelDef relation;
 
-
     @Before
-    public void init(){
+    public void init() {
+        MockitoAnnotations.initMocks(componentInstanceBusinessLogic);
         stubMethods();
         createComponents();
     }
 
     @Test
-    public void testGetRelationByIdSuccess(){
+    public void testGetRelationByIdSuccess() {
         getServiceRelationByIdSuccess(service);
         getServiceRelationByIdSuccess(resource);
     }
 
     @Test
-    public void testGetRelationByIdUserValidationFailure(){
+    public void testGetRelationByIdUserValidationFailure() {
         getServiceRelationByIdUserValidationFailure(service);
         getServiceRelationByIdUserValidationFailure(resource);
     }
 
     @Test
-    public void testGetRelationByIdComponentNotFoundFailure(){
+    public void testGetRelationByIdComponentNotFoundFailure() {
         getRelationByIdComponentNotFoundFailure(service);
         getRelationByIdComponentNotFoundFailure(resource);
     }
 
     @Test
-    public void testForwardingPathOnVersionChange(){
+    public void testForwardingPathOnVersionChange() {
         getforwardingPathOnVersionChange();
     }
 
@@ -169,90 +223,393 @@ public class ComponentInstanceBusinessLogicTest {
         assertFalse(componentInstanceBusinessLogic.isCloudSpecificArtifact(ARTIFACT_5));
     }
 
-    private void getforwardingPathOnVersionChange(){
-        String containerComponentParam="services";
-        String containerComponentID="121-cont";
-        String componentInstanceID="121-cont-1-comp";
-        Service component=new Service();
+    private void getforwardingPathOnVersionChange() {
+        String containerComponentParam = "services";
+        String containerComponentID = "121-cont";
+        String componentInstanceID = "121-cont-1-comp";
+        Service component = new Service();
         Map<String, ForwardingPathDataDefinition> forwardingPaths = generateForwardingPath(componentInstanceID);
 
         //Add existing componentInstance to component
-        List<ComponentInstance> componentInstanceList=new ArrayList<>();
-        ComponentInstance oldComponentInstance=new ComponentInstance();
+        List<ComponentInstance> componentInstanceList = new ArrayList<>();
+        ComponentInstance oldComponentInstance = new ComponentInstance();
         oldComponentInstance.setName("OLD_COMP_INSTANCE");
         oldComponentInstance.setUniqueId(componentInstanceID);
         oldComponentInstance.setName(componentInstanceID);
-        oldComponentInstance.setToscaPresentationValue(JsonPresentationFields.CI_COMPONENT_UID,"1-comp");
+        oldComponentInstance.setToscaPresentationValue(JsonPresentationFields.CI_COMPONENT_UID, "1-comp");
         componentInstanceList.add(oldComponentInstance);
         component.setComponentInstances(componentInstanceList);
         component.setForwardingPaths(forwardingPaths);
 
-        List<ComponentInstance> componentInstanceListNew=new ArrayList<>();
-        ComponentInstance newComponentInstance=new ComponentInstance();
-        String new_Comp_UID="2-comp";
-        newComponentInstance.setToscaPresentationValue(JsonPresentationFields.CI_COMPONENT_UID,new_Comp_UID);
+        List<ComponentInstance> componentInstanceListNew = new ArrayList<>();
+        ComponentInstance newComponentInstance = new ComponentInstance();
+        String new_Comp_UID = "2-comp";
+        newComponentInstance.setToscaPresentationValue(JsonPresentationFields.CI_COMPONENT_UID, new_Comp_UID);
         newComponentInstance.setUniqueId(new_Comp_UID);
         componentInstanceListNew.add(newComponentInstance);
-        Component component2=new Service();
+        Component component2 = new Service();
         component2.setComponentInstances(componentInstanceListNew);
 
         //Mock for getting component
-        when(toscaOperationFacade.getToscaElement(eq(containerComponentID),any(ComponentParametersView.class))).thenReturn(Either.left(component));
+        when(toscaOperationFacade.getToscaElement(eq(containerComponentID), any(ComponentParametersView.class)))
+            .thenReturn(Either.left(component));
         when(toscaOperationFacade.validateComponentExists(any(String.class))).thenReturn(Either.left(Boolean.TRUE));
         when(toscaOperationFacade.getToscaFullElement(eq(new_Comp_UID))).thenReturn(Either.left(component2));
 
-        Either<Set<String>, ResponseFormat> resultOp = componentInstanceBusinessLogic.forwardingPathOnVersionChange
-                (containerComponentParam,containerComponentID,componentInstanceID,newComponentInstance);
-        assertEquals(1,resultOp.left().value().size());
-        assertEquals("FP-ID-1",resultOp.left().value().iterator().next());
+        Either<Set<String>, ResponseFormat> resultOp = componentInstanceBusinessLogic
+            .forwardingPathOnVersionChange(containerComponentParam,
+                containerComponentID, componentInstanceID,
+                newComponentInstance);
+        assertEquals(1, resultOp.left().value().size());
+        assertEquals("FP-ID-1", resultOp.left().value().iterator().next());
 
     }
 
+    @Test
+    public void testCreateOrUpdatePropertiesValues2() {
+        String containerComponentID = "containerId";
+        String resourceInstanceId = "resourceId";
+        String componentInstanceID = "componentInstance";
+        List<ComponentInstanceProperty> properties = new ArrayList<>();
+        ComponentInstanceProperty property = new ComponentInstanceProperty();
+        property.setName("property");
+        property.setValue("newVal");
+        property.setType("string");
+        properties.add(property);
+
+        List<ComponentInstanceProperty> origProperties = new ArrayList<>();
+        ComponentInstanceProperty origProperty = new ComponentInstanceProperty();
+        origProperty.setName("property");
+        origProperty.setValue("value");
+        origProperty.setType("string");
+        origProperties.add(origProperty);
+
+        Map<String, DataTypeDefinition> types = new HashMap<>();
+        DataTypeDefinition dataTypeDef = new DataTypeDefinition();
+        types.put("string", dataTypeDef);
+
+        Component component = new Service();
+        component.setLastUpdaterUserId("userId");
+        component.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
+        Map<String, List<ComponentInstanceProperty>> componentInstanceProps = new HashMap<>();
+        componentInstanceProps.put("resourceId", origProperties);
+        component.setComponentInstancesProperties(componentInstanceProps);
+        ComponentInstance ci = createComponentInstance("ci1");
+        ci.setUniqueId("resourceId");
+        component.setComponentInstances(Arrays.asList(ci, createComponentInstance("ci2"),
+            createComponentInstance(componentInstanceID)));
+        HashMap<String, DataTypeDefinition> dataTypeDefinitionHashMap = new HashMap<>();
+        DataTypeDefinition dataTypeDefinition = new DataTypeDefinition();
+        dataTypeDefinition.setName("string");
+        dataTypeDefinitionHashMap.put("string", dataTypeDefinition);
+
+        //when(userValidations.validateUserExists(user.getUserId(), false)).thenReturn(user);
+        when(toscaOperationFacade.getToscaElement(containerComponentID, JsonParseFlagEnum.ParseAll))
+            .thenReturn(Either.left(component));
+        when(graphLockOperation.lockComponent(containerComponentID, NodeTypeEnum.ResourceInstance))
+            .thenReturn(StorageOperationStatus.OK);
+        when(dataTypeCache.getAll()).thenReturn(Either.left(types));
+        when(propertyOperation.validateAndUpdatePropertyValue(property.getType(), "newVal", true, null, types))
+            .thenReturn(Either.left("newVal"));
+        when(propertyOperation.validateAndUpdateRules("string", property.getRules(),
+            null, types, true)).thenReturn(ImmutablePair.of("string", null));
+        when(toscaOperationFacade.updateComponentInstanceProperty(component, ci.getUniqueId(),
+            origProperty)).thenReturn(StorageOperationStatus.OK);
+        origProperties.get(0).setValue("newVal");
+        when(toscaOperationFacade.updateComponentInstanceMetadataOfTopologyTemplate(component))
+            .thenReturn(Either.left(component));
+        when(janusGraphDao.commit()).thenReturn(JanusGraphOperationStatus.OK);
+        when(graphLockOperation.unlockComponent(containerComponentID, NodeTypeEnum.ResourceInstance))
+            .thenReturn(StorageOperationStatus.OK);
+
+        Either<List<ComponentInstanceProperty>, ResponseFormat> responseFormatEither = componentInstanceBusinessLogic
+            .createOrUpdatePropertiesValues(
+                ComponentTypeEnum.RESOURCE_INSTANCE, containerComponentID, resourceInstanceId, properties, "userId");
+        assertThat(responseFormatEither.left().value()).isEqualTo(properties);
+    }
 
     @Test
-    public void testDeleteForwardingPathsWhenComponentinstanceDeleted(){
+    public void testCreateOrUpdatePropertiesValuesPropertyNotExists() {
+        String containerComponentID = "containerId";
+        String resourceInstanceId = "resourceId";
+        String componentInstanceID = "componentInstance";
+        List<ComponentInstanceProperty> properties = new ArrayList<>();
+        ComponentInstanceProperty property = new ComponentInstanceProperty();
+        property.setName("property");
+        property.setValue("newVal");
+        property.setType("string");
+        properties.add(property);
+
+        List<ComponentInstanceProperty> origProperties = new ArrayList<>();
+
+        Map<String, DataTypeDefinition> types = new HashMap<>();
+        DataTypeDefinition dataTypeDef = new DataTypeDefinition();
+        types.put("string", dataTypeDef);
+
+        Component component = new Service();
+        component.setLastUpdaterUserId("userId");
+        component.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
+        Map<String, List<ComponentInstanceProperty>> componentInstanceProps = new HashMap<>();
+        componentInstanceProps.put("resourceId", origProperties);
+        component.setComponentInstancesProperties(componentInstanceProps);
+        ComponentInstance ci = createComponentInstance("ci1");
+        ci.setUniqueId("resourceId");
+        component.setComponentInstances(Arrays.asList(ci, createComponentInstance("ci2"),
+            createComponentInstance(componentInstanceID)));
+        HashMap<String, DataTypeDefinition> dataTypeDefinitionHashMap = new HashMap<>();
+        DataTypeDefinition dataTypeDefinition = new DataTypeDefinition();
+        dataTypeDefinition.setName("string");
+        dataTypeDefinitionHashMap.put("string", dataTypeDefinition);
+
+        //when(userValidations.validateUserExists(user.getUserId(), false)).thenReturn(user);
+        when(toscaOperationFacade.getToscaElement(containerComponentID, JsonParseFlagEnum.ParseAll))
+            .thenReturn(Either.left(component));
+        when(graphLockOperation.lockComponent(containerComponentID, NodeTypeEnum.ResourceInstance))
+            .thenReturn(StorageOperationStatus.OK);
+        //when(dataTypeCache.getAll()).thenReturn(Either.left(types));
+        //when (janusGraphDao.commit()).thenReturn(JanusGraphOperationStatus.OK);
+        when(graphLockOperation.unlockComponent(containerComponentID, NodeTypeEnum.ResourceInstance))
+            .thenReturn(StorageOperationStatus.OK);
+
+        try {
+            componentInstanceBusinessLogic.createOrUpdatePropertiesValues(
+                ComponentTypeEnum.RESOURCE_INSTANCE, containerComponentID, resourceInstanceId, properties, "userId");
+        } catch (ComponentException e) {
+            assertThat(e.getActionStatus()).isEqualTo(ActionStatus.PROPERTY_NOT_FOUND);
+        }
+
+    }
+
+    @Test
+    public void testCreateOrUpdatePropertiesValuesValidationFailure() {
+        String containerComponentID = "containerId";
+        String resourceInstanceId = "resourceId";
+        String componentInstanceID = "componentInstance";
+        List<ComponentInstanceProperty> properties = new ArrayList<>();
+        ComponentInstanceProperty property = new ComponentInstanceProperty();
+        property.setName("property");
+        property.setValue("newVal");
+        property.setType("string");
+        properties.add(property);
+
+        List<ComponentInstanceProperty> origProperties = new ArrayList<>();
+        ComponentInstanceProperty origProperty = new ComponentInstanceProperty();
+        origProperty.setName("property");
+        origProperty.setValue("value");
+        origProperty.setType("string");
+        origProperties.add(origProperty);
+
+        Map<String, DataTypeDefinition> types = new HashMap<>();
+        DataTypeDefinition dataTypeDef = new DataTypeDefinition();
+        types.put("string", dataTypeDef);
+
+        Component component = new Service();
+        component.setLastUpdaterUserId("userId");
+        component.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
+        Map<String, List<ComponentInstanceProperty>> componentInstanceProps = new HashMap<>();
+        componentInstanceProps.put("resourceId", origProperties);
+        component.setComponentInstancesProperties(componentInstanceProps);
+        ComponentInstance ci = createComponentInstance("ci1");
+        ci.setUniqueId("resourceId");
+        component.setComponentInstances(Arrays.asList(ci, createComponentInstance("ci2"),
+            createComponentInstance(componentInstanceID)));
+        HashMap<String, DataTypeDefinition> dataTypeDefinitionHashMap = new HashMap<>();
+        DataTypeDefinition dataTypeDefinition = new DataTypeDefinition();
+        dataTypeDefinition.setName("string");
+        dataTypeDefinitionHashMap.put("string", dataTypeDefinition);
+
+        //when(userValidations.validateUserExists(user.getUserId(), false)).thenReturn(user);
+        when(toscaOperationFacade.getToscaElement(containerComponentID, JsonParseFlagEnum.ParseAll))
+            .thenReturn(Either.left(component));
+        when(graphLockOperation.lockComponent(containerComponentID, NodeTypeEnum.ResourceInstance))
+            .thenReturn(StorageOperationStatus.OK);
+        when(dataTypeCache.getAll()).thenReturn(Either.left(types));
+        when(propertyOperation.validateAndUpdatePropertyValue(property.getType(), "newVal", true, null, types))
+            .thenReturn(Either.right(false));
+        when(componentsUtils.convertFromStorageResponse(StorageOperationStatus.BAD_REQUEST))
+            .thenReturn(ActionStatus.INVALID_CONTENT);
+
+        try {
+            componentInstanceBusinessLogic.createOrUpdatePropertiesValues(
+                ComponentTypeEnum.RESOURCE_INSTANCE, containerComponentID, resourceInstanceId, properties, "userId");
+        } catch (ComponentException e) {
+            assertThat(e.getActionStatus()).isEqualTo(ActionStatus.INVALID_CONTENT);
+            return;
+        }
+        fail();
+    }
+
+    @Test
+    public void testCreateOrUpdatePropertiesValuesMissingFieldFailure() {
+        String containerComponentID = "containerId";
+        String resourceInstanceId = "resourceId";
+        String componentInstanceID = "componentInstance";
+        List<ComponentInstanceProperty> properties = new ArrayList<>();
+        ComponentInstanceProperty property = new ComponentInstanceProperty();
+        property.setValue("newVal");
+        property.setType("string");
+        properties.add(property);
+
+        List<ComponentInstanceProperty> origProperties = new ArrayList<>();
+        ComponentInstanceProperty origProperty = new ComponentInstanceProperty();
+        origProperty.setName("property");
+        origProperty.setValue("value");
+        origProperty.setType("string");
+        origProperties.add(origProperty);
+
+        Component component = new Service();
+        component.setLastUpdaterUserId("userId");
+        component.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
+        Map<String, List<ComponentInstanceProperty>> componentInstanceProps = new HashMap<>();
+        componentInstanceProps.put("resourceId", origProperties);
+        component.setComponentInstancesProperties(componentInstanceProps);
+        ComponentInstance ci = createComponentInstance("ci1");
+        ci.setUniqueId("resourceId");
+        component.setComponentInstances(Arrays.asList(ci, createComponentInstance("ci2"),
+            createComponentInstance(componentInstanceID)));
+
+        HashMap<String, DataTypeDefinition> dataTypeDefinitionHashMap = new HashMap<>();
+        DataTypeDefinition dataTypeDefinition = new DataTypeDefinition();
+        dataTypeDefinition.setName("string");
+        dataTypeDefinitionHashMap.put("string", dataTypeDefinition);
+
+        //when(userValidations.validateUserExists(user.getUserId(), false)).thenReturn(user);
+        when(toscaOperationFacade.getToscaElement(containerComponentID, JsonParseFlagEnum.ParseAll))
+            .thenReturn(Either.left(component));
+        when(graphLockOperation.lockComponent(containerComponentID, NodeTypeEnum.ResourceInstance))
+            .thenReturn(StorageOperationStatus.OK);
+
+        try {
+            componentInstanceBusinessLogic.createOrUpdatePropertiesValues(
+                ComponentTypeEnum.RESOURCE_INSTANCE, containerComponentID, resourceInstanceId, properties, "userId");
+        } catch (ComponentException e) {
+            assertThat(e.getActionStatus()).isEqualTo(ActionStatus.MISSING_PROPERTY_NAME);
+        }
+    }
+
+    @Test
+    public void testDeleteForwardingPathsWhenComponentinstanceDeleted() {
 
         ComponentTypeEnum containerComponentType = ComponentTypeEnum.findByParamName("services");
         String containerComponentID = "Service-comp";
         String componentInstanceID = "NodeA1";
         Service component = new Service();
-        component.setComponentInstances(Arrays.asList(createComponentIstance("NodeA2"),createComponentIstance("NodeB2"),
-                createComponentIstance(componentInstanceID)));
-
-        component.addForwardingPath(createPath("path1", componentInstanceID, "NodeB1",  "1"));
-        component.addForwardingPath(createPath("Path2", "NodeA2","NodeB2", "2"));
-        when(toscaOperationFacade.getToscaElement(eq(containerComponentID),any(ComponentParametersView.class))).thenReturn(Either.left(component));
+        component
+            .setComponentInstances(Arrays.asList(createComponentInstance("NodeA2"), createComponentInstance("NodeB2"),
+                createComponentInstance(componentInstanceID)));
+
+        component.addForwardingPath(createPath("path1", componentInstanceID, "NodeB1", "1"));
+        component.addForwardingPath(createPath("Path2", "NodeA2", "NodeB2", "2"));
+        when(toscaOperationFacade.getToscaElement(eq(containerComponentID), any(ComponentParametersView.class)))
+            .thenReturn(Either.left(component));
         when(toscaOperationFacade.getToscaElement(eq(containerComponentID))).thenReturn(Either.left(component));
-        when(forwardingPathOperation.deleteForwardingPath(any(Service.class), anySet())).thenReturn(Either.left(new HashSet<>()));
+        when(forwardingPathOperation.deleteForwardingPath(any(Service.class), anySet()))
+            .thenReturn(Either.left(new HashSet<>()));
         final ComponentInstance ci = new ComponentInstance();
         ci.setName(componentInstanceID);
-        Either<ComponentInstance, ResponseFormat> responseFormatEither = componentInstanceBusinessLogic.deleteForwardingPathsRelatedTobeDeletedComponentInstance(
-                containerComponentID, containerComponentType, Either.left(ci));
-        assertThat(responseFormatEither.isLeft()).isEqualTo(true);
+        ComponentInstance responseFormatEither = componentInstanceBusinessLogic
+            .deleteForwardingPathsRelatedTobeDeletedComponentInstance(
+                containerComponentID, containerComponentType, ci);
+        assertThat(!responseFormatEither.isEmpty()).isEqualTo(true);
 
     }
 
-    private ComponentInstance createComponentIstance(String path1) {
+    @Test
+    public void testAddComponentInstanceDeploymentArtifacts() {
+
+        Component containerComponent = new Service();
+        ComponentInstance componentInstance = new ComponentInstance();
+        componentInstance.setUniqueId(COMPONENT_INSTANCE_ID);
+        Component originComponent = fillOriginComponent(new Resource());
+
+        Map<String, ArtifactDefinition> artifacts = new HashMap<>();
+        ArtifactDefinition deploymentArtifact1 = getArtifact("deploymentArtifact1", ArtifactTypeEnum.HEAT.getType());
+        artifacts.put(deploymentArtifact1.getArtifactLabel(), deploymentArtifact1);
+        ArtifactDefinition deploymentArtifact2 = getArtifact("deploymentArtifact2",
+            ArtifactTypeEnum.HEAT_ENV.getType());
+        artifacts.put(deploymentArtifact2.getArtifactLabel(), deploymentArtifact2);
+        ArtifactDefinition deploymentArtifact3 = getArtifact("deploymentArtifact3",
+            ArtifactTypeEnum.HEAT_VOL.getType());
+        artifacts.put(deploymentArtifact3.getArtifactLabel(), deploymentArtifact3);
+        ArtifactDefinition heatEnvPlaceHolder = getArtifact("deploymentArtifact4", ArtifactTypeEnum.HEAT_ENV.getType());
+        ArtifactDefinition heatEnvPlaceHolder2 = getArtifact("deploymentArtifact5",
+            ArtifactTypeEnum.HEAT_ENV.getType());
+
+        Either<Map<String, ArtifactDefinition>, StorageOperationStatus> getResourceDeploymentArtifacts = Either
+            .left(artifacts);
+
+        Map<String, ArtifactDefinition> finalDeploymentArtifacts = new HashMap<>();
+        finalDeploymentArtifacts.put(deploymentArtifact1.getArtifactLabel(), deploymentArtifact1);
+        finalDeploymentArtifacts.put(deploymentArtifact3.getArtifactLabel(), deploymentArtifact3);
+        finalDeploymentArtifacts.put(heatEnvPlaceHolder.getArtifactLabel(), heatEnvPlaceHolder);
+        finalDeploymentArtifacts.put(heatEnvPlaceHolder2.getArtifactLabel(), heatEnvPlaceHolder2);
+
+        when(artifactsBusinessLogic.getArtifacts(componentInstance.getComponentUid(), NodeTypeEnum.Resource,
+            ArtifactGroupTypeEnum.DEPLOYMENT, null)).thenReturn(getResourceDeploymentArtifacts);
+        when(artifactsBusinessLogic.createHeatEnvPlaceHolder(new ArrayList<>(),
+            deploymentArtifact1, ArtifactsBusinessLogic.HEAT_ENV_NAME, componentInstance.getUniqueId(),
+            NodeTypeEnum.ResourceInstance, componentInstance.getName(), user, containerComponent,
+            null)).thenReturn(heatEnvPlaceHolder);
+        when(artifactsBusinessLogic.createHeatEnvPlaceHolder(new ArrayList<>(),
+            deploymentArtifact3, ArtifactsBusinessLogic.HEAT_ENV_NAME, componentInstance.getUniqueId(),
+            NodeTypeEnum.ResourceInstance, componentInstance.getName(), user, containerComponent,
+            null)).thenReturn(heatEnvPlaceHolder2);
+
+        when(toscaOperationFacade.addDeploymentArtifactsToInstance(containerComponent.getUniqueId(), componentInstance,
+            finalDeploymentArtifacts)).thenReturn(StorageOperationStatus.OK);
+        when(toscaOperationFacade
+            .addGroupInstancesToComponentInstance(containerComponent, componentInstance, null, new HashMap<>()))
+            .thenReturn(StorageOperationStatus.OK);
+        when(toscaOperationFacade
+            .addInformationalArtifactsToInstance(containerComponent.getUniqueId(), componentInstance, null))
+            .thenReturn(StorageOperationStatus.OK);
+
+        ActionStatus status = componentInstanceBusinessLogic.addComponentInstanceArtifacts(containerComponent,
+            componentInstance, originComponent, user, null);
+
+        assertThat(status).isEqualTo(ActionStatus.OK);
+
+    }
+
+    private Component fillOriginComponent(Resource originComponent) {
+        originComponent.setUniqueId("resourceId");
+        originComponent.setUniqueId(ORIGIN_COMPONENT_ID);
+        originComponent.setComponentInstances(Lists.newArrayList(toInstance, fromInstance));
+        originComponent.setComponentType(ComponentTypeEnum.RESOURCE);
+        originComponent.setState(LifecycleStateEnum.CERTIFIED);
+        return originComponent;
+    }
+
+    private ArtifactDefinition getArtifact(String artifactLabel, String artifactType) {
+        ArtifactDefinition artifactDefinition = new ArtifactDefinition();
+        artifactDefinition.setArtifactLabel(artifactLabel);
+        artifactDefinition.setArtifactGroupType(ArtifactGroupTypeEnum.DEPLOYMENT);
+        artifactDefinition.setEsId("esId" + artifactLabel);
+        artifactDefinition.setArtifactType(artifactType);
+        return artifactDefinition;
+    }
+
+    private ComponentInstance createComponentInstance(String path1) {
         ComponentInstance componentInstance = new ComponentInstance();
         componentInstance.setName(path1);
         return componentInstance;
     }
 
-    private ForwardingPathDataDefinition createPath(String pathName, String fromNode, String toNode , String uniqueId){
+    private ForwardingPathDataDefinition createPath(String pathName, String fromNode, String toNode, String uniqueId) {
         ForwardingPathDataDefinition forwardingPath = new ForwardingPathDataDefinition(pathName);
         forwardingPath.setProtocol("protocol");
         forwardingPath.setDestinationPortNumber("port");
         forwardingPath.setUniqueId(uniqueId);
-        ListDataDefinition<ForwardingPathElementDataDefinition> forwardingPathElementListDataDefinition = new ListDataDefinition<>();
-        forwardingPathElementListDataDefinition.add(new ForwardingPathElementDataDefinition(fromNode, toNode,
-                "nodeAcpType", "nodeBcpType", "nodeDcpName", "nodeBcpName"));
+        ListDataDefinition<ForwardingPathElementDataDefinition> forwardingPathElementListDataDefinition =
+            new ListDataDefinition<>();
+        forwardingPathElementListDataDefinition
+            .add(new ForwardingPathElementDataDefinition(fromNode, toNode, "nodeAcpType", "nodeBcpType",
+                "nodeDcpName", "nodeBcpName"));
         forwardingPath.setPathElements(forwardingPathElementListDataDefinition);
 
         return forwardingPath;
     }
 
-
-
     private Map<String, ForwardingPathDataDefinition> generateForwardingPath(String componentInstanceID) {
         ForwardingPathDataDefinition forwardingPath = new ForwardingPathDataDefinition("fpName");
         String protocol = "protocol";
@@ -260,11 +617,10 @@ public class ComponentInstanceBusinessLogicTest {
         forwardingPath.setDestinationPortNumber("DestinationPortNumber");
         forwardingPath.setUniqueId("FP-ID-1");
         ListDataDefinition<ForwardingPathElementDataDefinition> forwardingPathElementListDataDefinition =
-                new ListDataDefinition<>();
-        forwardingPathElementListDataDefinition.add(
-                new ForwardingPathElementDataDefinition(componentInstanceID, "nodeB", "nodeA_FORWARDER_CAPABILITY",
-                        "nodeBcpType" , "nodeDcpName",
-                        "nodeBcpName"));
+            new ListDataDefinition<>();
+        forwardingPathElementListDataDefinition
+            .add(new ForwardingPathElementDataDefinition(componentInstanceID, "nodeB", "nodeA_FORWARDER_CAPABILITY",
+                "nodeBcpType", "nodeDcpName", "nodeBcpName"));
         forwardingPath.setPathElements(forwardingPathElementListDataDefinition);
         Map<String, ForwardingPathDataDefinition> forwardingPaths = new HashMap<>();
         forwardingPaths.put("1122", forwardingPath);
@@ -272,33 +628,46 @@ public class ComponentInstanceBusinessLogicTest {
     }
 
     @SuppressWarnings("unchecked")
-    private void getServiceRelationByIdSuccess(Component component){
+    private void getServiceRelationByIdSuccess(Component component) {
         Either<Component, StorageOperationStatus> getComponentRes = Either.left(component);
-        when(toscaOperationFacade.getToscaElement(eq(COMPONENT_ID), any(ComponentParametersView.class))).thenReturn(getComponentRes);
-        Either<RequirementCapabilityRelDef, ResponseFormat> response = componentInstanceBusinessLogic.getRelationById(COMPONENT_ID, RELATION_ID, USER_ID, component.getComponentType());
+        when(toscaOperationFacade.getToscaElement(eq(COMPONENT_ID), any(ComponentParametersView.class)))
+            .thenReturn(getComponentRes);
+        Either<RequirementCapabilityRelDef, ResponseFormat> response = componentInstanceBusinessLogic
+            .getRelationById(COMPONENT_ID,
+                RELATION_ID, USER_ID,
+                component.getComponentType());
         assertTrue(response.isLeft());
     }
 
-    private void getServiceRelationByIdUserValidationFailure(Component component){
-        when(userValidations.validateUserExists(eq(USER_ID), eq("get relation by Id"), eq(false))).thenThrow(new ComponentException(ActionStatus.USER_NOT_FOUND));
-        try{
-            componentInstanceBusinessLogic.getRelationById(COMPONENT_ID, RELATION_ID, USER_ID, component.getComponentType());
-        } catch(ComponentException e){
+    private void getServiceRelationByIdUserValidationFailure(Component component) {
+        when(userValidations.validateUserExists(eq(USER_ID)))
+            .thenThrow(new ByActionStatusComponentException(ActionStatus.USER_NOT_FOUND));
+        try {
+            componentInstanceBusinessLogic
+                .getRelationById(COMPONENT_ID, RELATION_ID, USER_ID, component.getComponentType());
+        } catch (ByActionStatusComponentException e) {
             assertSame(e.getActionStatus(), ActionStatus.USER_NOT_FOUND);
         }
     }
 
-    private void getRelationByIdComponentNotFoundFailure(Component component){
+    private void getRelationByIdComponentNotFoundFailure(Component component) {
         Either<User, ActionStatus> eitherCreator = Either.left(user);
         Either<Component, StorageOperationStatus> getComponentRes = Either.right(StorageOperationStatus.NOT_FOUND);
-        when(toscaOperationFacade.getToscaElement(eq(COMPONENT_ID), any(ComponentParametersView.class))).thenReturn(getComponentRes);
+        when(toscaOperationFacade.getToscaElement(eq(COMPONENT_ID), any(ComponentParametersView.class)))
+            .thenReturn(getComponentRes);
 
-        Either<RequirementCapabilityRelDef, ResponseFormat> response = componentInstanceBusinessLogic.getRelationById(COMPONENT_ID, RELATION_ID, USER_ID, component.getComponentType());
+        Either<RequirementCapabilityRelDef, ResponseFormat> response = componentInstanceBusinessLogic
+            .getRelationById(COMPONENT_ID,
+                RELATION_ID, USER_ID,
+                component.getComponentType());
         assertTrue(response.isRight());
     }
 
     private void stubMethods() {
-        when(userValidations.validateUserExists(eq(USER_ID), eq("get relation by Id"), eq(false))).thenReturn(user);
+        when(userValidations.validateUserExists(eq(USER_ID))).thenReturn(user);
+        when(componentsUtils
+            .convertFromStorageResponse(eq(StorageOperationStatus.GENERAL_ERROR), any(ComponentTypeEnum.class)))
+            .thenReturn(ActionStatus.GENERAL_ERROR);
     }
 
     private void createComponents() {
@@ -312,29 +681,28 @@ public class ComponentInstanceBusinessLogicTest {
         resource = new Resource();
         resource.setUniqueId(COMPONENT_ID);
         resource.setComponentInstancesRelations(Lists.newArrayList(relation));
-        resource.setComponentInstances(Lists.newArrayList(toInstance,fromInstance));
+        resource.setComponentInstances(Lists.newArrayList(toInstance, fromInstance));
         resource.setCapabilities(toInstance.getCapabilities());
         resource.setRequirements(fromInstance.getRequirements());
         resource.setComponentType(ComponentTypeEnum.RESOURCE);
         resource.setState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
     }
 
-
     private void createService() {
         service = new Service();
         service.setUniqueId(COMPONENT_ID);
         service.setComponentInstancesRelations(Lists.newArrayList(relation));
-        service.setComponentInstances(Lists.newArrayList(toInstance,fromInstance));
+        service.setComponentInstances(Lists.newArrayList(toInstance, fromInstance));
         service.setCapabilities(toInstance.getCapabilities());
         service.setRequirements(fromInstance.getRequirements());
         service.setComponentType(ComponentTypeEnum.SERVICE);
         service.setState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
     }
 
-
     private void createInstances() {
         toInstance = new ComponentInstance();
         toInstance.setUniqueId(TO_INSTANCE_ID);
+        toInstance.setName(TO_INSTANCE_NAME);
 
         fromInstance = new ComponentInstance();
         fromInstance.setUniqueId(FROM_INSTANCE_ID);
@@ -345,7 +713,11 @@ public class ComponentInstanceBusinessLogicTest {
         capability.setName(CAPABILITY_NAME);
 
         Map<String, List<CapabilityDefinition>> capabilities = new HashMap<>();
-        capabilities.put(capability.getName(), Lists.newArrayList(new CapabilityDefinition(capability)));
+        final CapabilityDefinition capabilityDefinition = new CapabilityDefinition(capability);
+        final ArrayList<ComponentInstanceProperty> properties = new ArrayList<>();
+        properties.add(componentInstancePropInput);
+        capabilityDefinition.setProperties(properties);
+        capabilities.put(capability.getName(), Lists.newArrayList(capabilityDefinition));
 
         requirement = new RequirementDataDefinition();
         requirement.setOwnerId(REQUIREMENT_OWNER_ID);
@@ -353,7 +725,6 @@ public class ComponentInstanceBusinessLogicTest {
         requirement.setName(REQUIREMENT_NAME);
         requirement.setRelationship(RELATIONSHIP_TYPE);
 
-
         Map<String, List<RequirementDefinition>> requirements = new HashMap<>();
         requirements.put(requirement.getCapability(), Lists.newArrayList(new RequirementDefinition(requirement)));
 
@@ -361,7 +732,6 @@ public class ComponentInstanceBusinessLogicTest {
         fromInstance.setRequirements(requirements);
     }
 
-
     private void createRelation() {
 
         relation = new RequirementCapabilityRelDef();
@@ -380,7 +750,7 @@ public class ComponentInstanceBusinessLogicTest {
         relationInfo.setRequirementOwnerId(REQUIREMENT_OWNER_ID);
         relationInfo.setRequirementUid(REQUIREMENT_UID);
         relationInfo.setRequirement(REQUIREMENT_NAME);
-        RelationshipImpl relationshipImpl  = new RelationshipImpl();
+        RelationshipImpl relationshipImpl = new RelationshipImpl();
         relationshipImpl.setType(RELATIONSHIP_TYPE);
         relationInfo.setRelationships(relationshipImpl);
     }
@@ -389,12 +759,8 @@ public class ComponentInstanceBusinessLogicTest {
         return componentInstanceBusinessLogic;
     }
 
-
-
-
-
     @Test
-    public void testChangeServiceProxyVersion(){
+    public void testChangeServiceProxyVersion() {
         ComponentInstanceBusinessLogic componentInstanceBusinessLogic;
 
         Either<ComponentInstance, ResponseFormat> result;
@@ -402,44 +768,20 @@ public class ComponentInstanceBusinessLogicTest {
         // default test
         componentInstanceBusinessLogic = createTestSubject();
         result = componentInstanceBusinessLogic.changeServiceProxyVersion();
+        Assert.assertNotNull(result);
     }
 
-
-
-
-
-
-
     @Test
-    public void testCreateServiceProxy()  {
+    public void testCreateServiceProxy() {
         ComponentInstanceBusinessLogic testSubject;
         Either<ComponentInstance, ResponseFormat> result;
 
         // default test
         testSubject = createTestSubject();
         result = testSubject.createServiceProxy();
+        Assert.assertNotNull(result);
     }
 
-
-
-
-
-    @Test
-    public void testDeleteForwardingPathsRelatedTobeDeletedComponentInstance()  {
-        ComponentInstanceBusinessLogic testSubject;
-        String containerComponentId = "";
-        String componentInstanceId = "";
-        ComponentTypeEnum containerComponentType = ComponentTypeEnum.RESOURCE;
-        Either<ComponentInstance, ResponseFormat> resultOp = null;
-        Either<ComponentInstance, ResponseFormat> result;
-
-        // default test
-        testSubject = createTestSubject();
-        result = testSubject.deleteForwardingPathsRelatedTobeDeletedComponentInstance(containerComponentId,
-                containerComponentType, resultOp);
-    }
-
-
     @Test
     public void testDeleteServiceProxy() {
         ComponentInstanceBusinessLogic testSubject;
@@ -449,15 +791,11 @@ public class ComponentInstanceBusinessLogicTest {
         // default test
         testSubject = createTestSubject();
         result = testSubject.deleteServiceProxy();
+        Assert.assertNotNull(result);
     }
 
-
-
-
-
-
     @Test
-    public void testGetComponentInstanceInputsByInputId()  {
+    public void testGetComponentInstanceInputsByInputId() {
         ComponentInstanceBusinessLogic testSubject;
         Component component = new Service();
         String inputId = "";
@@ -466,12 +804,11 @@ public class ComponentInstanceBusinessLogicTest {
         // default test
         testSubject = createTestSubject();
         result = testSubject.getComponentInstanceInputsByInputId(component, inputId);
+        Assert.assertNotNull(result);
     }
 
-
-
     @Test
-    public void testGetComponentInstancePropertiesByInputId()  {
+    public void testGetComponentInstancePropertiesByInputId() {
         ComponentInstanceBusinessLogic testSubject;
         Component component = new Service();
         String inputId = "";
@@ -480,11 +817,11 @@ public class ComponentInstanceBusinessLogicTest {
         // default test
         testSubject = createTestSubject();
         result = testSubject.getComponentInstancePropertiesByInputId(component, inputId);
+        Assert.assertNotNull(result);
     }
 
-
     @Test
-    public void testGetRelationById()  {
+    public void testGetRelationById() {
         ComponentInstanceBusinessLogic testSubject;
         String componentId = "";
         String relationId = "";
@@ -495,238 +832,62 @@ public class ComponentInstanceBusinessLogicTest {
         // default test
         testSubject = createTestSubject();
         result = testSubject.getRelationById(componentId, relationId, userId, componentTypeEnum);
+        Assert.assertNotNull(result);
     }
 
-
-
-
-
-    @Test
-    public void testCreateComponentInstance_1()  {
-        ComponentInstanceBusinessLogic testSubject;String containerComponentParam = "";
-        String containerComponentId = "";
-        String userId = user.getUserId();
-        ComponentInstance resourceInstance = null;
-        boolean inTransaction = false;
-        boolean needLock = false;
-        Either<ComponentInstance,ResponseFormat> result;
-
-        // default test
-        testSubject=createTestSubject();result=testSubject.createComponentInstance(containerComponentParam, containerComponentId, userId, resourceInstance, inTransaction, needLock);
-    }
-
-
-
-
-
     @Test
-    public void testCreateAndAssociateRIToRI()  {
-        ComponentInstanceBusinessLogic testSubject;
-
-        String containerComponentParam = "";
-        String containerComponentId = "";
-        String userId = user.getUserId();
-        CreateAndAssotiateInfo createAndAssotiateInfo = new CreateAndAssotiateInfo(null, null);
-        Either<CreateAndAssotiateInfo,ResponseFormat> result;
-
-        // default test
-        testSubject=createTestSubject();
-        result=testSubject.createAndAssociateRIToRI(containerComponentParam, containerComponentId, userId, createAndAssotiateInfo);
-    }
-
-    @Test
-    public void testGetOriginComponentFromComponentInstance_1()  {
-        ComponentInstanceBusinessLogic testSubject;
-        createResource();
-        String componentInstanceName = "";
-        String origComponetId = resource.getUniqueId();
-        Either<Component, StorageOperationStatus> oldResourceRes = Either.left(resource);
-        when(toscaOperationFacade.getToscaFullElement(resource.getUniqueId())).thenReturn(oldResourceRes);
-        Either<Component,ResponseFormat> result;
-
-        // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "getOriginComponentFromComponentInstance", new Object[]{componentInstanceName, origComponetId});
-    }
-
-
-    @Test
-    public void testCreateComponentInstanceOnGraph()  {
-        ComponentInstanceBusinessLogic testSubject;
-        createResource();
-        createInstances();
-        Either<ComponentInstance,ResponseFormat> result;
-
-        Either<ImmutablePair<Component, String>, StorageOperationStatus> result2 = Either.right(StorageOperationStatus.ARTIFACT_NOT_FOUND);
-        when(toscaOperationFacade.addComponentInstanceToTopologyTemplate(resource, resource,toInstance, false, user)).thenReturn(result2);
-
-        // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "createComponentInstanceOnGraph", new Object[]{resource, resource, toInstance, user});
-    }
-
-    @Ignore("test failing skipping for now")
-    @Test
-    public void testCreateComponentInstanceOnGraph2()  {
-        ComponentInstanceBusinessLogic testSubject;
-        createResource();
-        resource.setName("name");
-        createInstances();
-        Either<ComponentInstance,ResponseFormat> result;
-        ImmutablePair<Component, String> pair =  new ImmutablePair<>(resource,"");
-
-
-
-
-        Either<ImmutablePair<Component, String>, StorageOperationStatus> result2 = Either.left(pair);
-        when(toscaOperationFacade.addComponentInstanceToTopologyTemplate(resource, resource,toInstance, false, user)).thenReturn(result2);
-
-        // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "createComponentInstanceOnGraph", new Object[]{resource, resource, toInstance, user});
-    }
-
-    @Test
-    public void testUpdateComponentInstanceMetadata()  {
-        ComponentInstanceBusinessLogic testSubject;
-        String containerComponentParam = "";
-        String containerComponentId = "";
-        String componentInstanceId = "";
-        String userId = user.getUserId();
-        createInstances();
-        Either<ComponentInstance,ResponseFormat> result;
-
-        // default test
-        testSubject=createTestSubject();
-        result=testSubject.updateComponentInstanceMetadata(containerComponentParam, containerComponentId, componentInstanceId, userId, toInstance);
-    }
-
-
-    @Test
-    public void testUpdateComponentInstanceMetadata_1()  {
-        ComponentInstanceBusinessLogic testSubject;
-        String containerComponentParam = "";
-        String containerComponentId = "";
-        String componentInstanceId = "";
-        String userId = user.getUserId();
-        createInstances();
-        boolean inTransaction = false;
-        boolean needLock = false;
-        boolean createNewTransaction = false;
-        Either<ComponentInstance,ResponseFormat> result;
-
-        // default test
-        testSubject=createTestSubject();
-        result=testSubject.updateComponentInstanceMetadata(containerComponentParam, containerComponentId, componentInstanceId, userId, toInstance, inTransaction, needLock, createNewTransaction);
-    }
-
-
-
-
-
-    @Test
-    public void testValidateParent()  {
+    public void testValidateParent() {
         ComponentInstanceBusinessLogic testSubject;
         createResource();
         String nodeTemplateId = "";
         boolean result;
 
         // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "validateParent", new Object[]{resource, nodeTemplateId});
+        testSubject = createTestSubject();
+        result = Deencapsulation.invoke(testSubject, "validateParent", new Object[]{resource, nodeTemplateId});
+        Assert.assertNotNull(result);
     }
 
-
     @Test
     public void testGetComponentType() {
         ComponentInstanceBusinessLogic testSubject;
         ComponentTypeEnum result;
 
         // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "getComponentType", new Object[]{ComponentTypeEnum.class});
+        testSubject = createTestSubject();
+        result = Deencapsulation.invoke(testSubject, "getComponentType", new Object[]{ComponentTypeEnum.class});
+        Assert.assertNotNull(result);
     }
 
-
-
     @Test
-    public void testGetNewGroupName()  {
-        ComponentInstanceBusinessLogic testSubject;String oldPrefix = "";
+    public void testGetNewGroupName() {
+        ComponentInstanceBusinessLogic testSubject;
+        String oldPrefix = "";
         String newNormailzedPrefix = "";
         String qualifiedGroupInstanceName = "";
         String result;
 
         // test 1
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "getNewGroupName", new Object[]{oldPrefix, newNormailzedPrefix, qualifiedGroupInstanceName});
+        testSubject = createTestSubject();
+        result = Deencapsulation.invoke(testSubject, "getNewGroupName",
+            new Object[]{oldPrefix, newNormailzedPrefix, qualifiedGroupInstanceName});
+        Assert.assertNotNull(result);
     }
 
-
     @Test
-    public void testUpdateComponentInstanceMetadata_3()  {
+    public void testUpdateComponentInstanceMetadata_3() {
         ComponentInstanceBusinessLogic testSubject;
         createInstances();
         ComponentInstance newComponentInstance = null;
         ComponentInstance result;
 
         // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "updateComponentInstanceMetadata", new Object[]{toInstance, toInstance});
-    }
-
-
-    @Test
-    public void testDeleteComponentInstance() {
-        ComponentInstanceBusinessLogic testSubject;String containerComponentParam = "";
-        String containerComponentId = "";
-        String componentInstanceId = "";
-        String userId = user.getUserId();
-        Either<ComponentInstance,ResponseFormat> result;
-
-        // default test
-        testSubject=createTestSubject();
-        result=testSubject.deleteComponentInstance(containerComponentParam, containerComponentId, componentInstanceId, userId);
-    }
-
-
-    @Test
-    public void testDeleteForwardingPaths()  {
-        ComponentInstanceBusinessLogic testSubject;
-        createService();
-        String serviceId = service.getUniqueId();
-        List<String> pathIdsToDelete = new ArrayList<>();
-        Either<Set<String>,ResponseFormat> result;
-
-        //     Either<Service, StorageOperationStatus> storageStatus = toscaOperationFacade.getToscaElement(serviceId);
-        when(toscaOperationFacade.getToscaElement(serviceId)).thenReturn(Either.right(StorageOperationStatus.BAD_REQUEST));
-
-        // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "deleteForwardingPaths", new Object[]{serviceId, pathIdsToDelete});
-    }
-
-
-    @Test
-    public void testAssociateRIToRIOnGraph() throws Exception {
-        ComponentInstanceBusinessLogic testSubject;
-        createResource();
-        RequirementCapabilityRelDef requirementDef = new RequirementCapabilityRelDef();
-        ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.RESOURCE;
-        boolean inTransaction = false;
-        Either<RequirementCapabilityRelDef,ResponseFormat> result;
-
-
-
-        Either<RequirementCapabilityRelDef, StorageOperationStatus> getResourceResult = Either.left(requirementDef);
-        when(toscaOperationFacade.associateResourceInstances(resource.getUniqueId(), requirementDef)).thenReturn(getResourceResult);
-
-        // default test
-        testSubject=createTestSubject();
-        result=testSubject.associateRIToRIOnGraph(resource, requirementDef, componentTypeEnum, inTransaction);
+        testSubject = createTestSubject();
+        result = Deencapsulation
+            .invoke(testSubject, "updateComponentInstanceMetadata", new Object[]{toInstance, toInstance});
+        Assert.assertNotNull(result);
     }
 
-
-
     @Test
     public void testFindRelation() throws Exception {
         ComponentInstanceBusinessLogic testSubject;
@@ -735,40 +896,11 @@ public class ComponentInstanceBusinessLogicTest {
         RequirementCapabilityRelDef result;
 
         // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "findRelation", new Object[]{relationId, requirementCapabilityRelations});
-    }
-
-
-    @Test
-    public void testIsNetworkRoleServiceProperty() throws Exception {
-        ComponentInstanceBusinessLogic testSubject;
-        ComponentInstanceProperty property = new ComponentInstanceProperty();
-        ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.RESOURCE;
-        boolean result;
-
-        // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "isNetworkRoleServiceProperty", new Object[]{property, componentTypeEnum});
-    }
-
-
-    @Test
-    public void testConcatServiceNameToVLINetworkRolePropertiesValues() throws Exception {
-        ComponentInstanceBusinessLogic testSubject;
-        ToscaOperationFacade toscaOperationFacade = new ToscaOperationFacade();
-        ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.RESOURCE;
-        String componentId = "";
-        String resourceInstanceId = "";
-        List<ComponentInstanceProperty> properties = new ArrayList<>();
-        StorageOperationStatus result;
-
-        // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "concatServiceNameToVLINetworkRolePropertiesValues", new Object[]{toscaOperationFacade, componentTypeEnum, componentId, resourceInstanceId, properties});
+        testSubject = createTestSubject();
+        result = Deencapsulation.invoke(testSubject, "findRelation",
+            new Object[]{relationId, requirementCapabilityRelations});
     }
 
-
     @Test
     public void testCreateOrUpdatePropertiesValues() throws Exception {
         ComponentInstanceBusinessLogic testSubject;
@@ -778,24 +910,30 @@ public class ComponentInstanceBusinessLogicTest {
         String resourceInstanceId = "";
         List<ComponentInstanceProperty> properties = new ArrayList<>();
         String userId = user.getUserId();
-        Either<List<ComponentInstanceProperty>,ResponseFormat> result;
+        Either<List<ComponentInstanceProperty>, ResponseFormat> result;
 
-
-        when(toscaOperationFacade.getToscaElement(componentId, JsonParseFlagEnum.ParseAll)).thenReturn(Either.left(resource));
+        when(toscaOperationFacade.getToscaElement(componentId, JsonParseFlagEnum.ParseAll))
+            .thenReturn(Either.left(resource));
 
         // test 1
-        testSubject=createTestSubject();
-        result=testSubject.createOrUpdatePropertiesValues(componentTypeEnum, componentId, resourceInstanceId, properties, userId);
-
-        componentTypeEnum =null;
-        result=testSubject.createOrUpdatePropertiesValues(componentTypeEnum, componentId, resourceInstanceId, properties, userId);
+        testSubject = createTestSubject();
+        result = testSubject
+            .createOrUpdatePropertiesValues(componentTypeEnum, componentId, resourceInstanceId, properties,
+                userId);
+        Assert.assertNotNull(result);
 
-//        when(toscaOperationFacade.getToscaElement(componentId, JsonParseFlagEnum.ParseAll)).thenReturn(Either.right(StorageOperationStatus.BAD_REQUEST));
-        result=testSubject.createOrUpdatePropertiesValues(componentTypeEnum, componentId, resourceInstanceId, properties, userId);
+        componentTypeEnum = null;
+        result = testSubject
+            .createOrUpdatePropertiesValues(componentTypeEnum, componentId, resourceInstanceId, properties,
+                userId);
+        Assert.assertNotNull(result);
 
+        result = testSubject
+            .createOrUpdatePropertiesValues(componentTypeEnum, componentId, resourceInstanceId, properties,
+                userId);
+        Assert.assertNotNull(result);
     }
 
-
     @Test
     public void testUpdateCapabilityPropertyOnContainerComponent() throws Exception {
         ComponentInstanceBusinessLogic testSubject;
@@ -808,12 +946,11 @@ public class ComponentInstanceBusinessLogicTest {
         ResponseFormat result;
 
         // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "updateCapabilityPropertyOnContainerComponent", new Object[]{property, newValue, resource, toInstance, capabilityType, capabilityName});
+        testSubject = createTestSubject();
+        result = Deencapsulation.invoke(testSubject, "updateCapabilityPropertyOnContainerComponent",
+            new Object[]{property, newValue, resource, toInstance, capabilityType, capabilityName});
     }
 
-
-
     @Test
     public void testCreateOrUpdateInstanceInputValues() throws Exception {
         ComponentInstanceBusinessLogic testSubject;
@@ -823,23 +960,29 @@ public class ComponentInstanceBusinessLogicTest {
         String resourceInstanceId = "";
         List<ComponentInstanceInput> inputs = new ArrayList<>();
         String userId = user.getUserId();
-        Either<List<ComponentInstanceInput>,ResponseFormat> result;
+        Either<List<ComponentInstanceInput>, ResponseFormat> result;
 
-        when(toscaOperationFacade.getToscaElement(componentId, JsonParseFlagEnum.ParseAll)).thenReturn(Either.left(resource));
+        when(toscaOperationFacade.getToscaElement(componentId, JsonParseFlagEnum.ParseAll))
+            .thenReturn(Either.left(resource));
 
         // test 1
-        testSubject=createTestSubject();
-        result=testSubject.createOrUpdateInstanceInputValues(componentTypeEnum, componentId, resourceInstanceId, inputs, userId);
-        componentTypeEnum =null;
-        result=testSubject.createOrUpdateInstanceInputValues(componentTypeEnum, componentId, resourceInstanceId, inputs, userId);
-
-
-//        when(toscaOperationFacade.getToscaElement(componentId, JsonParseFlagEnum.ParseAll)).thenReturn(Either.right(StorageOperationStatus.BAD_REQUEST));
-        result=testSubject.createOrUpdateInstanceInputValues(componentTypeEnum, componentId, resourceInstanceId, inputs, userId);
+        testSubject = createTestSubject();
+        result = testSubject
+            .createOrUpdateInstanceInputValues(componentTypeEnum, componentId, resourceInstanceId, inputs,
+                userId);
+        Assert.assertNotNull(result);
+        componentTypeEnum = null;
+        result = testSubject
+            .createOrUpdateInstanceInputValues(componentTypeEnum, componentId, resourceInstanceId, inputs,
+                userId);
+        Assert.assertNotNull(result);
 
+        result = testSubject
+            .createOrUpdateInstanceInputValues(componentTypeEnum, componentId, resourceInstanceId, inputs,
+                userId);
+        Assert.assertNotNull(result);
     }
 
-
     @Test
     public void testCreateOrUpdateGroupInstancePropertyValue() throws Exception {
         ComponentInstanceBusinessLogic testSubject;
@@ -850,49 +993,29 @@ public class ComponentInstanceBusinessLogicTest {
         String groupInstanceId = "";
         ComponentInstanceProperty property = new ComponentInstanceProperty();
         String userId = user.getUserId();
-        Either<ComponentInstanceProperty,ResponseFormat> result;
-
+        Either<ComponentInstanceProperty, ResponseFormat> result;
 
-        when(toscaOperationFacade.getToscaElement(componentId, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(resource));
+        when(toscaOperationFacade.getToscaElement(componentId, JsonParseFlagEnum.ParseMetadata))
+            .thenReturn(Either.left(resource));
 
         // test 1
-        testSubject=createTestSubject();
-        result=testSubject.createOrUpdateGroupInstancePropertyValue(componentTypeEnum, componentId, resourceInstanceId, groupInstanceId, property, userId);
-        componentTypeEnum = null;
-        result=testSubject.createOrUpdateGroupInstancePropertyValue(componentTypeEnum, componentId, resourceInstanceId, groupInstanceId, property, userId);
-
-//        when(toscaOperationFacade.getToscaElement(componentId, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.right(StorageOperationStatus.BAD_REQUEST));
-        result=testSubject.createOrUpdateGroupInstancePropertyValue(componentTypeEnum, componentId, resourceInstanceId, groupInstanceId, property, userId);
-    }
-
-
-    @Test
-    public void testCreateOrUpdateInputValue() throws Exception {
-        ComponentInstanceBusinessLogic testSubject;
-        createResource();
-        ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.RESOURCE;
-        String componentId = resource.getUniqueId();
-        String resourceInstanceId = resource.getUniqueId();
-        ComponentInstanceInput inputProperty = new ComponentInstanceInput();
-        String userId = user.getUserId();
-        Either<ComponentInstanceInput,ResponseFormat> result;
-
-
-        Either<Component, StorageOperationStatus> getResourceResult = Either.left(resource);
-        when(toscaOperationFacade.getToscaElement(resource.getUniqueId(), JsonParseFlagEnum.ParseMetadata)).thenReturn(getResourceResult);
-
-        // test 1
-        testSubject=createTestSubject();
-        result=testSubject.createOrUpdateInputValue(componentTypeEnum, componentId, resourceInstanceId, inputProperty, userId);
-
+        testSubject = createTestSubject();
+        result = testSubject
+            .createOrUpdateGroupInstancePropertyValue(componentTypeEnum, componentId, resourceInstanceId,
+                groupInstanceId, property, userId);
+        Assert.assertNotNull(result);
         componentTypeEnum = null;
-        result=testSubject.createOrUpdateInputValue(componentTypeEnum, componentId, resourceInstanceId, inputProperty, userId);
+        result = testSubject
+            .createOrUpdateGroupInstancePropertyValue(componentTypeEnum, componentId, resourceInstanceId,
+                groupInstanceId, property, userId);
+        Assert.assertNotNull(result);
 
-//        when(toscaOperationFacade.getToscaElement(resource.getUniqueId(), JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.right(StorageOperationStatus.BAD_REQUEST));
-        result=testSubject.createOrUpdateInputValue(componentTypeEnum, componentId, resourceInstanceId, inputProperty, userId);
+        result = testSubject
+            .createOrUpdateGroupInstancePropertyValue(componentTypeEnum, componentId, resourceInstanceId,
+                groupInstanceId, property, userId);
+        Assert.assertNotNull(result);
     }
 
-
     @Test
     public void testDeletePropertyValue() throws Exception {
         ComponentInstanceBusinessLogic testSubject;
@@ -902,195 +1025,50 @@ public class ComponentInstanceBusinessLogicTest {
         String resourceInstanceId = "";
         String propertyValueId = "";
         String userId = user.getUserId();
-        Either<ComponentInstanceProperty,ResponseFormat> result;
+        Either<ComponentInstanceProperty, ResponseFormat> result;
 
-        when(toscaOperationFacade.getToscaElement(serviceId, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.left(service));
+        when(toscaOperationFacade.getToscaElement(serviceId, JsonParseFlagEnum.ParseMetadata))
+            .thenReturn(Either.left(service));
 
         // test 1
-        testSubject=createTestSubject();
-        result=testSubject.deletePropertyValue(componentTypeEnum, serviceId, resourceInstanceId, propertyValueId, userId);
-        componentTypeEnum= null;
-        result=testSubject.deletePropertyValue(componentTypeEnum, serviceId, resourceInstanceId, propertyValueId, userId);
-
-//        when(toscaOperationFacade.getToscaElement(serviceId, JsonParseFlagEnum.ParseMetadata)).thenReturn(Either.right(StorageOperationStatus.BAD_REQUEST));
-        result=testSubject.deletePropertyValue(componentTypeEnum, serviceId, resourceInstanceId, propertyValueId, userId);
-    }
-
-
-    @Test
-    public void testGetAndValidateOriginComponentOfComponentInstance() throws Exception {
-        ComponentInstanceBusinessLogic testSubject;
-        ComponentTypeEnum containerComponentType = ComponentTypeEnum.RESOURCE;
-        createResource();
-        createInstances();
-        Either<Component,ResponseFormat> result;
-
-        when(toscaOperationFacade.getToscaFullElement(toInstance.getComponentUid())).thenReturn(Either.left(resource));
+        testSubject = createTestSubject();
+        result = testSubject.deletePropertyValue(componentTypeEnum, serviceId, resourceInstanceId, propertyValueId,
+            userId);
+        Assert.assertNotNull(result);
+        componentTypeEnum = null;
+        result = testSubject.deletePropertyValue(componentTypeEnum, serviceId, resourceInstanceId, propertyValueId,
+            userId);
+        Assert.assertNotNull(result);
 
-        // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "getAndValidateOriginComponentOfComponentInstance", new Object[]{containerComponentType, toInstance});
+        result = testSubject.deletePropertyValue(componentTypeEnum, serviceId, resourceInstanceId, propertyValueId,
+            userId);
+        Assert.assertNotNull(result);
     }
 
-
-
-
-
     @Test
     public void testGetComponentParametersViewForForwardingPath() throws Exception {
         ComponentInstanceBusinessLogic testSubject;
         ComponentParametersView result;
 
         // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "getComponentParametersViewForForwardingPath");
-    }
-
-
-    @Test
-    public void testChangeComponentInstanceVersion() throws Exception {
-        ComponentInstanceBusinessLogic testSubject;
-        String containerComponentParam = "";
-        String containerComponentId = "";
-        String componentInstanceId = "";
-        String userId = user.getUserId();
-        createInstances();
-        ComponentInstance newComponentInstance =toInstance;
-        Either<ComponentInstance,ResponseFormat> result;
-
-        // default test
-        testSubject=createTestSubject();
-        result=testSubject.changeComponentInstanceVersion(containerComponentParam, containerComponentId, componentInstanceId, userId, newComponentInstance);
-        newComponentInstance = null;
-        testSubject=createTestSubject();
-        result=testSubject.changeComponentInstanceVersion(containerComponentParam, containerComponentId, componentInstanceId, userId, newComponentInstance);
-
-    }
-
-    @Ignore("test failing skipping for now")
-    @Test
-    public void testValidateInstanceNameUniquenessUponUpdate() throws Exception {
-        ComponentInstanceBusinessLogic testSubject;
-        createResource();
-        createInstances();
-        String newInstanceName = toInstance.getName();
-        Boolean result;
-
-        // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "validateInstanceNameUniquenessUponUpdate", new Object[]{resource, toInstance, newInstanceName});
+        testSubject = createTestSubject();
+        result = Deencapsulation.invoke(testSubject, "getComponentParametersViewForForwardingPath");
+        Assert.assertNotNull(result);
     }
 
-
     @Test
     public void testGetResourceInstanceById() throws Exception {
         ComponentInstanceBusinessLogic testSubject;
         createResource();
         String instanceId = "";
-        Either<ComponentInstance,StorageOperationStatus> result;
+        Either<ComponentInstance, StorageOperationStatus> result;
 
         // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "getResourceInstanceById", new Object[]{resource, instanceId});
-    }
-
-    @Ignore("test failing skipping for now")
-    @Test
-    public void testBuildComponentInstance() throws Exception {
-        ComponentInstanceBusinessLogic testSubject;
-        createInstances();
-        ComponentInstance origInstanceForUpdate = null;
-        ComponentInstance result;
-
-        // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "buildComponentInstance", new Object[]{toInstance, toInstance});
-    }
-
-
-
-
-
-    @Test
-    public void testFindCapabilityOfInstance() throws Exception {
-        ComponentInstanceBusinessLogic testSubject;String componentId = "";
-        String instanceId = "";
-        String capabilityType = "";
-        String capabilityName = "";
-        String ownerId = "";
-        Map<String,List<CapabilityDefinition>> instanceCapabilities = new HashMap<>();
-        Either<List<ComponentInstanceProperty>,ResponseFormat> result;
-
-        // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "findCapabilityOfInstance", new Object[]{componentId, instanceId, capabilityType, capabilityName, ownerId, instanceCapabilities});
-    }
-
-
-    @Test
-    public void testFetchComponentInstanceCapabilityProperties() throws Exception {
-        ComponentInstanceBusinessLogic testSubject;String componentId = "";
-        String instanceId = "";
-        String capabilityType = "";
-        String capabilityName = "";
-        String ownerId = "";
-        Either<List<ComponentInstanceProperty>,ResponseFormat> result;
-
-        // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "fetchComponentInstanceCapabilityProperties", new Object[]{componentId, instanceId, capabilityType, capabilityName, ownerId});
-    }
-
-
-    @Test
-    public void testUpdateCapabilityPropertyOnContainerComponent_1() throws Exception {
-        ComponentInstanceBusinessLogic testSubject;
-        ComponentInstanceProperty property = new ComponentInstanceProperty();
-        String newValue = "";
-        createResource();
-        createInstances();
-        String capabilityType = "";
-        String capabilityName = "";
-        String ownerId = "";
-        ResponseFormat result;
-
-        // default test
-        testSubject=createTestSubject();
-        result=Deencapsulation.invoke(testSubject, "updateCapabilityPropertyOnContainerComponent", new Object[]{property, newValue, resource, toInstance, capabilityType, capabilityName, ownerId});
-    }
-
-
-    @Test
-    public void testUpdateInstanceCapabilityProperties() throws Exception {
-        ComponentInstanceBusinessLogic testSubject;
-        ComponentTypeEnum componentTypeEnum = ComponentTypeEnum.RESOURCE;
-        createResource();
-        String containerComponentId = resource.getUniqueId();
-        String componentInstanceUniqueId = "";
-        String capabilityType = "";
-        String capabilityName = "";
-        String ownerId = "";
-        List<ComponentInstanceProperty> properties = new ArrayList<>();
-        String userId = user.getUserId();
-        Either<List<ComponentInstanceProperty>,ResponseFormat> result;
-
-
-        when(toscaOperationFacade.getToscaFullElement(containerComponentId)).thenReturn(Either.left(resource));
-
-
-
-        // test 1
-        testSubject=createTestSubject();
-        result=testSubject.updateInstanceCapabilityProperties(componentTypeEnum, containerComponentId, componentInstanceUniqueId, capabilityType, capabilityName, ownerId, properties, userId);
-        when(toscaOperationFacade.getToscaFullElement(containerComponentId)).thenReturn(Either.right(StorageOperationStatus.ARTIFACT_NOT_FOUND));
-        result=testSubject.updateInstanceCapabilityProperties(componentTypeEnum, containerComponentId, componentInstanceUniqueId, capabilityType, capabilityName, ownerId, properties, userId);
-        componentTypeEnum = null;
-        result=testSubject.updateInstanceCapabilityProperties(componentTypeEnum, containerComponentId, componentInstanceUniqueId, capabilityType, capabilityName, ownerId, properties, userId);
-
-
+        testSubject = createTestSubject();
+        result = Deencapsulation.invoke(testSubject, "getResourceInstanceById", new Object[]{resource, instanceId});
+        Assert.assertNotNull(result);
     }
 
-
     @Test
     public void testUpdateInstanceCapabilityProperties_1() throws Exception {
         ComponentInstanceBusinessLogic testSubject;
@@ -1102,15 +1080,19 @@ public class ComponentInstanceBusinessLogicTest {
         String capabilityName = "";
         List<ComponentInstanceProperty> properties = new ArrayList<>();
         String userId = user.getUserId();
-        Either<List<ComponentInstanceProperty>,ResponseFormat> result;
-
+        Either<List<ComponentInstanceProperty>, ResponseFormat> result;
 
-        when(toscaOperationFacade.getToscaFullElement(containerComponentId)).thenReturn(Either.right(StorageOperationStatus.BAD_REQUEST));
+        when(toscaOperationFacade.getToscaFullElement(containerComponentId))
+            .thenReturn(Either.right(StorageOperationStatus.BAD_REQUEST));
         // test 1
-        testSubject=createTestSubject();
-        result=testSubject.updateInstanceCapabilityProperties(componentTypeEnum, containerComponentId, componentInstanceUniqueId, capabilityType, capabilityName, properties, userId);
+        testSubject = createTestSubject();
+        result = testSubject.updateInstanceCapabilityProperties(componentTypeEnum, containerComponentId,
+            componentInstanceUniqueId, capabilityType, capabilityName, properties, userId);
+        Assert.assertNotNull(result);
         when(toscaOperationFacade.getToscaFullElement(containerComponentId)).thenReturn(Either.left(resource));
-        result=testSubject.updateInstanceCapabilityProperties(componentTypeEnum, containerComponentId, componentInstanceUniqueId, capabilityType, capabilityName, properties, userId);
+        result = testSubject.updateInstanceCapabilityProperties(componentTypeEnum, containerComponentId,
+            componentInstanceUniqueId, capabilityType, capabilityName, properties, userId);
+        Assert.assertNotNull(result);
     }
 
     @Test
@@ -1126,18 +1108,19 @@ public class ComponentInstanceBusinessLogicTest {
         Either<Component, StorageOperationStatus> leftServiceOp = Either.left(service);
         when(toscaOperationFacade.getToscaElement(containerComponentId)).thenReturn(leftServiceOp);
         when(toscaOperationFacade.getToscaElement(eq(containerComponentId), any(ComponentParametersView.class)))
-                .thenReturn(leftServiceOp);
-        when(titanDao.rollback()).thenReturn(TitanOperationStatus.OK);
+            .thenReturn(leftServiceOp);
+        when(janusGraphDao.rollback()).thenReturn(JanusGraphOperationStatus.OK);
         when(graphLockOperation.unlockComponent(Mockito.anyString(), eq(NodeTypeEnum.Service)))
-                .thenReturn(StorageOperationStatus.OK);
+            .thenReturn(StorageOperationStatus.OK);
         when(graphLockOperation.lockComponent(Mockito.anyString(), eq(NodeTypeEnum.Service)))
-                .thenReturn(StorageOperationStatus.OK);
+            .thenReturn(StorageOperationStatus.OK);
 
         result = componentInstanceBusinessLogic
-                .copyComponentInstance(inputComponentInstance, containerComponentId, componentInstanceId, USER_ID);
+            .copyComponentInstance(inputComponentInstance, containerComponentId, componentInstanceId,
+                USER_ID);
+        Assert.assertNotNull(result);
 
         service.setLastUpdaterUserId(oldLastUpdatedUserId);
-
         assertThat(result.isRight());
     }
 
@@ -1153,21 +1136,17 @@ public class ComponentInstanceBusinessLogicTest {
         Either<Component, StorageOperationStatus> leftServiceOp = Either.left(service);
         when(toscaOperationFacade.getToscaElement(containerComponentId)).thenReturn(leftServiceOp);
         when(toscaOperationFacade.getToscaElement(eq(containerComponentId), any(ComponentParametersView.class)))
-                .thenReturn(leftServiceOp);
-        when(titanDao.rollback()).thenReturn(TitanOperationStatus.OK);
+            .thenReturn(leftServiceOp);
+        when(janusGraphDao.rollback()).thenReturn(JanusGraphOperationStatus.OK);
         when(graphLockOperation.unlockComponent(Mockito.anyString(), eq(NodeTypeEnum.Service)))
-                .thenReturn(StorageOperationStatus.OK);
+            .thenReturn(StorageOperationStatus.OK);
         when(graphLockOperation.lockComponent(Mockito.anyString(), eq(NodeTypeEnum.Service)))
-                .thenReturn(StorageOperationStatus.OK);
+            .thenReturn(StorageOperationStatus.OK);
         Either<Component, StorageOperationStatus> getComponentRes = Either.left(resource);
-        when(toscaOperationFacade.getToscaFullElement(inputComponentInstance.getComponentUid()))
-                .thenReturn(getComponentRes);
-
         result = componentInstanceBusinessLogic
-                .copyComponentInstance(inputComponentInstance, containerComponentId, componentInstanceId, USER_ID);
-
+            .copyComponentInstance(inputComponentInstance, containerComponentId, componentInstanceId, USER_ID);
+        Assert.assertNotNull(result);
         service.setLastUpdaterUserId(oldServiceLastUpdatedUserId);
-
         assertThat(result.isRight());
     }
 
@@ -1185,30 +1164,22 @@ public class ComponentInstanceBusinessLogicTest {
         Either<Component, StorageOperationStatus> leftServiceOp = Either.left(service);
         when(toscaOperationFacade.getToscaElement(containerComponentId)).thenReturn(leftServiceOp);
         when(toscaOperationFacade.getToscaElement(eq(containerComponentId), any(ComponentParametersView.class)))
-                .thenReturn(leftServiceOp);
+            .thenReturn(leftServiceOp);
         when(graphLockOperation.unlockComponent(Mockito.anyString(), eq(NodeTypeEnum.Service)))
-                .thenReturn(StorageOperationStatus.OK);
+            .thenReturn(StorageOperationStatus.OK);
         when(graphLockOperation.lockComponent(Mockito.anyString(), eq(NodeTypeEnum.Service)))
-                .thenReturn(StorageOperationStatus.OK);
+            .thenReturn(StorageOperationStatus.OK);
         Either<Component, StorageOperationStatus> getComponentRes = Either.left(resource);
-        when(toscaOperationFacade.getToscaFullElement(inputComponentInstance.getComponentUid()))
-                .thenReturn(getComponentRes);
         ImmutablePair<Component, String> pair = new ImmutablePair<>(resource, TO_INSTANCE_ID);
         Either<ImmutablePair<Component, String>, StorageOperationStatus> result2 = Either.left(pair);
-        when(toscaOperationFacade
-                .addComponentInstanceToTopologyTemplate(eq(service), eq(resource), eq(inputComponentInstance), eq(false),
-                        isNull(User.class))).thenReturn(result2);
         Either<Map<String, ArtifactDefinition>, StorageOperationStatus> getResourceDeploymentArtifacts = Either
-                .left(new HashMap<String, ArtifactDefinition>());
-        when(artifactBusinessLogic.getArtifacts(eq(inputComponentInstance.getComponentUid()), eq(NodeTypeEnum.Resource),
-                eq(ArtifactGroupTypeEnum.DEPLOYMENT), isNull(String.class))).thenReturn(getResourceDeploymentArtifacts);
+            .left(new HashMap<String, ArtifactDefinition>());
         StorageOperationStatus artStatus = StorageOperationStatus.OK;
-        when(toscaOperationFacade
-                .addInformationalArtifactsToInstance(eq(resource.getUniqueId()), eq(inputComponentInstance),
-                        isNull(Map.class))).thenReturn(artStatus);
 
         result = componentInstanceBusinessLogic
-                .copyComponentInstance(inputComponentInstance, containerComponentId, componentInstanceId, USER_ID);
+            .copyComponentInstance(inputComponentInstance, containerComponentId, componentInstanceId,
+                USER_ID);
+        Assert.assertNotNull(result);
 
         service.setLastUpdaterUserId(oldServiceLastUpdatedUserId);
         resource.setLifecycleState(oldResourceLifeCycle);
@@ -1229,7 +1200,8 @@ public class ComponentInstanceBusinessLogicTest {
         service.setLastUpdaterUserId(USER_ID);
         service.setLifecycleState(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT);
 
-        Map<String, List<ComponentInstanceProperty>> instAttrsMap = new HashMap<String, List<ComponentInstanceProperty>>();
+        Map<String, List<ComponentInstanceProperty>> instAttrsMap =
+            new HashMap<String, List<ComponentInstanceProperty>>();
         List<ComponentInstanceProperty> instAttrsList = new ArrayList<ComponentInstanceProperty>();
         ComponentInstanceProperty prop = new ComponentInstanceProperty();
         prop.setUniqueId(attribute.getUniqueId());
@@ -1238,15 +1210,22 @@ public class ComponentInstanceBusinessLogicTest {
         service.setComponentInstancesAttributes(instAttrsMap);
 
         Either<Component, StorageOperationStatus> serviceEitherLeft = Either.left(service);
-        when(toscaOperationFacade.getToscaElement(serviceComponentInstance.getUniqueId(), JsonParseFlagEnum.ParseAll)).thenReturn(serviceEitherLeft);
-        when(toscaOperationFacade.updateComponentInstanceAttribute(service, toInstance.getUniqueId(), attribute)).thenReturn(StorageOperationStatus.OK);
-        when(toscaOperationFacade.updateComponentInstanceMetadataOfTopologyTemplate(service)).thenReturn(serviceEitherLeft);
-
-        Either<ComponentInstanceProperty, ResponseFormat> result = Deencapsulation.invoke(componentInstanceBusinessLogic, "createOrUpdateAttributeValueForCopyPaste", ComponentTypeEnum.SERVICE,
-                serviceComponentInstance.getUniqueId(),
-                toInstance.getUniqueId(),
-                attribute,
+        when(toscaOperationFacade.getToscaElement(serviceComponentInstance.getUniqueId(), JsonParseFlagEnum.ParseAll))
+            .thenReturn(serviceEitherLeft);
+        when(toscaOperationFacade.updateComponentInstanceAttribute(service, toInstance.getUniqueId(), attribute))
+            .thenReturn(StorageOperationStatus.OK);
+        when(toscaOperationFacade.updateComponentInstanceMetadataOfTopologyTemplate(service))
+            .thenReturn(serviceEitherLeft);
+
+        Either<ComponentInstanceProperty, ResponseFormat> result = Deencapsulation
+            .invoke(componentInstanceBusinessLogic,
+                "createOrUpdateAttributeValueForCopyPaste",
+                ComponentTypeEnum.SERVICE,
+                serviceComponentInstance
+                    .getUniqueId(),
+                toInstance.getUniqueId(), attribute,
                 USER_ID);
+        Assert.assertNotNull(result);
 
         service.setLastUpdaterUserId(oldLastUpdatedUserId);
         service.setLifecycleState(oldLifeCycleState);
@@ -1268,15 +1247,14 @@ public class ComponentInstanceBusinessLogicTest {
         when(toscaOperationFacade.getToscaElement(containerComponentId)).thenReturn(getComponent);
         StorageOperationStatus status = StorageOperationStatus.OK;
         when(toscaOperationFacade.updateComponentInstanceProperty(service, componentInstanceId, property))
-                .thenReturn(status);
+            .thenReturn(status);
         Either<Component, StorageOperationStatus> updateContainerRes = Either.left(service);
         when(toscaOperationFacade.updateComponentInstanceMetadataOfTopologyTemplate(service))
-                .thenReturn(updateContainerRes);
-
-        Either<String, ResponseFormat> result = Deencapsulation
-                .invoke(componentInstanceBusinessLogic, "updateComponentInstanceProperty", containerComponentId,
-                        componentInstanceId, property);
+            .thenReturn(updateContainerRes);
 
+        Either<String, ResponseFormat> result = Deencapsulation.invoke(componentInstanceBusinessLogic,
+            "updateComponentInstanceProperty", containerComponentId, componentInstanceId, property);
+        Assert.assertNotNull(result);
         assertTrue(result.isLeft());
     }
 
@@ -1293,8 +1271,8 @@ public class ComponentInstanceBusinessLogicTest {
         List<InputDefinition> oldInputs = service.getInputs();
         service.setInputs(newInputs);
 
-        Either<String, ResponseFormat> result = Deencapsulation
-                .invoke(componentInstanceBusinessLogic, "getInputListDefaultValue", component, inputId);
+        Either<String, ResponseFormat> result =
+            Deencapsulation.invoke(componentInstanceBusinessLogic, "getInputListDefaultValue", component, inputId);
 
         service.setInputs(oldInputs);
 
@@ -1314,17 +1292,26 @@ public class ComponentInstanceBusinessLogicTest {
         List<String> deleteErrorIds = new ArrayList<>();
         deleteErrorIds.add(componentInstanceId);
         deleteErrorMap.put("deleteFailedIds", deleteErrorIds);
+        Either<Component, StorageOperationStatus> cont = Either.left(service);
+        when(componentsUtils.convertFromStorageResponse(eq(StorageOperationStatus.NOT_FOUND), eq(null)))
+            .thenReturn(ActionStatus.GENERAL_ERROR);
+        when(toscaOperationFacade.getToscaElement(any(String.class), any(ComponentParametersView.class)))
+            .thenReturn(cont);
 
-        result = componentInstanceBusinessLogic
+        try {
+            result = componentInstanceBusinessLogic
                 .batchDeleteComponentInstance(containerComponentParam, containerComponentId, componentInstanceIdList,
-                        userId);
-
-        assertEquals(deleteErrorMap, result);
+                    userId);
+            Assert.assertNotNull(result);
+            assertEquals(deleteErrorMap, result);
+        } catch (ComponentException e) {
+            assertEquals(e.getActionStatus().toString(), StorageOperationStatus.GENERAL_ERROR.toString());
+        }
     }
 
     @Test
     public void testBatchDeleteComponentInstanceFailureCompIds() {
-        Map<String, List<String>> result;
+        Map<String, List<String>> result = new HashMap<>();
         String containerComponentParam = ComponentTypeEnum.SERVICE_PARAM_NAME;
         String containerComponentId = "containerComponentId";
         String componentInstanceId = "componentInstanceId";
@@ -1338,13 +1325,17 @@ public class ComponentInstanceBusinessLogicTest {
 
         Either<Component, StorageOperationStatus> err = Either.right(StorageOperationStatus.GENERAL_ERROR);
         when(toscaOperationFacade.getToscaElement(eq(containerComponentId), any(ComponentParametersView.class)))
-                .thenReturn(err);
+            .thenReturn(err);
 
-        result = componentInstanceBusinessLogic
+        try {
+            result = componentInstanceBusinessLogic
                 .batchDeleteComponentInstance(containerComponentParam, containerComponentId, componentInstanceIdList,
-                        userId);
-
-        assertEquals(deleteErrorMap, result);
+                    userId);
+            Assert.assertNotNull(result);
+            assertEquals(deleteErrorMap, result);
+        } catch (ComponentException e) {
+            assertEquals(e.getActionStatus().toString(), StorageOperationStatus.GENERAL_ERROR.toString());
+        }
     }
 
     @Test
@@ -1366,23 +1357,25 @@ public class ComponentInstanceBusinessLogicTest {
 
         Either<Component, StorageOperationStatus> cont = Either.left(service);
         when(graphLockOperation.unlockComponent(Mockito.anyString(), eq(NodeTypeEnum.Service)))
-                .thenReturn(StorageOperationStatus.OK);
+            .thenReturn(StorageOperationStatus.OK);
         when(graphLockOperation.lockComponent(Mockito.anyString(), eq(NodeTypeEnum.Service)))
-                .thenReturn(StorageOperationStatus.OK);
+            .thenReturn(StorageOperationStatus.OK);
         ImmutablePair<Component, String> pair = new ImmutablePair<>(resource, TO_INSTANCE_ID);
         Either<ImmutablePair<Component, String>, StorageOperationStatus> result2 = Either.left(pair);
         when(toscaOperationFacade.deleteComponentInstanceFromTopologyTemplate(service, componentInstanceId))
-                .thenReturn(result2);
+            .thenReturn(result2);
         when(toscaOperationFacade.getToscaElement(eq(service.getUniqueId()), any(ComponentParametersView.class)))
-                .thenReturn(cont);
-        when(titanDao.commit()).thenReturn(TitanOperationStatus.OK);
+            .thenReturn(cont);
+        when(janusGraphDao.commit()).thenReturn(JanusGraphOperationStatus.OK);
 
         result = componentInstanceBusinessLogic
-                .batchDeleteComponentInstance(containerComponentParam, containerComponentId, componentInstanceIdList, userId);
+            .batchDeleteComponentInstance(containerComponentParam, containerComponentId,
+                componentInstanceIdList, userId);
+        Assert.assertNotNull(result);
 
         service.setLastUpdaterUserId(oldLastUpdatedUserId);
         service.setLifecycleState(oldLifeCycleState);
-        assertEquals(deleteErrorMap,result);
+        assertEquals(deleteErrorMap, result);
     }
 
     @Test
@@ -1411,22 +1404,29 @@ public class ComponentInstanceBusinessLogicTest {
 
         Either<Component, StorageOperationStatus> cont = Either.left(service);
         when(toscaOperationFacade.getToscaElement(eq(service.getUniqueId()), any(ComponentParametersView.class)))
-                .thenReturn(cont);
+            .thenReturn(cont);
         when(graphLockOperation.unlockComponent(Mockito.anyString(), eq(NodeTypeEnum.Service)))
-                .thenReturn(StorageOperationStatus.OK);
+            .thenReturn(StorageOperationStatus.OK);
         when(graphLockOperation.lockComponent(Mockito.anyString(), eq(NodeTypeEnum.Service)))
-                .thenReturn(StorageOperationStatus.OK);
+            .thenReturn(StorageOperationStatus.OK);
         Either<RequirementCapabilityRelDef, StorageOperationStatus> resultEither;
         resultEither = Either.right(StorageOperationStatus.OK);
+        when(componentsUtils.convertFromStorageResponseForResourceInstance(eq(StorageOperationStatus.OK), eq(true)))
+            .thenReturn(ActionStatus.GENERAL_ERROR);
         when(toscaOperationFacade.dissociateResourceInstances(componentId, ref)).thenReturn(resultEither);
 
-        result = componentInstanceBusinessLogic
+        try {
+            result = componentInstanceBusinessLogic
                 .batchDissociateRIFromRI(componentId, userId, requirementDefList, componentTypeEnum);
+            Assert.assertNotNull(result);
+            assertEquals(new ArrayList<>(), result);
+        } catch (ComponentException e) {
+            assertEquals(e.getActionStatus().toString(), StorageOperationStatus.GENERAL_ERROR.toString());
+        }
 
         service.setLastUpdaterUserId(oldLastUpdatedUserId);
         service.setLifecycleState(oldLifeCycleState);
 
-        assertEquals(new ArrayList<>(), result);
     }
 
     @Test
@@ -1446,17 +1446,18 @@ public class ComponentInstanceBusinessLogicTest {
 
         Either<Component, StorageOperationStatus> cont = Either.left(service);
         when(toscaOperationFacade.getToscaElement(eq(service.getUniqueId()), any(ComponentParametersView.class)))
-                .thenReturn(cont);
+            .thenReturn(cont);
         when(graphLockOperation.unlockComponent(Mockito.anyString(), eq(NodeTypeEnum.Service)))
-                .thenReturn(StorageOperationStatus.OK);
+            .thenReturn(StorageOperationStatus.OK);
         when(graphLockOperation.lockComponent(Mockito.anyString(), eq(NodeTypeEnum.Service)))
-                .thenReturn(StorageOperationStatus.OK);
+            .thenReturn(StorageOperationStatus.OK);
         Either<RequirementCapabilityRelDef, StorageOperationStatus> resultEither;
         resultEither = Either.left(ref);
         when(toscaOperationFacade.dissociateResourceInstances(componentId, ref)).thenReturn(resultEither);
 
         result = componentInstanceBusinessLogic
-                .batchDissociateRIFromRI(componentId, userId, requirementDefList, componentTypeEnum);
+            .batchDissociateRIFromRI(componentId, userId, requirementDefList, componentTypeEnum);
+        Assert.assertNotNull(result);
 
         service.setLastUpdaterUserId(oldLastUpdatedUserId);
         service.setLifecycleState(oldLifeCycleState);
@@ -1464,6 +1465,51 @@ public class ComponentInstanceBusinessLogicTest {
         assertEquals(requirementDefList, result);
     }
 
+    @Test
+    public void testGetComponentInstancePropertyByPolicyId_success() {
+        Optional<ComponentInstanceProperty> propertyCandidate =
+            getComponentInstanceProperty(PROP_NAME);
+
+        Assert.assertTrue(propertyCandidate.isPresent());
+        Assert.assertEquals(propertyCandidate.get().getName(), PROP_NAME);
+    }
+
+    @Test
+    public void testGetComponentInstancePropertyByPolicyId_failure() {
+        Optional<ComponentInstanceProperty> propertyCandidate =
+            getComponentInstanceProperty(NON_EXIST_NAME);
+
+        Assert.assertEquals(propertyCandidate, Optional.empty());
+    }
+
+    private Optional<ComponentInstanceProperty> getComponentInstanceProperty(String propertyName) {
+        ComponentInstanceProperty componentInstanceProperty = new ComponentInstanceProperty();
+        componentInstanceProperty.setName(propertyName);
+
+        PolicyDefinition policyDefinition = getPolicyDefinition();
+        componentInstanceProperty.setGetPolicyValues(policyDefinition.getGetPolicyValues());
+
+        service.setComponentInstancesProperties(
+            Collections.singletonMap(COMPONENT_INST_ID, Collections.singletonList(componentInstanceProperty)));
+
+        return componentInstanceBusinessLogic.getComponentInstancePropertyByPolicyId(service, policyDefinition);
+    }
+
+    private PolicyDefinition getPolicyDefinition() {
+        PolicyDefinition policyDefinition = new PolicyDefinition();
+        policyDefinition.setInstanceUniqueId(COMPONENT_INST_ID);
+        policyDefinition.setName(PROP_NAME);
+
+        GetPolicyValueDataDefinition getPolicy = new GetPolicyValueDataDefinition();
+        getPolicy.setPropertyName(PROP_NAME);
+
+        List<GetPolicyValueDataDefinition> getPolicies = new ArrayList<>();
+        getPolicies.add(getPolicy);
+        policyDefinition.setGetPolicyValues(getPolicies);
+
+        return policyDefinition;
+    }
+
     private ComponentInstance createComponetInstanceFromComponent(Component component) {
         ComponentInstance componentInst = new ComponentInstance();
         componentInst.setUniqueId(component.getUniqueId());