Fix Node Filter Not Found issue 11/83611/2
authorshrek2000 <orenkle@amdocs.com>
Thu, 28 Mar 2019 13:54:33 +0000 (15:54 +0200)
committerAvi Gaffa <avi.gaffa@amdocs.com>
Sat, 30 Mar 2019 07:53:48 +0000 (07:53 +0000)
Add dependent child service to service
Issue-ID: SDC-1987

Change-Id: I2b11f50bb1b88c407d6b1d9d4074a3efad243977
Signed-off-by: shrek2000 <orenkle@amdocs.com>
catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/utils/ModelConverter.java

index 31a445a..808fdbd 100644 (file)
@@ -1181,6 +1181,9 @@ public class ModelConverter {
                 List<GroupInstance> groupInstances = topologyTemplate.getInstGroups().get(key).getMapToscaDataDefinition().entrySet().stream().map(e -> new GroupInstance(e.getValue())).collect(Collectors.toList());
                 currComponentInstance.setGroupInstances(groupInstances);
             }
+            if(nodeFilterComponents != null && nodeFilterComponents.containsKey(key)){
+                currComponentInstance.setNodeFilter(nodeFilterComponents.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);