Fix 'Wrong Inputs creation on (Add Service)'
[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / components / impl / InputsBusinessLogic.java
index d6497b5..763552f 100644 (file)
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ * Modifications copyright (c) 2019 Nokia
+ * ================================================================================
  */
-
 package org.openecomp.sdc.be.components.impl;
 
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.function.BiConsumer;
+import fj.data.Either;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
-
-import jline.internal.Log;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.json.simple.JSONObject;
+import org.apache.commons.collections4.ListUtils;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.openecomp.sdc.be.components.impl.exceptions.ByActionStatusComponentException;
+import org.openecomp.sdc.be.components.impl.exceptions.ByResponseFormatComponentException;
+import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
+import org.openecomp.sdc.be.components.property.PropertyDeclarationOrchestrator;
 import org.openecomp.sdc.be.components.validation.ComponentValidations;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
-import org.openecomp.sdc.be.config.BeEcompErrorManager.ErrorSeverity;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
-import org.openecomp.sdc.be.datatypes.elements.GetInputValueDataDefinition;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
+import org.openecomp.sdc.be.dao.utils.MapUtil;
+import org.openecomp.sdc.be.datamodel.utils.PropertyValueConstraintValidationUtil;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.SchemaDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
+import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.ComponentInstInputsMap;
+import org.openecomp.sdc.be.model.ComponentInstListInput;
 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.IComponentInstanceConnectedElement;
 import org.openecomp.sdc.be.model.InputDefinition;
 import org.openecomp.sdc.be.model.PropertyDefinition;
-import org.openecomp.sdc.be.model.User;
-
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ArtifactsOperations;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.InterfaceOperation;
+import org.openecomp.sdc.be.model.operations.api.IElementOperation;
+import org.openecomp.sdc.be.model.operations.api.IGroupInstanceOperation;
+import org.openecomp.sdc.be.model.operations.api.IGroupOperation;
+import org.openecomp.sdc.be.model.operations.api.IGroupTypeOperation;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.DaoStatusConverter;
+import org.openecomp.sdc.be.model.operations.impl.InterfaceLifecycleOperation;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
+import org.openecomp.sdc.be.model.operations.utils.ComponentValidationUtils;
 import org.openecomp.sdc.be.model.tosca.ToscaPropertyType;
 import org.openecomp.sdc.be.model.tosca.converters.PropertyValueConverter;
+import org.openecomp.sdc.be.resources.data.EntryData;
+import org.openecomp.sdc.common.log.elements.LoggerSupportability;
+import org.openecomp.sdc.common.log.enums.LoggerSupportabilityActions;
+import org.openecomp.sdc.common.log.enums.StatusCode;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.exception.ResponseFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.yaml.snakeyaml.Yaml;
+import org.springframework.beans.factory.annotation.Autowired;
 
-import com.google.gson.Gson;
-
-import fj.data.Either;
-
-@Component("inputsBusinessLogic")
+@org.springframework.stereotype.Component("inputsBusinessLogic")
 public class InputsBusinessLogic extends BaseBusinessLogic {
 
-       private static final String CREATE_INPUT = "CreateInput";
-       private static final String UPDATE_INPUT = "UpdateInput";
-
-       private static Logger log = LoggerFactory.getLogger(InputsBusinessLogic.class.getName());
-
-       private static final String GET_INPUT = "get_input";
-
-       private static final short LOOP_PROTECTION_LEVEL = 10 ;
-
-       private static String ASSOCIATING_INPUT_TO_PROP = "AssociatingInputToComponentInstanceProperty";
-       private Gson gson = new Gson();
-
-
-       /**
-        * associate inputs to a given component with paging
-        *
-        * @param componentId
-        * @param userId
-        * @param fromId
-        * @param amount
-        * @return
-        */
-       public Either<List<InputDefinition>, ResponseFormat> getInputs(String userId, String componentId, String fromName, int amount) {
-
-               Either<User, ResponseFormat> resp = validateUserExists(userId, "get Inputs", false);
-
-               if (resp.isRight()) {
-                       return Either.right(resp.right().value());
-               }
-
-
-               ComponentParametersView filters = new ComponentParametersView();
-               filters.disableAll();
-               filters.setIgnoreInputs(false);
-
-               Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> getComponentEither = toscaOperationFacade.getToscaElement(componentId, filters);
-               if(getComponentEither.isRight()){
-                       ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-                       log.debug("Failed to found component {}, error: {}", componentId, actionStatus.name());
-                       return Either.right(componentsUtils.getResponseFormat(actionStatus));
-
-               }
-               org.openecomp.sdc.be.model.Component component = getComponentEither.left().value();
-               List<InputDefinition> inputs = component.getInputs();
-
-               return Either.left(inputs);
-
-       }
-
-       public Either<List<ComponentInstanceInput>, ResponseFormat> getComponentInstanceInputs(String userId, String componentId, String componentInstanceId) {
-
-               Either<User, ResponseFormat> resp = validateUserExists(userId, "get Inputs", false);
-
-               if (resp.isRight()) {
-                       return Either.right(resp.right().value());
-               }
-
-
-               ComponentParametersView filters = new ComponentParametersView();
-               filters.disableAll();
-               filters.setIgnoreInputs(false);
-               filters.setIgnoreComponentInstances(false);
-               filters.setIgnoreComponentInstancesInputs(false);
-
-               Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> getComponentEither = toscaOperationFacade.getToscaElement(componentId, filters);
-               if(getComponentEither.isRight()){
-                       ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-                       log.debug("Failed to found component {}, error: {}", componentId, actionStatus.name());
-                       return Either.right(componentsUtils.getResponseFormat(actionStatus));
-
-               }
-               org.openecomp.sdc.be.model.Component component = getComponentEither.left().value();
-
-               if(!ComponentValidations.validateComponentInstanceExist(component, componentInstanceId)){
-                       ActionStatus actionStatus = ActionStatus.COMPONENT_INSTANCE_NOT_FOUND;
-                       log.debug("Failed to found component instance inputs {}, error: {}", componentInstanceId, actionStatus.name());
-                       return Either.right(componentsUtils.getResponseFormat(actionStatus));
-               }
-               Map<String, List<ComponentInstanceInput>> ciInputs = Optional.ofNullable(component.getComponentInstancesInputs()).orElse(Collections.emptyMap());
-               return Either.left(ciInputs.getOrDefault(componentInstanceId, Collections.emptyList()));
-       }
-
-       /**
-        * associate properties to a given component instance input
-        *
-        * @param instanceId
-        * @param userId
-        * @param inputId
-        * @return
-        */
-
-       public Either<List<ComponentInstanceProperty>, ResponseFormat> getComponentInstancePropertiesByInputId(String userId, String componentId, String instanceId, String inputId) {
-               Either<User, ResponseFormat> resp = validateUserExists(userId, "get Properties by input", false);
-               if (resp.isRight()) {
-                       return Either.right(resp.right().value());
-               }
-               String parentId = componentId;
-               org.openecomp.sdc.be.model.Component component = null;
-               ComponentParametersView filters = new ComponentParametersView();
-               filters.disableAll();
-               filters.setIgnoreComponentInstances(false);
-
-               if(!instanceId.equals(inputId)){
-
-
-                       Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> getComponentEither = toscaOperationFacade.getToscaElement(parentId, filters);
-
-                       if(getComponentEither.isRight()){
-                               ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-                               log.debug("Failed to found component {}, error: {}", parentId, actionStatus.name());
-                               return Either.right(componentsUtils.getResponseFormat(actionStatus));
-
-                       }
-                       component = getComponentEither.left().value();
-                       Optional<ComponentInstance> ciOp = component.getComponentInstances().stream().filter(ci ->ci.getUniqueId().equals(instanceId)).findAny();
-                       if(ciOp.isPresent()){
-                               parentId = ciOp.get().getComponentUid();
-                       }
-
-               }
-
-               filters.setIgnoreInputs(false);
-
-               filters.setIgnoreComponentInstancesProperties(false);
-               filters.setIgnoreComponentInstancesInputs(false);
-               filters.setIgnoreProperties(false);
-
-               Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> getComponentEither = toscaOperationFacade.getToscaElement(parentId, filters);
-
-               if(getComponentEither.isRight()){
-                       ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-                       log.debug("Failed to found component {}, error: {}", parentId, actionStatus.name());
-                       return Either.right(componentsUtils.getResponseFormat(actionStatus));
-
-               }
-               component = getComponentEither.left().value();
-
-               Optional<InputDefinition> op = component.getInputs().stream().filter(in -> in.getUniqueId().equals(inputId)).findFirst();
-               if(!op.isPresent()){
-                       ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-                       log.debug("Failed to found input {} under component {}, error: {}", inputId, parentId, actionStatus.name());
-                       return Either.right(componentsUtils.getResponseFormat(actionStatus));
-               }
-
-               return Either.left(getComponentInstancePropertiesByInputId(component, inputId));
-
-       }
-
-       public Either<InputDefinition, ResponseFormat> updateInputValue(ComponentTypeEnum componentType, String componentId, InputDefinition input, String userId, boolean shouldLockComp, boolean inTransaction) {
-
-               Either<InputDefinition, ResponseFormat> result = null;
-               org.openecomp.sdc.be.model.Component component = null;
-
-
-               try {
-                       Either<User, ResponseFormat> resp = validateUserExists(userId, "get input", false);
-
-                       if (resp.isRight()) {
-                               result = Either.right(resp.right().value());
-                               return result;
-                       }
-
-                       ComponentParametersView componentParametersView = new ComponentParametersView();
-                       componentParametersView.disableAll();
-                       componentParametersView.setIgnoreInputs(false);
-                       componentParametersView.setIgnoreUsers(false);
-
-                       Either<? extends org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponent = validateComponentExists(componentId, componentType, componentParametersView);
-
-                       if (validateComponent.isRight()) {
-                               result = Either.right(validateComponent.right().value());
-                               return result;
-                       }
-                       component = validateComponent.left().value();
-
-                       if (shouldLockComp) {
-                               Either<Boolean, ResponseFormat> lockComponent = lockComponent(component, UPDATE_INPUT);
-                               if (lockComponent.isRight()) {
-                                       result = Either.right(lockComponent.right().value());
-                                       return result;
-                               }
-                       }
-
-                       Either<Boolean, ResponseFormat> canWork = validateCanWorkOnComponent(component, userId);
-                       if (canWork.isRight()) {
-                               result = Either.right(canWork.right().value());
-                               return result;
-                       }
-
-                       Either<Map<String, DataTypeDefinition>, ResponseFormat> allDataTypes = getAllDataTypes(applicationDataTypeCache);
-                       if (allDataTypes.isRight()) {
-                               result = Either.right(allDataTypes.right().value());
-                               return result;
-                       }
-
-                       Map<String, DataTypeDefinition> dataTypes = allDataTypes.left().value();
-
-                       Optional<InputDefinition> op = component.getInputs().stream().filter(in -> in.getUniqueId().equals(input.getUniqueId())).findFirst();
-                       if(!op.isPresent()){
-                               ActionStatus actionStatus = ActionStatus.COMPONENT_NOT_FOUND;
-                               log.debug("Failed to found input {} under component {}, error: {}", input.getUniqueId(), componentId, actionStatus.name());
-                               result = Either.right(componentsUtils.getResponseFormat(actionStatus));
-                               return result;
-                       }
-                       InputDefinition currentInput = op.get();
-
-                       String innerType = null;
-                       String propertyType = currentInput.getType();
-                       ToscaPropertyType type = ToscaPropertyType.isValidType(propertyType);
-                       log.debug("The type of the property {} is {}", currentInput.getUniqueId(), propertyType);
-
-                       if (type == ToscaPropertyType.LIST || type == ToscaPropertyType.MAP) {
-                               SchemaDefinition def = currentInput.getSchema();
-                               if (def == null) {
-                                       log.debug("Schema doesn't exists for property of type {}", type);
-                                       return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE)));
-                               }
-                               PropertyDataDefinition propDef = def.getProperty();
-                               if (propDef == null) {
-                                       log.debug("Property in Schema Definition inside property of type {} doesn't exist", type);
-                                       return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE)));
-                               }
-                               innerType = propDef.getType();
-                       }
-                       // Specific Update Logic
-
-                       Either<Object, Boolean> isValid = propertyOperation.validateAndUpdatePropertyValue(propertyType, input.getDefaultValue(), true, innerType, allDataTypes.left().value());
-
-                       String newValue = currentInput.getDefaultValue();
-                       if (isValid.isRight()) {
-                               Boolean res = isValid.right().value();
-                               if (res == false) {
-                                       return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(DaoStatusConverter.convertTitanStatusToStorageStatus(TitanOperationStatus.ILLEGAL_ARGUMENT))));
-                               }
-                       } else {
-                               Object object = isValid.left().value();
-                               if (object != null) {
-                                       newValue = object.toString();
-                               }
-                       }
-
-                       currentInput.setDefaultValue(newValue);
-
-                       Either<InputDefinition, StorageOperationStatus> status = toscaOperationFacade.updateInputOfComponent(component, currentInput);
-
-                       if(status.isRight()){
-                               ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(status.right().value());
-                               result = Either.right(componentsUtils.getResponseFormat(actionStatus, ""));
-                               return result;
-                       }
-
-
-                       result = Either.left(status.left().value());
-
-                       return result;
-
-
-               }finally {
-
-                               if (false == inTransaction) {
-
-                                       if (result == null || result.isRight()) {
-                                               log.debug("Going to execute rollback on create group.");
-                                               titanDao.rollback();
-                                       } else {
-                                               log.debug("Going to execute commit on create group.");
-                                               titanDao.commit();
-                                       }
-
-                               }
-                               // unlock resource
-                               if (shouldLockComp && component != null) {
-                                       graphLockOperation.unlockComponent(componentId, componentType.getNodeType());
-                               }
-
-                       }
-
-
-       }
-
-       public Either<List<ComponentInstanceInput>, ResponseFormat> getInputsForComponentInput(String userId, String componentId, String inputId) {
-               Either<User, ResponseFormat> resp = validateUserExists(userId, "get Properties by input", false);
-               if (resp.isRight()) {
-                       return Either.right(resp.right().value());
-               }
-               String parentId = componentId;
-               org.openecomp.sdc.be.model.Component component = null;
-               ComponentParametersView filters = new ComponentParametersView();
-               filters.disableAll();
-               filters.setIgnoreComponentInstances(false);
-               filters.setIgnoreInputs(false);
-               filters.setIgnoreComponentInstancesInputs(false);
-               filters.setIgnoreProperties(false);
-
-               Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> getComponentEither = toscaOperationFacade.getToscaElement(parentId, filters);
-
-               if(getComponentEither.isRight()){
-                       ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-                       log.debug("Failed to found component {}, error: {}", parentId, actionStatus.name());
-                       return Either.right(componentsUtils.getResponseFormat(actionStatus));
-
-               }
-               component = getComponentEither.left().value();
-
-               Optional<InputDefinition> op = component.getInputs().stream().filter(in -> in.getUniqueId().equals(inputId)).findFirst();
-               if(!op.isPresent()){
-                       ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-                       log.debug("Failed to found input {} under component {}, error: {}", inputId, parentId, actionStatus.name());
-                       return Either.right(componentsUtils.getResponseFormat(actionStatus));
-               }
-
-               return Either.left(getComponentInstanceInputsByInputId(component, inputId));
-
-       }
-
-       public Either<List<InputDefinition>, ResponseFormat> createMultipleInputs(String userId, String componentId, ComponentTypeEnum componentType, ComponentInstInputsMap componentInstInputsMapUi, boolean shouldLockComp, boolean inTransaction) {
-
-               Either<List<InputDefinition>, ResponseFormat> result = null;
-               org.openecomp.sdc.be.model.Component component = null;
-
-               Map<String, List<ComponentInstanceInput>> inputsValueToCreateMap = new HashMap<>();
-               Map<String, List<ComponentInstanceProperty>> propertiesToCreateMap = new HashMap<>();
-               Map<String, InputDefinition> inputsToCreate = new HashMap<>();
-
-               try {
-                       Either<User, ResponseFormat> resp = validateUserExists(userId, "get Properties by input", false);
-
-                       if (resp.isRight()) {
-                               result = Either.right(resp.right().value());
-                               return result;
-                       }
-
-                       ComponentParametersView componentParametersView = new ComponentParametersView();
-                       componentParametersView.disableAll();
-                       componentParametersView.setIgnoreInputs(false);
-                       componentParametersView.setIgnoreComponentInstancesInputs(false);
-                       componentParametersView.setIgnoreComponentInstances(false);
-                       componentParametersView.setIgnoreComponentInstancesProperties(false);
-                       componentParametersView.setIgnoreUsers(false);
-
-                       Either<? extends org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponent = validateComponentExists(componentId, componentType, componentParametersView);
-
-                       if (validateComponent.isRight()) {
-                               result = Either.right(validateComponent.right().value());
-                               return result;
-                       }
-                       component = validateComponent.left().value();
-
-                       if (shouldLockComp) {
-                               Either<Boolean, ResponseFormat> lockComponent = lockComponent(component, CREATE_INPUT);
-                               if (lockComponent.isRight()) {
-                                       result = Either.right(lockComponent.right().value());
-                                       return result;
-                               }
-                       }
-
-                       Either<Boolean, ResponseFormat> canWork = validateCanWorkOnComponent(component, userId);
-                       if (canWork.isRight()) {
-                               result = Either.right(canWork.right().value());
-                               return result;
-                       }
-
-                       Either<Map<String, DataTypeDefinition>, ResponseFormat> allDataTypes = getAllDataTypes(applicationDataTypeCache);
-                       if (allDataTypes.isRight()) {
-                               result = Either.right(allDataTypes.right().value());
-                               return result;
-                       }
-
-                       Map<String, DataTypeDefinition> dataTypes = allDataTypes.left().value();
-                       Map<String, org.openecomp.sdc.be.model.Component> origComponentMap = new HashMap<>();
-
-
-                       //////////////////////////////////////////////////////////////////////////////////////////////////////
-
-                       List<InputDefinition> resList = new ArrayList<InputDefinition>();
-                       Map<String, List<ComponentInstancePropInput>> newInputsMap = componentInstInputsMapUi.getComponentInstanceInputsMap();
-                       List<ComponentInstance> ciList = component.getComponentInstances();
-                       if (newInputsMap != null && !newInputsMap.isEmpty()) {
-                               
-                               result = createInputsFromProperty(component, origComponentMap, inputsToCreate, propertiesToCreateMap, inputsValueToCreateMap, dataTypes, resList, newInputsMap, true);
-
-                               if (result.isRight()) {
-                                       log.debug("Failed to create inputs of resource  for id {} error {}", component.getUniqueId(), result.right().value());
-                                       return result;
-                               }
-                               resList = result.left().value();
-                               
-                               /*int index = 0;
-                               for (Entry<String, List<InputDefinition>> entry : newInputsMap.entrySet()) {
-                                       
-                                       String compInstId = entry.getKey();
-
-                                       Optional<ComponentInstance> op = ciList.stream().filter(ci -> ci.getUniqueId().equals(compInstId)).findAny();
-                                       if(!op.isPresent()){
-                                               ActionStatus actionStatus = ActionStatus.INVALID_CONTENT;
-                                               log.debug("Failed to find component instance {} under component {}", compInstId, componentId);
-                                               result = Either.right(componentsUtils.getResponseFormat(actionStatus));
-                                               return result;
-                                       }
-                                       ComponentInstance ci = op.get();
-                                       String compInstname = ci.getNormalizedName();
-                                       Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> origComponentEither = getOriginComponent(ci, origComponentMap);
-                                       if(origComponentEither.isRight()){
-                                               ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(origComponentEither.right().value());
-                                               log.debug("Failed to create inputs value under component {}, error: {}", componentId, actionStatus.name());
-                                               result = Either.right(componentsUtils.getResponseFormat(actionStatus));
-                                               return result;
-                                       }
-                                       org.openecomp.sdc.be.model.Component origComponent = origComponentEither.left().value();
-
-                                       List<InputDefinition> inputs = entry.getValue();
-
-                                       if (inputs != null && !inputs.isEmpty()) {
-
-                                               for (InputDefinition input : inputs) {
-
-                                                       StorageOperationStatus status = addInputsToComponent(componentId, inputsToCreate, inputsValueToCreateMap, allDataTypes.left().value(), resList, index, compInstId, compInstname, origComponent, input);
-                                                       if(status != StorageOperationStatus.OK ){
-                                                               ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(status);
-                                                               log.debug("Failed to create inputs value under component {}, error: {}", componentId, actionStatus.name());
-                                                               result = Either.right(componentsUtils.getResponseFormat(actionStatus));
-                                                               return result;
-                                                       }
-
-                                               }
-                                       }
-                                       
-                               }*/
-
-                       }
-
-                       Map<String, List<ComponentInstancePropInput>> newInputsPropsMap = componentInstInputsMapUi.getComponentInstanceProperties();
-                       if (newInputsPropsMap != null && !newInputsPropsMap.isEmpty()) {
-
-                               result = createInputsFromProperty(component, origComponentMap, inputsToCreate, propertiesToCreateMap,  inputsValueToCreateMap, dataTypes, resList, newInputsPropsMap, false);
-
-                               if (result.isRight()) {
-                                       log.debug("Failed to create inputs of resource  for id {} error {}", component.getUniqueId(), result.right().value());
-                                       return result;
-                               }
-                               resList = result.left().value();
-
-                       }
-
-
-                       Either<List<InputDefinition>, StorageOperationStatus> assotiateInputsEither = toscaOperationFacade.addInputsToComponent(inputsToCreate, component.getUniqueId());
-                       if(assotiateInputsEither.isRight()){
-                               log.debug("Failed to create inputs under component {}. Status is {}", component.getUniqueId(), assotiateInputsEither.right().value());
-                               result = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(assotiateInputsEither.right().value())));
-                               return result;
-                       }
-
-                       Either<Map<String, List<ComponentInstanceProperty>>, StorageOperationStatus> assotiatePropsEither = toscaOperationFacade.addComponentInstancePropertiesToComponent(component, propertiesToCreateMap, component.getUniqueId());
-                       if(assotiatePropsEither.isRight()){
-                               log.debug("Failed to add inputs values under component {}. Status is {}", component.getUniqueId(), assotiateInputsEither.right().value());
-                               result = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(assotiateInputsEither.right().value())));
-                               return result;
-                       }
-
-                       Either<Map<String, List<ComponentInstanceInput>>, StorageOperationStatus> addciInputsEither = toscaOperationFacade.addComponentInstanceInputsToComponent(component, inputsValueToCreateMap);
-                       if(addciInputsEither.isRight()){
-                               log.debug("Failed to add inputs values under component {}. Status is {}", component.getUniqueId(), assotiateInputsEither.right().value());
-                               result = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(assotiateInputsEither.right().value())));
-                               return result;
-                       }
-
-
-
-
-                       result =  Either.left(resList);
-                       return result;
-                       ///////////////////////////////////////////////////////////////////////////////////////////
-
-               } finally {
-
-                       if (false == inTransaction) {
-
-                               if (result == null || result.isRight()) {
-                                       log.debug("Going to execute rollback on create group.");
-                                       titanDao.rollback();
-                               } else {
-                                       log.debug("Going to execute commit on create group.");
-                                       titanDao.commit();
-                               }
-
-                       }
-                       // unlock resource
-                       if (shouldLockComp && component != null) {
-                               graphLockOperation.unlockComponent(componentId, componentType.getNodeType());
-                       }
-
-               }
-
-       }
-
-       private StorageOperationStatus addInputsToComponent(String componentId, Map<String, InputDefinition> inputsToCreate, Map<String, List<ComponentInstanceInput>> inputsValueToCreateMap,  Map<String, DataTypeDefinition> allDataTypes, List<InputDefinition> resList, int index,
-                       String compInstId, String compInstname, org.openecomp.sdc.be.model.Component origComponent, InputDefinition input) {
-               
-
-               Either<List<InputDefinition>, ResponseFormat> result;
-               String innerType = null;
-               InputDefinition oldInput = origComponent.getInputs().stream().filter(ciIn -> ciIn.getUniqueId().equals(input.getUniqueId())).findAny().get();
-               String serviceInputName = compInstname + "_" + input.getName();
-               input.setName(serviceInputName);
-
-               JSONObject jobject = new JSONObject();
-               jobject.put(GET_INPUT, input.getName());
-
-               ComponentInstanceInput inputValue = new ComponentInstanceInput(oldInput, jobject.toJSONString(), null);
-
-               Either<String, StorageOperationStatus> validatevalueEiter = validateInputValueBeforeCreate(inputValue, jobject.toJSONString(), false, innerType, allDataTypes);
-               if (validatevalueEiter.isRight()) {
-
-                       return validatevalueEiter.right().value();
-               }
-
-               String uniqueId = UniqueIdBuilder.buildResourceInstanceInputValueUid(compInstId, index++);
-               inputValue.setUniqueId(uniqueId);
-               inputValue.setValue(validatevalueEiter.left().value());
-
-
-               input.setUniqueId(UniqueIdBuilder.buildPropertyUniqueId(componentId, input.getName()));
-               input.setSchema(oldInput.getSchema());
-               input.setDefaultValue(oldInput.getDefaultValue());
-               input.setConstraints(oldInput.getConstraints());
-               input.setDescription(oldInput.getDescription());
-               input.setHidden(oldInput.isHidden());
-               input.setImmutable(oldInput.isImmutable());
-               input.setDefinition(oldInput.isDefinition());
-               input.setRequired(oldInput.isRequired());
-               input.setOwnerId(null);
-               input.setParentUniqueId(null);
-               input.setInstanceUniqueId(compInstId);
-               inputsToCreate.put(input.getName(), input);
-
-
-
-               List<GetInputValueDataDefinition> getInputValues = new ArrayList<>();
-               GetInputValueDataDefinition getInputValueDataDefinition = new GetInputValueDataDefinition();
-               getInputValueDataDefinition.setInputId(input.getUniqueId());
-               getInputValueDataDefinition.setInputName(input.getName());
-               getInputValues.add(getInputValueDataDefinition);
-               inputValue.setGetInputValues(getInputValues);
-
-               List<ComponentInstanceInput> inputsValueToCreate = null;
-               
-               if(inputsValueToCreateMap.containsKey(compInstId)){
-                       inputsValueToCreate = inputsValueToCreateMap.get(compInstId);
-               }else{
-                       inputsValueToCreate = new ArrayList<>();
-               }
-               inputsValueToCreate.add(inputValue);
-               inputsValueToCreateMap.put(compInstId, inputsValueToCreate);
-       
-               
-               inputsValueToCreate.add(inputValue);
-               List<ComponentInstanceInput> inputsValue = input.getInputs();
-               if(inputsValue == null)
-                       inputsValue = new ArrayList<>();
-               inputsValue.add(inputValue);
-               input.setInputs(inputsValue);   
-
-               resList.add(input);
-               return StorageOperationStatus.OK;
-       }
-
-       public Either<List<InputDefinition>, ResponseFormat> createInputs(String componentId, String userId, ComponentTypeEnum componentType, List<InputDefinition> inputsDefinitions, boolean shouldLockComp, boolean inTransaction) {
-
-               Either<List<InputDefinition>, ResponseFormat> result = null;
-
-               org.openecomp.sdc.be.model.Component component = null;
-               try {
-
-                       if (inputsDefinitions != null && false == inputsDefinitions.isEmpty()) {
-
-                               if (shouldLockComp == true && inTransaction == true) {
-                                       BeEcompErrorManager.getInstance().logInternalFlowError("createGroups", "Cannot lock component since we are inside a transaction", ErrorSeverity.ERROR);
-                                       // Cannot lock component since we are in a middle of another
-                                       // transaction.
-                                       ActionStatus actionStatus = ActionStatus.INVALID_CONTENT;
-                                       result = Either.right(componentsUtils.getResponseFormat(actionStatus));
-                                       return result;
-                               }
-
-                               Either<User, ResponseFormat> validateUserExists = validateUserExists(userId, CREATE_INPUT, true);
-                               if (validateUserExists.isRight()) {
-                                       result = Either.right(validateUserExists.right().value());
-                                       return result;
-                               }
-
-                               User user = validateUserExists.left().value();
-
-                               Either<? extends org.openecomp.sdc.be.model.Component, ResponseFormat> validateComponent = validateComponentExists(componentId, componentType, null);
-                               if (validateComponent.isRight()) {
-                                       result = Either.right(validateComponent.right().value());
-                                       return result;
-                               }
-                               component = validateComponent.left().value();
-
-                               if (shouldLockComp) {
-                                       Either<Boolean, ResponseFormat> lockComponent = lockComponent(component, CREATE_INPUT);
-                                       if (lockComponent.isRight()) {
-                                               return Either.right(lockComponent.right().value());
-                                       }
-                               }
-
-                               Either<Boolean, ResponseFormat> canWork = validateCanWorkOnComponent(component, userId);
-                               if (canWork.isRight()) {
-                                       result = Either.right(canWork.right().value());
-                                       return result;
-                               }
-                               Map<String, InputDefinition> inputs = inputsDefinitions.stream().collect(Collectors.toMap( o -> o.getName(), o -> o));
-
-                               result = createInputsInGraph(inputs, component, user, inTransaction);
-                       }
-
-                       return result;
-
-               } finally {
-
-                       if (false == inTransaction) {
-
-                               if (result == null || result.isRight()) {
-                                       log.debug("Going to execute rollback on create group.");
-                                       titanDao.rollback();
-                               } else {
-                                       log.debug("Going to execute commit on create group.");
-                                       titanDao.commit();
-                               }
-
-                       }
-                       // unlock resource
-                       if (shouldLockComp && component != null) {
-                               graphLockOperation.unlockComponent(componentId, componentType.getNodeType());
-                       }
-
-               }
-
-       }
-
-       public Either<List<InputDefinition>, ResponseFormat> createInputsInGraph(Map<String, InputDefinition> inputs, org.openecomp.sdc.be.model.Component component, User user, boolean inTransaction) {
-
-               List<InputDefinition> resList = inputs.values().stream().collect(Collectors.toList());
-               Either<List<InputDefinition>, ResponseFormat> result = Either.left(resList);
-               List<InputDefinition> resourceProperties = component.getInputs();
-
-               if(inputs != null && !inputs.isEmpty()){
-                       Either<Map<String, DataTypeDefinition>, ResponseFormat> allDataTypes = getAllDataTypes(applicationDataTypeCache);
-                       if (allDataTypes.isRight()) {
-                               return Either.right(allDataTypes.right().value());
-                       }
-
-                       Map<String, DataTypeDefinition> dataTypes = allDataTypes.left().value();
-
-                       for (Map.Entry<String, InputDefinition> inputDefinition : inputs.entrySet()) {
-                               String inputName = inputDefinition.getKey();
-                               inputDefinition.getValue().setName(inputName);
-
-                               Either<InputDefinition, ResponseFormat> preparedInputEither = prepareAndValidateInputBeforeCreate(inputDefinition.getValue(), dataTypes);
-                               if(preparedInputEither.isRight()){
-                                       return Either.right(preparedInputEither.right().value());
-                               }
-
-                       }
-                       if (resourceProperties != null) {
-                               Map<String, InputDefinition> generatedInputs = resourceProperties.stream().collect(Collectors.toMap(i -> i.getName(), i -> i));
-                               Either<Map<String, InputDefinition>, String> mergeEither = ToscaDataDefinition.mergeDataMaps(generatedInputs, inputs);
-                               if(mergeEither.isRight()){
-                                       return Either.right(componentsUtils.getResponseFormat(ActionStatus.PROPERTY_ALREADY_EXIST, mergeEither.right().value()));
-                               }
-                               inputs = mergeEither.left().value();
-                       }
-
-                       Either<List<InputDefinition>, StorageOperationStatus> assotiateInputsEither = toscaOperationFacade.createAndAssociateInputs(inputs, component.getUniqueId());
-                       if(assotiateInputsEither.isRight()){
-                               log.debug("Failed to create inputs under component {}. Status is {}", component.getUniqueId(), assotiateInputsEither.right().value());
-                               return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(assotiateInputsEither.right().value())));
-                       }
-                       result  = Either.left(assotiateInputsEither.left().value());
-
-               }
-
-
-               return result;
-       }
-
-
-       /*          Mutates the object
-        *              Tail recurse -> traverse the tosca elements and remove nested empty map properties
-        *              this only handles nested maps, other objects are left untouched (even a Set containing a map) since behaviour is unexpected
-        *
-                        *              @param  toscaElement - expected map of tosca values
-        *          @return mutated @param toscaElement , where empty maps are deleted , return null for empty map.
-                       **/
-       private Object cleanEmptyNestedValuesInMap(Object toscaElement , short loopProtectionLevel ){
-               //region - Stop if map is empty
-               if (loopProtectionLevel<=0 || toscaElement==null || !(toscaElement instanceof  Map))
-                       return toscaElement;
-               //endregion
-               //region - Remove empty map entries & return null iff empty map
-               if ( MapUtils.isNotEmpty( (Map)toscaElement ) ) {
-                       Object ret;
-                       Set<Object> keysToRemove = new HashSet<>();                                                                                                                             // use different set to avoid ConcurrentModificationException
-                       for( Object key : ((Map)toscaElement).keySet() ) {
-                               Object value = ((Map) toscaElement).get(key);
-                               ret = cleanEmptyNestedValuesInMap(value , --loopProtectionLevel );
-                               if ( ret == null )
-                                       keysToRemove.add(key);
-                       }
-                       Collection set = ((Map) toscaElement).keySet();
-                       if (CollectionUtils.isNotEmpty(set))
-                               set.removeAll(keysToRemove);
-
-                       if ( isEmptyNestedMap(toscaElement) )                                                                                                                                           // similar to < if ( MapUtils.isEmpty( (Map)toscaElement ) ) > ,but adds nested map check
-                               return null;
-               }
-               //endregion
-               else
-                       return null;
-               return toscaElement;
-       }
-
-       //@returns true iff map nested maps are all empty
-       //ignores other collection objects
-       private boolean isEmptyNestedMap(Object element){
-               boolean isEmpty = true;
-               if (element != null){
-                       if ( element instanceof Map ){
-                               if (MapUtils.isEmpty((Map)element))
-                                       isEmpty = true;
-                               else
-                               {
-                                       for( Object key : ((Map)(element)).keySet() ){
-                                               Object value =  ((Map)(element)).get(key);
-                                               isEmpty &= isEmptyNestedMap( value );
-                                       }
-                               }
-                       } else {
-                               isEmpty = false;
-                       }
-               }
-               return isEmpty;
-       }
-
-       public Either cleanNestedMap( Map mappedToscaTemplate , boolean deepClone  ){
-               if (MapUtils.isNotEmpty( mappedToscaTemplate ) ){
-                       if (deepClone){
-                               if (!(mappedToscaTemplate instanceof HashMap))
-                                       return Either.right("expecting mappedToscaTemplate as HashMap ,recieved "+ mappedToscaTemplate.getClass().getSimpleName() );
-                               else
-                                       mappedToscaTemplate = (HashMap)((HashMap) mappedToscaTemplate).clone();
-                       }
-                       return Either.left( (Map) cleanEmptyNestedValuesInMap( mappedToscaTemplate , InputsBusinessLogic.LOOP_PROTECTION_LEVEL ) );
-               }
-               else {
-                       log.debug("mappedToscaTemplate is empty ");
-                       return Either.right("mappedToscaTemplate is empty ");
-               }
-       }
-
-
-
-       /**
-        * Delete input from service
-        *
-        * @param componentType
-        * @param inputId
-        * @param component
-        * @param user
-        *
-        * @return
-        */
-       public Either<InputDefinition, ResponseFormat> deleteInput(String componentType, String componentId, String userId, String inputId) {
-
-               Either<InputDefinition, ResponseFormat> deleteEither = null;
-               if (log.isDebugEnabled())
-                       log.debug("Going to delete input id: {}", inputId);
-
-               // Validate user (exists)
-               Either<User, ResponseFormat> userEither = validateUserExists(userId, "Delete input", true);
-               if (userEither.isRight()) {
-                       deleteEither =  Either.right(userEither.right().value());
-                       return deleteEither;
-               }
-
-               // Get component using componentType, componentId
-
-               ComponentParametersView componentParametersView = new ComponentParametersView();
-               componentParametersView.disableAll();
-               componentParametersView.setIgnoreInputs(false);
-               componentParametersView.setIgnoreComponentInstances(false);
-               componentParametersView.setIgnoreComponentInstancesInputs(false);
-               componentParametersView.setIgnoreComponentInstancesProperties(false);
-               componentParametersView.setIgnoreUsers(false);
-
-               Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> componentEither = toscaOperationFacade.getToscaElement(componentId, componentParametersView);
-               if (componentEither.isRight()) {
-                       deleteEither =  Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(componentEither.right().value())));
-                       return deleteEither;
-               }
-               org.openecomp.sdc.be.model.Component component = componentEither.left().value();
-
-               // Validate inputId is child of the component
-               Optional<InputDefinition> optionalInput = component.getInputs().stream().
-               // filter by ID
-                               filter(input -> input.getUniqueId().equals(inputId)).
-                               // Get the input
-                               findAny();
-               if (!optionalInput.isPresent()) {
-                       return Either.right(componentsUtils.getResponseFormat(ActionStatus.INPUT_IS_NOT_CHILD_OF_COMPONENT, inputId, componentId));
-               }
-
-               InputDefinition inputForDelete = optionalInput.get();
-
-               // Lock component
-               Either<Boolean, ResponseFormat> lockResultEither = lockComponent(componentId, component, "deleteInput");
-               if (lockResultEither.isRight()) {
-                       ResponseFormat responseFormat = lockResultEither.right().value();
-                       deleteEither =  Either.right(responseFormat);
-                       return deleteEither;
-               }
-
-               // Delete input operations
-               try {
-                       StorageOperationStatus status = toscaOperationFacade.deleteInputOfResource(component, inputForDelete.getName());
-                       if(status != StorageOperationStatus.OK){
-                               log.debug("Component id: {} delete input id: {} failed", componentId, inputId);
-                               deleteEither =  Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(status), component.getName()));
-                               return deleteEither;
-                       }
-
-                       List<ComponentInstanceInput> inputsValue= getComponentInstanceInputsByInputId(component, inputId);
-                       Map<String, List<ComponentInstanceInput>> insInputsMatToDelete = new HashMap<>();
-
-                       if(inputsValue != null && !inputsValue.isEmpty()){
-                               for(ComponentInstanceInput inputValue: inputsValue){
-                                       String compInstId = inputValue.getComponentInstanceId();
-                                       prepareValueBeforeDelete(compInstId, inputForDelete, inputValue, inputValue.getPath());
-                                       
-                                       status = toscaOperationFacade.updateComponentInstanceInput(component, compInstId, inputValue);
-                                       List<ComponentInstanceInput> inputList = null;
-                                       if(status != StorageOperationStatus.OK){
-                                               log.debug("Component id: {} update component instance property {} id: {} failed", componentId, inputValue.getUniqueId(), inputId);
-                                               deleteEither = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(status), component.getName()));
-                                               return deleteEither;
-                                       }
-
-                               }
-                               
-                               
-                       }
-
-                       // US848813 delete service input that relates to VL / CP property
-
-                       List<ComponentInstanceProperty> propertiesValue = getComponentInstancePropertiesByInputId(component, inputId);
-                               if(propertiesValue != null && !propertiesValue.isEmpty()){
-                                       //propertyList = propertyValueStatus.left().value();
-                                       for(ComponentInstanceProperty propertyValue: propertiesValue){
-
-                                               String compInstId = propertyValue.getComponentInstanceId();
-                                               prepareValueBeforeDelete(compInstId, inputForDelete, propertyValue, propertyValue.getPath());
-                                               
-                                               status = toscaOperationFacade.updateComponentInstanceProperty(component, compInstId, propertyValue);
-                                               if(status != StorageOperationStatus.OK){
-                                                       log.debug("Component id: {} update component instance property {} id: {} failed", componentId, propertyValue.getUniqueId(), inputId);
-                                                       deleteEither = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(status), component.getName()));
-                                                       return deleteEither;
-                                               }
-
-                                       }
-                               }
-
-
-                               deleteEither = Either.left(inputForDelete);
-                       return deleteEither;
-               } finally {
-                       if (deleteEither == null || deleteEither.isRight()) {
-                               log.debug("Component id: {} delete input id: {} failed", componentId, inputId);
-                               titanDao.rollback();
-                       } else {
-                               log.debug("Component id: {} delete input id: {} success", componentId, inputId);
-                               titanDao.commit();
-                       }
-                       unlockComponent(deleteEither, component);
-               }
-       }
-
-       private Either<InputDefinition, ResponseFormat>  prepareValueBeforeDelete(String compInstId, InputDefinition inputForDelete, PropertyDefinition inputValue, List<String> pathOfComponentInstances) {
-               Either<InputDefinition, ResponseFormat> deleteEither = Either.left(inputForDelete);
-               String value = inputValue.getValue();
-               Map<String, Object> mappedToscaTemplate = (Map<String, Object>) new Yaml().load(value);
-
-               resetInputName(mappedToscaTemplate, inputForDelete.getName());
-
-               value = "";
-               if(!mappedToscaTemplate.isEmpty()){
-                       Either result = cleanNestedMap(mappedToscaTemplate , true);
-                       Map modifiedMappedToscaTemplate = mappedToscaTemplate;
-                       if (result.isLeft())
-                               modifiedMappedToscaTemplate = (Map)result.left().value();
-                       else
-                               Log.warn("Map cleanup failed -> " +result.right().value().toString());  //continue, don't break operation
-                       value = gson.toJson(modifiedMappedToscaTemplate);
-               }
-               inputValue.setValue(value);
-               
-               
-               List<GetInputValueDataDefinition> getInputsValues = inputValue.getGetInputValues();
-               if(getInputsValues != null && !getInputsValues.isEmpty()){
-                       Optional<GetInputValueDataDefinition> op = getInputsValues.stream().filter(gi -> gi.getInputId().equals(inputForDelete.getUniqueId())).findAny();
-                       if(op.isPresent()){
-                               getInputsValues.remove(op.get());
-                       }
-               }
-               inputValue.setGetInputValues(getInputsValues);
-
-               Either<String, TitanOperationStatus> findDefaultValue = propertyOperation.findDefaultValueFromSecondPosition(pathOfComponentInstances, inputValue.getUniqueId(), inputValue.getDefaultValue());
-               if (findDefaultValue.isRight()) {
-                       deleteEither = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(DaoStatusConverter.convertTitanStatusToStorageStatus(findDefaultValue.right().value()))));
-                       return deleteEither;
-
-               }
-               String defaultValue = findDefaultValue.left().value();
-               inputValue.setDefaultValue(defaultValue);
-               log.debug("The returned default value in ResourceInstanceProperty is {}", defaultValue);
-               return deleteEither;
-       }
-
-       private Either<InputDefinition, ResponseFormat> prepareAndValidateInputBeforeCreate(InputDefinition newInputDefinition, Map<String, DataTypeDefinition> dataTypes) {
-
-
-               // validate input default values
-               Either<Boolean, ResponseFormat> defaultValuesValidation = validatePropertyDefaultValue(newInputDefinition, dataTypes);
-               if (defaultValuesValidation.isRight()) {
-                       return Either.right(defaultValuesValidation.right().value());
-               }
-               // convert property
-               ToscaPropertyType type = getType(newInputDefinition.getType());
-               if (type != null) {
-                       PropertyValueConverter converter = type.getConverter();
-                       // get inner type
-                       String innerType = null;
-                       if (newInputDefinition != null) {
-                               SchemaDefinition schema = newInputDefinition.getSchema();
-                               if (schema != null) {
-                                       PropertyDataDefinition prop = schema.getProperty();
-                                       if (prop != null) {
-                                               innerType = prop.getType();
-                                       }
-                               }
-                               String convertedValue = null;
-                               if (newInputDefinition.getDefaultValue() != null) {
-                                       convertedValue = converter.convert(newInputDefinition.getDefaultValue(), innerType, dataTypes);
-                                       newInputDefinition.setDefaultValue(convertedValue);
-                               }
-                       }
-               }
-               return Either.left(newInputDefinition);
-       }
-
-       public boolean isInputExist(List<InputDefinition> inputs, String resourceUid, String inputName) {
-
-               if (inputs == null) {
-                       return false;
-               }
-
-               for (InputDefinition propertyDefinition : inputs) {
-                       String parentUniqueId = propertyDefinition.getParentUniqueId();
-                       String name = propertyDefinition.getName();
-
-                       if (parentUniqueId.equals(resourceUid) && name.equals(inputName)) {
-                               return true;
-                       }
-               }
-
-               return false;
-
-       }
-
-
-       public Either<InputDefinition, ResponseFormat> getInputsAndPropertiesForComponentInput(String userId, String componentId, String inputId, boolean inTransaction) {
-               Either<InputDefinition, ResponseFormat> result = null;
-               try {
-
-                       Either<User, ResponseFormat> resp = validateUserExists(userId, "get Properties by input", false);
-                       if (resp.isRight()) {
-                               return Either.right(resp.right().value());
-                       }
-                       Either<List<ComponentInstanceProperty>, StorageOperationStatus> propertiesEitherRes = null;
-
-                       ComponentParametersView filters = new ComponentParametersView();
-                       filters.disableAll();
-                       filters.setIgnoreComponentInstances(false);
-                       filters.setIgnoreInputs(false);
-                       filters.setIgnoreComponentInstancesInputs(false);
-                       filters.setIgnoreComponentInstancesProperties(false);
-                       filters.setIgnoreProperties(false);
-                       Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> getComponentEither = toscaOperationFacade.getToscaElement(componentId, filters);
-                       if(getComponentEither.isRight()){
-                               ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-                               log.debug("Failed to found component {}, error: {}", componentId, actionStatus.name());
-                               return Either.right(componentsUtils.getResponseFormat(actionStatus));
-
-                       }
-                       org.openecomp.sdc.be.model.Component component = getComponentEither.left().value();
-                       Optional<InputDefinition> op = component.getInputs().stream().filter(in -> in.getUniqueId().equals(inputId)).findFirst();
-                       if(!op.isPresent()){
-                               ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
-                               log.debug("Failed to found input {} under component {}, error: {}", inputId, componentId, actionStatus.name());
-                               return Either.right(componentsUtils.getResponseFormat(actionStatus));
-                       }
-
-                       InputDefinition resObj = op.get();
-
-                       List<ComponentInstanceInput> inputCIInput = getComponentInstanceInputsByInputId(component, inputId) ;
-
-                       resObj.setInputs(inputCIInput);
-
-
-                       List<ComponentInstanceProperty> inputProps = getComponentInstancePropertiesByInputId(component, inputId) ;
-
-                       resObj.setProperties(inputProps);
-
-
-                       result = Either.left(resObj);
-
-                       return result;
-
-               } finally {
-
-                       if (false == inTransaction) {
-
-                               if (result == null || result.isRight()) {
-                                       log.debug("Going to execute rollback on create group.");
-                                       titanDao.rollback();
-                               } else {
-                                       log.debug("Going to execute commit on create group.");
-                                       titanDao.commit();
-                               }
-
-                       }
-
-               }
-
-       }
-
-       private List<ComponentInstanceProperty> getComponentInstancePropertiesByInputId(org.openecomp.sdc.be.model.Component component, String inputId){
-               List<ComponentInstanceProperty> resList = new ArrayList<>();
-               Map<String, List<ComponentInstanceProperty>> ciPropertiesMap = component.getComponentInstancesProperties();
-               if(ciPropertiesMap != null && !ciPropertiesMap.isEmpty()){
-                       ciPropertiesMap.forEach(new BiConsumer<String, List<ComponentInstanceProperty>>() {
-                               @Override
-                               public void accept(String s, List<ComponentInstanceProperty> ciPropList) {
-                                       String ciName = "";
-                                       Optional<ComponentInstance> ciOp = component.getComponentInstances().stream().filter(ci ->ci.getUniqueId().equals(s)).findAny();
-                                       if(ciOp.isPresent())
-                                               ciName = ciOp.get().getName();
-                                       if (ciPropList != null && !ciPropList.isEmpty()) {
-                                               for(ComponentInstanceProperty prop: ciPropList){
-                                                       List<GetInputValueDataDefinition> inputsValues = prop.getGetInputValues();
-                                                       if(inputsValues != null && !inputsValues.isEmpty()){
-                                                               for(GetInputValueDataDefinition inputData: inputsValues){
-                                                                       if(inputData.getInputId().equals(inputId) || (inputData.getGetInputIndex() != null && inputData.getGetInputIndex().getInputId().equals(inputId))){
-                                                                               prop.setComponentInstanceId(s);
-                                                                               prop.setComponentInstanceName(ciName);
-                                                                               resList.add(prop);
-                                                                               break;
-                                                                       }
-                                                               }
-                                                       }
-
-                                               }
-                                       }
-                               }
-                       });
-               }
-               return resList;
-
-       }
-
-       private List<ComponentInstanceInput> getComponentInstanceInputsByInputId(org.openecomp.sdc.be.model.Component component, String inputId){
-               List<ComponentInstanceInput> resList = new ArrayList<>();
-               Map<String, List<ComponentInstanceInput>> ciInputsMap = component.getComponentInstancesInputs();
-               if(ciInputsMap != null && !ciInputsMap.isEmpty()){
-                       ciInputsMap.forEach(new BiConsumer<String, List<ComponentInstanceInput>>() {
-                               @Override
-                               public void accept(String s, List<ComponentInstanceInput> ciPropList) {
-                                       String ciName = "";
-                                       Optional<ComponentInstance> ciOp = component.getComponentInstances().stream().filter(ci ->ci.getUniqueId().equals(s)).findAny();
-                                       if(ciOp.isPresent())
-                                               ciName = ciOp.get().getName();
-                                       if (ciPropList != null && !ciPropList.isEmpty()) {
-                                               for(ComponentInstanceInput prop: ciPropList){
-                                                       List<GetInputValueDataDefinition> inputsValues = prop.getGetInputValues();
-                                                       if(inputsValues != null && !inputsValues.isEmpty()){
-                                                               for(GetInputValueDataDefinition inputData: inputsValues){
-                                                                       if(inputData.getInputId().equals(inputId) || (inputData.getGetInputIndex() != null && inputData.getGetInputIndex().getInputId().equals(inputId))){
-                                                                               prop.setComponentInstanceId(s);
-                                                                               prop.setComponentInstanceName(ciName);
-                                                                               resList.add(prop);
-                                                                               break;
-                                                                       }
-                                                               }
-                                                       }
-
-                                               }
-                                       }
-                               }
-                       });
-               }
-               return resList;
-
-       }
-
-       private Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> getOriginComponent(ComponentInstance ci, Map<String, org.openecomp.sdc.be.model.Component> origComponentMap){
-               Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> result = null;
-               String compInstname = ci.getNormalizedName();
-
-               ComponentParametersView componentParametersView = new ComponentParametersView();
-               componentParametersView.disableAll();
-               componentParametersView.setIgnoreInputs(false);
-               org.openecomp.sdc.be.model.Component origComponent = null;
-               if(!origComponentMap.containsKey(ci.getComponentUid())){
-                       Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> componentFound  = toscaOperationFacade.getToscaElement(ci.getComponentUid(), componentParametersView);
-
-                       if (componentFound.isRight()) {
-                               result = Either.right(componentFound.right().value());
-                               return result;
-                       }
-                       origComponent =  componentFound.left().value();
-                       origComponentMap.put(origComponent.getUniqueId(), origComponent);
-               }else{
-                       origComponent = origComponentMap.get(ci.getComponentUid());
-               }
-               result = Either.left(origComponent);
-               return result;
-       }
-
-
-
-       private Either<List<InputDefinition>, ResponseFormat> createInputsFromProperty(org.openecomp.sdc.be.model.Component component, Map<String, org.openecomp.sdc.be.model.Component> origComponentMap,  Map<String, InputDefinition> inputsToCreate, Map<String, List<ComponentInstanceProperty>> propertiesToCreateMap, Map<String, List<ComponentInstanceInput>> inputsValueToCreateMap, Map<String, DataTypeDefinition> dataTypes,  List<InputDefinition> resList, Map<String, List<ComponentInstancePropInput>> newInputsPropsMap, boolean isInputValue) {
-               List<ComponentInstance> ciList = component.getComponentInstances();
-               String componentId = component.getUniqueId();
-               for (Entry<String, List<ComponentInstancePropInput>> entry : newInputsPropsMap.entrySet()) {
-                       String compInstId = entry.getKey();
-                       List<ComponentInstanceProperty> propertiesToCreate = null;
-                       if(propertiesToCreateMap.containsKey(compInstId)){
-                               propertiesToCreate = propertiesToCreateMap.get(compInstId);
-                       }else{
-                               propertiesToCreate = new ArrayList<>();
-                       }
-                       
-                       List<ComponentInstanceInput> inputsValueToCreate = null;
-                       if(propertiesToCreateMap.containsKey(compInstId)){
-                               inputsValueToCreate = inputsValueToCreateMap.get(compInstId);
-                       }else{
-                               inputsValueToCreate = new ArrayList<>();
-                       }
-                       
-                       List<ComponentInstancePropInput> properties = entry.getValue();
-
-                       Optional<ComponentInstance> op = ciList.stream().filter(ci -> ci.getUniqueId().equals(compInstId)).findAny();
-                       if(!op.isPresent()){
-                               ActionStatus actionStatus = ActionStatus.INVALID_CONTENT;
-                               log.debug("Failed to find component instance {} under component {}", compInstId, componentId);
-                               return Either.right(componentsUtils.getResponseFormat(actionStatus));
-
-                       }
-                       ComponentInstance ci = op.get();
-                       String compInstname = ci.getNormalizedName();
-                       Either<org.openecomp.sdc.be.model.Component, StorageOperationStatus> origComponentEither = getOriginComponent(ci, origComponentMap);
-                       if(origComponentEither.isRight()){
-                               ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(origComponentEither.right().value());
-                               log.debug("Failed to create inputs value under component {}, error: {}", componentId, actionStatus.name());
-                               return Either.right(componentsUtils.getResponseFormat(actionStatus));
-
-                       }
-                       org.openecomp.sdc.be.model.Component origComponent = origComponentEither.left().value();
-
-
-                       //String originType = (String) titanGenericDao.getProperty(originVertex, GraphPropertiesDictionary.LABEL.getProperty());
-
-                       String inputName = compInstname;
-
-                       if (properties != null && !properties.isEmpty()) {
-                               for (ComponentInstancePropInput propInput : properties) {
-                                       propInput.setOwnerId(null);
-                                       propInput.setParentUniqueId(null);
-
-                                       Either<InputDefinition, StorageOperationStatus> createInputRes = createInputForComponentInstance(component, origComponent,ci, inputsToCreate, propertiesToCreate, inputsValueToCreate, dataTypes, inputName, propInput, isInputValue);
-
-                                       if (createInputRes.isRight()) {
-                                               log.debug("Failed to create input  of resource instance for id {} error {}", compInstId, createInputRes.right().value());
-                                               return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(createInputRes.right().value())));
-
-                                       }
-
-                                       resList.add(createInputRes.left().value());
-
-                               }
-                               if(! isInputValue){
-                                       propertiesToCreateMap.put(compInstId, propertiesToCreate);
-                               }                                       
-                               else{
-                                       inputsValueToCreateMap.put(compInstId, inputsValueToCreate);
-                               }
-                       }
-
-               }
-               return Either.left(resList);
-       }
-
-       private Either<InputDefinition, StorageOperationStatus> createInputForComponentInstance(org.openecomp.sdc.be.model.Component component,org.openecomp.sdc.be.model.Component orignComponent, ComponentInstance ci, Map<String, InputDefinition> inputsToCreate, List<ComponentInstanceProperty> propertiesToCreate, List<ComponentInstanceInput> inputsValueToCreate, Map<String, DataTypeDefinition> dataTypes, String inputName, ComponentInstancePropInput propInput, boolean isInputValue) {
-               String propertiesName = propInput.getPropertiesName() ;
-               PropertyDefinition selectedProp = propInput.getInput();
-               String[] parsedPropNames = propInput.getParsedPropNames();
-
-               if(parsedPropNames != null){
-                       for(String str: parsedPropNames){
-                               inputName += "_"  + str;
-                       }
-               } else {
-                       inputName += "_"  + propInput.getName();
-               }
-
-               InputDefinition input = null;
-               PropertyDefinition prop = propInput;
-
-               if(CollectionUtils.isNotEmpty(propertiesToCreate) && !isInputValue){
-                       Optional<ComponentInstanceProperty> propOpt = propertiesToCreate.stream().filter(p -> p.getName().equals(propInput.getName())).findFirst();
-                       if(propOpt.isPresent()){
-                               prop = propOpt.get();
-                       }
-               }else{
-                       if(CollectionUtils.isNotEmpty(inputsValueToCreate) && isInputValue){
-                               Optional<ComponentInstanceInput> propOpt = inputsValueToCreate.stream().filter(p -> p.getName().equals(propInput.getName())).findFirst();
-                               if(propOpt.isPresent()){
-                                       prop = propOpt.get();
-                               }
-                       }
-               }
-               
-               boolean complexProperty = false;
-               if(propertiesName != null && !propertiesName.isEmpty() && selectedProp != null){
-                       complexProperty = true;
-                       input = new InputDefinition(selectedProp);
-               }else{
-                       input = new InputDefinition(prop);
-                       input.setName(inputName + "_" + prop.getName());
-
-               }
-               input.setName(inputName);
-               input.setUniqueId(UniqueIdBuilder.buildPropertyUniqueId(component.getUniqueId(), input.getName()));
-               input.setInputPath(propertiesName);
-               input.setInstanceUniqueId(ci.getUniqueId());
-               input.setPropertyId(propInput.getUniqueId());
-
-               JSONObject jobject = new JSONObject();
-
-
-               if(prop.getValue() == null || prop.getValue().isEmpty()){
-                       if(complexProperty){
-
-                               jobject = createJSONValueForProperty(parsedPropNames.length -1, parsedPropNames, jobject, inputName);
-                               prop.setValue(jobject.toJSONString());
-
-                       }else{
-
-                               jobject.put(GET_INPUT, input.getName());
-                               prop.setValue(jobject.toJSONString());
-
-                       }
-
-               }else{
-
-                       String value = prop.getValue();
-                       Object objValue =  new Yaml().load(value);
-                       if( objValue instanceof Map || objValue  instanceof List ){
-                               if(!complexProperty){
-                                       jobject.put(GET_INPUT, input.getName());
-                                       prop.setValue(jobject.toJSONString());
-                                       
-
-                               }else{
-                                       Map<String, Object> mappedToscaTemplate = (Map<String, Object>) objValue;
-                                       createInputValue(mappedToscaTemplate, 1, parsedPropNames, inputName);
-
-                                       String json = gson.toJson(mappedToscaTemplate);
-                                       prop.setValue(json);
-                                       
-                               }
-
-                       }else{
-                               jobject.put(GET_INPUT, input.getName());
-                               prop.setValue(jobject.toJSONString());
-                               
-                       }
-
-               }
-               
-               ((IComponentInstanceConnectedElement)prop).setComponentInstanceId(ci.getUniqueId());
-               ((IComponentInstanceConnectedElement)prop).setComponentInstanceName(ci.getName());
-
-               if(CollectionUtils.isEmpty(prop.getGetInputValues())){
-                       prop.setGetInputValues(new ArrayList<>());
-               }
-               List<GetInputValueDataDefinition> getInputValues = prop.getGetInputValues();
-
-               GetInputValueDataDefinition getInputValueDataDefinition = new GetInputValueDataDefinition();
-               getInputValueDataDefinition.setInputId(input.getUniqueId());
-               getInputValueDataDefinition.setInputName(input.getName());
-               getInputValues.add(getInputValueDataDefinition);
-
-               if(!isInputValue){
-                       if(!propertiesToCreate.contains(prop)){
-                               propertiesToCreate.add((ComponentInstanceProperty)prop);
-                       }
-       
-                       inputsToCreate.put(input.getName(), input);
-                       List<ComponentInstanceProperty> propertiesList = input.getProperties();
-                       if(propertiesList == null)
-                        propertiesList = new ArrayList<>(); // adding the property with the new value for UI
-                       propertiesList.add((ComponentInstanceProperty)prop);
-                       input.setProperties(propertiesList);
-               }else{
-                       ComponentInstanceInput inputValue = new ComponentInstanceInput(prop);
-                       if(!inputsValueToCreate.contains(inputValue)){
-                               inputsValueToCreate.add(inputValue);;
-                       }
-       
-                       inputsToCreate.put(input.getName(), input);
-                       List<ComponentInstanceInput> inputsValueList = input.getInputs();
-                       if(inputsValueList == null)
-                               inputsValueList = new ArrayList<>(); // adding the property with the new value for UI
-                       inputsValueList.add(inputValue);
-                       input.setInputs(inputsValueList);
-               }
-
-               return Either.left(input);
-
-       }
-
-       private  JSONObject createJSONValueForProperty (int i, String [] parsedPropNames, JSONObject ooj, String inputName){
-
-               while(i >= 1){
-                       if( i == parsedPropNames.length -1){
-                               JSONObject jobProp = new JSONObject();
-                               jobProp.put(GET_INPUT, inputName);
-                               ooj.put(parsedPropNames[i], jobProp);
-                               i--;
-                               return createJSONValueForProperty (i, parsedPropNames, ooj, inputName);
-                       }else{
-                               JSONObject res = new JSONObject();
-                               res.put(parsedPropNames[i], ooj);
-                               i --;
-                               res =  createJSONValueForProperty (i, parsedPropNames, res, inputName);
-                               return res;
-                       }
-               }
-
-               return ooj;
-       }
-
-       public void resetInputName(Map<String, Object> lhm1, String inputName){
-           for (Map.Entry<String, Object> entry : lhm1.entrySet()) {
-               String key = entry.getKey();
-               Object value = entry.getValue();
-               if (value instanceof String && ((String) value).equalsIgnoreCase(inputName) && key.equals(GET_INPUT)) {
-                       value = "";
-                       lhm1.remove(key);
-               } else if (value instanceof Map) {
-                   Map<String, Object> subMap = (Map<String, Object>)value;
-                   resetInputName(subMap, inputName);
-               } else {
-                    continue;
-               }
-
-           }
-       }
-
-       private  Map<String, Object> createInputValue(Map<String, Object> lhm1, int index, String[] inputNames, String inputName){
-               while(index < inputNames.length){
-                       if(lhm1.containsKey(inputNames[index])){
-                               Object value = lhm1.get(inputNames[index]);
-                               if (value instanceof Map){
-                                       if(index == inputNames.length -1){
-                                               ((Map) value).put(GET_INPUT, inputName);
-                                               return ((Map) value);
-
-                                       }else{
-                                               index++;
-                                               return  createInputValue((Map)value, index, inputNames, inputName);
-                                       }
-                               }else{
-                                       Map<String, Object> jobProp = new HashMap<>();
-                                       if(index == inputNames.length -1){
-                                               jobProp.put(GET_INPUT, inputName);
-                                               lhm1.put(inputNames[index], jobProp);
-                                               return lhm1;
-                                       }else{
-                                               lhm1.put(inputNames[index], jobProp);
-                                               index++;
-                                               return  createInputValue(jobProp, index, inputNames, inputName);
-                                       }
-                               }
-                       }else{
-                               Map<String, Object> jobProp = new HashMap<>();
-                               lhm1.put(inputNames[index], jobProp);
-                               if(index == inputNames.length -1){
-                                       jobProp.put(GET_INPUT, inputName);
-                                       return jobProp;
-                               }else{
-                                       index++;
-                                       return  createInputValue(jobProp, index, inputNames, inputName);
-                               }
-                       }
-               }
-               return lhm1;
-       }
-
-
-
-
+    private static final String CREATE_INPUT = "CreateInput";
+    private static final String UPDATE_INPUT = "UpdateInput";
+    private static final Logger log = Logger.getLogger(InputsBusinessLogic.class);
+    private static final String FAILED_TO_FOUND_COMPONENT_ERROR = "Failed to found component {}, error: {}";
+    private static final String FAILED_TO_FOUND_INPUT_UNDER_COMPONENT_ERROR = "Failed to found input {} under component {}, error: {}";
+    private static final String GOING_TO_EXECUTE_ROLLBACK_ON_CREATE_GROUP = "Going to execute rollback on create group.";
+    private static final String GOING_TO_EXECUTE_COMMIT_ON_CREATE_GROUP = "Going to execute commit on create group.";
+    private static final String GOING_TO_EXECUTE_ROLLBACK_ON_UPDATE_INPUT = "Going to execute rollback on update input.";
+    private static final String GOING_TO_EXECUTE_COMMIT_ON_UPDATE_INPUT = "Going to execute commit on update input.";
+    private static final LoggerSupportability loggerSupportability = LoggerSupportability.getLogger(InputsBusinessLogic.class.getName());
+    private final PropertyDeclarationOrchestrator propertyDeclarationOrchestrator;
+    private final ComponentInstanceBusinessLogic componentInstanceBusinessLogic;
+    private final DataTypeBusinessLogic dataTypeBusinessLogic;
+
+    @Autowired
+    public InputsBusinessLogic(IElementOperation elementDao, IGroupOperation groupOperation, IGroupInstanceOperation groupInstanceOperation,
+                               IGroupTypeOperation groupTypeOperation, InterfaceOperation interfaceOperation,
+                               InterfaceLifecycleOperation interfaceLifecycleTypeOperation,
+                               PropertyDeclarationOrchestrator propertyDeclarationOrchestrator,
+                               ComponentInstanceBusinessLogic componentInstanceBusinessLogic, DataTypeBusinessLogic dataTypeBusinessLogic,
+                               ArtifactsOperations artifactToscaOperation) {
+        super(elementDao, groupOperation, groupInstanceOperation, groupTypeOperation, interfaceOperation, interfaceLifecycleTypeOperation,
+            artifactToscaOperation);
+        this.propertyDeclarationOrchestrator = propertyDeclarationOrchestrator;
+        this.componentInstanceBusinessLogic = componentInstanceBusinessLogic;
+        this.dataTypeBusinessLogic = dataTypeBusinessLogic;
+    }
+
+    /**
+     * associate inputs to a given component with paging
+     *
+     * @param userId
+     * @param componentId
+     * @return
+     */
+    public Either<List<InputDefinition>, ResponseFormat> getInputs(String userId, String componentId) {
+        validateUserExists(userId);
+        ComponentParametersView filters = new ComponentParametersView();
+        filters.disableAll();
+        filters.setIgnoreInputs(false);
+        Either<Component, StorageOperationStatus> getComponentEither = toscaOperationFacade
+            .getToscaElement(componentId, filters);
+        if (getComponentEither.isRight()) {
+            ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
+            log.debug(FAILED_TO_FOUND_COMPONENT_ERROR, componentId, actionStatus);
+            return Either.right(componentsUtils.getResponseFormat(actionStatus));
+        }
+        Component component = getComponentEither.left().value();
+        List<InputDefinition> inputs = component.getInputs();
+        return Either.left(inputs);
+    }
+
+    public Either<List<ComponentInstanceInput>, ResponseFormat> getComponentInstanceInputs(String userId, String componentId,
+                                                                                           String componentInstanceId) {
+        validateUserExists(userId);
+        ComponentParametersView filters = new ComponentParametersView();
+        filters.disableAll();
+        filters.setIgnoreInputs(false);
+        filters.setIgnoreComponentInstances(false);
+        filters.setIgnoreComponentInstancesInputs(false);
+        Either<Component, StorageOperationStatus> getComponentEither = toscaOperationFacade
+            .getToscaElement(componentId, filters);
+        if (getComponentEither.isRight()) {
+            ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
+            log.debug(FAILED_TO_FOUND_COMPONENT_ERROR, componentId, actionStatus);
+            return Either.right(componentsUtils.getResponseFormat(actionStatus));
+        }
+        Component component = getComponentEither.left().value();
+        if (!ComponentValidations.validateComponentInstanceExist(component, componentInstanceId)) {
+            ActionStatus actionStatus = ActionStatus.COMPONENT_INSTANCE_NOT_FOUND;
+            log.debug("Failed to found component instance inputs {}, error: {}", componentInstanceId, actionStatus);
+            loggerSupportability.log(LoggerSupportabilityActions.CREATE_INPUTS, component.getComponentMetadataForSupportLog(), StatusCode.ERROR,
+                "Failed to found component instance inputs componentInstanceId: {}", componentInstanceId);
+            return Either.right(componentsUtils.getResponseFormat(actionStatus));
+        }
+        Map<String, List<ComponentInstanceInput>> ciInputs = Optional.ofNullable(component.getComponentInstancesInputs())
+            .orElse(Collections.emptyMap());
+        // Set Constraints on Input
+        MapUtils.emptyIfNull(ciInputs).values()
+            .forEach(inputs -> ListUtils.emptyIfNull(inputs).forEach(input -> input.setConstraints(setInputConstraint(input))));
+        return Either.left(ciInputs.getOrDefault(componentInstanceId, Collections.emptyList()));
+    }
+
+    /**
+     * associate properties to a given component instance input
+     *
+     * @param instanceId
+     * @param userId
+     * @param inputId
+     * @return
+     */
+    public Either<List<ComponentInstanceProperty>, ResponseFormat> getComponentInstancePropertiesByInputId(String userId, String componentId,
+                                                                                                           String instanceId, String inputId) {
+        validateUserExists(userId);
+        String parentId = componentId;
+        Component component;
+        ComponentParametersView filters = new ComponentParametersView();
+        filters.disableAll();
+        filters.setIgnoreComponentInstances(false);
+        if (!instanceId.equals(inputId)) {
+            Either<Component, StorageOperationStatus> getComponentEither = toscaOperationFacade
+                .getToscaElement(parentId, filters);
+            if (getComponentEither.isRight()) {
+                ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
+                log.debug(FAILED_TO_FOUND_COMPONENT_ERROR, parentId, actionStatus);
+                return Either.right(componentsUtils.getResponseFormat(actionStatus));
+            }
+            component = getComponentEither.left().value();
+            Optional<ComponentInstance> ciOp = component.getComponentInstances().stream().filter(ci -> ci.getUniqueId().equals(instanceId)).findAny();
+            if (ciOp.isPresent()) {
+                parentId = ciOp.get().getComponentUid();
+            }
+        }
+        filters.setIgnoreInputs(false);
+        filters.setIgnoreComponentInstancesProperties(false);
+        filters.setIgnoreComponentInstancesInputs(false);
+        filters.setIgnoreProperties(false);
+        Either<Component, StorageOperationStatus> getComponentEither = toscaOperationFacade
+            .getToscaElement(parentId, filters);
+        if (getComponentEither.isRight()) {
+            ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
+            log.debug(FAILED_TO_FOUND_COMPONENT_ERROR, parentId, actionStatus);
+            return Either.right(componentsUtils.getResponseFormat(actionStatus));
+        }
+        component = getComponentEither.left().value();
+        Optional<InputDefinition> op = component.getInputs().stream().filter(in -> in.getUniqueId().equals(inputId)).findFirst();
+        if (op.isEmpty()) {
+            ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
+            log.debug(FAILED_TO_FOUND_INPUT_UNDER_COMPONENT_ERROR, inputId, parentId, actionStatus);
+            return Either.right(componentsUtils.getResponseFormat(actionStatus));
+        }
+        return Either.left(componentInstanceBusinessLogic.getComponentInstancePropertiesByInputId(component, inputId));
+    }
+
+    private String updateInputObjectValue(InputDefinition currentInput, InputDefinition newInput, Map<String, DataTypeDefinition> dataTypes) {
+        String innerType = null;
+        String propertyType = currentInput.getType();
+        ToscaPropertyType type = ToscaPropertyType.isValidType(propertyType);
+        log.debug("The type of the property {} is {}", currentInput.getUniqueId(), propertyType);
+        if (type == ToscaPropertyType.LIST || type == ToscaPropertyType.MAP) {
+            SchemaDefinition def = currentInput.getSchema();
+            if (def == null) {
+                log.debug("Schema doesn't exists for property of type {}", type);
+                throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE));
+            }
+            PropertyDataDefinition propDef = def.getProperty();
+            if (propDef == null) {
+                log.debug("Property in Schema Definition inside property of type {} doesn't exist", type);
+                throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(StorageOperationStatus.INVALID_VALUE));
+            }
+            innerType = propDef.getType();
+        }
+        // Specific Update Logic
+        Either<Object, Boolean> isValid = propertyOperation
+            .validateAndUpdatePropertyValue(propertyType, newInput.getDefaultValue(), true, innerType, dataTypes);
+        String newValue = newInput.getDefaultValue();
+        if (isValid.isRight()) {
+            Boolean res = isValid.right().value();
+            if (Boolean.FALSE.equals(res)) {
+                throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(
+                    DaoStatusConverter.convertJanusGraphStatusToStorageStatus(JanusGraphOperationStatus.ILLEGAL_ARGUMENT)));
+            }
+        } else {
+            Object object = isValid.left().value();
+            if (object != null) {
+                newValue = object.toString();
+            }
+        }
+        return newValue;
+    }
+
+    private InputDefinition getInputFromInputsListById(List<InputDefinition> componentsOldInputs, InputDefinition input) {
+        return componentsOldInputs.stream().filter(in -> in.getUniqueId().equals(input.getUniqueId())).findFirst().orElse(null);
+    }
+
+    public Either<List<InputDefinition>, ResponseFormat> updateInputsValue(ComponentTypeEnum componentType, String componentId,
+                                                                           List<InputDefinition> inputs, String userId, boolean shouldLockComp) {
+        List<InputDefinition> returnInputs = new ArrayList<>();
+        Either<List<InputDefinition>, ResponseFormat> result = null;
+        Component component = null;
+        try {
+            validateUserExists(userId);
+            ComponentParametersView componentParametersView = new ComponentParametersView();
+            componentParametersView.disableAll();
+            componentParametersView.setIgnoreInputs(false);
+            componentParametersView.setIgnoreUsers(false);
+            componentParametersView.setIgnoreProperties(false);
+            componentParametersView.setIgnoreComponentInstancesProperties(false);
+            componentParametersView.setIgnoreComponentInstances(false);
+            component = validateComponentExists(componentId, componentType, componentParametersView);
+            if (shouldLockComp) {
+                try {
+                    lockComponent(component, UPDATE_INPUT);
+                } catch (ComponentException e) {
+                    log.error("Failed to lock component", e);
+                    result = Either.right(e.getResponseFormat());
+                    return result;
+                }
+            }
+            //Validate value and Constraint of input
+            Either<Boolean, ResponseFormat> constraintValidatorResponse = validateInputValueConstraint(inputs, component.getModel());
+            if (constraintValidatorResponse.isRight()) {
+                log.error("Failed validation value and constraint of property: {}", constraintValidatorResponse.right().value());
+                return Either.right(constraintValidatorResponse.right().value());
+            }
+            validateCanWorkOnComponent(component, userId);
+            Map<String, DataTypeDefinition> dataTypes;
+            dataTypes = componentsUtils.getAllDataTypes(applicationDataTypeCache, component.getModel());
+            List<InputDefinition> componentsOldInputs = Optional.ofNullable(component.getInputs()).orElse(Collections.emptyList());
+            for (InputDefinition newInput : inputs) {
+                InputDefinition currInput = getInputFromInputsListById(componentsOldInputs, newInput);
+                if (currInput == null) {
+                    ActionStatus actionStatus = ActionStatus.COMPONENT_NOT_FOUND;
+                    log.debug("Failed to found newInput {} under component {}, error: {}", newInput.getUniqueId(), componentId, actionStatus);
+                    result = Either.right(componentsUtils.getResponseFormat(actionStatus));
+                    return result;
+                }
+                String updateInputObjectValue = updateInputObjectValue(currInput, newInput, dataTypes);
+                currInput.setDefaultValue(updateInputObjectValue);
+                currInput.setOwnerId(userId);
+                currInput.setMetadata(newInput.getMetadata());
+                if (newInput.isRequired() != null) {
+                    currInput.setRequired(newInput.isRequired());
+                }
+                Either<InputDefinition, StorageOperationStatus> status = toscaOperationFacade.updateInputOfComponent(component, currInput);
+                if (status.isRight()) {
+                    ActionStatus actionStatus = componentsUtils.convertFromStorageResponseForResourceInstanceProperty(status.right().value());
+                    result = Either.right(componentsUtils.getResponseFormat(actionStatus, ""));
+                    return result;
+                } else {
+                    returnInputs.add(status.left().value());
+                }
+            }
+            result = Either.left(returnInputs);
+        } catch (ComponentException e) {
+            log.debug(GOING_TO_EXECUTE_ROLLBACK_ON_UPDATE_INPUT);
+            unlockRollbackWithException(component, e);
+        } catch (Exception e) {
+            log.debug(GOING_TO_EXECUTE_ROLLBACK_ON_UPDATE_INPUT);
+            unlockRollbackWithException(component, new ByActionStatusComponentException(ActionStatus.GENERAL_ERROR));
+        }
+        log.debug(GOING_TO_EXECUTE_COMMIT_ON_UPDATE_INPUT);
+        unlockWithCommit(component);
+        return result;
+    }
+
+    private Either<Boolean, ResponseFormat> validateInputValueConstraint(List<InputDefinition> inputs, final String model) {
+        PropertyValueConstraintValidationUtil propertyValueConstraintValidationUtil = new PropertyValueConstraintValidationUtil();
+        List<InputDefinition> inputDefinitions = new ArrayList<>();
+        for (InputDefinition inputDefinition : inputs) {
+            InputDefinition inputDef = new InputDefinition();
+            inputDefinition.setDefaultValue(inputDefinition.getDefaultValue());
+            inputDefinition.setInputPath(inputDefinition.getSubPropertyInputPath());
+            inputDefinition.setType(inputDefinition.getType());
+            if (Objects.nonNull(inputDefinition.getParentPropertyType())) {
+                ComponentInstanceProperty propertyDefinition = new ComponentInstanceProperty();
+                propertyDefinition.setType(inputDefinition.getParentPropertyType());
+                inputDefinition.setProperties(Collections.singletonList(propertyDefinition));
+            }
+            inputDefinitions.add(inputDef);
+        }
+        return propertyValueConstraintValidationUtil.validatePropertyConstraints(inputDefinitions, applicationDataTypeCache, model);
+    }
+
+    public Either<List<ComponentInstanceInput>, ResponseFormat> getInputsForComponentInput(String userId, String componentId, String inputId) {
+        validateUserExists(userId);
+        Component component = null;
+        ComponentParametersView filters = new ComponentParametersView();
+        filters.disableAll();
+        filters.setIgnoreComponentInstances(false);
+        filters.setIgnoreInputs(false);
+        filters.setIgnoreComponentInstancesInputs(false);
+        filters.setIgnoreProperties(false);
+        Either<Component, StorageOperationStatus> getComponentEither = toscaOperationFacade
+            .getToscaElement(componentId, filters);
+        if (getComponentEither.isRight()) {
+            ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
+            log.debug(FAILED_TO_FOUND_COMPONENT_ERROR, componentId, actionStatus);
+            return Either.right(componentsUtils.getResponseFormat(actionStatus));
+        }
+        component = getComponentEither.left().value();
+        Optional<InputDefinition> op = component.getInputs().stream().filter(in -> in.getUniqueId().equals(inputId)).findFirst();
+        if (op.isEmpty()) {
+            ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
+            log.debug(FAILED_TO_FOUND_INPUT_UNDER_COMPONENT_ERROR, inputId, componentId, actionStatus);
+            return Either.right(componentsUtils.getResponseFormat(actionStatus));
+        }
+        return Either.left(componentInstanceBusinessLogic.getComponentInstanceInputsByInputId(component, inputId));
+    }
+
+    @Override
+    public Either<List<InputDefinition>, ResponseFormat> declareProperties(String userId, String componentId, ComponentTypeEnum componentTypeEnum,
+                                                                           ComponentInstInputsMap componentInstInputsMap) {
+        return createMultipleInputs(userId, componentId, componentTypeEnum, componentInstInputsMap, true, false);
+    }
+
+    private Either<List<InputDefinition>, ResponseFormat> createMultipleInputs(String userId, String componentId, ComponentTypeEnum componentType,
+                                                                               ComponentInstInputsMap componentInstInputsMapUi,
+                                                                               boolean shouldLockComp,
+                                                                               boolean inTransaction) {
+        Either<List<InputDefinition>, ResponseFormat> result = null;
+        Component component = null;
+        try {
+            validateUserExists(userId);
+            component = getAndValidateComponentForCreate(userId, componentId, componentType, shouldLockComp);
+            result = propertyDeclarationOrchestrator.declarePropertiesToInputs(component, componentInstInputsMapUi).left()
+                .bind(inputsToCreate -> prepareInputsForCreation(userId, componentId, inputsToCreate)).right()
+                .map(componentsUtils::getResponseFormat);
+            return result;
+        } catch (ByResponseFormatComponentException e) {
+            log.error("#createMultipleInputs: Exception thrown: ", e);
+            result = Either.right(e.getResponseFormat());
+            return result;
+        } finally {
+            if (!inTransaction) {
+                if (result == null || result.isRight()) {
+                    log.debug(GOING_TO_EXECUTE_ROLLBACK_ON_CREATE_GROUP);
+                    janusGraphDao.rollback();
+                } else {
+                    log.debug(GOING_TO_EXECUTE_COMMIT_ON_CREATE_GROUP);
+                    janusGraphDao.commit();
+                }
+            }
+            // unlock resource
+            if (shouldLockComp && component != null) {
+                graphLockOperation.unlockComponent(componentId, componentType.getNodeType());
+            }
+        }
+    }
+
+    /**
+     * Creates a list input with a data type which has properties specified.
+     *
+     * @param userId             User ID
+     * @param componentId        Component ID
+     * @param componentType      Component type
+     * @param componentListInput Properties to be declared and input to be created
+     * @param shouldLockComp     true if the component should be locked
+     * @param inTransaction      true if already in transaction
+     */
+    public Either<List<InputDefinition>, ResponseFormat> createListInput(String userId, String componentId, ComponentTypeEnum componentType,
+                                                                         ComponentInstListInput componentListInput, boolean shouldLockComp,
+                                                                         boolean inTransaction) {
+        Either<List<InputDefinition>, ResponseFormat> result = null;
+        Component component = null;
+        log.trace("#createListInput: enter");
+        try {
+            /* check if user exists */
+            validateUserExists(userId);
+
+            component = getAndValidateComponentForCreate(userId, componentId, componentType, shouldLockComp);
+
+            InputDefinition listInput = componentListInput.getListInput();
+            DataTypeDefinition dataType =
+                prepareDataTypeForListInput(componentListInput.getComponentInstInputsMap(), listInput);
+            Map<String, DataTypeDefinition> dataTypesMap = new HashMap<>();
+            dataTypesMap.put(dataType.getName(), dataType);
+            if (log.isDebugEnabled()) {
+                log.debug("#createListInput: dataTypesMap={}", ReflectionToStringBuilder.toString(dataTypesMap));
+            }
+
+            Either<List<DataTypeDefinition>, StorageOperationStatus> dataTypeResult =
+                toscaOperationFacade.addDataTypesToComponent(dataTypesMap, componentId);
+            if (dataTypeResult.isRight()) {
+                log.debug("#createListInput: DataType creation failed.");
+                throw new ByResponseFormatComponentException(componentsUtils.getResponseFormat(dataTypeResult.right().value()));
+            }
+
+            // create list input
+            listInput.setUniqueId(UniqueIdBuilder.buildPropertyUniqueId(componentId, listInput.getName()));
+            listInput.setInstanceUniqueId(
+                propertyDeclarationOrchestrator.getPropOwnerId(componentListInput.getComponentInstInputsMap()));
+            listInput.setIsDeclaredListInput(true);
+            Map<String, InputDefinition> listInputMap = new HashMap<>();
+            listInputMap.put(listInput.getName(), listInput);
+            result = createListInputsInGraph(listInputMap, dataTypesMap, component);
+            if (result.isRight()) {
+                log.debug("#createListInput: createListInputsInGraph failed.");
+                throw new ByResponseFormatComponentException(result.right().value());
+            }
+
+            // update properties
+            result = propertyDeclarationOrchestrator
+                .declarePropertiesToListInput(component, componentListInput.getComponentInstInputsMap(), listInput)
+                .right().map(err -> componentsUtils.getResponseFormat(err))
+                .left().map(Arrays::asList);
+
+            log.trace("#createListInput: leave");
+
+            return result;
+
+        } catch (ByResponseFormatComponentException e) {
+            log.error("#createListInput: Exception thrown", e);
+            result = Either.right(e.getResponseFormat());
+            return result;
+        } finally {
+
+            if (!inTransaction) {
+                if (result == null || result.isRight()) {
+                    log.debug(GOING_TO_EXECUTE_ROLLBACK_ON_CREATE_GROUP);
+                    janusGraphDao.rollback();
+                } else {
+                    log.debug(GOING_TO_EXECUTE_COMMIT_ON_CREATE_GROUP);
+                    janusGraphDao.commit();
+                }
+            }
+            // unlock resource
+            if (shouldLockComp && component != null) {
+                graphLockOperation.unlockComponent(componentId, componentType.getNodeType());
+            }
+        }
+    }
+
+    private ComponentParametersView getBaseComponentParametersView() {
+        ComponentParametersView componentParametersView = new ComponentParametersView();
+        componentParametersView.disableAll();
+        componentParametersView.setIgnoreInputs(false);
+        componentParametersView.setIgnoreComponentInstances(false);
+        componentParametersView.setIgnoreComponentInstancesInputs(false);
+        componentParametersView.setIgnoreComponentInstancesProperties(false);
+        componentParametersView.setIgnorePolicies(false);
+        componentParametersView.setIgnoreGroups(false);
+        componentParametersView.setIgnoreUsers(false);
+        return componentParametersView;
+    }
+
+    private Component getAndValidateComponentForCreate(
+        String userId, String componentId, ComponentTypeEnum componentType, boolean shouldLockComp
+    ) {
+        ComponentParametersView componentParametersView = getBaseComponentParametersView();
+        Component component = validateComponentExists(componentId, componentType, componentParametersView);
+        if (shouldLockComp) {
+            // lock the component
+            lockComponent(component, CREATE_INPUT);
+        }
+        validateCanWorkOnComponent(component, userId);
+        return component;
+    }
+
+    private DataTypeDefinition prepareDataTypeForListInput(ComponentInstInputsMap inputsMap, InputDefinition input) {
+        // Confirm if type is list
+        if (StringUtils.isEmpty(input.getType()) || !input.getType().equals(ToscaPropertyType.LIST.getType())) {
+            log.debug("#prepareDataTypeForListInput: Type of input is not list.");
+            throw new ByResponseFormatComponentException(componentsUtils.getResponseFormat(ActionStatus.INVALID_PROPERTY_TYPE));
+        }
+
+        // Confirm schema type is not empty
+        String desiredTypeName = input.getSchemaType();
+        if (StringUtils.isEmpty(desiredTypeName)) {
+            log.debug("#prepareDataTypeForListInput: Schema type of list input is empty.");
+            throw new ByResponseFormatComponentException(componentsUtils.getResponseFormat(ActionStatus.INVALID_PROPERTY_INNER_TYPE));
+        }
+
+        DataTypeDefinition dataType = new DataTypeDefinition();
+        List<ComponentInstancePropInput> propInputs = inputsMap.resolvePropertiesToDeclare().getRight();
+        dataType.setName(desiredTypeName);
+        dataType.setDerivedFromName(ToscaPropertyType.ROOT.getType());
+        // Copy properties from inputsMap
+        dataType.setProperties(propInputs.stream().map(PropertyDefinition::new).collect(Collectors.toList()));
+        return dataType;
+    }
+
+    private Either<List<InputDefinition>, StorageOperationStatus> prepareInputsForCreation(String userId, String cmptId,
+                                                                                           List<InputDefinition> inputsToCreate) {
+        Map<String, InputDefinition> inputsToPersist = MapUtil.toMap(inputsToCreate, InputDefinition::getName);
+        assignOwnerIdToInputs(userId, inputsToPersist);
+        inputsToPersist.values()
+            .forEach(input -> input.setConstraints(componentInstanceBusinessLogic.setInputConstraint(input)));
+
+        return toscaOperationFacade.addInputsToComponent(inputsToPersist, cmptId)
+            .left()
+            .map(persistedInputs -> inputsToCreate);
+    }
+
+    private void assignOwnerIdToInputs(String userId, Map<String, InputDefinition> inputsToCreate) {
+        inputsToCreate.values().forEach(inputDefinition -> inputDefinition.setOwnerId(userId));
+    }
+
+    public Either<List<InputDefinition>, ResponseFormat> createInputsInGraph(Map<String, InputDefinition> inputs,
+                                                                             Component component) {
+
+        List<InputDefinition> resourceProperties = component.getInputs();
+
+        final Map<String, DataTypeDefinition> dataTypes = componentsUtils.getAllDataTypes(applicationDataTypeCache, component.getModel());
+
+        for (Map.Entry<String, InputDefinition> inputDefinition : inputs.entrySet()) {
+            String inputName = inputDefinition.getKey();
+            inputDefinition.getValue().setName(inputName);
+
+            Either<InputDefinition, ResponseFormat> preparedInputEither = prepareAndValidateInputBeforeCreate(inputDefinition.getValue(), dataTypes);
+            if (preparedInputEither.isRight()) {
+                return Either.right(preparedInputEither.right().value());
+            }
+
+        }
+        if (resourceProperties != null) {
+            Map<String, InputDefinition> generatedInputs = resourceProperties.stream()
+                .collect(Collectors.toMap(PropertyDataDefinition::getName, i -> i));
+            Either<Map<String, InputDefinition>, String> mergeEither = ToscaDataDefinition.mergeDataMaps(generatedInputs, inputs);
+            if (mergeEither.isRight()) {
+                return Either.right(componentsUtils.getResponseFormat(ActionStatus.PROPERTY_ALREADY_EXIST, mergeEither.right().value()));
+            }
+            inputs = mergeEither.left().value();
+        }
+
+        Either<List<InputDefinition>, StorageOperationStatus> associateInputsEither = toscaOperationFacade
+            .createAndAssociateInputs(inputs, component.getUniqueId());
+        if (associateInputsEither.isRight()) {
+            log.debug("Failed to create inputs under component {}. Status is {}", component.getUniqueId(), associateInputsEither.right().value());
+
+            return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(associateInputsEither.right().value())));
+        }
+        return Either.left(associateInputsEither.left().value());
+    }
+
+    private Either<List<InputDefinition>, ResponseFormat> createListInputsInGraph(Map<String, InputDefinition> inputs,
+                                                                                  Map<String, DataTypeDefinition> privateDataTypes,
+                                                                                  Component component) {
+
+        log.trace("#createListInputsInGraph: enter");
+
+        Map<String, DataTypeDefinition> dataTypes = componentsUtils.getAllDataTypes(applicationDataTypeCache, component.getModel());
+        dataTypes.putAll(privateDataTypes);
+
+        for (Map.Entry<String, InputDefinition> inputDefinition : inputs.entrySet()) {
+            String inputName = inputDefinition.getKey();
+            inputDefinition.getValue().setName(inputName);
+
+            Either<InputDefinition, ResponseFormat> preparedInputEither =
+                prepareAndValidateInputBeforeCreate(inputDefinition.getValue(), dataTypes);
+            if (preparedInputEither.isRight()) {
+                return Either.right(preparedInputEither.right().value());
+            }
+        }
+
+        Either<List<InputDefinition>, StorageOperationStatus> addInputsEither = toscaOperationFacade
+            .addInputsToComponent(inputs, component.getUniqueId());
+        if (addInputsEither.isRight()) {
+            log.debug("#createListInputsInGraph: Failed to create inputs under component {}. Status is {}",
+                component.getUniqueId(), addInputsEither.right().value());
+            return Either.right(componentsUtils.getResponseFormat(
+                componentsUtils.convertFromStorageResponse(addInputsEither.right().value())));
+        }
+        log.trace("#createListInputsInGraph: leave");
+        return Either.left(addInputsEither.left().value());
+    }
+
+    /**
+     * Delete input from service
+     *
+     * @param componentId
+     * @param userId
+     * @param inputId
+     * @return
+     */
+    public InputDefinition deleteInput(String componentId, String userId, String inputId) {
+        Either<InputDefinition, ResponseFormat> deleteEither = null;
+        if (log.isDebugEnabled()) {
+            log.debug("Going to delete input id: {}", inputId);
+        }
+        validateUserExists(userId);
+        ComponentParametersView componentParametersView = getBaseComponentParametersView();
+        componentParametersView.setIgnoreInterfaces(false);
+        componentParametersView.setIgnoreDataType(false);
+        componentParametersView.setIgnoreProperties(false);
+        Either<Component, StorageOperationStatus> componentEither = toscaOperationFacade
+            .getToscaElement(componentId, componentParametersView);
+        if (componentEither.isRight()) {
+            throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(componentEither.right().value()));
+        }
+        Component component = componentEither.left().value();
+        // Validate inputId is child of the component
+        Optional<InputDefinition> optionalInput = component.getInputs().stream().
+            // filter by ID
+                filter(input -> input.getUniqueId().equals(inputId)).
+            // Get the input
+                findAny();
+        if (optionalInput.isEmpty()) {
+            throw new ByActionStatusComponentException(ActionStatus.INPUT_IS_NOT_CHILD_OF_COMPONENT, inputId, componentId);
+        }
+        InputDefinition inputForDelete = optionalInput.get();
+        // Lock component
+        lockComponent(componentId, component, "deleteInput");
+        // Delete input operations
+        boolean failed = false;
+        try {
+            StorageOperationStatus status = toscaOperationFacade.deleteInputOfResource(component, inputForDelete.getName());
+            if (status != StorageOperationStatus.OK) {
+                log.debug("Component id: {} delete input id: {} failed", componentId, inputId);
+                throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(status), component.getName());
+            }
+            if (BooleanUtils.isTrue(inputForDelete.getIsDeclaredListInput())) {
+                deleteEither = deleteListInput(componentId, inputId, component, inputForDelete, status);
+                if (deleteEither.isRight()) {
+                    throw new ByResponseFormatComponentException(deleteEither.right().value());
+                }
+                return deleteEither.left().value();
+            }
+            StorageOperationStatus storageOperationStatus = propertyDeclarationOrchestrator.unDeclarePropertiesAsInputs(component, inputForDelete);
+            if (storageOperationStatus != StorageOperationStatus.OK) {
+                log.debug("Component id: {} update properties declared as input for input id: {} failed", componentId, inputId);
+                throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(storageOperationStatus), component.getName());
+            }
+            return inputForDelete;
+        } catch (ComponentException e) {
+            failed = true;
+            throw e;
+        } finally {
+            unlockComponent(failed, component);
+        }
+    }
+
+    private Either<InputDefinition, ResponseFormat> deleteListInput(String componentId, String inputId,
+                                                                    Component component, InputDefinition inputForDelete,
+                                                                    StorageOperationStatus status) {
+        // the input is created by 'Declare List'.
+        // need to 1. undeclare properties, 2. delete input, 3. delete private data type
+        StorageOperationStatus storageOperationStatus = propertyDeclarationOrchestrator.unDeclarePropertiesAsListInputs(component, inputForDelete);
+        if (storageOperationStatus != StorageOperationStatus.OK) {
+            log.debug("Component id: {} update properties declared as input for input id: {} failed", componentId, inputId);
+            return Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(status), component.getName()));
+        }
+        Either<DataTypeDefinition, StorageOperationStatus> deleteResult = dataTypeBusinessLogic
+            .deletePrivateDataType(component, inputForDelete.getSchemaType());
+        if (deleteResult.isRight()) {
+            log.debug("Component id: {} delete datatype name: {} failed", componentId, inputForDelete.getSchemaType());
+            return Either.right(
+                componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(deleteResult.right().value()), component.getName()));
+        }
+        log.trace("deleteInput: deletePrivateDataType (OK)");
+        return Either.left(inputForDelete);
+    }
+
+    private Either<InputDefinition, ResponseFormat> prepareAndValidateInputBeforeCreate(InputDefinition newInputDefinition,
+                                                                                        Map<String, DataTypeDefinition> dataTypes) {
+        // validate input default values
+        Either<Boolean, ResponseFormat> defaultValuesValidation = validatePropertyDefaultValue(newInputDefinition, dataTypes);
+        if (defaultValuesValidation.isRight()) {
+            return Either.right(defaultValuesValidation.right().value());
+        }
+        // convert property
+        ToscaPropertyType type = getType(newInputDefinition.getType());
+        if (type != null) {
+            PropertyValueConverter converter = type.getConverter();
+            // get inner type
+            SchemaDefinition schema = newInputDefinition.getSchema();
+            String innerType = null;
+            if (schema != null) {
+                PropertyDataDefinition prop = schema.getProperty();
+                if (prop != null) {
+                    innerType = prop.getType();
+                }
+            }
+            String convertedValue;
+            if (newInputDefinition.getDefaultValue() != null) {
+                convertedValue = converter.convert(newInputDefinition.getDefaultValue(), innerType, dataTypes);
+                newInputDefinition.setDefaultValue(convertedValue);
+            }
+        }
+        return Either.left(newInputDefinition);
+    }
+
+    public Either<InputDefinition, ResponseFormat> getInputsAndPropertiesForComponentInput(String userId, String componentId, String inputId,
+                                                                                           boolean inTransaction) {
+        Either<InputDefinition, ResponseFormat> result = null;
+        try {
+            validateUserExists(userId);
+            ComponentParametersView filters = new ComponentParametersView();
+            filters.disableAll();
+            filters.setIgnoreComponentInstances(false);
+            filters.setIgnoreInputs(false);
+            filters.setIgnoreComponentInstancesInputs(false);
+            filters.setIgnoreComponentInstancesProperties(false);
+            filters.setIgnoreProperties(false);
+            Either<Component, StorageOperationStatus> getComponentEither = toscaOperationFacade
+                .getToscaElement(componentId, filters);
+            if (getComponentEither.isRight()) {
+                ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
+                log.debug(FAILED_TO_FOUND_COMPONENT_ERROR, componentId, actionStatus);
+                return Either.right(componentsUtils.getResponseFormat(actionStatus));
+            }
+            Component component = getComponentEither.left().value();
+            Optional<InputDefinition> op = component.getInputs().stream().filter(in -> in.getUniqueId().equals(inputId)).findFirst();
+            if (op.isEmpty()) {
+                ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(getComponentEither.right().value());
+                log.debug(FAILED_TO_FOUND_INPUT_UNDER_COMPONENT_ERROR, inputId, componentId, actionStatus);
+                return Either.right(componentsUtils.getResponseFormat(actionStatus));
+            }
+            InputDefinition resObj = op.get();
+            List<ComponentInstanceInput> inputCIInput = componentInstanceBusinessLogic.getComponentInstanceInputsByInputId(component, inputId);
+            resObj.setInputs(inputCIInput);
+            List<ComponentInstanceProperty> inputProps = componentInstanceBusinessLogic.getComponentInstancePropertiesByInputId(component, inputId);
+            resObj.setProperties(inputProps);
+            result = Either.left(resObj);
+            return result;
+        } finally {
+            if (!inTransaction) {
+                if (result == null || result.isRight()) {
+                    log.debug(GOING_TO_EXECUTE_ROLLBACK_ON_CREATE_GROUP);
+                    janusGraphDao.rollback();
+                } else {
+                    log.debug(GOING_TO_EXECUTE_COMMIT_ON_CREATE_GROUP);
+                    janusGraphDao.commit();
+                }
+            }
+        }
+    }
+
+    public Either<EntryData<String, InputDefinition>, ResponseFormat> addInputToComponent(String componentId, String inputName,
+                                                                                          InputDefinition newInputDefinition, String userId) {
+        Either<EntryData<String, InputDefinition>, ResponseFormat> result = null;
+        validateUserExists(userId);
+        Either<Component, StorageOperationStatus> serviceElement = toscaOperationFacade.getToscaElement(componentId);
+        if (serviceElement.isRight()) {
+            result = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, ""));
+            return result;
+        }
+        Component component = serviceElement.left().value();
+        NodeTypeEnum nodeType = component.getComponentType().getNodeType();
+        StorageOperationStatus lockResult = graphLockOperation.lockComponent(componentId, nodeType);
+        if (!lockResult.equals(StorageOperationStatus.OK)) {
+            BeEcompErrorManager.getInstance().logBeFailedLockObjectError(CREATE_INPUT, nodeType.name().toLowerCase(), componentId);
+            log.info("Failed to lock component {}. Error - {}", componentId, lockResult);
+            result = Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
+            return result;
+        }
+        try {
+            if (!ComponentValidationUtils.canWorkOnComponent(component, userId)) {
+                result = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
+                return result;
+            }
+            List<InputDefinition> inputs = component.getInputs();
+            if (CollectionUtils.isEmpty(inputs)) {
+                inputs = new ArrayList<>();
+            }
+            if (isInputExistInComponent(inputs, inputName)) {
+                result = Either.right(componentsUtils.getResponseFormat(ActionStatus.INPUT_ALREADY_EXIST, inputName));
+                return result;
+            }
+            Map<String, DataTypeDefinition> allDataTypes = componentsUtils.getAllDataTypes(applicationDataTypeCache, component.getModel());
+            // validate input default values
+            Either<Boolean, ResponseFormat> defaultValuesValidation = validatePropertyDefaultValue(newInputDefinition, allDataTypes);
+            if (defaultValuesValidation.isRight()) {
+                result = Either.right(defaultValuesValidation.right().value());
+                return result;
+            }
+            // convert Input
+            ToscaPropertyType type = getType(newInputDefinition.getType());
+            if (type != null) {
+                PropertyValueConverter converter = type.getConverter();
+                // get inner type
+                String innerType = null;
+                SchemaDefinition schema = newInputDefinition.getSchema();
+                if (schema != null) {
+                    PropertyDataDefinition prop = schema.getProperty();
+                    if (prop != null) {
+                        innerType = prop.getType();
+                    }
+                }
+                if (newInputDefinition.getDefaultValue() != null) {
+                    String convertedValue = converter.convert(newInputDefinition.getDefaultValue(), innerType, allDataTypes);
+                    newInputDefinition.setDefaultValue(convertedValue);
+                }
+            }
+            newInputDefinition.setMappedToComponentProperty(false);
+            Either<InputDefinition, StorageOperationStatus> addInputEither = toscaOperationFacade
+                .addInputToComponent(inputName, newInputDefinition, component);
+            if (addInputEither.isRight()) {
+                log.info("Failed to add new input {}. Error - {}", componentId, addInputEither.right().value());
+                result = Either.right(componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR));
+                return result;
+            }
+            result = Either.left(new EntryData<>(inputName, newInputDefinition));
+            return result;
+        } finally {
+            commitOrRollback(result);
+            // unlock component
+            graphLockOperation.unlockComponent(componentId, nodeType);
+        }
+    }
+
+    private boolean isInputExistInComponent(List<InputDefinition> inputs, String inputName) {
+        return CollectionUtils.isNotEmpty(inputs) && inputs.stream().anyMatch(input -> input.getName().equals(inputName));
+    }
 }