Fix issue with invariantUUID in exported tosca
[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / tosca / ToscaExportHandler.java
index 0813650..ab87b5e 100644 (file)
 
 package org.openecomp.sdc.be.tosca;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+import static org.apache.commons.collections.MapUtils.isNotEmpty;
+import static org.openecomp.sdc.be.components.utils.PropertiesUtils.resolvePropertyValueFromInput;
+import static org.openecomp.sdc.be.tosca.InterfacesOperationsConverter.addInterfaceTypeElement;
+import static org.openecomp.sdc.tosca.datatypes.ToscaFunctions.GET_ATTRIBUTE;
+import static org.openecomp.sdc.tosca.datatypes.ToscaFunctions.GET_INPUT;
+import static org.openecomp.sdc.tosca.datatypes.ToscaFunctions.GET_PROPERTY;
+
 import fj.data.Either;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import lombok.NoArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
@@ -32,27 +55,75 @@ import org.apache.commons.lang3.tuple.Triple;
 import org.onap.sdc.tosca.services.YamlUtil;
 import org.openecomp.sdc.be.components.impl.exceptions.SdcResourceNotFoundException;
 import org.openecomp.sdc.be.config.ConfigurationManager;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.datatypes.components.ResourceMetadataDataDefinition;
-import org.openecomp.sdc.be.datatypes.elements.*;
+import org.openecomp.sdc.be.datatypes.elements.AttributeDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.CINodeFilterDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.InterfaceDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ListDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.RequirementNodeFilterCapabilityDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.RequirementNodeFilterPropertyDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.RequirementSubstitutionFilterPropertyDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.SubstitutionFilterDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.ToscaArtifactDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
-import org.openecomp.sdc.be.model.*;
+import org.openecomp.sdc.be.exception.ToscaExportException;
+import org.openecomp.sdc.be.model.ArtifactDefinition;
+import org.openecomp.sdc.be.model.AttributeDefinition;
+import org.openecomp.sdc.be.model.CapabilityDefinition;
+import org.openecomp.sdc.be.model.CapabilityRequirementRelationship;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.ComponentInstance;
+import org.openecomp.sdc.be.model.ComponentInstanceInput;
+import org.openecomp.sdc.be.model.ComponentInstanceInterface;
+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.GroupInstance;
+import org.openecomp.sdc.be.model.InputDefinition;
+import org.openecomp.sdc.be.model.InterfaceDefinition;
+import org.openecomp.sdc.be.model.PropertyDefinition;
+import org.openecomp.sdc.be.model.RelationshipInfo;
+import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
+import org.openecomp.sdc.be.model.RequirementDefinition;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
-import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
-import org.openecomp.sdc.be.model.jsontitan.utils.ModelConverter;
+import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.ModelConverter;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.InterfaceLifecycleOperation;
-import org.openecomp.sdc.be.model.tosca.ToscaFunctions;
-import org.openecomp.sdc.be.model.tosca.converters.ToscaValueBaseConverter;
-import org.openecomp.sdc.be.tosca.model.*;
+import org.openecomp.sdc.be.tosca.PropertyConvertor.PropertyType;
+import org.openecomp.sdc.be.tosca.builder.ToscaRelationshipBuilder;
+import org.openecomp.sdc.be.tosca.exception.ToscaConversionException;
+import org.openecomp.sdc.be.tosca.model.CapabilityFilter;
+import org.openecomp.sdc.be.tosca.model.NodeFilter;
+import org.openecomp.sdc.be.tosca.model.SubstitutionMapping;
+import org.openecomp.sdc.be.tosca.model.ToscaAttribute;
+import org.openecomp.sdc.be.tosca.model.ToscaCapability;
+import org.openecomp.sdc.be.tosca.model.ToscaDataType;
+import org.openecomp.sdc.be.tosca.model.ToscaGroupTemplate;
+import org.openecomp.sdc.be.tosca.model.ToscaNodeTemplate;
+import org.openecomp.sdc.be.tosca.model.ToscaNodeType;
+import org.openecomp.sdc.be.tosca.model.ToscaPolicyTemplate;
+import org.openecomp.sdc.be.tosca.model.ToscaProperty;
+import org.openecomp.sdc.be.tosca.model.ToscaPropertyAssignment;
+import org.openecomp.sdc.be.tosca.model.ToscaRelationshipTemplate;
+import org.openecomp.sdc.be.tosca.model.ToscaRequirement;
+import org.openecomp.sdc.be.tosca.model.ToscaTemplate;
+import org.openecomp.sdc.be.tosca.model.ToscaTemplateArtifact;
+import org.openecomp.sdc.be.tosca.model.ToscaTemplateRequirement;
+import org.openecomp.sdc.be.tosca.model.ToscaTopolgyTemplate;
 import org.openecomp.sdc.be.tosca.utils.ForwardingPathToscaUtil;
 import org.openecomp.sdc.be.tosca.utils.InputConverter;
-import org.openecomp.sdc.be.tosca.utils.InterfacesOperationsToscaUtil;
+import org.openecomp.sdc.be.tosca.utils.OutputConverter;
+import org.openecomp.sdc.common.log.enums.EcompLoggerErrorCode;
 import org.openecomp.sdc.common.log.wrappers.Logger;
-import org.openecomp.sdc.externalupload.utils.ServiceUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.DumperOptions.FlowStyle;
@@ -67,21 +138,13 @@ import org.yaml.snakeyaml.nodes.Tag;
 import org.yaml.snakeyaml.representer.Represent;
 import org.yaml.snakeyaml.representer.Representer;
 
-import java.beans.IntrospectionException;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import static org.apache.commons.collections.CollectionUtils.isEmpty;
-import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
-import static org.apache.commons.collections.MapUtils.isNotEmpty;
-import static org.openecomp.sdc.be.tosca.utils.InterfacesOperationsToscaUtil.addInterfaceDefinitionElement;
-import static org.openecomp.sdc.be.tosca.utils.InterfacesOperationsToscaUtil.addInterfaceTypeElement;
-
+@NoArgsConstructor
 @org.springframework.stereotype.Component("tosca-export-handler")
 public class ToscaExportHandler {
 
+    private static final Logger log = Logger.getLogger(ToscaExportHandler.class);
+    private static final String INVARIANT_UUID = "invariantUUID";
+
     private ApplicationDataTypeCache dataTypeCache;
     private ToscaOperationFacade toscaOperationFacade;
     private CapabilityRequirementConverter capabilityRequirementConverter;
@@ -89,62 +152,64 @@ public class ToscaExportHandler {
     private GroupExportParser groupExportParser;
     private PropertyConvertor propertyConvertor;
     private InputConverter inputConverter;
+    private OutputConverter outputConverter;
     private InterfaceLifecycleOperation interfaceLifecycleOperation;
+    private InterfacesOperationsConverter interfacesOperationsConverter;
 
     @Autowired
-    public ToscaExportHandler(ApplicationDataTypeCache dataTypeCache, ToscaOperationFacade toscaOperationFacade,
-            CapabilityRequirementConverter capabilityRequirementConverter, PolicyExportParser policyExportParser,
-            GroupExportParser groupExportParser, InputConverter inputConverter, InterfaceLifecycleOperation interfaceLifecycleOperation) {
+    public ToscaExportHandler(final ApplicationDataTypeCache dataTypeCache,
+                              final ToscaOperationFacade toscaOperationFacade,
+                              final CapabilityRequirementConverter capabilityRequirementConverter,
+                              final PolicyExportParser policyExportParser,
+                              final GroupExportParser groupExportParser,
+                              final PropertyConvertor propertyConvertor,
+                              final InputConverter inputConverter,
+                              final OutputConverter outputConverter,
+                              final InterfaceLifecycleOperation interfaceLifecycleOperation,
+                              final InterfacesOperationsConverter interfacesOperationsConverter) {
         this.dataTypeCache = dataTypeCache;
         this.toscaOperationFacade = toscaOperationFacade;
         this.capabilityRequirementConverter = capabilityRequirementConverter;
         this.policyExportParser = policyExportParser;
         this.groupExportParser = groupExportParser;
-        this.propertyConvertor = PropertyConvertor.getInstance();
-        this.inputConverter =  inputConverter;
+        this.propertyConvertor = propertyConvertor;
+        this.inputConverter = inputConverter;
+        this.outputConverter = outputConverter;
         this.interfaceLifecycleOperation = interfaceLifecycleOperation;
+        this.interfacesOperationsConverter = interfacesOperationsConverter;
     }
 
-
-    private static final Logger log = Logger.getLogger(ToscaExportHandler.class);
-
-    private static final String TOSCA_VERSION = "tosca_simple_yaml_1_1";
+    private static final String TOSCA_VERSION = "tosca_simple_yaml_1_3";
     private static final String SERVICE_NODE_TYPE_PREFIX = "org.openecomp.service.";
     private static final String IMPORTS_FILE_KEY = "file";
     private static final String TOSCA_INTERFACE_NAME = "-interface.yml";
     public static final String ASSET_TOSCA_TEMPLATE = "assettoscatemplate";
     private static final String FAILED_TO_GET_DEFAULT_IMPORTS_CONFIGURATION = "convertToToscaTemplate - failed to get Default Imports section from configuration";
     private static final String NOT_SUPPORTED_COMPONENT_TYPE = "Not supported component type {}";
-    private static final List<Map<String, Map<String, String>>> DEFAULT_IMPORTS = ConfigurationManager
-                                                                                          .getConfigurationManager().getConfiguration().getDefaultImports();
-    private static YamlUtil yamlUtil = new YamlUtil();
-
-    public ToscaExportHandler(){}
+    private static final String NATIVE_ROOT = "tosca.nodes.Root";
+    private static final YamlUtil yamlUtil = new YamlUtil();
 
     public Either<ToscaRepresentation, ToscaError> exportComponent(Component component) {
-
-        Either<ToscaTemplate, ToscaError> toscaTemplateRes = convertToToscaTemplate(component);
-        if (toscaTemplateRes.isRight()) {
-            return Either.right(toscaTemplateRes.right().value());
-        }
-
-        ToscaTemplate toscaTemplate = toscaTemplateRes.left().value();
-        ToscaRepresentation toscaRepresentation = this.createToscaRepresentation(toscaTemplate);
-        return Either.left(toscaRepresentation);
+        return convertToToscaTemplate(component).left().map(this::createToscaRepresentation);
     }
 
-    public Either<ToscaRepresentation, ToscaError> exportComponentInterface(Component component,
-            boolean isAssociatedComponent) {
-        if (null == DEFAULT_IMPORTS) {
+    public Either<ToscaRepresentation, ToscaError> exportComponentInterface(final Component component,
+                                                                            final boolean isAssociatedComponent) {
+        final List<Map<String, Map<String, String>>> defaultToscaImportConfig = getDefaultToscaImportConfig();
+        if (CollectionUtils.isEmpty(defaultToscaImportConfig)) {
             log.debug(FAILED_TO_GET_DEFAULT_IMPORTS_CONFIGURATION);
             return Either.right(ToscaError.GENERAL_ERROR);
         }
 
-        ToscaTemplate toscaTemplate = new ToscaTemplate(TOSCA_VERSION);
-        toscaTemplate.setImports(new ArrayList<>(DEFAULT_IMPORTS));
-        Map<String, ToscaNodeType> nodeTypes = new HashMap<>();
-        Either<ToscaTemplate, ToscaError> toscaTemplateRes = convertInterfaceNodeType(new HashMap<>(), component,
-                toscaTemplate, nodeTypes, isAssociatedComponent);
+        String toscaVersion = null;
+        if (component instanceof Resource) {
+            toscaVersion = ((Resource) component).getToscaVersion();
+        }
+        ToscaTemplate toscaTemplate = new ToscaTemplate(toscaVersion != null ? toscaVersion : TOSCA_VERSION);
+        toscaTemplate.setImports(new ArrayList<>(defaultToscaImportConfig));
+        final Map<String, ToscaNodeType> nodeTypes = new HashMap<>();
+        final Either<ToscaTemplate, ToscaError> toscaTemplateRes =
+            convertInterfaceNodeType(new HashMap<>(), component, toscaTemplate, nodeTypes, isAssociatedComponent);
         if (toscaTemplateRes.isRight()) {
             return Either.right(toscaTemplateRes.right().value());
         }
@@ -175,35 +240,34 @@ public class ToscaExportHandler {
         sb.append(yamlAsString);
         sb.append(ConfigurationManager.getConfigurationManager().getConfiguration().getHeatEnvArtifactFooter());
 
-        ToscaRepresentation toscaRepresentation = new ToscaRepresentation();
-        toscaRepresentation.setMainYaml(sb.toString());
-        toscaRepresentation.setDependencies(toscaTemplate.getDependencies());
-
-        return toscaRepresentation;
+        return ToscaRepresentation.make(sb.toString().getBytes(), toscaTemplate);
     }
 
     public Either<ToscaTemplate, ToscaError> getDependencies(Component component) {
         ToscaTemplate toscaTemplate = new ToscaTemplate(null);
         Either<ImmutablePair<ToscaTemplate, Map<String, Component>>, ToscaError> fillImports = fillImports(component,
-                toscaTemplate);
+            toscaTemplate);
         if (fillImports.isRight()) {
             return Either.right(fillImports.right().value());
         }
         return Either.left(fillImports.left().value().left);
     }
 
-    private Either<ToscaTemplate, ToscaError> convertToToscaTemplate(Component component) {
-        if (null == DEFAULT_IMPORTS) {
+    public Either<ToscaTemplate, ToscaError> convertToToscaTemplate(final Component component) {
+        final List<Map<String, Map<String, String>>> defaultToscaImportConfig = getDefaultToscaImportConfig();
+        if (CollectionUtils.isEmpty(defaultToscaImportConfig)) {
             log.debug(FAILED_TO_GET_DEFAULT_IMPORTS_CONFIGURATION);
             return Either.right(ToscaError.GENERAL_ERROR);
         }
-
         log.trace("start tosca export for {}", component.getUniqueId());
-        ToscaTemplate toscaTemplate = new ToscaTemplate(TOSCA_VERSION);
-
+        String toscaVersion = null;
+        if (component instanceof Resource) {
+            toscaVersion = ((Resource) component).getToscaVersion();
+        }
+        final ToscaTemplate toscaTemplate = new ToscaTemplate(toscaVersion != null ? toscaVersion : TOSCA_VERSION);
         toscaTemplate.setMetadata(convertMetadata(component));
-        toscaTemplate.setImports(new ArrayList<>(DEFAULT_IMPORTS));
-        Map<String, ToscaNodeType> nodeTypes = new HashMap<>();
+        toscaTemplate.setImports(new ArrayList<>(defaultToscaImportConfig));
+        final Map<String, ToscaNodeType> nodeTypes = new HashMap<>();
         if (ModelConverter.isAtomicComponent(component)) {
             log.trace("convert component as node type");
             return convertNodeType(new HashMap<>(), component, toscaTemplate, nodeTypes);
@@ -217,16 +281,17 @@ public class ToscaExportHandler {
     private Either<ToscaTemplate, ToscaError> convertToscaTemplate(Component component, ToscaTemplate toscaNode) {
 
         Either<ImmutablePair<ToscaTemplate, Map<String, Component>>, ToscaError> importsRes = fillImports(component,
-                toscaNode);
+            toscaNode);
         if (importsRes.isRight()) {
             return Either.right(importsRes.right().value());
         }
         toscaNode = importsRes.left().value().left;
         Map<String, Component> componentCache = importsRes.left().value().right;
-        Either<Map<String, ToscaNodeType>, ToscaError> nodeTypesMapEither = createProxyNodeTypes(componentCache , component );
+        Either<Map<String, ToscaNodeType>, ToscaError> nodeTypesMapEither = createProxyNodeTypes(componentCache,
+            component);
         if (nodeTypesMapEither.isRight()) {
             log.debug("Failed to fetch normative service proxy resource by tosca name, error {}",
-                    nodeTypesMapEither.right().value());
+                nodeTypesMapEither.right().value());
             return Either.right(nodeTypesMapEither.right().value());
         }
         Map<String, ToscaNodeType> nodeTypesMap = nodeTypesMapEither.left().value();
@@ -234,8 +299,20 @@ public class ToscaExportHandler {
             toscaNode.setNode_types(nodeTypesMap);
         }
 
+        createServiceSubstitutionNodeTypes(componentCache, component, toscaNode);
 
-        Either<Map<String, DataTypeDefinition>, TitanOperationStatus> dataTypesEither = dataTypeCache.getAll();
+        Either<Map<String, Object>, ToscaError> proxyInterfaceTypesEither = createProxyInterfaceTypes(component);
+        if (proxyInterfaceTypesEither.isRight()) {
+            log.debug("Failed to populate service proxy local interface types in tosca, error {}",
+                nodeTypesMapEither.right().value());
+            return Either.right(proxyInterfaceTypesEither.right().value());
+        }
+        Map<String, Object> proxyInterfaceTypes = proxyInterfaceTypesEither.left().value();
+        if (MapUtils.isNotEmpty(proxyInterfaceTypes)) {
+            toscaNode.setInterface_types(proxyInterfaceTypes);
+        }
+
+        Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> dataTypesEither = dataTypeCache.getAll();
         if (dataTypesEither.isRight()) {
             log.debug("Failed to retrieve all data types {}", dataTypesEither.right().value());
             return Either.right(ToscaError.GENERAL_ERROR);
@@ -249,65 +326,86 @@ public class ToscaExportHandler {
             topologyTemplate.setInputs(inputs);
         }
 
-        List<ComponentInstance> componentInstances = component.getComponentInstances();
-        Map<String, List<ComponentInstanceProperty>> componentInstancesProperties =
-                component.getComponentInstancesProperties();
-        Map<String, List<ComponentInstanceInterface>> componentInstanceInterfaces =
-            component.getComponentInstancesInterfaces();
-        if (componentInstances != null && !componentInstances.isEmpty()) {
+        final Map<String, ToscaProperty> outputs;
+        try {
+            outputs = outputConverter.convert(component.getOutputs(), dataTypes);
+        } catch (final ToscaConversionException e) {
+            log.error(EcompLoggerErrorCode.SCHEMA_ERROR, ToscaExportHandler.class.getName(),
+                "Could not parse component '{}' outputs. Component unique id '{}'.",
+                new Object[]{component.getName(), component.getUniqueId(), e});
+            return Either.right(ToscaError.GENERAL_ERROR);
+        }
+        if (!outputs.isEmpty()) {
+            topologyTemplate.setOutputs(outputs);
+        }
 
-            Either<Map<String, ToscaNodeTemplate>, ToscaError> nodeTemplates =
-                    convertNodeTemplates(component, componentInstances,
-                        componentInstancesProperties, componentInstanceInterfaces,
-                        componentCache, dataTypes, topologyTemplate);
+        final List<ComponentInstance> componentInstances = component.getComponentInstances();
+        Map<String, List<ComponentInstanceProperty>> componentInstancesProperties = component.getComponentInstancesProperties();
+        Map<String, List<ComponentInstanceInterface>> componentInstanceInterfaces = component.getComponentInstancesInterfaces();
+        if (CollectionUtils.isNotEmpty(componentInstances)) {
+            final Either<Map<String, ToscaNodeTemplate>, ToscaError> nodeTemplates = convertNodeTemplates(component, componentInstances,
+                componentInstancesProperties, componentInstanceInterfaces, componentCache, dataTypes, topologyTemplate);
             if (nodeTemplates.isRight()) {
                 return Either.right(nodeTemplates.right().value());
             }
             log.debug("node templates converted");
-
             topologyTemplate.setNode_templates(nodeTemplates.left().value());
         }
+        final Map<String, ToscaRelationshipTemplate> relationshipTemplatesMap =
+            new ToscaExportRelationshipTemplatesHandler().createFrom(topologyTemplate.getNode_templates());
+        if (!relationshipTemplatesMap.isEmpty()) {
+            topologyTemplate.setRelationshipTemplates(relationshipTemplatesMap);
+        }
 
+        SubstitutionMapping substitutionMapping = new SubstitutionMapping();
+        convertSubstitutionMappingFilter(component, substitutionMapping);
 
         addGroupsToTopologyTemplate(component, topologyTemplate);
 
         try {
             addPoliciesToTopologyTemplate(component, topologyTemplate);
         } catch (SdcResourceNotFoundException e) {
-            log.debug("Fail to add policies to topology template:",e);
+            log.debug("Fail to add policies to topology template:", e);
             return Either.right(ToscaError.GENERAL_ERROR);
         }
 
-
-        SubstitutionMapping substitutionMapping = new SubstitutionMapping();
         String toscaResourceName;
         switch (component.getComponentType()) {
             case RESOURCE:
                 toscaResourceName = ((ResourceMetadataDataDefinition) component.getComponentMetadataDefinition()
-                                                                               .getMetadataDataDefinition()).getToscaResourceName();
+                    .getMetadataDataDefinition()).getToscaResourceName();
                 break;
             case SERVICE:
                 toscaResourceName = SERVICE_NODE_TYPE_PREFIX
-                                            + component.getComponentMetadataDefinition().getMetadataDataDefinition().getSystemName();
+                    + component.getComponentMetadataDefinition().getMetadataDataDefinition().getSystemName();
                 break;
             default:
                 log.debug(NOT_SUPPORTED_COMPONENT_TYPE, component.getComponentType());
                 return Either.right(ToscaError.NOT_SUPPORTED_TOSCA_TYPE);
         }
         substitutionMapping.setNode_type(toscaResourceName);
-
-        Either<SubstitutionMapping, ToscaError> capabilities = convertCapabilities(component, substitutionMapping, componentCache);
+        Either<SubstitutionMapping, ToscaError> capabilities = convertCapabilities(component, substitutionMapping,
+            componentCache);
         if (capabilities.isRight()) {
             return Either.right(capabilities.right().value());
         }
         substitutionMapping = capabilities.left().value();
 
         Either<SubstitutionMapping, ToscaError> requirements = capabilityRequirementConverter
-                                                                       .convertSubstitutionMappingRequirements(componentCache, component, substitutionMapping);
+            .convertSubstitutionMappingRequirements(componentCache, component, substitutionMapping);
         if (requirements.isRight()) {
             return Either.right(requirements.right().value());
         }
         substitutionMapping = requirements.left().value();
+        final Map<String, String[]> propertyMappingMap = buildSubstitutionMappingPropertyMapping(component);
+        if (!propertyMappingMap.isEmpty()) {
+            substitutionMapping.setProperties(propertyMappingMap);
+        }
+
+        final Map<String, String[]> attributesMappingMap = buildSubstitutionMappingAttributesMapping(component);
+        if (!attributesMappingMap.isEmpty()) {
+            substitutionMapping.setAttributes(attributesMappingMap);
+        }
 
         topologyTemplate.setSubstitution_mappings(substitutionMapping);
 
@@ -316,51 +414,65 @@ public class ToscaExportHandler {
         return Either.left(toscaNode);
     }
 
-  private void addGroupsToTopologyTemplate(Component component, ToscaTopolgyTemplate topologyTemplate) {
-
+    private void convertSubstitutionMappingFilter(final Component component,
+                                                  final SubstitutionMapping substitutionMapping) {
+        if (component.getSubstitutionFilter() != null
+            && (component.getSubstitutionFilter().getProperties()).getListToscaDataDefinition() != null) {
+            substitutionMapping
+                .setSubstitution_filter(convertToSubstitutionFilterComponent(component.getSubstitutionFilter()));
+        }
+    }
 
+    private void addGroupsToTopologyTemplate(Component component, ToscaTopolgyTemplate topologyTemplate) {
         Map<String, ToscaGroupTemplate> groups = groupExportParser.getGroups(component);
-        if(groups!= null) {
+        if (groups != null) {
             topologyTemplate.addGroups(groups);
         }
     }
 
     private void addPoliciesToTopologyTemplate(Component component, ToscaTopolgyTemplate topologyTemplate)
-            throws SdcResourceNotFoundException {
+        throws SdcResourceNotFoundException {
         Map<String, ToscaPolicyTemplate> policies = policyExportParser.getPolicies(component);
-        if(policies!= null) {
+        if (policies != null) {
             topologyTemplate.addPolicies(policies);
         }
     }
 
-    private ToscaMetadata convertMetadata(Component component) {
+    private Map<String, String> convertMetadata(Component component) {
         return convertMetadata(component, false, null);
     }
 
-    private ToscaMetadata convertMetadata(Component component, boolean isInstance,
-            ComponentInstance componentInstance) {
-        ToscaMetadata toscaMetadata = new ToscaMetadata();
-        toscaMetadata.setInvariantUUID(component.getInvariantUUID());
-        toscaMetadata.setUUID(component.getUUID());
-        toscaMetadata.setDescription(component.getDescription());
-        toscaMetadata.setName(component.getComponentMetadataDefinition().getMetadataDataDefinition().getName());
+    private Map<String, String> convertMetadata(Component component, boolean isInstance,
+                                                ComponentInstance componentInstance) {
+        Map<String, String> toscaMetadata = new LinkedHashMap<>();
+        toscaMetadata.put(convertMetadataKey(JsonPresentationFields.INVARIANT_UUID), component.getInvariantUUID());
+        toscaMetadata.put(JsonPresentationFields.UUID.getPresentation(), component.getUUID());
+        toscaMetadata
+            .put(JsonPresentationFields.NAME.getPresentation(), component.getComponentMetadataDefinition().getMetadataDataDefinition().getName());
+        toscaMetadata.put(JsonPresentationFields.DESCRIPTION.getPresentation(), component.getDescription());
 
         List<CategoryDefinition> categories = component.getCategories();
         CategoryDefinition categoryDefinition = categories.get(0);
-        toscaMetadata.setCategory(categoryDefinition.getName());
+        toscaMetadata.put(JsonPresentationFields.CATEGORY.getPresentation(), categoryDefinition.getName());
 
         if (isInstance) {
-            toscaMetadata.setVersion(component.getVersion());
-            toscaMetadata.setCustomizationUUID(componentInstance.getCustomizationUUID());
+            toscaMetadata.put(JsonPresentationFields.VERSION.getPresentation(), component.getVersion());
+            toscaMetadata.put(JsonPresentationFields.CUSTOMIZATION_UUID.getPresentation(), componentInstance.getCustomizationUUID());
             if (componentInstance.getSourceModelInvariant() != null
-                        && !componentInstance.getSourceModelInvariant().isEmpty()) {
-                toscaMetadata.setVersion(componentInstance.getComponentVersion());
-                toscaMetadata.setSourceModelInvariant(componentInstance.getSourceModelInvariant());
-                toscaMetadata.setSourceModelUuid(componentInstance.getSourceModelUuid());
-                toscaMetadata.setSourceModelName(componentInstance.getSourceModelName());
-                toscaMetadata.setName(
+                && !componentInstance.getSourceModelInvariant().isEmpty()) {
+                toscaMetadata.put(JsonPresentationFields.VERSION.getPresentation(), componentInstance.getComponentVersion());
+                toscaMetadata.put(JsonPresentationFields.CI_SOURCE_MODEL_INVARIANT.getPresentation(), componentInstance.getSourceModelInvariant());
+                toscaMetadata.put(JsonPresentationFields.CI_SOURCE_MODEL_UUID.getPresentation(), componentInstance.getSourceModelUuid());
+                toscaMetadata.put(JsonPresentationFields.CI_SOURCE_MODEL_NAME.getPresentation(), componentInstance.getSourceModelName());
+                if (componentInstance.getOriginType() == OriginTypeEnum.ServiceProxy) {
+                    toscaMetadata.put(JsonPresentationFields.NAME.getPresentation(),
                         componentInstance.getSourceModelName() + " " + OriginTypeEnum.ServiceProxy.getDisplayValue());
-                toscaMetadata.setDescription(componentInstance.getDescription());
+                } else if (componentInstance.getOriginType() == OriginTypeEnum.ServiceSubstitution) {
+                    toscaMetadata.put(JsonPresentationFields.NAME.getPresentation(),
+                        componentInstance.getSourceModelName() + " " + OriginTypeEnum.ServiceSubstitution
+                            .getDisplayValue());
+                }
+                toscaMetadata.put(JsonPresentationFields.DESCRIPTION.getPresentation(), componentInstance.getDescription());
             }
 
         }
@@ -368,70 +480,77 @@ public class ToscaExportHandler {
             case RESOURCE:
                 Resource resource = (Resource) component;
 
-                if (isInstance && componentInstance.getOriginType() == OriginTypeEnum.ServiceProxy) {
-                    toscaMetadata.setType(componentInstance.getOriginType().getDisplayValue());
+                if (isInstance && (componentInstance.getOriginType() == OriginTypeEnum.ServiceProxy
+                    || componentInstance.getOriginType() == OriginTypeEnum.ServiceSubstitution)) {
+                    toscaMetadata.put(JsonPresentationFields.TYPE.getPresentation(), componentInstance.getOriginType().getDisplayValue());
                 } else {
-                    toscaMetadata.setType(resource.getResourceType().name());
+                    toscaMetadata.put(JsonPresentationFields.TYPE.getPresentation(), resource.getResourceType().name());
                 }
-                toscaMetadata.setSubcategory(categoryDefinition.getSubcategories().get(0).getName());
-                toscaMetadata.setResourceVendor(resource.getVendorName());
-                toscaMetadata.setResourceVendorRelease(resource.getVendorRelease());
-                toscaMetadata.setResourceVendorModelNumber(resource.getResourceVendorModelNumber());
+                toscaMetadata.put(JsonPresentationFields.SUB_CATEGORY.getPresentation(), categoryDefinition.getSubcategories().get(0).getName());
+                toscaMetadata.put(JsonPresentationFields.RESOURCE_VENDOR.getPresentation(), resource.getVendorName());
+                toscaMetadata.put(JsonPresentationFields.RESOURCE_VENDOR_RELEASE.getPresentation(), resource.getVendorRelease());
+                toscaMetadata.put(JsonPresentationFields.RESOURCE_VENDOR_MODEL_NUMBER.getPresentation(), resource.getResourceVendorModelNumber());
                 break;
             case SERVICE:
                 Service service = (Service) component;
-                toscaMetadata.setType(component.getComponentType().getValue());
-                toscaMetadata.setServiceType(service.getServiceType());
-                toscaMetadata.setServiceRole(service.getServiceRole());
-                toscaMetadata.setEnvironmentContext(service.getEnvironmentContext());
-                resolveInstantiationTypeAndSetItToToscaMetaData(toscaMetadata, service);
+                toscaMetadata.put(JsonPresentationFields.TYPE.getPresentation(), component.getComponentType().getValue());
+                toscaMetadata.put(JsonPresentationFields.SERVICE_TYPE.getPresentation(), service.getServiceType());
+                toscaMetadata.put(JsonPresentationFields.SERVICE_ROLE.getPresentation(), service.getServiceRole());
+                toscaMetadata.put(JsonPresentationFields.SERVICE_FUNCTION.getPresentation(), service.getServiceFunction());
+                toscaMetadata.put(JsonPresentationFields.ENVIRONMENT_CONTEXT.getPresentation(), service.getEnvironmentContext());
+                toscaMetadata.put(JsonPresentationFields.INSTANTIATION_TYPE.getPresentation(),
+                    service.getEnvironmentContext() == null ? StringUtils.EMPTY : service.getInstantiationType());
                 if (!isInstance) {
                     // DE268546
-                    toscaMetadata.setServiceEcompNaming(((Service) component).isEcompGeneratedNaming());
-                    toscaMetadata.setEcompGeneratedNaming(((Service) component).isEcompGeneratedNaming());
-                    toscaMetadata.setNamingPolicy(((Service) component).getNamingPolicy());
+                    toscaMetadata.put(JsonPresentationFields.ECOMP_GENERATED_NAMING.getPresentation(), service.isEcompGeneratedNaming().toString());
+                    toscaMetadata.put(JsonPresentationFields.ECOMP_GENERATED_NAMING.getPresentation(), service.isEcompGeneratedNaming().toString());
+                    toscaMetadata.put(JsonPresentationFields.NAMING_POLICY.getPresentation(), service.getNamingPolicy());
                 }
                 break;
             default:
                 log.debug(NOT_SUPPORTED_COMPONENT_TYPE, component.getComponentType());
         }
-        return toscaMetadata;
-    }
 
-    private void resolveInstantiationTypeAndSetItToToscaMetaData(ToscaMetadata toscaMetadata, Service service) {
-        if (service.getInstantiationType() != null) {
-            toscaMetadata.setInstantiationType(service.getInstantiationType());
+        for (final String key : component.getCategorySpecificMetadata().keySet()) {
+            toscaMetadata.put(key, component.getCategorySpecificMetadata().get(key));
         }
-        else {
-            toscaMetadata.setInstantiationType(StringUtils.EMPTY);
+        return toscaMetadata;
+    }
+    
+    private String convertMetadataKey(JsonPresentationFields jsonPresentationField) {
+        if (JsonPresentationFields.INVARIANT_UUID.equals(jsonPresentationField)) {
+            return INVARIANT_UUID;
         }
+        return jsonPresentationField.getPresentation();
     }
 
     private Either<ImmutablePair<ToscaTemplate, Map<String, Component>>, ToscaError> fillImports(Component component,
-            ToscaTemplate toscaTemplate) {
+                                                                                                 ToscaTemplate toscaTemplate) {
 
-        if (null == DEFAULT_IMPORTS) {
+        final List<Map<String, Map<String, String>>> defaultToscaImportConfig = getDefaultToscaImportConfig();
+        if (CollectionUtils.isEmpty(defaultToscaImportConfig)) {
             log.debug(FAILED_TO_GET_DEFAULT_IMPORTS_CONFIGURATION);
             return Either.right(ToscaError.GENERAL_ERROR);
         }
         Map<String, Component> componentCache = new HashMap<>();
 
         if (!ModelConverter.isAtomicComponent(component)) {
-            List<Map<String, Map<String, String>>> additionalImports = toscaTemplate.getImports() == null
-                                                                               ? new ArrayList<>(DEFAULT_IMPORTS) : new ArrayList<>(toscaTemplate.getImports());
+            final List<Map<String, Map<String, String>>> additionalImports =
+                toscaTemplate.getImports() == null ? new ArrayList<>(defaultToscaImportConfig)
+                    : new ArrayList<>(toscaTemplate.getImports());
 
             List<Triple<String, String, Component>> dependecies = new ArrayList<>();
 
             Map<String, ArtifactDefinition> toscaArtifacts = component.getToscaArtifacts();
             if (isNotEmpty(toscaArtifacts)) {
                 ArtifactDefinition artifactDefinition = toscaArtifacts.get(ToscaExportHandler.ASSET_TOSCA_TEMPLATE);
-                if(artifactDefinition != null) {
+                if (artifactDefinition != null) {
                     Map<String, Map<String, String>> importsListMember = new HashMap<>();
                     Map<String, String> interfaceFiles = new HashMap<>();
                     interfaceFiles.put(IMPORTS_FILE_KEY, getInterfaceFilename(artifactDefinition.getArtifactName()));
                     StringBuilder keyNameBuilder = new StringBuilder();
                     keyNameBuilder.append(component.getComponentType().toString().toLowerCase()).append("-")
-                                  .append(component.getName()).append("-interface");
+                        .append(component.getName()).append("-interface");
                     importsListMember.put(keyNameBuilder.toString(), interfaceFiles);
                     additionalImports.add(importsListMember);
                 }
@@ -448,60 +567,157 @@ public class ToscaExportHandler {
         return Either.left(new ImmutablePair<>(toscaTemplate, componentCache));
     }
 
-    private void createDependency(Map<String, Component> componentCache, List<Map<String, Map<String, String>>> imports,
-            List<Triple<String, String, Component>> dependecies, ComponentInstance ci) {
-        Map<String, String> files = new HashMap<>();
-        Map<String, Map<String, String>> importsListMember = new HashMap<>();
-        StringBuilder keyNameBuilder;
+    private List<Map<String, Map<String, String>>> getDefaultToscaImportConfig() {
+        return ConfigurationManager.getConfigurationManager().getConfiguration().getDefaultImports();
+    }
 
-        Component componentRI = componentCache.get(ci.getComponentUid());
-        if (componentRI == null) {
+    private void createDependency(final Map<String, Component> componentCache,
+                                  final List<Map<String, Map<String, String>>> imports,
+                                  final List<Triple<String, String, Component>> dependencies,
+                                  final ComponentInstance componentInstance) {
+        log.debug("createDependency componentCache {}", componentCache);
+        Component componentRI = componentCache.get(componentInstance.getComponentUid());
+        if (componentRI == null || componentInstance.getOriginType() == OriginTypeEnum.ServiceSubstitution) {
             // all resource must be only once!
-            Either<Component, StorageOperationStatus> resource = toscaOperationFacade
-                                                                         .getToscaFullElement(ci.getComponentUid());
+            final Either<Component, StorageOperationStatus> resource = toscaOperationFacade
+                .getToscaFullElement(componentInstance.getComponentUid());
             if ((resource.isRight()) && (log.isDebugEnabled())) {
-                log.debug("Failed to fetch resource with id {} for instance {}",ci.getComponentUid() ,ci.getUniqueId());
-                return ;
+                log.debug("Failed to fetch resource with id {} for instance {}", componentInstance.getComponentUid(),
+                    componentInstance.getUniqueId());
+                return;
             }
+            final Component fetchedComponent = resource.left().value();
+            componentRI = setComponentCache(componentCache, componentInstance, fetchedComponent);
+            addDependencies(imports, dependencies, componentRI);
+        }
+    }
 
-            Component fetchedComponent = resource.left().value();
-            componentCache.put(fetchedComponent.getUniqueId(), fetchedComponent);
+    /**
+     * Sets a componentCache from the given component/resource.
+     */
+    private Component setComponentCache(final Map<String, Component> componentCache,
+                                   final ComponentInstance componentInstance,
+                                   final Component fetchedComponent) {
+        componentCache.put(fetchedComponent.getUniqueId(), fetchedComponent);
+        if (componentInstance.getOriginType() == OriginTypeEnum.ServiceProxy
+            || componentInstance.getOriginType() == OriginTypeEnum.ServiceSubstitution) {
+            final Either<Component, StorageOperationStatus> sourceService = toscaOperationFacade
+                .getToscaFullElement(componentInstance.getSourceModelUid());
+            if (sourceService.isRight() && (log.isDebugEnabled())) {
+                log.debug("Failed to fetch source service with id {} for proxy {}",
+                    componentInstance.getSourceModelUid(), componentInstance.getUniqueId());
+            }
+            final Component fetchedSource = sourceService.left().value();
+            componentCache.put(fetchedSource.getUniqueId(), fetchedSource);
+            return fetchedSource;
+        }
+        return fetchedComponent;
+    }
 
-            if (ci.getOriginType() == OriginTypeEnum.ServiceProxy){
-                Either<Component, StorageOperationStatus> sourceService = toscaOperationFacade
-                                                                                  .getToscaFullElement(ci.getSourceModelUid());
-                if (sourceService.isRight() && (log.isDebugEnabled())) {
-                    log.debug("Failed to fetch source service with id {} for proxy {}", ci.getSourceModelUid(), ci.getUniqueId());
-                }
-                Component fetchedSource = sourceService.left().value();
-                componentCache.put(fetchedSource.getUniqueId(), fetchedSource);
+    /**
+     * Retrieves all derived_from nodes and stores it in a predictable order.
+     */
+    private void addDependencies(final List<Map<String, Map<String, String>>> imports,
+                                 final List<Triple<String, String, Component>> dependencies,
+                                 final Component fetchedComponent) {
+        final Set<Component> componentsList = new LinkedHashSet<>();
+        if (fetchedComponent instanceof Resource) {
+            log.debug("fetchedComponent is a resource {}", fetchedComponent);
+
+            final Optional<Map<String, String>> derivedFromMapOfIdToName = getDerivedFromMapOfIdToName(fetchedComponent,
+                componentsList);
+            if (derivedFromMapOfIdToName.isPresent() && !derivedFromMapOfIdToName.get().isEmpty()) {
+                derivedFromMapOfIdToName.get().entrySet().forEach(entry -> {
+                    log.debug("Started entry.getValue() : {}", entry.getValue());
+                    if (!NATIVE_ROOT.equals(entry.getValue())) {
+                        Either<Resource, StorageOperationStatus> resourcefetched = toscaOperationFacade
+                            .getToscaElement(entry.getKey());
+                        if (resourcefetched != null && resourcefetched.isLeft()) {
+                            componentsList.add(resourcefetched.left().value());
+                        }
+                    }
+                });
+                setImports(imports, dependencies, componentsList);
+            } else {
+                setImports(imports, dependencies, fetchedComponent);
             }
 
-            componentRI = fetchedComponent;
-
-            Map<String, ArtifactDefinition> toscaArtifacts = componentRI.getToscaArtifacts();
-            ArtifactDefinition artifactDefinition = toscaArtifacts.get(ASSET_TOSCA_TEMPLATE);
-            if (artifactDefinition != null) {
-                String artifactName = artifactDefinition.getArtifactName();
-                files.put(IMPORTS_FILE_KEY, artifactName);
-                keyNameBuilder = new StringBuilder();
-                keyNameBuilder.append(fetchedComponent.getComponentType().toString().toLowerCase());
-                keyNameBuilder.append("-");
-                keyNameBuilder.append(ci.getComponentName());
-                importsListMember.put(keyNameBuilder.toString(), files);
-                imports.add(importsListMember);
-                dependecies.add(new ImmutableTriple<>(artifactName,
-                        artifactDefinition.getEsId(), fetchedComponent));
-
-                if (!ModelConverter.isAtomicComponent(componentRI)) {
-                    importsListMember = new HashMap<>();
-                    Map<String, String> interfaceFiles = new HashMap<>();
-                    interfaceFiles.put(IMPORTS_FILE_KEY, getInterfaceFilename(artifactName));
-                    keyNameBuilder.append("-interface");
-                    importsListMember.put(keyNameBuilder.toString(), interfaceFiles);
-                    imports.add(importsListMember);
+        }
+    }
+
+    /**
+     * Returns all derived_from nodes found.
+     */
+    private Optional<Map<String, String>> getDerivedFromMapOfIdToName(final Component fetchedComponent,
+                                                                      final Set<Component> componentsList) {
+        final Resource parentResource = (Resource) fetchedComponent;
+        Map<String, String> derivedFromMapOfIdToName = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(parentResource.getComponentInstances())) {
+            componentsList.add(fetchedComponent);
+            for (final ComponentInstance componentInstance : parentResource.getComponentInstances()) {
+                final Either<Resource, StorageOperationStatus> resourcefetched = toscaOperationFacade
+                    .getToscaElement(componentInstance.getComponentUid());
+                if (resourcefetched != null && resourcefetched.isLeft()) {
+                    final Map<String, String> derivedWithId = resourcefetched.left().value()
+                        .getDerivedFromMapOfIdToName();
+                    if (MapUtils.isNotEmpty(derivedWithId)) {
+                        derivedFromMapOfIdToName.putAll(derivedWithId);
+                    }
                 }
             }
+        } else {
+            derivedFromMapOfIdToName = parentResource.getDerivedFromMapOfIdToName();
+        }
+        log.debug("Started derivedFromMapOfIdToName: {}", derivedFromMapOfIdToName);
+        return Optional.ofNullable(derivedFromMapOfIdToName);
+    }
+
+    /**
+     * Creates a resource map and adds it to the import list.
+     */
+    private void setImports(final List<Map<String, Map<String, String>>> imports,
+                            final List<Triple<String, String, Component>> dependencies,
+                            final Set<Component> componentsList) {
+        componentsList.forEach(component -> setImports(imports, dependencies, component));
+    }
+
+    private void setImports(final List<Map<String, Map<String, String>>> imports,
+                            final List<Triple<String, String, Component>> dependencies,
+                            final Component component) {
+        final Map<String, ArtifactDefinition> toscaArtifacts = component.getToscaArtifacts();
+        final ArtifactDefinition artifactDefinition = toscaArtifacts.get(ASSET_TOSCA_TEMPLATE);
+        if (artifactDefinition != null) {
+            final Map<String, String> files = new HashMap<>();
+            final String artifactName = artifactDefinition.getArtifactName();
+            files.put(IMPORTS_FILE_KEY, artifactName);
+            final StringBuilder keyNameBuilder = new StringBuilder();
+            keyNameBuilder.append(component.getComponentType().toString().toLowerCase());
+            keyNameBuilder.append("-");
+            keyNameBuilder.append(component.getName());
+            addImports(imports, keyNameBuilder, files);
+            dependencies
+                    .add(new ImmutableTriple<>(artifactName, artifactDefinition.getEsId(), component));
+
+            if (!ModelConverter.isAtomicComponent(component)) {
+                final Map<String, String> interfaceFiles = new HashMap<>();
+                interfaceFiles.put(IMPORTS_FILE_KEY, getInterfaceFilename(artifactName));
+                keyNameBuilder.append("-interface");
+                addImports(imports, keyNameBuilder, interfaceFiles);
+            }
+        }
+    }
+
+    /**
+     * Adds the found resource to the import definition list.
+     */
+    private void addImports(final List<Map<String, Map<String, String>>> imports,
+                            final StringBuilder keyNameBuilder,
+                            final Map<String, String> files) {
+        final String mapKey = keyNameBuilder.toString();
+        if (imports.stream().allMatch(stringMapMap -> stringMapMap.get(mapKey) == null)) {
+            final Map<String, Map<String, String>> importsListMember = new HashMap<>();
+            importsListMember.put(keyNameBuilder.toString(), files);
+            imports.add(importsListMember);
         }
     }
 
@@ -509,32 +725,33 @@ public class ToscaExportHandler {
         return artifactName.substring(0, artifactName.lastIndexOf('.')) + ToscaExportHandler.TOSCA_INTERFACE_NAME;
     }
 
-    private Either<ToscaTemplate, ToscaError> convertNodeType(Map<String, Component> componentsCache, Component component, ToscaTemplate toscaNode,
+    private Either<ToscaTemplate, ToscaError> convertNodeType(Map<String, Component> componentsCache,
+                                                              Component component, ToscaTemplate toscaNode,
                                                               Map<String, ToscaNodeType> nodeTypes) {
         return convertInterfaceNodeType(componentsCache, component, toscaNode, nodeTypes, false);
     }
 
-    private Either<ToscaTemplate, ToscaError> convertInterfaceNodeType(Map<String, Component> componentsCache,
-            Component component, ToscaTemplate toscaNode,
-            Map<String, ToscaNodeType> nodeTypes,
-            boolean isAssociatedComponent) {
+    public Either<ToscaTemplate, ToscaError> convertInterfaceNodeType(Map<String, Component> componentsCache,
+                                                                      Component component, ToscaTemplate toscaNode,
+                                                                      Map<String, ToscaNodeType> nodeTypes,
+                                                                      boolean isAssociatedComponent) {
         log.debug("start convert node type for {}", component.getUniqueId());
         ToscaNodeType toscaNodeType = createNodeType(component);
 
         Either<Map<String, InterfaceDefinition>, StorageOperationStatus> lifecycleTypeEither =
-                interfaceLifecycleOperation.getAllInterfaceLifecycleTypes();
-        if(lifecycleTypeEither.isRight()){
+            interfaceLifecycleOperation.getAllInterfaceLifecycleTypes();
+        if (lifecycleTypeEither.isRight()) {
             log.debug("Failed to fetch all interface types :", lifecycleTypeEither.right().value());
             return Either.right(ToscaError.GENERAL_ERROR);
         }
         List<String> allGlobalInterfaceTypes = lifecycleTypeEither.left().value()
-                .values()
-                .stream()
-                .map(InterfaceDataDefinition::getType)
-                .collect(Collectors.toList());
+            .values()
+            .stream()
+            .map(InterfaceDataDefinition::getType)
+            .collect(Collectors.toList());
         toscaNode.setInterface_types(addInterfaceTypeElement(component, allGlobalInterfaceTypes));
 
-        Either<Map<String, DataTypeDefinition>, TitanOperationStatus> dataTypesEither = dataTypeCache.getAll();
+        Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> dataTypesEither = dataTypeCache.getAll();
         if (dataTypesEither.isRight()) {
             log.debug("Failed to fetch all data types :", dataTypesEither.right().value());
             return Either.right(ToscaError.GENERAL_ERROR);
@@ -544,45 +761,54 @@ public class ToscaExportHandler {
 
         List<InputDefinition> inputDef = component.getInputs();
         Map<String, ToscaProperty> mergedProperties = new HashMap<>();
-        addInterfaceDefinitionElement(component, toscaNodeType, dataTypes, isAssociatedComponent);
-        if (inputDef != null) {
-            addInputsToProperties(dataTypes, inputDef, mergedProperties);
-        }
+        interfacesOperationsConverter
+            .addInterfaceDefinitionElement(component, toscaNodeType, dataTypes, isAssociatedComponent);
+        addInputsToProperties(dataTypes, inputDef, mergedProperties);
 
-        if(CollectionUtils.isNotEmpty(component.getProperties())) {
+        final Map<String, ToscaAttribute> toscaAttributeMap;
+        try {
+            toscaAttributeMap = convertToToscaAttributes(component.getAttributes(), dataTypes);
+        } catch (final ToscaConversionException e) {
+            log.error(EcompLoggerErrorCode.SCHEMA_ERROR, ToscaExportHandler.class.getName(),
+                "Could not parse component '{}' attributes. Component unique id '{}'.",
+                new Object[]{component.getName(), component.getUniqueId(), e});
+            return Either.right(ToscaError.GENERAL_ERROR);
+        }
+        if (!toscaAttributeMap.isEmpty()) {
+            toscaNodeType.setAttributes(toscaAttributeMap);
+        }
+        if (CollectionUtils.isNotEmpty(component.getProperties())) {
             List<PropertyDefinition> properties = component.getProperties();
-            Map<String, ToscaProperty> convertedProperties;
-            convertedProperties = properties.stream().collect(Collectors.toMap(
-                    PropertyDataDefinition::getName,
+            Map<String, ToscaProperty> convertedProperties = properties.stream()
+                .map(propertyDefinition -> resolvePropertyValueFromInput(propertyDefinition, component.getInputs()))
+                .collect(Collectors.toMap(PropertyDataDefinition::getName,
                     property -> propertyConvertor.convertProperty(dataTypes, property,
-                            PropertyConvertor.PropertyType.PROPERTY)));
+                        PropertyConvertor.PropertyType.PROPERTY)));
             // merge component properties and inputs properties
             mergedProperties.putAll(convertedProperties);
         }
         if (MapUtils.isNotEmpty(mergedProperties)) {
-            if (Objects.nonNull(inputDef)) {
-                resolveDefaultPropertyValue(inputDef, mergedProperties, dataTypes);
-            }
             toscaNodeType.setProperties(mergedProperties);
         }
 
         /* convert private data_types */
         List<DataTypeDefinition> privateDataTypes = component.getDataTypes();
-        if (CollectionUtils.isNotEmpty(privateDataTypes) ) {
+        if (CollectionUtils.isNotEmpty(privateDataTypes)) {
             Map<String, ToscaDataType> toscaDataTypeMap = new HashMap<>();
-            for (DataTypeDefinition dataType: privateDataTypes) {
+            for (DataTypeDefinition dataType : privateDataTypes) {
                 log.debug("Emitting private data type: component.name={} dataType.name={}",
-                        component.getNormalizedName(), dataType.getName());
+                    component.getNormalizedName(), dataType.getName());
                 ToscaDataType toscaDataType = new ToscaDataType();
                 toscaDataType.setDerived_from(dataType.getDerivedFromName());
                 toscaDataType.setDescription(dataType.getDescription());
                 toscaDataType.setVersion(dataType.getVersion());
                 if (CollectionUtils.isNotEmpty(dataType.getProperties())) {
                     toscaDataType.setProperties(dataType.getProperties().stream()
-                            .collect(Collectors.toMap(
-                                    s -> s.getName(),
-                                    s -> propertyConvertor.convertProperty(dataTypes, s, PropertyConvertor.PropertyType.PROPERTY)
-                            )));
+                        .collect(Collectors.toMap(
+                            PropertyDataDefinition::getName,
+                            s -> propertyConvertor
+                                .convertProperty(dataTypes, s, PropertyType.PROPERTY)
+                        )));
                 }
                 toscaDataTypeMap.put(dataType.getName(), toscaDataType);
             }
@@ -593,61 +819,34 @@ public class ToscaExportHandler {
         return convertReqCapAndTypeName(componentsCache, component, toscaNode, nodeTypes, toscaNodeType, dataTypes);
     }
 
-    private void resolveDefaultPropertyValue(List<InputDefinition> inputDef,
-                                             Map<String, ToscaProperty> mergedProperties,
-                                             Map<String, DataTypeDefinition> dataTypes) {
-        for (Map.Entry<String, ToscaProperty> mergedPropertyEntry : mergedProperties.entrySet()) {
-            ToscaProperty value = mergedPropertyEntry.getValue();
-            if (Objects.nonNull(value) && value.getDefaultp() instanceof Map) {
-                Map<String, Object> valueAsMap = (Map<String, Object>) value.getDefaultp();
-                Object getInputValue = valueAsMap.get(ToscaFunctions.GET_INPUT.getFunctionName());
-                if (getInputValue instanceof String) {
-                    String inputName = (String)getInputValue;
-                    Optional<InputDefinition> matchedInputDefinition = inputDef.stream()
-                            .filter(componentInput -> componentInput.getName().equals(inputName))
-                            .findFirst();
-                    if (matchedInputDefinition.isPresent()) {
-                        InputDefinition matchedInput = matchedInputDefinition.get();
-                        Object resolvedDefaultValue = new PropertyConvertor().convertToToscaObject(matchedInput.getType(),
-                                matchedInput.getDefaultValue(), matchedInput.getSchemaType(), dataTypes, false);
-                        value.setDefaultp(resolvedDefaultValue);
-                        mergedProperties.put(mergedPropertyEntry.getKey(), value);
-                    }
-                } else if (getInputValue instanceof List) {
-                    // new get_input syntax to refer to sub-element (introduced from TOSCA v1.3)
-                    // e.g. get_input: [input_name, INDEX, inner_property]
-                    // currently resolving default value for the syntax is not supported
-                    log.debug("#resolveDefaultPropertyValue: ignore get_input list syntax. propname={}, val={}",
-                        mergedPropertyEntry.getKey(), getInputValue);
-                } else {
-                    // Ignore unknown get_input syntax
-                    log.debug("#resolveDefaultPropertyValue: ignore unknown get_input syntax. propname={}, val={}",
-                        mergedPropertyEntry.getKey(), getInputValue);
-                }
-            }
+    private Map<String, ToscaAttribute> convertToToscaAttributes(final List<AttributeDefinition> attributeList,
+                                                                 final Map<String, DataTypeDefinition> dataTypes) throws ToscaConversionException {
+        if (CollectionUtils.isEmpty(attributeList)) {
+            return Collections.emptyMap();
         }
+        final AttributeConverter attributeConverter = new AttributeConverter(dataTypes);
+        final Map<String, ToscaAttribute> toscaAttributeMap = new HashMap<>();
+        for (final AttributeDefinition attributeDefinition : attributeList) {
+            toscaAttributeMap.put(attributeDefinition.getName(), attributeConverter.convert(attributeDefinition));
+        }
+        return toscaAttributeMap;
     }
 
-  private void addInputsToProperties(Map<String, DataTypeDefinition> dataTypes,
-                                     List<InputDefinition> inputDef,
-                                     Map<String, ToscaProperty> mergedProperties) {
-    for(InputDefinition input : inputDef) {
-      ToscaProperty property = propertyConvertor.convertProperty(dataTypes, input, PropertyConvertor.PropertyType.INPUT);
-      mergedProperties.put(input.getName(), property);
-    }
-  }
-
-    private Either<ToscaTemplate, ToscaError> convertReqCapAndTypeName(Map<String, Component> componentsCache, Component component, ToscaTemplate toscaNode,
-            Map<String, ToscaNodeType> nodeTypes, ToscaNodeType toscaNodeType,
-            Map<String, DataTypeDefinition> dataTypes) {
-        Either<ToscaNodeType, ToscaError> capabilities = convertCapabilities(componentsCache, component, toscaNodeType, dataTypes);
+    private Either<ToscaTemplate, ToscaError> convertReqCapAndTypeName(Map<String, Component> componentsCache,
+                                                                       Component component, ToscaTemplate toscaNode,
+                                                                       Map<String, ToscaNodeType> nodeTypes,
+                                                                       ToscaNodeType toscaNodeType,
+                                                                       Map<String, DataTypeDefinition> dataTypes) {
+        Either<ToscaNodeType, ToscaError> capabilities = convertCapabilities(componentsCache, component, toscaNodeType,
+            dataTypes);
         if (capabilities.isRight()) {
             return Either.right(capabilities.right().value());
         }
         toscaNodeType = capabilities.left().value();
         log.debug("Capabilities converted for {}", component.getUniqueId());
 
-        Either<ToscaNodeType, ToscaError> requirements = capabilityRequirementConverter.convertRequirements(componentsCache, component,
+        Either<ToscaNodeType, ToscaError> requirements = capabilityRequirementConverter
+            .convertRequirements(componentsCache, component,
                 toscaNodeType);
         if (requirements.isRight()) {
             return Either.right(requirements.right().value());
@@ -659,11 +858,11 @@ public class ToscaExportHandler {
         switch (component.getComponentType()) {
             case RESOURCE:
                 toscaResourceName = ((ResourceMetadataDataDefinition) component.getComponentMetadataDefinition()
-                                                                               .getMetadataDataDefinition()).getToscaResourceName();
+                    .getMetadataDataDefinition()).getToscaResourceName();
                 break;
             case SERVICE:
                 toscaResourceName = SERVICE_NODE_TYPE_PREFIX
-                                            + component.getComponentMetadataDefinition().getMetadataDataDefinition().getSystemName();
+                    + component.getComponentMetadataDefinition().getMetadataDataDefinition().getSystemName();
                 break;
             default:
                 log.debug(NOT_SUPPORTED_COMPONENT_TYPE, component.getComponentType());
@@ -677,35 +876,38 @@ public class ToscaExportHandler {
     }
 
     protected Either<Map<String, ToscaNodeTemplate>, ToscaError> convertNodeTemplates(
-            Component component,
-            List<ComponentInstance> componentInstances,
-            Map<String, List<ComponentInstanceProperty>> componentInstancesProperties,
-            Map<String, List<ComponentInstanceInterface>> componentInstanceInterfaces,
-            Map<String, Component> componentCache, Map<String, DataTypeDefinition> dataTypes,
-            ToscaTopolgyTemplate topologyTemplate) {
+        Component component,
+        List<ComponentInstance> componentInstances,
+        Map<String, List<ComponentInstanceProperty>> componentInstancesProperties,
+        Map<String, List<ComponentInstanceInterface>> componentInstanceInterfaces,
+        Map<String, Component> componentCache, Map<String, DataTypeDefinition> dataTypes,
+        ToscaTopolgyTemplate topologyTemplate) {
 
         Either<Map<String, ToscaNodeTemplate>, ToscaError> convertNodeTemplatesRes = null;
         log.debug("start convert topology template for {} for type {}", component.getUniqueId(),
-                component.getComponentType());
+            component.getComponentType());
         Map<String, ToscaNodeTemplate> nodeTemplates = new HashMap<>();
         Map<String, List<ComponentInstanceInput>> componentInstancesInputs = component.getComponentInstancesInputs();
 
         Map<String, ToscaGroupTemplate> groupsMap = null;
         for (ComponentInstance componentInstance : componentInstances) {
             ToscaNodeTemplate nodeTemplate = new ToscaNodeTemplate();
+            if (MapUtils.isNotEmpty(componentInstance.getToscaArtifacts())) {
+                nodeTemplate.setArtifacts(convertToNodeTemplateArtifacts(componentInstance.getToscaArtifacts()));
+            }
             nodeTemplate.setType(componentInstance.getToscaComponentName());
             nodeTemplate.setDirectives(componentInstance.getDirectives());
             nodeTemplate.setNode_filter(convertToNodeTemplateNodeFilterComponent(componentInstance.getNodeFilter()));
 
             Either<Component, Boolean> originComponentRes = capabilityRequirementConverter
-                                                                    .getOriginComponent(componentCache, componentInstance);
+                .getOriginComponent(componentCache, componentInstance);
             if (originComponentRes.isRight()) {
                 convertNodeTemplatesRes = Either.right(ToscaError.NODE_TYPE_REQUIREMENT_ERROR);
                 break;
             }
             Either<ToscaNodeTemplate, ToscaError> requirements = convertComponentInstanceRequirements(component,
-                    componentInstance, component.getComponentInstancesRelations(), nodeTemplate,
-                    originComponentRes.left().value(), componentCache);
+                componentInstance, component.getComponentInstancesRelations(), nodeTemplate,
+                originComponentRes.left().value(), componentCache);
             if (requirements.isRight()) {
                 convertNodeTemplatesRes = Either.right(requirements.right().value());
                 break;
@@ -717,7 +919,7 @@ public class ToscaExportHandler {
 
             Component originalComponent = componentCache.get(componentInstance.getActualComponentUid());
 
-            if (componentInstance.getOriginType() == OriginTypeEnum.ServiceProxy){
+            if (componentInstance.getOriginType() == OriginTypeEnum.ServiceProxy) {
                 Component componentOfProxy = componentCache.get(componentInstance.getComponentUid());
                 nodeTemplate.setMetadata(convertMetadata(componentOfProxy, true, componentInstance));
             } else {
@@ -725,7 +927,7 @@ public class ToscaExportHandler {
             }
 
             Either<ToscaNodeTemplate, ToscaError> capabilities = capabilityRequirementConverter
-                                                                         .convertComponentInstanceCapabilities(componentInstance, dataTypes, nodeTemplate);
+                .convertComponentInstanceCapabilities(componentInstance, dataTypes, nodeTemplate);
             if (capabilities.isRight()) {
                 convertNodeTemplatesRes = Either.right(capabilities.right().value());
                 break;
@@ -740,20 +942,20 @@ public class ToscaExportHandler {
                 addPropertiesOfParentComponent(dataTypes, originalComponent, props);
             }
 
-            if (null != componentInstancesProperties && componentInstancesProperties.containsKey(instanceUniqueId)
-                    && !isComponentOfTypeServiceProxy(componentInstance)) {
-                addPropertiesOfComponentInstance(componentInstancesProperties, dataTypes,
-                        instanceUniqueId, props);
+            if (null != componentInstancesProperties && componentInstancesProperties.containsKey(instanceUniqueId)) {
+                addPropertiesOfComponentInstance(componentInstancesProperties, dataTypes, instanceUniqueId,
+                    props);
             }
 
             if (componentInstancesInputs != null && componentInstancesInputs.containsKey(instanceUniqueId)
-                    && !isComponentOfTypeServiceProxy(componentInstance)) {
-                addComponentInstanceInputs(dataTypes, componentInstancesInputs, instanceUniqueId,
-                        props);
+                && !isComponentOfTypeServiceProxy(componentInstance)) {
+                //For service proxy the inputs are already handled under instance properties above
+                addComponentInstanceInputs(dataTypes, componentInstancesInputs, instanceUniqueId, props);
             }
+
             //M3[00001] - NODE TEMPLATE INTERFACES  - START
             handleInstanceInterfaces(componentInstanceInterfaces, componentInstance, dataTypes, nodeTemplate,
-                    instanceUniqueId, component);
+                instanceUniqueId, component);
             //M3[00001] - NODE TEMPLATE INTERFACES  - END
             if (props != null && !props.isEmpty()) {
                 nodeTemplate.setProperties(props);
@@ -773,7 +975,8 @@ public class ToscaExportHandler {
                     }
 
                     if (addToTosca) {
-                        ToscaGroupTemplate toscaGroup = groupExportParser.getToscaGroupTemplate(groupInst, componentInstance.getInvariantName());
+                        ToscaGroupTemplate toscaGroup = groupExportParser
+                            .getToscaGroupTemplate(groupInst, componentInstance.getInvariantName());
                         groupsMap.put(groupInst.getName(), toscaGroup);
                     }
                 }
@@ -785,51 +988,49 @@ public class ToscaExportHandler {
             log.debug("instance groups added");
             topologyTemplate.addGroups(groupsMap);
         }
-        if (component.getComponentType() == ComponentTypeEnum.SERVICE && isNotEmpty(((Service) component).getForwardingPaths())) {
+        if (component.getComponentType() == ComponentTypeEnum.SERVICE && isNotEmpty(
+            ((Service) component).getForwardingPaths())) {
             log.debug("Starting converting paths for component {}, name {}", component.getUniqueId(),
-                    component.getName());
-            ForwardingPathToscaUtil.addForwardingPaths((Service) component, nodeTemplates, capabilityRequirementConverter, componentCache, toscaOperationFacade);
+                component.getName());
+            ForwardingPathToscaUtil
+                .addForwardingPaths((Service) component, nodeTemplates, capabilityRequirementConverter, componentCache,
+                    toscaOperationFacade);
             log.debug("Finished converting paths for component {}, name {}", component.getUniqueId(),
-                    component.getName());
+                component.getName());
         }
         if (convertNodeTemplatesRes == null) {
             convertNodeTemplatesRes = Either.left(nodeTemplates);
         }
         log.debug("finish convert topology template for {} for type {}", component.getUniqueId(),
-                component.getComponentType());
+            component.getComponentType());
         return convertNodeTemplatesRes;
     }
 
     private void handleInstanceInterfaces(
-            Map<String, List<ComponentInstanceInterface>> componentInstanceInterfaces,
-            ComponentInstance componentInstance, Map<String, DataTypeDefinition> dataTypes, ToscaNodeTemplate nodeTemplate,
-            String instanceUniqueId,
-            Component parentComponent) {
-
-        Map<String, Object> interfaces;
-
-        // we need to handle service proxy interfaces
-        if(isComponentOfTypeServiceProxy(componentInstance)) {
-            if(MapUtils.isEmpty(componentInstanceInterfaces)
-                || !componentInstanceInterfaces.containsKey(instanceUniqueId)) {
-                interfaces = null;
-            } else {
-                List<ComponentInstanceInterface> currServiceInterfaces =
-                    componentInstanceInterfaces.get(instanceUniqueId);
+        Map<String, List<ComponentInstanceInterface>> componentInstanceInterfaces,
+        ComponentInstance componentInstance, Map<String, DataTypeDefinition> dataTypes, ToscaNodeTemplate nodeTemplate,
+        String instanceUniqueId,
+        Component parentComponent) {
+
+        if (MapUtils.isEmpty(componentInstanceInterfaces)
+            || !componentInstanceInterfaces.containsKey(instanceUniqueId)) {
+            nodeTemplate.setInterfaces(null);
+            return;
+        }
 
-                Map<String, InterfaceDefinition> tmpInterfaces = new HashMap<>();
-                currServiceInterfaces.forEach(instInterface -> tmpInterfaces.put(instInterface
-                    .getUniqueId(), instInterface));
+        final List<ComponentInstanceInterface> currServiceInterfaces =
+            componentInstanceInterfaces.get(instanceUniqueId);
 
-                interfaces = InterfacesOperationsToscaUtil
-                                     .getInterfacesMap(parentComponent, componentInstance, tmpInterfaces, dataTypes, true, true);
-            }
-        } else {
-            interfaces =
-                getComponentInstanceInterfaceInstances(componentInstanceInterfaces,
-                    componentInstance, instanceUniqueId);
-        }
-        nodeTemplate.setInterfaces(interfaces);
+        final Map<String, InterfaceDefinition> tmpInterfaces = new HashMap<>();
+        currServiceInterfaces.forEach(instInterface -> tmpInterfaces.put(instInterface
+            .getUniqueId(), instInterface));
+
+        final Map<String, Object> interfaceMap = interfacesOperationsConverter
+            .getInterfacesMap(parentComponent, componentInstance, tmpInterfaces, dataTypes, isComponentOfTypeServiceProxy(componentInstance),
+                isComponentOfTypeServiceProxy(componentInstance));
+
+        interfacesOperationsConverter.removeInterfacesWithoutOperations(interfaceMap);
+        nodeTemplate.setInterfaces(MapUtils.isEmpty(interfaceMap) ? null : interfaceMap);
     }
 
     private boolean isComponentOfTypeServiceProxy(ComponentInstance componentInstance) {
@@ -837,100 +1038,46 @@ public class ToscaExportHandler {
             && componentInstance.getOriginType().getValue().equals("Service Proxy");
     }
 
-    //M3[00001] - NODE TEMPLATE INTERFACES  - START
-    private Map<String, Object> getComponentInstanceInterfaceInstances(Map<String, List<ComponentInstanceInterface>> componentInstancesInterfaces,
-                                                                        ComponentInstance componentInstance,
-                                                                       String instanceUniqueId) {
-        if(MapUtils.isEmpty(componentInstancesInterfaces)) {
-            return null;
-        }
-
-        List<ComponentInstanceInterface> componentInstanceInterfaces =
-            componentInstancesInterfaces.get(instanceUniqueId);
-
-        if(CollectionUtils.isEmpty(componentInstanceInterfaces)) {
-          return null;
-        }
-
-        Map<String, Object> interfaces = new HashMap<>();
-        for(ComponentInstanceInterface componentInstanceInterface : componentInstanceInterfaces) {
-            interfaces.put(componentInstanceInterface.getInterfaceId(),
-                removeOperationsKeyFromInterface(componentInstanceInterface.getInterfaceInstanceDataDefinition()));
-        }
-
-        componentInstance.setInterfaces(interfaces);
-
-        return interfaces;
-    }
-
     private void addComponentInstanceInputs(Map<String, DataTypeDefinition> dataTypes,
-            Map<String, List<ComponentInstanceInput>> componentInstancesInputs,
-            String instanceUniqueId, Map<String, Object> props) {
+                                            Map<String, List<ComponentInstanceInput>> componentInstancesInputs,
+                                            String instanceUniqueId, Map<String, Object> props) {
 
         List<ComponentInstanceInput> instanceInputsList = componentInstancesInputs.get(instanceUniqueId);
         if (instanceInputsList != null) {
             instanceInputsList.forEach(input -> {
 
                 Supplier<String> supplier = () -> input.getValue() != null && !Objects.isNull(input.getValue())
-                        ? input.getValue() : input.getDefaultValue();
+                    ? input.getValue() : input.getDefaultValue();
                 propertyConvertor.convertAndAddValue(dataTypes, props, input, supplier);
             });
         }
     }
 
     private void addPropertiesOfComponentInstance(
-            Map<String, List<ComponentInstanceProperty>> componentInstancesProperties,
-            Map<String, DataTypeDefinition> dataTypes, String instanceUniqueId,
-            Map<String, Object> props) {
+        Map<String, List<ComponentInstanceProperty>> componentInstancesProperties,
+        Map<String, DataTypeDefinition> dataTypes, String instanceUniqueId,
+        Map<String, Object> props) {
 
         if (isNotEmpty(componentInstancesProperties)) {
             componentInstancesProperties.get(instanceUniqueId)
-                                        // Converts and adds each value to property map
-                                        .forEach(prop -> propertyConvertor.convertAndAddValue(dataTypes, props, prop,
-                                                prop::getValue));
+                // Converts and adds each value to property map
+                .forEach(prop -> propertyConvertor.convertAndAddValue(dataTypes, props, prop,
+                    prop::getValue));
         }
     }
 
     private void addPropertiesOfParentComponent(Map<String, DataTypeDefinition> dataTypes,
-            Component componentOfInstance, Map<String, Object> props) {
+                                                Component componentOfInstance, Map<String, Object> props) {
 
         List<PropertyDefinition> componentProperties = componentOfInstance.getProperties();
         if (isNotEmpty(componentProperties)) {
             componentProperties.stream()
-                    // Filters out properties with empty default values
-                               .filter(prop -> StringUtils.isNotEmpty(prop.getDefaultValue()))
-                    // Converts and adds each value to property map
-                    .forEach(prop -> propertyConvertor.convertAndAddValue(dataTypes, props, prop,
-                                       prop::getDefaultValue));
-        }
-    }
-
-    /**
-     * @param dataTypes
-     * @param componentInstance
-     * @param props
-     * @param prop
-     * @param supplier
-     */
-    private void convertAndAddValue(Map<String, DataTypeDefinition> dataTypes, ComponentInstance componentInstance,
-            Map<String, Object> props, PropertyDefinition prop, Supplier<String> supplier) {
-        Object convertedValue = convertValue(dataTypes, componentInstance, prop, supplier);
-        if (!ToscaValueBaseConverter.isEmptyObjectValue(convertedValue)) {
-            props.put(prop.getName(), convertedValue);
-        }
-    }
-
-    private <T extends PropertyDefinition> Object convertValue(Map<String, DataTypeDefinition> dataTypes,
-            ComponentInstance componentInstance, T input, Supplier<String> supplier) {
-        log.debug("Convert property or input value {} for instance {}", input.getName(),
-                componentInstance.getUniqueId());
-        String propertyType = input.getType();
-        String innerType = null;
-        if (input.getSchema() != null && input.getSchema().getProperty() != null) {
-            innerType = input.getSchema().getProperty().getType();
+                // Filters out properties with empty default values
+                .filter(prop -> StringUtils.isNotEmpty(prop.getDefaultValue()))
+                // Converts and adds each value to property map
+                .forEach(prop -> propertyConvertor.convertAndAddValue(dataTypes, props, prop,
+                    prop::getDefaultValue));
         }
-        return propertyConvertor.convertToToscaObject(propertyType, supplier.get(), innerType,
-            dataTypes, true);
     }
 
     private ToscaNodeType createNodeType(Component component) {
@@ -942,13 +1089,65 @@ public class ToscaExportHandler {
             toscaNodeType.setDescription(component.getDescription());
         } else {
             String derivedFrom = null != component.getDerivedFromGenericType() ? component.getDerivedFromGenericType()
-                                         : "tosca.nodes.Root";
+                : NATIVE_ROOT;
             toscaNodeType.setDerived_from(derivedFrom);
         }
         return toscaNodeType;
     }
 
-    private Either<Map<String, ToscaNodeType>, ToscaError> createProxyNodeTypes(Map<String, Component> componentCache ,Component container  ) {
+    private Either<Map<String, Object>, ToscaError> createProxyInterfaceTypes(Component container) {
+
+        Map<String, Object> proxyInterfaceTypes = new HashMap<>();
+        Either<Map<String, Object>, ToscaError> res = Either.left(proxyInterfaceTypes);
+        List<ComponentInstance> componentInstances = container.getComponentInstances();
+        if (CollectionUtils.isEmpty(componentInstances)) {
+            return res;
+        }
+        Map<String, ComponentInstance> serviceProxyInstanceList = new HashMap<>();
+        componentInstances.stream()
+            .filter(this::isComponentOfTypeServiceProxy)
+            .forEach(inst -> serviceProxyInstanceList.put(inst.getToscaComponentName(), inst));
+        if (MapUtils.isEmpty(serviceProxyInstanceList)) {
+            return res;
+        }
+        for (Entry<String, ComponentInstance> entryProxy : serviceProxyInstanceList.entrySet()) {
+            Component serviceComponent;
+            ComponentParametersView componentParametersView = new ComponentParametersView();
+            componentParametersView.disableAll();
+            componentParametersView.setIgnoreInterfaces(false);
+            Either<Component, StorageOperationStatus> service = toscaOperationFacade
+                .getToscaElement(entryProxy.getValue().getSourceModelUid(), componentParametersView);
+            if (service.isRight()) {
+                log.debug("Failed to fetch original service component with id {} for instance {}",
+                    entryProxy.getValue().getSourceModelUid(), entryProxy.getValue().getName());
+                return Either.right(ToscaError.GENERAL_ERROR);
+            } else {
+                serviceComponent = service.left().value();
+            }
+
+            Either<Map<String, InterfaceDefinition>, StorageOperationStatus> lifecycleTypeEither =
+                interfaceLifecycleOperation.getAllInterfaceLifecycleTypes();
+            if (lifecycleTypeEither.isRight()) {
+                log.debug("Failed to retrieve global interface types :", lifecycleTypeEither.right().value());
+                return Either.right(ToscaError.GENERAL_ERROR);
+            }
+
+            List<String> allGlobalInterfaceTypes = lifecycleTypeEither.left().value().values().stream()
+                .map(InterfaceDataDefinition::getType)
+                .collect(Collectors.toList());
+            //Add interface types for local interfaces in the original service component for proxy
+            Map<String, Object> localInterfaceTypes = addInterfaceTypeElement(serviceComponent,
+                allGlobalInterfaceTypes);
+            if (MapUtils.isNotEmpty(localInterfaceTypes)) {
+                proxyInterfaceTypes.putAll(localInterfaceTypes);
+            }
+
+        }
+        return Either.left(proxyInterfaceTypes);
+    }
+
+    private Either<Map<String, ToscaNodeType>, ToscaError> createProxyNodeTypes(Map<String, Component> componentCache,
+                                                                                Component container) {
 
         Map<String, ToscaNodeType> nodeTypesMap = new HashMap<>();
         Either<Map<String, ToscaNodeType>, ToscaError> res = Either.left(nodeTypesMap);
@@ -960,8 +1159,8 @@ public class ToscaExportHandler {
         }
         Map<String, ComponentInstance> serviceProxyInstanceList = new HashMap<>();
         List<ComponentInstance> proxyInst = componentInstances.stream()
-                                                              .filter(p -> p.getOriginType().name().equals(OriginTypeEnum.ServiceProxy.name()))
-                                                              .collect(Collectors.toList());
+            .filter(p -> p.getOriginType().name().equals(OriginTypeEnum.ServiceProxy.name()))
+            .collect(Collectors.toList());
         if (proxyInst != null && !proxyInst.isEmpty()) {
             for (ComponentInstance inst : proxyInst) {
                 serviceProxyInstanceList.put(inst.getToscaComponentName(), inst);
@@ -971,14 +1170,11 @@ public class ToscaExportHandler {
         if (serviceProxyInstanceList.isEmpty()) {
             return res;
         }
-        ComponentParametersView filter = new ComponentParametersView(true);
-        filter.setIgnoreCapabilities(false);
-        filter.setIgnoreComponentInstances(false);
         Either<Resource, StorageOperationStatus> serviceProxyOrigin = toscaOperationFacade
-                                                                              .getLatestByName("serviceProxy");
+            .getLatestByName("serviceProxy");
         if (serviceProxyOrigin.isRight()) {
             log.debug("Failed to fetch normative service proxy resource by tosca name, error {}",
-                    serviceProxyOrigin.right().value());
+                serviceProxyOrigin.right().value());
             return Either.right(ToscaError.NOT_SUPPORTED_TOSCA_TYPE);
         }
         Component origComponent = serviceProxyOrigin.left().value();
@@ -988,172 +1184,275 @@ public class ToscaExportHandler {
             ComponentParametersView componentParametersView = new ComponentParametersView();
             componentParametersView.disableAll();
             componentParametersView.setIgnoreCategories(false);
+            componentParametersView.setIgnoreProperties(false);
+            componentParametersView.setIgnoreInputs(false);
+            componentParametersView.setIgnoreInterfaces(false);
+            componentParametersView.setIgnoreRequirements(false);
             Either<Component, StorageOperationStatus> service = toscaOperationFacade
-                                                                        .getToscaElement(entryProxy.getValue().getSourceModelUid(), componentParametersView);
+                .getToscaElement(entryProxy.getValue().getSourceModelUid(), componentParametersView);
             if (service.isRight()) {
-                log.debug("Failed to fetch resource with id {} for instance {}", entryProxy.getValue().getSourceModelUid(),  entryProxy.getValue().getName());
+                log.debug("Failed to fetch resource with id {} for instance {}",
+                    entryProxy.getValue().getSourceModelUid(), entryProxy.getValue().getName());
             } else {
                 serviceComponent = service.left().value();
             }
 
-            ToscaNodeType toscaNodeType = createProxyNodeType(componentCache , origComponent, serviceComponent, entryProxy.getValue());
+            ToscaNodeType toscaNodeType = createProxyNodeType(componentCache, origComponent, serviceComponent,
+                entryProxy.getValue());
             nodeTypesMap.put(entryProxy.getKey(), toscaNodeType);
         }
 
         return Either.left(nodeTypesMap);
     }
 
-    private ToscaNodeType createProxyNodeType(Map<String, Component> componentCache , Component origComponent, Component proxyComponent,
-            ComponentInstance instance) {
+    private void createServiceSubstitutionNodeTypes(final Map<String, Component> componentCache,
+                                                    final Component container, final ToscaTemplate toscaNode) {
+        final List<ComponentInstance> componentInstances = container.getComponentInstances();
+
+        if (CollectionUtils.isEmpty(componentInstances)) {
+            return;
+        }
+        final List<ComponentInstance> serviceSubstitutionInstanceList = componentInstances.stream()
+            .filter(p -> p.getOriginType().name().equals(OriginTypeEnum.ServiceSubstitution.name()))
+            .collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(serviceSubstitutionInstanceList)) {
+            for (ComponentInstance inst : serviceSubstitutionInstanceList) {
+                final Map<String, ToscaNodeType> nodeTypes =
+                    toscaNode.getNode_types() == null ? new HashMap<>() : toscaNode.getNode_types();
+                convertInterfaceNodeType(new HashMap<>(), componentCache.get(inst.getSourceModelUid()), toscaNode,
+                    nodeTypes, true);
+            }
+        }
+    }
+
+    private ToscaNodeType createProxyNodeType(Map<String, Component> componentCache, Component origComponent,
+                                              Component proxyComponent, ComponentInstance componentInstance) {
         ToscaNodeType toscaNodeType = new ToscaNodeType();
         String derivedFrom = ((Resource) origComponent).getToscaResourceName();
 
         toscaNodeType.setDerived_from(derivedFrom);
-        Either<Map<String, DataTypeDefinition>, TitanOperationStatus> dataTypesEither = dataTypeCache.getAll();
+        Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> dataTypesEither = dataTypeCache.getAll();
         if (dataTypesEither.isRight()) {
             log.debug("Failed to retrieve all data types {}", dataTypesEither.right().value());
         }
         Map<String, DataTypeDefinition> dataTypes = dataTypesEither.left().value();
         Map<String, ToscaCapability> capabilities = this.capabilityRequirementConverter
-                                                            .convertProxyCapabilities( componentCache ,origComponent, proxyComponent, instance, dataTypes);
+            .convertProxyCapabilities(componentCache, componentInstance, dataTypes);
 
-        toscaNodeType.setCapabilities(capabilities);
+        if (MapUtils.isNotEmpty(capabilities)) {
+            toscaNodeType.setCapabilities(capabilities);
+        }
+        List<Map<String, ToscaRequirement>> proxyNodeTypeRequirements = this.capabilityRequirementConverter
+            .convertProxyRequirements(componentCache, componentInstance);
+        if (CollectionUtils.isNotEmpty(proxyNodeTypeRequirements)) {
+            toscaNodeType.setRequirements(proxyNodeTypeRequirements);
+        }
+        Optional<Map<String, ToscaProperty>> proxyProperties = getProxyNodeTypeProperties(proxyComponent, dataTypes);
+        proxyProperties.ifPresent(toscaNodeType::setProperties);
+
+        Map<String, Object> interfaceMap = new HashMap<>();
+        if (MapUtils.isEmpty(componentInstance.getInterfaces())) {
+            final Optional<Map<String, Object>> proxyInterfaces = getProxyNodeTypeInterfaces(proxyComponent, dataTypes);
+            if (proxyInterfaces.isPresent()) {
+                interfaceMap = proxyInterfaces.get();
+            }
+        } else {
+            interfaceMap = interfacesOperationsConverter
+                .getInterfacesMapFromComponentInstance(proxyComponent, componentInstance, dataTypes, false, false);
+
+        }
+        interfacesOperationsConverter.removeInterfacesWithoutOperations(interfaceMap);
+        toscaNodeType.setInterfaces(MapUtils.isEmpty(interfaceMap) ? null : interfaceMap);
 
         return toscaNodeType;
     }
 
     private Either<ToscaNodeTemplate, ToscaError> convertComponentInstanceRequirements(Component component,
-            ComponentInstance componentInstance, List<RequirementCapabilityRelDef> relations,
-            ToscaNodeTemplate nodeTypeTemplate, Component originComponent, Map<String, Component> componentCache) {
-
-        List<Map<String, ToscaTemplateRequirement>> toscaRequirements = new ArrayList<>();
-        if (!addRequirements(component, componentInstance, relations, originComponent, toscaRequirements, componentCache)) {
-            log.debug("Failed to convert component instance requirements for the component instance {}. ",
-                    componentInstance.getName());
-            return Either.right(ToscaError.NODE_TYPE_REQUIREMENT_ERROR);
-        }
-        if (!toscaRequirements.isEmpty()) {
-            nodeTypeTemplate.setRequirements(toscaRequirements);
+                                                                                       ComponentInstance componentInstance,
+                                                                                       List<RequirementCapabilityRelDef> relations,
+                                                                                       ToscaNodeTemplate nodeTypeTemplate,
+                                                                                       Component originComponent,
+                                                                                       Map<String, Component> componentCache) {
+
+        final List<Map<String, ToscaTemplateRequirement>> toscaRequirements;
+        final List<RequirementCapabilityRelDef> requirementDefinitionList = filterRequirements(componentInstance,
+            relations);
+        if (isNotEmpty(requirementDefinitionList)) {
+            try {
+                toscaRequirements = buildRequirements(component, componentInstance,
+                    requirementDefinitionList, originComponent, componentCache);
+                if (!toscaRequirements.isEmpty()) {
+                    nodeTypeTemplate.setRequirements(toscaRequirements);
+                }
+            } catch (final Exception e) {
+                log.debug("Failed to convert component instance requirements for the component instance {}. ",
+                    componentInstance.getName(), e);
+                return Either.right(ToscaError.NODE_TYPE_REQUIREMENT_ERROR);
+            }
         }
         log.debug("Finished to convert requirements for the node type {} ", componentInstance.getName());
         return Either.left(nodeTypeTemplate);
     }
 
-    private boolean addRequirements(Component component, ComponentInstance componentInstance,
-            List<RequirementCapabilityRelDef> relations, Component originComponent,
-            List<Map<String, ToscaTemplateRequirement>> toscaRequirements, Map<String, Component> componentCache) {
-        List<RequirementCapabilityRelDef> filteredRelations = relations.stream()
-                                                                       .filter(p -> componentInstance.getUniqueId().equals(p.getFromNode())).collect(Collectors.toList());
-        return isEmpty(filteredRelations) ||
-                       filteredRelations.stream()
-                                        .allMatch(rel -> addRequirement(componentInstance, originComponent, component.getComponentInstances(), rel, toscaRequirements, componentCache));
-    }
+    private List<Map<String, ToscaTemplateRequirement>> buildRequirements(final Component component,
+                                                                          final ComponentInstance componentInstance,
+                                                                          final List<RequirementCapabilityRelDef> filteredRelations,
+                                                                          final Component originComponent,
+                                                                          final Map<String, Component> componentCache)
+        throws ToscaExportException {
 
-    private boolean addRequirement(ComponentInstance fromInstance, Component fromOriginComponent,
-            List<ComponentInstance> instancesList, RequirementCapabilityRelDef rel,
-            List<Map<String, ToscaTemplateRequirement>> toscaRequirements, Map<String, Component> componentCache) {
+        final List<Map<String, ToscaTemplateRequirement>> toscaRequirements = new ArrayList<>();
+        for (RequirementCapabilityRelDef relationshipDefinition : filteredRelations) {
+            final Map<String, ToscaTemplateRequirement> toscaTemplateRequirementMap =
+                buildRequirement(componentInstance, originComponent, component.getComponentInstances(),
+                    relationshipDefinition, componentCache);
+            toscaRequirements.add(toscaTemplateRequirementMap);
+        }
 
-        boolean result = true;
-        Map<String, List<RequirementDefinition>> reqMap = fromOriginComponent.getRequirements();
-        RelationshipInfo reqAndRelationshipPair = rel.getRelationships().get(0).getRelation();
-        Either<Component, StorageOperationStatus> getOriginRes = null;
-        Optional<RequirementDefinition> reqOpt = Optional.empty();
-        Component toOriginComponent = null;
-        Optional<CapabilityDefinition> capOpt = Optional.empty();
+        return toscaRequirements;
+    }
 
-        ComponentInstance toInstance = instancesList.stream().filter(i -> rel.getToNode().equals(i.getUniqueId()))
-                                                    .findFirst().orElse(null);
+    private List<RequirementCapabilityRelDef> filterRequirements(ComponentInstance componentInstance,
+                                                                 List<RequirementCapabilityRelDef> relations) {
+        return relations.stream()
+            .filter(p -> componentInstance.getUniqueId().equals(p.getFromNode())).collect(Collectors.toList());
+    }
+
+    private Map<String, ToscaTemplateRequirement> buildRequirement(final ComponentInstance fromInstance,
+                                                                   final Component fromOriginComponent,
+                                                                   final List<ComponentInstance> instancesList,
+                                                                   final RequirementCapabilityRelDef relationshipDefinition,
+                                                                   final Map<String, Component> componentCache)
+        throws ToscaExportException {
+
+        final Map<String, List<RequirementDefinition>> reqMap = fromOriginComponent.getRequirements();
+        final CapabilityRequirementRelationship capabilityRequirementRelationship = relationshipDefinition
+            .getRelationships().get(0);
+        final RelationshipInfo relationshipInfo = capabilityRequirementRelationship.getRelation();
+
+        final ComponentInstance toInstance = instancesList.stream()
+            .filter(i -> relationshipDefinition.getToNode().equals(i.getUniqueId()))
+            .findFirst().orElse(null);
         if (toInstance == null) {
-            log.debug("Failed to find a relation from the node {} to the node {}", fromInstance.getName(),
-                    rel.getToNode());
-            result = false;
-        }
-        if (result) {
-            reqOpt = findRequirement(fromOriginComponent, reqMap, reqAndRelationshipPair, fromInstance.getUniqueId());
-            if (!reqOpt.isPresent()) {
-                log.debug("Failed to find a requirement with uniqueId {} on a component with uniqueId {}",
-                        reqAndRelationshipPair.getRequirementUid(), fromOriginComponent.getUniqueId());
-                result = false;
-            }
-        }
-        if (result) {
-            ComponentParametersView filter = new ComponentParametersView(true);
-            filter.setIgnoreComponentInstances(false);
-            filter.setIgnoreCapabilities(false);
-            filter.setIgnoreGroups(false);
-            getOriginRes = toscaOperationFacade.getToscaElement(toInstance.getActualComponentUid(), filter);
-            if (getOriginRes.isRight()) {
-                log.debug("Failed to build substituted name for the requirement {}. Failed to get an origin component with uniqueId {}",
-                        reqOpt.get().getName(), toInstance.getActualComponentUid());
-                result = false;
-            }
-        }
-        if (result) {
-            toOriginComponent = getOriginRes.left().value();
-            capOpt = toOriginComponent.getCapabilities().get(reqOpt.get().getCapability()).stream()
-                                      .filter(c -> isCapabilityBelongToRelation(reqAndRelationshipPair, c)).findFirst();
-            if (!capOpt.isPresent()) {
-                capOpt = findCapability(reqAndRelationshipPair, toOriginComponent, fromOriginComponent, reqOpt.get());
-                if(!capOpt.isPresent()){
-                    result = false;
-                    log.debug("Failed to find a capability with name {} on a component with uniqueId {}",
-                            reqAndRelationshipPair.getCapability(), fromOriginComponent.getUniqueId());
-                }
+            final String errorMsg = String
+                .format("Failed to find a relation from the node %s to the node %s", fromInstance.getName(),
+                    relationshipDefinition.getToNode());
+            log.debug(errorMsg);
+            throw new ToscaExportException(errorMsg);
+        }
+        final Optional<RequirementDefinition> reqOpt =
+            findRequirement(fromOriginComponent, reqMap, relationshipInfo, fromInstance.getUniqueId());
+        if (reqOpt.isEmpty()) {
+            final String errorMsg = String
+                .format("Failed to find a requirement with uniqueId %s on a component with uniqueId %s",
+                    relationshipInfo.getRequirementUid(), fromOriginComponent.getUniqueId());
+            log.debug(errorMsg);
+            throw new ToscaExportException(errorMsg);
+        }
+        final ComponentParametersView filter = new ComponentParametersView(true);
+        filter.setIgnoreComponentInstances(false);
+        filter.setIgnoreCapabilities(false);
+        filter.setIgnoreGroups(false);
+        final Either<Component, StorageOperationStatus> getOriginRes =
+            toscaOperationFacade.getToscaElement(toInstance.getActualComponentUid(), filter);
+        if (getOriginRes.isRight()) {
+            final String errorMsg = String.format(
+                "Failed to build substituted name for the requirement %s. "
+                    + "Failed to get an origin component with uniqueId %s",
+                reqOpt.get().getName(), toInstance.getActualComponentUid());
+            log.debug(errorMsg);
+            throw new ToscaExportException(errorMsg);
+        }
+        final Component toOriginComponent = getOriginRes.left().value();
+        Optional<CapabilityDefinition> capOpt = toOriginComponent.getCapabilities().get(reqOpt.get().getCapability()).stream()
+            .filter(c -> isCapabilityBelongToRelation(relationshipInfo, c)).findFirst();
+        if (capOpt.isEmpty()) {
+            capOpt = findCapability(relationshipInfo, toOriginComponent, fromOriginComponent, reqOpt.get());
+            if (capOpt.isEmpty()) {
+                final String errorMsg = String
+                    .format("Failed to find a capability with name %s on a component with uniqueId %s",
+                        relationshipInfo.getCapability(), fromOriginComponent.getUniqueId());
+                log.debug(errorMsg);
+                throw new ToscaExportException(errorMsg);
             }
         }
-        if (result) {
-            result = buildAndAddRequirement(toscaRequirements, fromOriginComponent, toOriginComponent, capOpt.get(),
-                    reqOpt.get(), reqAndRelationshipPair, toInstance, componentCache);
-        }
-        return result;
+        return buildRequirement(fromOriginComponent, toOriginComponent, capOpt.get(), reqOpt.get(),
+            capabilityRequirementRelationship, toInstance, componentCache);
     }
 
-    private boolean isCapabilityBelongToRelation(RelationshipInfo reqAndRelationshipPair, CapabilityDefinition capability) {
-        return capability.getName().equals(reqAndRelationshipPair.getCapability()) && (capability.getOwnerId() !=null && capability.getOwnerId().equals(reqAndRelationshipPair.getCapabilityOwnerId()));
+    private boolean isCapabilityBelongToRelation(RelationshipInfo reqAndRelationshipPair,
+                                                 CapabilityDefinition capability) {
+        return capability.getName().equals(reqAndRelationshipPair.getCapability()) && (capability.getOwnerId() != null
+            && capability.getOwnerId().equals(reqAndRelationshipPair.getCapabilityOwnerId()));
     }
 
-    private Optional<CapabilityDefinition> findCapability(RelationshipInfo reqAndRelationshipPair, Component toOriginComponent, Component fromOriginComponent, RequirementDefinition requirement) {
-        Optional<CapabilityDefinition> cap = toOriginComponent.getCapabilities().get(requirement.getCapability()).stream().filter(c -> c.getType().equals(requirement.getCapability())).findFirst();
+    private Optional<CapabilityDefinition> findCapability(RelationshipInfo reqAndRelationshipPair,
+                                                          Component toOriginComponent, Component fromOriginComponent,
+                                                          RequirementDefinition requirement) {
+        Optional<CapabilityDefinition> cap = toOriginComponent.getCapabilities().get(requirement.getCapability())
+            .stream().filter(c -> c.getType().equals(requirement.getCapability())).findFirst();
         if (!cap.isPresent()) {
-            log.debug("Failed to find a capability with name {} on a component with uniqueId {}", reqAndRelationshipPair.getCapability(), fromOriginComponent.getUniqueId());
+            log.debug("Failed to find a capability with name {} on a component with uniqueId {}",
+                reqAndRelationshipPair.getCapability(), fromOriginComponent.getUniqueId());
         }
         return cap;
     }
 
-    private boolean buildAndAddRequirement(List<Map<String, ToscaTemplateRequirement>> toscaRequirements, Component fromOriginComponent, Component toOriginComponent, CapabilityDefinition capability, RequirementDefinition requirement, RelationshipInfo reqAndRelationshipPair, ComponentInstance toInstance, Map<String, Component> componentCache) {
+    private Map<String, ToscaTemplateRequirement> buildRequirement(final Component fromOriginComponent,
+                                                                   final Component toOriginComponent,
+                                                                   final CapabilityDefinition capability,
+                                                                   final RequirementDefinition requirement,
+                                                                   final CapabilityRequirementRelationship capabilityRequirementRelationship,
+                                                                   final ComponentInstance toInstance,
+                                                                   final Map<String, Component> componentCache)
+        throws ToscaExportException {
+
         List<String> reducedPath = capability.getPath();
-        if(capability.getOwnerId() !=null){
-            reducedPath =   capabilityRequirementConverter.getReducedPathByOwner(capability.getPath() , capability.getOwnerId() );
-        }
-        Either<String, Boolean> buildCapNameRes = capabilityRequirementConverter.buildSubstitutedName(componentCache,
-                toOriginComponent, reducedPath, reqAndRelationshipPair.getCapability(), capability.getPreviousName());
-        if (buildCapNameRes.isRight()) {
-            log.debug(
-                    "Failed to build a substituted capability name for the capability with name {} on a component with uniqueId {}",
-                    reqAndRelationshipPair.getCapability(), fromOriginComponent.getUniqueId());
-            return false;
-        }
-        Either<String, Boolean> buildReqNameRes  = capabilityRequirementConverter.buildSubstitutedName(componentCache, fromOriginComponent,
-                requirement.getPath(), reqAndRelationshipPair.getRequirement(), requirement.getPreviousName());
-        if (buildReqNameRes.isRight()) {
+        if (capability.getOwnerId() != null) {
+            reducedPath = capabilityRequirementConverter
+                .getReducedPathByOwner(capability.getPath(), capability.getOwnerId());
+        }
+        final RelationshipInfo relationshipInfo = capabilityRequirementRelationship.getRelation();
+        final Either<String, Boolean> capabilityNameEither = capabilityRequirementConverter.buildSubstitutedName(componentCache,
+            toOriginComponent, reducedPath, relationshipInfo.getCapability(), capability.getPreviousName());
+        if (capabilityNameEither.isRight()) {
+            final String errorMsg = String.format(
+                "Failed to build a substituted capability name for the capability with name %s on a component with uniqueId %s",
+                capabilityRequirementRelationship.getCapability(), toOriginComponent.getUniqueId());
             log.debug(
-                    "Failed to build a substituted requirement name for the requirement with name {} on a component with uniqueId {}",
-                    reqAndRelationshipPair.getRequirement(), fromOriginComponent.getUniqueId());
-            return false;
-        }
-        ToscaTemplateRequirement toscaRequirement = new ToscaTemplateRequirement();
-        Map<String, ToscaTemplateRequirement> toscaReqMap = new HashMap<>();
+                errorMsg);
+            throw new ToscaExportException(errorMsg);
+        }
+        final Either<String, Boolean> requirementNameEither = capabilityRequirementConverter
+            .buildSubstitutedName(componentCache, fromOriginComponent,
+                requirement.getPath(), relationshipInfo.getRequirement(), requirement.getPreviousName());
+        if (requirementNameEither.isRight()) {
+            final String errorMsg = String.format("Failed to build a substituted requirement name for the requirement "
+                    + "with name %s on a component with uniqueId %s",
+                capabilityRequirementRelationship.getRequirement(), fromOriginComponent.getUniqueId());
+            log.debug(errorMsg);
+            throw new ToscaExportException(errorMsg);
+        }
+        final ToscaTemplateRequirement toscaRequirement = new ToscaTemplateRequirement();
+        final Map<String, ToscaTemplateRequirement> toscaReqMap = new HashMap<>();
         toscaRequirement.setNode(toInstance.getName());
-        toscaRequirement.setCapability(buildCapNameRes.left().value());
-        toscaReqMap.put(buildReqNameRes.left().value(), toscaRequirement);
-        toscaRequirements.add(toscaReqMap);
-        return true;
+        toscaRequirement.setCapability(capabilityNameEither.left().value());
+        if (isNotEmpty(capabilityRequirementRelationship.getOperations())) {
+            toscaRequirement.setRelationship(new ToscaRelationshipBuilder().from(capabilityRequirementRelationship));
+        }
+        toscaReqMap.put(requirementNameEither.left().value(), toscaRequirement);
+        return toscaReqMap;
     }
 
-    private Optional<RequirementDefinition> findRequirement(Component fromOriginComponent, Map<String, List<RequirementDefinition>> reqMap, RelationshipInfo reqAndRelationshipPair,  String fromInstanceId) {
-        for(List<RequirementDefinition> reqList: reqMap.values()){
-            Optional<RequirementDefinition> reqOpt = reqList.stream().filter(r -> isRequirementBelongToRelation(fromOriginComponent, reqAndRelationshipPair, r, fromInstanceId)).findFirst();
-            if(reqOpt.isPresent()){
+    private Optional<RequirementDefinition> findRequirement(Component fromOriginComponent,
+                                                            Map<String, List<RequirementDefinition>> reqMap,
+                                                            RelationshipInfo reqAndRelationshipPair,
+                                                            String fromInstanceId) {
+        for (List<RequirementDefinition> reqList : reqMap.values()) {
+            Optional<RequirementDefinition> reqOpt = reqList.stream().filter(
+                r -> isRequirementBelongToRelation(fromOriginComponent, reqAndRelationshipPair, r, fromInstanceId))
+                .findFirst();
+            if (reqOpt.isPresent()) {
                 return reqOpt;
             }
         }
@@ -1161,40 +1460,42 @@ public class ToscaExportHandler {
     }
 
     /**
-     * Allows detecting the requirement belonging to the received relationship
-     * The detection logic is: A requirement belongs to a relationship IF 1.The
-     * name of the requirement equals to the "requirement" field of the
-     * relation; AND 2. In case of a non-atomic resource, OwnerId of the
-     * requirement equals to requirementOwnerId of the relation OR uniqueId of
-     * toInstance equals to capabilityOwnerId of the relation
+     * Allows detecting the requirement belonging to the received relationship The detection logic is: A requirement belongs to a relationship IF
+     * 1.The name of the requirement equals to the "requirement" field of the relation; AND 2. In case of a non-atomic resource, OwnerId of the
+     * requirement equals to requirementOwnerId of the relation OR uniqueId of toInstance equals to capabilityOwnerId of the relation
      */
-    private boolean isRequirementBelongToRelation(Component originComponent, RelationshipInfo reqAndRelationshipPair, RequirementDefinition requirement, String fromInstanceId) {
+    private boolean isRequirementBelongToRelation(Component originComponent, RelationshipInfo reqAndRelationshipPair,
+                                                  RequirementDefinition requirement, String fromInstanceId) {
         if (!StringUtils.equals(requirement.getName(), reqAndRelationshipPair.getRequirement())) {
             log.debug("Failed to find a requirement with name {} and  reqAndRelationshipPair {}",
-                    requirement.getName(), reqAndRelationshipPair.getRequirement());
+                requirement.getName(), reqAndRelationshipPair.getRequirement());
             return false;
         }
         return ModelConverter.isAtomicComponent(originComponent) ||
-                       isRequirementBelongToOwner(reqAndRelationshipPair, requirement, fromInstanceId, originComponent);
+            isRequirementBelongToOwner(reqAndRelationshipPair, requirement, fromInstanceId, originComponent);
     }
 
-    private boolean isRequirementBelongToOwner(RelationshipInfo reqAndRelationshipPair, RequirementDefinition requirement, String fromInstanceId, Component originComponent) {
+    private boolean isRequirementBelongToOwner(RelationshipInfo reqAndRelationshipPair,
+                                               RequirementDefinition requirement, String fromInstanceId,
+                                               Component originComponent) {
         return StringUtils.equals(requirement.getOwnerId(), reqAndRelationshipPair.getRequirementOwnerId())
-                || (isCvfc(originComponent) && StringUtils.equals(fromInstanceId, reqAndRelationshipPair.getRequirementOwnerId())
-                || StringUtils.equals(requirement.getOwnerId(), originComponent.getUniqueId()));
+            || (isCvfc(originComponent) && StringUtils
+            .equals(fromInstanceId, reqAndRelationshipPair.getRequirementOwnerId())
+            || StringUtils.equals(requirement.getOwnerId(), originComponent.getUniqueId()));
     }
 
     private boolean isCvfc(Component component) {
         return component.getComponentType() == ComponentTypeEnum.RESOURCE &&
-                       ((Resource) component).getResourceType() == ResourceTypeEnum.CVFC;
+            ((Resource) component).getResourceType() == ResourceTypeEnum.CVFC;
     }
 
     private Either<SubstitutionMapping, ToscaError> convertCapabilities(Component component,
-            SubstitutionMapping substitutionMappings, Map<String, Component> componentCache) {
+                                                                        SubstitutionMapping substitutionMappings,
+                                                                        Map<String, Component> componentCache) {
 
         Either<SubstitutionMapping, ToscaError> result = Either.left(substitutionMappings);
         Either<Map<String, String[]>, ToscaError> toscaCapabilitiesRes = capabilityRequirementConverter
-                                                                                 .convertSubstitutionMappingCapabilities(componentCache, component);
+            .convertSubstitutionMappingCapabilities(componentCache, component);
         if (toscaCapabilitiesRes.isRight()) {
             result = Either.right(toscaCapabilitiesRes.right().value());
             log.debug("Failed convert capabilities for the component {}. ", component.getName());
@@ -1206,9 +1507,11 @@ public class ToscaExportHandler {
         return result;
     }
 
-    private Either<ToscaNodeType, ToscaError> convertCapabilities(Map<String, Component> componentsCache, Component component, ToscaNodeType nodeType,
-            Map<String, DataTypeDefinition> dataTypes) {
-        Map<String, ToscaCapability> toscaCapabilities = capabilityRequirementConverter.convertCapabilities(componentsCache, component,
+    private Either<ToscaNodeType, ToscaError> convertCapabilities(Map<String, Component> componentsCache,
+                                                                  Component component, ToscaNodeType nodeType,
+                                                                  Map<String, DataTypeDefinition> dataTypes) {
+        Map<String, ToscaCapability> toscaCapabilities = capabilityRequirementConverter
+            .convertCapabilities(componentsCache, component,
                 dataTypes);
         if (!toscaCapabilities.isEmpty()) {
             nodeType.setCapabilities(toscaCapabilities);
@@ -1218,15 +1521,29 @@ public class ToscaExportHandler {
         return Either.left(nodeType);
     }
 
+    private Map<String, ToscaTemplateArtifact> convertToNodeTemplateArtifacts(
+        Map<String, ToscaArtifactDataDefinition> artifacts) {
+        if (artifacts == null) {
+            return null;
+        }
+        Map<String, ToscaTemplateArtifact> arts = new HashMap<>();
+        for (Map.Entry<String, ToscaArtifactDataDefinition> entry : artifacts.entrySet()) {
+            ToscaTemplateArtifact artifact = new ToscaTemplateArtifact();
+            artifact.setFile(entry.getValue().getFile());
+            artifact.setType(entry.getValue().getType());
+            arts.put(entry.getKey(), artifact);
+        }
+        return arts;
+    }
 
     protected NodeFilter convertToNodeTemplateNodeFilterComponent(CINodeFilterDataDefinition inNodeFilter) {
-        if (inNodeFilter == null){
+        if (inNodeFilter == null) {
             return null;
         }
         NodeFilter nodeFilter = new NodeFilter();
 
         ListDataDefinition<RequirementNodeFilterCapabilityDataDefinition> origCapabilities =
-                inNodeFilter.getCapabilities();
+            inNodeFilter.getCapabilities();
 
         ListDataDefinition<RequirementNodeFilterPropertyDataDefinition> origProperties = inNodeFilter.getProperties();
 
@@ -1236,40 +1553,61 @@ public class ToscaExportHandler {
         copyNodeFilterCapabilitiesTemplate(origCapabilities, capabilitiesCopy);
         copyNodeFilterProperties(origProperties, propertiesCopy);
 
-        if(CollectionUtils.isNotEmpty(capabilitiesCopy)) {
+        if (CollectionUtils.isNotEmpty(capabilitiesCopy)) {
             nodeFilter.setCapabilities(capabilitiesCopy);
         }
 
-        if(CollectionUtils.isNotEmpty(propertiesCopy)) {
+        if (CollectionUtils.isNotEmpty(propertiesCopy)) {
             nodeFilter.setProperties(propertiesCopy);
         }
 
         nodeFilter.setTosca_id(cloneToscaId(inNodeFilter.getTosca_id()));
 
-
         nodeFilter = (NodeFilter) cloneObjectFromYml(nodeFilter, NodeFilter.class);
 
         return nodeFilter;
     }
 
+    private NodeFilter convertToSubstitutionFilterComponent(
+        final SubstitutionFilterDataDefinition substitutionFilterDataDefinition) {
+
+        if (substitutionFilterDataDefinition == null) {
+            return null;
+        }
+        NodeFilter nodeFilter = new NodeFilter();
+
+        ListDataDefinition<RequirementSubstitutionFilterPropertyDataDefinition> origProperties =
+            substitutionFilterDataDefinition.getProperties();
+        List<Map<String, List<Object>>> propertiesCopy = new ArrayList<>();
+
+        copySubstitutionFilterProperties(origProperties, propertiesCopy);
+
+        if (CollectionUtils.isNotEmpty(propertiesCopy)) {
+            nodeFilter.setProperties(propertiesCopy);
+        }
+        nodeFilter.setTosca_id(cloneToscaId(substitutionFilterDataDefinition.getTosca_id()));
+
+        return (NodeFilter) cloneObjectFromYml(nodeFilter, NodeFilter.class);
+    }
+
     private Object cloneToscaId(Object toscaId) {
         return Objects.isNull(toscaId) ? null
-                       : cloneObjectFromYml(toscaId, toscaId.getClass());
+            : cloneObjectFromYml(toscaId, toscaId.getClass());
     }
 
-
     private Object cloneObjectFromYml(Object objToClone, Class classOfObj) {
         String objectAsYml = yamlUtil.objectToYaml(objToClone);
         return yamlUtil.yamlToObject(objectAsYml, classOfObj);
     }
+
     private void copyNodeFilterCapabilitiesTemplate(
-            ListDataDefinition<RequirementNodeFilterCapabilityDataDefinition> origCapabilities,
-            List<Map<String, CapabilityFilter>> capabilitiesCopy) {
-        if(origCapabilities == null || origCapabilities.getListToscaDataDefinition() == null ||
-                   origCapabilities.getListToscaDataDefinition().isEmpty() ) {
+        ListDataDefinition<RequirementNodeFilterCapabilityDataDefinition> origCapabilities,
+        List<Map<String, CapabilityFilter>> capabilitiesCopy) {
+        if (origCapabilities == null || origCapabilities.getListToscaDataDefinition() == null ||
+            origCapabilities.getListToscaDataDefinition().isEmpty()) {
             return;
         }
-        for(RequirementNodeFilterCapabilityDataDefinition capability : origCapabilities.getListToscaDataDefinition()) {
+        for (RequirementNodeFilterCapabilityDataDefinition capability : origCapabilities.getListToscaDataDefinition()) {
             Map<String, CapabilityFilter> capabilityFilterCopyMap = new HashMap<>();
             CapabilityFilter capabilityFilter = new CapabilityFilter();
             List<Map<String, List<Object>>> propertiesCopy = new ArrayList<>();
@@ -1280,63 +1618,218 @@ public class ToscaExportHandler {
         }
     }
 
-    private List<Object> copyNodeFilterProperty(List<Object> propertyList) {
-        String listAsString = yamlUtil.objectToYaml(propertyList);
-        return yamlUtil.yamlToObject(listAsString, List.class);
+    private void copyNodeFilterProperties(
+        ListDataDefinition<RequirementNodeFilterPropertyDataDefinition> origProperties,
+        List<Map<String, List<Object>>> propertiesCopy) {
+        if (origProperties == null || origProperties.getListToscaDataDefinition() == null ||
+            origProperties.isEmpty()) {
+            return;
+        }
+        Map<String, List<Object>> propertyMapCopy = new HashMap<>();
+        for (RequirementNodeFilterPropertyDataDefinition propertyDataDefinition : origProperties
+            .getListToscaDataDefinition()) {
+            for (String propertyInfoEntry : propertyDataDefinition.getConstraints()) {
+                Map propertyValObj = new YamlUtil().yamlToObject(propertyInfoEntry, Map.class);
+                String propertyName = propertyDataDefinition.getName();
+                if (propertyMapCopy.containsKey(propertyName)) {
+                    addPropertyConstraintValueToList(propertyName, propertyValObj, propertyMapCopy.get(propertyName));
+                } else {
+                    if (propertyName != null) {
+                        List<Object> propsList = new ArrayList<>();
+                        addPropertyConstraintValueToList(propertyName, propertyValObj, propsList);
+                        propertyMapCopy.put(propertyName, propsList);
+                    } else {
+                        propertyMapCopy.putAll(propertyValObj);
+                    }
+                }
+            }
+        }
+        propertyMapCopy.entrySet().stream().forEach(entry ->
+            addCalculatedConstraintsIntoPropertiesList(propertiesCopy, entry));
     }
 
-
-    private void copyNodeFilterProperties(
-            ListDataDefinition<RequirementNodeFilterPropertyDataDefinition> origProperties,
-            List<Map<String, List<Object>>> propertiesCopy) {
-        if(origProperties == null || origProperties.getListToscaDataDefinition() == null ||
-                   origProperties.isEmpty()) {
+    private void copySubstitutionFilterProperties(
+        final ListDataDefinition<RequirementSubstitutionFilterPropertyDataDefinition> origProperties,
+        final List<Map<String, List<Object>>> propertiesCopy) {
+        if (origProperties == null || origProperties.getListToscaDataDefinition() == null ||
+            origProperties.isEmpty()) {
             return;
         }
-        for(RequirementNodeFilterPropertyDataDefinition propertyDataDefinition : origProperties.getListToscaDataDefinition()) {
-            Map<String, List<Object>> propertyMapCopy = new HashMap<>();
-            for(String propertyInfoEntry : propertyDataDefinition.getConstraints()) {
-                Map propertyValObj =  new YamlUtil().yamlToObject(propertyInfoEntry, Map.class);
-                if (propertyMapCopy.containsKey(propertyDataDefinition.getName())){
-                    propertyMapCopy.get(propertyDataDefinition.getName()).add(propertyValObj);
+        final Map<String, List<Object>> propertyMapCopy = new HashMap<>();
+        for (final RequirementSubstitutionFilterPropertyDataDefinition propertyDataDefinition : origProperties
+            .getListToscaDataDefinition()) {
+            for (final String propertyInfoEntry : propertyDataDefinition.getConstraints()) {
+                final Map<String, List<Object>> propertyValObj = new YamlUtil()
+                    .yamlToObject(propertyInfoEntry, Map.class);
+                final String propertyName = propertyDataDefinition.getName();
+                if (propertyMapCopy.containsKey(propertyName)) {
+                    addPropertyConstraintValueToList(propertyName, propertyValObj, propertyMapCopy.get(propertyName));
                 } else {
-                    if (propertyDataDefinition.getName() != null) {
-                        List propsList =new ArrayList();
-                        propsList.add(propertyValObj);
-                        propertyMapCopy.put(propertyDataDefinition.getName(), propsList);
+                    if (propertyName != null) {
+                        final List<Object> propsList = new ArrayList<>();
+                        addPropertyConstraintValueToList(propertyName, propertyValObj, propsList);
+                        propertyMapCopy.put(propertyName, propsList);
                     } else {
                         propertyMapCopy.putAll(propertyValObj);
                     }
                 }
             }
-            propertiesCopy.add(propertyMapCopy);
         }
+        propertyMapCopy.entrySet().forEach(entry ->
+            addCalculatedConstraintsIntoPropertiesList(propertiesCopy, entry));
+    }
+
+    private void addPropertyConstraintValueToList(String propertyName, Map<String, List<Object>> propertyValObj, List<Object> propsList) {
+        if (propertyValObj.containsKey(propertyName)) {
+            propsList.add(propertyValObj.get(propertyName));
+        } else {
+            propsList.add(propertyValObj);
+        }
+    }
 
+    private void addCalculatedConstraintsIntoPropertiesList(List<Map<String, List<Object>>> propertiesCopy,
+                                                            Entry<String, List<Object>> entry) {
+        Map<String, List<Object>> tempMap = new HashMap<>();
+        tempMap.put(entry.getKey(), entry.getValue());
+        propertiesCopy.add(tempMap);
     }
 
     private static class CustomRepresenter extends Representer {
-        public CustomRepresenter() {
+
+        CustomRepresenter() {
             super();
+            this.representers.put(ToscaPropertyAssignment.class, new RepresentToscaPropertyAssignment());
+            this.representers.put(ToscaAttribute.class, new RepresentToscaAttribute());
             // null representer is exceptional and it is stored as an instance
             // variable.
             this.nullRepresenter = new RepresentNull();
 
         }
 
+        private class RepresentToscaAttribute implements Represent {
+
+            @Override
+            public Node representData(Object data) {
+                final ToscaAttribute toscaAttribute = (ToscaAttribute) data;
+                return represent(toscaAttribute.asToscaMap());
+            }
+        }
+
+        private class RepresentToscaPropertyAssignment implements Represent {
+
+            public Node representData(Object data) {
+                final ToscaPropertyAssignment toscaOperationAssignment = (ToscaPropertyAssignment) data;
+                if (toscaOperationAssignment.getValue() instanceof String) {
+                    final String stringValue = (String) toscaOperationAssignment.getValue();
+                    if (isPropertyOrAttributeFunction(stringValue)) {
+                        return representGetAttribute(stringValue);
+                    }
+
+                    return representScalar(Tag.STR, stringValue);
+                }
+                return represent(null);
+            }
+
+            public Node representGetAttribute(final String getAttributeFunction) {
+                return represent(new Yaml().load(getAttributeFunction));
+            }
+
+            public boolean isPropertyOrAttributeFunction(final String value) {
+                try {
+                    final Yaml yaml = new Yaml();
+                    final Object yamlObj = yaml.load(value);
+                    if (!(yamlObj instanceof Map)) {
+                        return false;
+                    }
+                    final Map<String, Object> getAttributeMap = (Map) yamlObj;
+                    if (getAttributeMap.size() != 1) {
+                        return false;
+                    }
+                    final List<String> functionList = Arrays
+                        .asList(GET_ATTRIBUTE.getFunctionName(), GET_INPUT.getFunctionName(),
+                            GET_PROPERTY.getFunctionName());
+                    final Optional<String> function = getAttributeMap.keySet().stream()
+                        .filter(key -> functionList.stream().anyMatch(function1 -> function1.equals(key))).findFirst();
+
+                    if (function.isEmpty()) {
+                        return false;
+                    }
+                    final String functionName = function.get();
+                    final Object getAttributeValueObj = getAttributeMap.get(functionName);
+                    if (GET_INPUT.getFunctionName().equals(functionName)) {
+                        return validateGetInputValue(getAttributeValueObj);
+                    } else {
+                        return validateGetPropertyOrAttributeValue(getAttributeValueObj);
+                    }
+                } catch (final Exception ignored) {
+                    return false;
+                }
+            }
+        }
+
+        public boolean validateGetInputValue(final Object valueObj) {
+            if (!(valueObj instanceof List) && !(valueObj instanceof String)) {
+                return false;
+            }
+            if (valueObj instanceof List) {
+                return ((List) valueObj).size() > 1;
+            }
+
+            return true;
+        }
+
+        public boolean validateGetPropertyOrAttributeValue(final Object valueObj) {
+            if (valueObj instanceof List) {
+                return ((List) valueObj).size() > 1;
+            }
+
+            return false;
+        }
+
         @Override
         protected NodeTuple representJavaBeanProperty(Object javaBean, Property property, Object propertyValue,
-                Tag customTag) {
+                                                      Tag customTag) {
             if (propertyValue == null) {
                 return null;
-            } else {
-                // skip not relevant for Tosca property
-                if ("dependencies".equals(property.getName())) {
-                    return null;
-                }
-                NodeTuple defaultNode = super.representJavaBeanProperty(javaBean, property, propertyValue, customTag);
+            }
+            // skip not relevant for Tosca property
+            if ("dependencies".equals(property.getName())) {
+                return null;
+            }
+            if (javaBean instanceof ToscaRelationshipTemplate && "name".equals(property.getName())) {
+                return null;
+            }
+
+            removeDefaultP(propertyValue);
+            NodeTuple defaultNode = super.representJavaBeanProperty(javaBean, property, propertyValue, customTag);
+
+            if (javaBean instanceof ToscaTopolgyTemplate && "relationshipTemplates".equals(property.getName())) {
+                return new NodeTuple(representData("relationship_templates"), defaultNode.getValueNode());
+            }
+
+            return "_defaultp_".equals(property.getName())
+                ? new NodeTuple(representData("default"), defaultNode.getValueNode()) : defaultNode;
+        }
+
+        private void removeDefaultP(final Object propertyValue) {
+            if (propertyValue instanceof Map) {
+                final Map mapPropertyValue = ((Map) propertyValue);
+
+                final Iterator<Entry> iter = mapPropertyValue.entrySet().iterator();
+                Object defaultValue = null;
+                while (iter.hasNext()) {
+                    final Map.Entry entry = iter.next();
 
-                return "_defaultp_".equals(property.getName())
-                               ? new NodeTuple(representData("default"), defaultNode.getValueNode()) : defaultNode;
+                    if ("_defaultp_".equals(entry.getKey())) {
+                        defaultValue = entry.getValue();
+                        iter.remove();
+                    } else if (entry.getValue() instanceof Map) {
+                        removeDefaultP(entry.getValue());
+                    }
+                }
+                if (defaultValue != null) {
+                    mapPropertyValue.putIfAbsent("default", defaultValue);
+                }
             }
         }
 
@@ -1351,6 +1844,7 @@ public class ToscaExportHandler {
         }
 
         private class RepresentNull implements Represent {
+
             @Override
             public Node representData(Object data) {
                 // possible values are here http://yaml.org/type/null.html
@@ -1360,30 +1854,95 @@ public class ToscaExportHandler {
     }
 
     private static class UnsortedPropertyUtils extends PropertyUtils {
+
         @Override
-        protected Set<Property> createPropertySet(Class type, BeanAccess bAccess)
-                throws IntrospectionException {
+        protected Set<Property> createPropertySet(Class type, BeanAccess bAccess) {
             Collection<Property> fields = getPropertiesMap(type, BeanAccess.FIELD).values();
             return new LinkedHashSet<>(fields);
         }
     }
 
-    private Object removeOperationsKeyFromInterface(Object interfaceInstanceDataDefinition) {
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.configure(SerializationFeature.WRITE_NULL_MAP_VALUES, false);
+    private Map<String, String[]> buildSubstitutionMappingPropertyMapping(final Component component) {
+        if (component == null || CollectionUtils.isEmpty(component.getInputs())) {
+            return Collections.emptyMap();
+        }
+        return component.getInputs().stream()
+            .map(PropertyDataDefinition::getName)
+            .collect(
+                Collectors.toMap(
+                    inputName -> inputName,
+                    inputName -> new String[]{inputName},
+                    (inputName1, inputName2) -> inputName1)
+            );
+    }
 
-            Map<String, Object> interfaceAsMap = ServiceUtils.getObjectAsMap(interfaceInstanceDataDefinition);
-            Map<String, Object> operations = (Map<String, Object>) interfaceAsMap.remove("operations");
-            interfaceAsMap.remove("empty");
+    private Map<String, String[]> buildSubstitutionMappingAttributesMapping(final Component component) {
+        if (component == null || CollectionUtils.isEmpty(component.getOutputs())) {
+            return Collections.emptyMap();
+        }
+        return component.getOutputs().stream()
+            .map(AttributeDataDefinition::getName)
+            .collect(
+                Collectors.toMap(
+                    outputName -> outputName,
+                    outputName -> new String[]{outputName},
+                    (outputName1, outputName2) -> outputName1)
+            );
+    }
 
-            if(MapUtils.isNotEmpty(operations)) {
-                interfaceAsMap.putAll(operations);
-            }
+    Optional<Map<String, ToscaProperty>> getProxyNodeTypeProperties(Component proxyComponent,
+                                                                    Map<String, DataTypeDefinition>
+                                                                        dataTypes) {
+        if (Objects.isNull(proxyComponent)) {
+            return Optional.empty();
+        }
+        Map<String, ToscaProperty> proxyProperties = new HashMap<>();
+        addInputsToProperties(dataTypes, proxyComponent.getInputs(), proxyProperties);
+        if (CollectionUtils.isNotEmpty(proxyComponent.getProperties())) {
+            proxyProperties.putAll(proxyComponent.getProperties().stream()
+                .map(propertyDefinition -> resolvePropertyValueFromInput(propertyDefinition,
+                    proxyComponent.getInputs()))
+                .collect(Collectors.toMap(PropertyDataDefinition::getName,
+                    property -> propertyConvertor.convertProperty(dataTypes, property,
+                        PropertyConvertor.PropertyType.PROPERTY))));
+        }
+        return MapUtils.isNotEmpty(proxyProperties) ? Optional.of(proxyProperties) : Optional.empty();
+    }
 
-            Object interfaceObject = objectMapper.convertValue(interfaceAsMap, Object.class);
+    void addInputsToProperties(Map<String, DataTypeDefinition> dataTypes,
+                               List<InputDefinition> componentInputs,
+                               Map<String, ToscaProperty> mergedProperties) {
+        if (CollectionUtils.isEmpty(componentInputs)) {
+            return;
+        }
+        for (InputDefinition input : componentInputs) {
+            ToscaProperty property = propertyConvertor.convertProperty(dataTypes, input,
+                PropertyConvertor.PropertyType.INPUT);
+            mergedProperties.put(input.getName(), property);
+        }
+    }
 
-            return interfaceObject;
+    Optional<Map<String, Object>> getProxyNodeTypeInterfaces(Component proxyComponent,
+                                                             Map<String, DataTypeDefinition> dataTypes) {
+        if (Objects.isNull(proxyComponent) || MapUtils.isEmpty(proxyComponent.getInterfaces())) {
+            return Optional.empty();
+        }
+        Map<String, InterfaceDefinition> proxyComponentInterfaces = proxyComponent.getInterfaces();
+        //Unset artifact path for operation implementation for proxy node types as for operations with artifacts it is
+        // always available in the proxy node template
+        removeOperationImplementationForProxyNodeType(proxyComponentInterfaces);
+        return Optional.ofNullable(interfacesOperationsConverter
+            .getInterfacesMap(proxyComponent, null, proxyComponentInterfaces, dataTypes,
+                false, false));
+    }
 
+    private static void removeOperationImplementationForProxyNodeType(
+        Map<String, InterfaceDefinition> proxyComponentInterfaces) {
+        if (MapUtils.isEmpty(proxyComponentInterfaces)) {
+            return;
+        }
+        proxyComponentInterfaces.values().stream().map(InterfaceDataDefinition::getOperations)
+            .filter(MapUtils::isNotEmpty)
+            .forEach(operations -> operations.values().forEach(operation -> operation.setImplementation(null)));
     }
 }
-