Added new nodes type

Added new nodes type and new property in Port.
All test data need to be updated, so file count is much more.

Change-Id: Ic21befe8d7feee912fbed1d3eb676488db1fb68c
Issue-ID: SDC-1183
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>

3 files changed, 50 insertions, 35 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/to/UnifiedCompositionTo.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/to/UnifiedCompositionTo.java
index 56c647129f..8927149dfc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/to/UnifiedCompositionTo.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/to/UnifiedCompositionTo.java
@@ -16,6 +16,7 @@
 
 package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.to;
 
+import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate;
 import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
 import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData;
@@ -27,15 +28,18 @@ public class UnifiedCompositionTo {
   private ServiceTemplate substitutionServiceTemplate;
   private List<UnifiedCompositionData> unifiedCompositionDataList;
   private TranslationContext context;
+  private NodeTemplate nodeTemplate;
 
   public UnifiedCompositionTo(ServiceTemplate serviceTemplate,
                               ServiceTemplate substitutionServiceTemplate,
                               List<UnifiedCompositionData> unifiedCompositionDataList,
-                              TranslationContext context) {
+                              TranslationContext context,
+                              NodeTemplate nodeTemplate) {
     this.serviceTemplate = serviceTemplate;
     this.substitutionServiceTemplate = substitutionServiceTemplate;
     this.unifiedCompositionDataList = unifiedCompositionDataList;
     this.context = context;
+    this.nodeTemplate = nodeTemplate;
   }
 
   public ServiceTemplate getServiceTemplate() {
@@ -70,4 +74,12 @@ public class UnifiedCompositionTo {
   public void setContext(TranslationContext context) {
     this.context = context;
   }
+
+  public NodeTemplate getNodeTemplate() {
+    return nodeTemplate;
+  }
+
+  public void setNodeTemplate(NodeTemplate nodeTemplate) {
+    this.nodeTemplate=nodeTemplate;
+  }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
index 7e54f97d28..639e76d646 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
@@ -115,6 +115,8 @@ public class UnifiedCompositionService {
   private static final Map<String, ImplementationConfiguration> unifiedCompositionImplMap;
 
   private static final EnumMap<UnifiedCompositionEntity, String> unifiedSubstitutionNodeTemplateIdGeneratorImplMap;
+  private static final String SUB_INTERFACE_INDICATOR_PROPERTY = "subinterface_indicator";
+  private final ConsolidationService consolidationService = new ConsolidationService();
 
   static {
     Configuration config = ConfigurationManager.lookup();
@@ -134,8 +136,6 @@ public class UnifiedCompositionService {
             .SUB_INTERFACE_NEW_NODE_TEMPLATE_ID_GENERATOR_IMPL);
   }
 
-  private final ConsolidationService consolidationService = new ConsolidationService();
-
   private static List<EntityConsolidationData> getPortConsolidationDataList(
           List<String> portIds,
           List<UnifiedCompositionData> unifiedCompositionDataList) {
@@ -204,7 +204,7 @@ public class UnifiedCompositionService {
             computeNodeType, context);
 
     UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(serviceTemplate,
-            substitutionServiceTemplate, unifiedCompositionDataList, context);
+            substitutionServiceTemplate, unifiedCompositionDataList, context, null);
     handleSubInterfaces(unifiedCompositionTo);
     createOutputParameters(unifiedCompositionTo, computeNodeType);
     NodeType substitutionGlobalNodeType =
@@ -281,7 +281,7 @@ public class UnifiedCompositionService {
       return;
     }
     UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(serviceTemplate, null,
-        unifiedCompositionDataList, context);
+        unifiedCompositionDataList, context, null);
     unifiedCompositionDataList.forEach(unifiedCompositionData ->
         createSubInterfaceVfcInstanceGroup(abstractNodeTemplateId, unifiedCompositionTo, unifiedCompositionData));
   }
@@ -2134,9 +2134,8 @@ public class UnifiedCompositionService {
                                 List<UnifiedCompositionData> unifiedCompositionDataList,
                                 TranslationContext context) {
     nodeTemplate.setProperties(new HashedMap());
-    handleNodeTemplateProperties(serviceTemplate, nodeTemplate, substitutionServiceTemplate,
-            unifiedCompositionEntity, entityConsolidationDataList, computeTemplateConsolidationData,
-            unifiedCompositionDataList, context);
+    UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(serviceTemplate,  substitutionServiceTemplate,unifiedCompositionDataList, context, nodeTemplate);
+       handleNodeTemplateProperties(unifiedCompositionTo, unifiedCompositionEntity, entityConsolidationDataList, computeTemplateConsolidationData);
     //Add enrich properties from openecomp node type as input to global and substitution ST
     handleNodeTypeProperties(substitutionServiceTemplate,
             entityConsolidationDataList, nodeTemplate, unifiedCompositionEntity,
@@ -2144,62 +2143,66 @@ public class UnifiedCompositionService {
 
   }
 
-  private void handleNodeTemplateProperties(ServiceTemplate serviceTemplate,
-                                            NodeTemplate nodeTemplate,
-                                            ServiceTemplate substitutionServiceTemplate,
+  private void handleNodeTemplateProperties(UnifiedCompositionTo unifiedCompositionTo,
                                             UnifiedCompositionEntity unifiedCompositionEntity,
                                             List<EntityConsolidationData>
                                                     entityConsolidationDataList,
                                             ComputeTemplateConsolidationData
-                                                    computeTemplateConsolidationData,
-                                            List<UnifiedCompositionData> unifiedCompositionDataList,
-                                            TranslationContext context) {
+                                                    computeTemplateConsolidationData
+                                            ) {
     List<String> propertiesWithIdenticalVal =
             consolidationService.getPropertiesWithIdenticalVal(unifiedCompositionEntity);
 
     for (EntityConsolidationData entityConsolidationData : entityConsolidationDataList) {
       String nodeTemplateId = entityConsolidationData.getNodeTemplateId();
       Optional<List<String>> indexVarProperties =
-              context.getIndexVarProperties(ToscaUtil.getServiceTemplateFileName(serviceTemplate),
-                      nodeTemplateId);
+          unifiedCompositionTo.getContext().getIndexVarProperties(ToscaUtil.getServiceTemplateFileName(unifiedCompositionTo.getServiceTemplate()),
+              nodeTemplateId);
       Map<String, Object> properties =
-              DataModelUtil.getNodeTemplateProperties(serviceTemplate, nodeTemplateId);
+              DataModelUtil.getNodeTemplateProperties(unifiedCompositionTo.getServiceTemplate(),
+              nodeTemplateId);
       if (MapUtils.isEmpty(properties)) {
         continue;
       }
 
+      if(unifiedCompositionEntity == UnifiedCompositionEntity.PORT
+          && entityConsolidationData instanceof PortTemplateConsolidationData) {
+        properties.put(SUB_INTERFACE_INDICATOR_PROPERTY, true);
+      }
+
       for (Map.Entry<String, Object> propertyEntry : properties.entrySet()) {
         NodeType nodeTypeWithFlatHierarchy =
-                HeatToToscaUtil.getNodeTypeWithFlatHierarchy(nodeTemplate.getType(), serviceTemplate,
-                        context);
+            HeatToToscaUtil.getNodeTypeWithFlatHierarchy(unifiedCompositionTo.getNodeTemplate().getType(),
+                unifiedCompositionTo.getServiceTemplate(), unifiedCompositionTo.getContext());
         PropertyDefinition propertyDefinition =
                 nodeTypeWithFlatHierarchy.getProperties().get(propertyEntry.getKey());
         String propertyType = propertyDefinition.getType();
 
         if (propertiesWithIdenticalVal.contains(propertyEntry.getKey())) {
           String parameterId =
-                  updateIdenticalProperty(nodeTemplateId, propertyEntry.getKey(), nodeTemplate,
-                          unifiedCompositionEntity, unifiedCompositionDataList);
+              updateIdenticalProperty(nodeTemplateId, propertyEntry.getKey(),
+                  unifiedCompositionTo.getNodeTemplate(),unifiedCompositionEntity, unifiedCompositionTo.getUnifiedCompositionDataList());
 
           addInputParameter(
-                  parameterId, propertyType,
-                  propertyType.equals(PropertyType.LIST.getDisplayName()) ? propertyDefinition
-                          .getEntry_schema() : null,
-                  substitutionServiceTemplate);
+              parameterId, propertyType,
+              propertyType.equals(PropertyType.LIST.getDisplayName()) ? propertyDefinition
+                  .getEntry_schema() : null,
+              unifiedCompositionTo.getSubstitutionServiceTemplate());
         } else if (indexVarProperties.isPresent()
                 && indexVarProperties.get().contains(propertyEntry.getKey())) {
           //Handle index property
-          handleIndexVarProperty(propertyEntry.getKey(), propertyEntry.getValue(), nodeTemplate);
+          handleIndexVarProperty(propertyEntry.getKey(), propertyEntry.getValue(),
+              unifiedCompositionTo.getNodeTemplate());
         } else {
           Optional<String> parameterId =
-                  updateProperty(serviceTemplate, nodeTemplateId, nodeTemplate, propertyEntry,
-                          unifiedCompositionEntity, computeTemplateConsolidationData, null,
-                          unifiedCompositionDataList,
-                          context);
+              updateProperty(unifiedCompositionTo.getServiceTemplate(), nodeTemplateId, unifiedCompositionTo.getNodeTemplate(), propertyEntry,
+                  unifiedCompositionEntity, computeTemplateConsolidationData, null,
+                  unifiedCompositionTo.getUnifiedCompositionDataList(),
+                  unifiedCompositionTo.getContext());
           parameterId.ifPresent(
-                  parameterIdValue -> addPropertyInputParameter(propertyType,
-                          substitutionServiceTemplate,
-                          propertyDefinition.getEntry_schema(), parameterIdValue));
+              parameterIdValue -> addPropertyInputParameter(propertyType,
+                  unifiedCompositionTo.getSubstitutionServiceTemplate(),
+                  propertyDefinition.getEntry_schema(), parameterIdValue));
         }
       }
     }
@@ -2638,7 +2641,7 @@ public class UnifiedCompositionService {
     UnifiedSubstitutionNodeTemplateIdGenerator nodeTemplateIdGenerator =
             CommonMethods.newInstance(nodeTemplateIdGeneratorImpl, UnifiedSubstitutionNodeTemplateIdGenerator.class);
     UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(serviceTemplate, null,
-            unifiedCompositionDataList, context);
+            unifiedCompositionDataList, context, null);
     Optional<String> generatedNodeTemplateId = nodeTemplateIdGenerator.generate(unifiedCompositionTo, nodeTemplateId);
     if (generatedNodeTemplateId.isPresent()) {
       newNodeTemplateId = generatedNodeTemplateId.get();
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionNestedSingleCompute.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionNestedSingleCompute.java
index a48e107370..7bd9106078 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionNestedSingleCompute.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionNestedSingleCompute.java
@@ -27,7 +27,7 @@ public class UnifiedCompositionNestedSingleCompute implements UnifiedComposition
     }
 
     UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(serviceTemplate, nestedServiceTemplate,
-        unifiedCompositionDataList, context);
+        unifiedCompositionDataList, context, null);
     for (UnifiedCompositionData unifiedCompositionData : unifiedCompositionDataList) {
       unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo, unifiedCompositionData);
       String nestedNodeTemplateId = unifiedCompositionData.getNestedTemplateConsolidationData().getNodeTemplateId();