1 files changed, 31 insertions, 6 deletions

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java
index ae854254c2..272d664b8e 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsonjanusgraph/utils/ModelConverter.java
@@ -71,6 +71,7 @@ import org.openecomp.sdc.be.datatypes.elements.ProductMetadataDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.RelationshipInstDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.RequirementDataDefinition;
+import org.openecomp.sdc.be.datatypes.elements.SubstitutionFilterDataDefinition;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.CreatedFrom;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
@@ -217,6 +218,9 @@ public class ModelConverter {
         convertDataTypes(topologyTemplate, service);
 
         convertNodeFiltersComponents(topologyTemplate, service);
+
+        convertSubstitutionFiltersComponents(topologyTemplate, service);
+
         setCapabilitiesToComponent(topologyTemplate, service);
         setRequirementsToComponent(topologyTemplate, service);
         return service;
@@ -879,17 +883,33 @@ public class ModelConverter {
         component.setDeploymentArtifacts(copy);
     }
 
-    private static void convertNodeFiltersComponents(TopologyTemplate topologyTemplate, Component component) {
-        Map<String, CINodeFilterDataDefinition> filters = topologyTemplate.getNodeFilterComponents();
-        Map<String, CINodeFilterDataDefinition> copy;
-        if (filters != null) {
-            copy = filters.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> new CINodeFilterDataDefinition(e.getValue())));
+    private static void convertNodeFiltersComponents(final TopologyTemplate topologyTemplate,
+                                                     final Component component) {
+        final Map<String, CINodeFilterDataDefinition> filters = topologyTemplate.getNodeFilterComponents();
+        final Map<String, CINodeFilterDataDefinition> copy;
+        if (MapUtils.isNotEmpty(filters)) {
+            copy = filters.entrySet().stream()
+                .collect(Collectors.toMap(Map.Entry::getKey, e -> new CINodeFilterDataDefinition(e.getValue())));
         } else {
             copy = new HashMap<>();
         }
         component.setNodeFilterComponents(copy);
     }
 
+    private static void convertSubstitutionFiltersComponents(final TopologyTemplate topologyTemplate,
+                                                             final Component component) {
+        final Map<String, SubstitutionFilterDataDefinition> filters = topologyTemplate
+            .getSubstitutionFilterDataDefinitionMap();
+        final Map<String, SubstitutionFilterDataDefinition> copy;
+        if (MapUtils.isNotEmpty(filters)) {
+            copy = filters.entrySet().stream()
+                .collect(Collectors.toMap(Map.Entry::getKey, e -> new SubstitutionFilterDataDefinition(e.getValue())));
+        } else {
+            copy = new HashMap<>();
+        }
+        component.setSubstitutionFilterComponents(copy);
+    }
+
     private static void convertServiceApiArtifacts(TopologyTemplate topologyTemplate, Service service) {
         Map<String, ArtifactDataDefinition> serviceApiArtifacts = topologyTemplate.getServiceApiArtifacts();
         Map<String, ArtifactDefinition> copy;
@@ -1328,6 +1348,8 @@ public class ModelConverter {
         List<ComponentInstance> componentInstances = new ArrayList<>();
         ComponentInstance currComponentInstance;
         Map<String, CINodeFilterDataDefinition> nodeFilterComponents = topologyTemplate.getNodeFilterComponents();
+        Map<String, SubstitutionFilterDataDefinition> substitutionFilterDataDefinitionMap = topologyTemplate
+            .getSubstitutionFilterDataDefinitionMap();
 
         for (Map.Entry<String, ComponentInstanceDataDefinition> entry : topologyTemplate.getComponentInstances().entrySet()) {
             String key = entry.getKey();
@@ -1337,9 +1359,12 @@ public class ModelConverter {
                 currComponentInstance.setGroupInstances(groupInstances);
             }
             setComponentInstanceSource(currComponentInstance, component);
-            if(nodeFilterComponents != null && nodeFilterComponents.containsKey(key)){
+            if(MapUtils.isNotEmpty(nodeFilterComponents) && nodeFilterComponents.containsKey(key)){
                 currComponentInstance.setNodeFilter(nodeFilterComponents.get(key));
             }
+            if(MapUtils.isNotEmpty(substitutionFilterDataDefinitionMap) && substitutionFilterDataDefinitionMap.containsKey(key)) {
+                currComponentInstance.setSubstitutionFilter(substitutionFilterDataDefinitionMap.get(key));
+            }
             if(topologyTemplate.getInstProperties() != null && topologyTemplate.getInstProperties().containsKey(key) && topologyTemplate.getInstProperties().get(key) != null ){
                 List<PropertyDefinition> instanceProps = topologyTemplate.getInstProperties().get(key).getMapToscaDataDefinition().entrySet().stream().map(e -> new PropertyDefinition(e.getValue())).collect(Collectors.toList());
                 currComponentInstance.setProperties(instanceProps);