Change node template prefix

Add "".compute" to nested compute node types in substitution service templates

Issue - Id : SDC-425

Change-Id: I00902576a3adf8d0463ef1352961629663efd96c
Signed-off-by: talio <tali.orenbach@amdocs.com>

5 files changed, 45 insertions, 26 deletions

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 bed404f800..244434c1b8 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
@@ -193,11 +193,6 @@ public class UnifiedCompositionService {
         handleSubstitutionGlobalNodeType(serviceTemplate, substitutionServiceTemplate,
             context, unifiedCompositionData, substitutionNodeTypeId, index);
 
-    ServiceTemplate globalSubstitutionServiceTemplate =
-        HeatToToscaUtil.fetchGlobalSubstitutionServiceTemplate(serviceTemplate, context);
-    addComputeNodeTypeToGlobalST(computeNodeType, serviceTemplate,
-        globalSubstitutionServiceTemplate, substitutionGlobalNodeType);
-
     HeatToToscaUtil.handleSubstitutionMapping(context,
         substitutionNodeTypeId,
         substitutionServiceTemplate, substitutionGlobalNodeType);
@@ -206,18 +201,6 @@ public class UnifiedCompositionService {
     return Optional.of(substitutionServiceTemplate);
   }
 
-  private void addComputeNodeTypeToGlobalST(String computeNodeType,
-                                            ServiceTemplate serviceTemplate,
-                                            ServiceTemplate globalSubstitutionServiceTemplate,
-                                            NodeType substitutionGlobalNodeType) {
-    NodeType nodeType = DataModelUtil.getNodeType(serviceTemplate, computeNodeType);
-    NodeType clonedNT =
-        (NodeType) DataModelUtil.getClonedObject(substitutionGlobalNodeType, NodeType.class);
-    clonedNT.setDerived_from(nodeType.getDerived_from());
-    DataModelUtil
-        .addNodeType(globalSubstitutionServiceTemplate, computeNodeType,
-            clonedNT);
-  }
 
   /**
    * Create abstract substitute node template that can be substituted by the input
@@ -342,6 +325,28 @@ public class UnifiedCompositionService {
     }
   }
 
+  public void updateSubstitutionNodeTypePrefix(ServiceTemplate substitutionServiceTemplate){
+    Map<String, NodeTemplate> node_templates =
+        substitutionServiceTemplate.getTopology_template().getNode_templates();
+
+    for(Map.Entry<String,NodeTemplate> nodeTemplateEntry : node_templates.entrySet()){
+      String nodeTypeId = nodeTemplateEntry.getValue().getType();
+      NodeType origNodeType = substitutionServiceTemplate.getNode_types().get(nodeTypeId);
+      if(Objects.nonNull(origNodeType)
+          && nodeTypeId.startsWith(ToscaNodeType.VFC_TYPE_PREFIX)
+          && origNodeType.getDerived_from().equals(ToscaNodeType.NOVA_SERVER)){
+        substitutionServiceTemplate.getNode_types().remove(nodeTypeId);
+
+        String newNodeTypeId =
+            nodeTypeId.replace(ToscaNodeType.VFC_TYPE_PREFIX, ToscaNodeType.COMPUTE_TYPE_PREFIX);
+        nodeTemplateEntry.getValue().setType(newNodeTypeId);
+        DataModelUtil
+            .addNodeTemplate(substitutionServiceTemplate, nodeTemplateEntry.getKey(), nodeTemplateEntry.getValue());
+        substitutionServiceTemplate.getNode_types().put(newNodeTypeId, origNodeType);
+      }
+    }
+  }
+
   /**
    * Update unified abstract nodes connectivity.
    *
@@ -510,8 +515,6 @@ public class UnifiedCompositionService {
     NodeType nestedNodeType =
         DataModelUtil.getNodeType(globalSubstitutionServiceTemplate, nodeTypeId);
     nestedNodeType.setProperties(nodeTypePropertiesDefinition);
-    addComputeNodeTypeToGlobalST(nestedServiceTemplate.getNode_types().keySet().iterator().next()
-        , nestedServiceTemplate, globalSubstitutionServiceTemplate, nestedNodeType);
   }
 
   private String updateNodeTypeId(String nodeTypeId, String newNestedNodeTypeId,
@@ -1814,14 +1817,13 @@ public class UnifiedCompositionService {
         unifiedCompositionDataList, context);
     ServiceTemplate globalSubstitutionServiceTemplate =
         HeatToToscaUtil.fetchGlobalSubstitutionServiceTemplate(serviceTemplate, context);
-    return handleComputeNodeType(serviceTemplate, substitutionServiceTemplate, globalSubstitutionServiceTemplate,
+    return handleComputeNodeType(serviceTemplate, substitutionServiceTemplate,
         computeTemplateConsolidationData);
   }
 
   private String handleComputeNodeType(
       ServiceTemplate serviceTemplate,
       ServiceTemplate substitutionServiceTemplate,
-      ServiceTemplate globalSubstitutionServiceTemplate,
       ComputeTemplateConsolidationData computeTemplateConsolidationData) {
     NodeTemplate computeNodeTemplate = DataModelUtil.getNodeTemplate(serviceTemplate,
         computeTemplateConsolidationData.getNodeTemplateId());
@@ -1830,15 +1832,15 @@ public class UnifiedCompositionService {
         DataModelUtil.getNodeType(serviceTemplate, computeNodeTypeId);
     DataModelUtil
         .addNodeType(substitutionServiceTemplate, computeNodeTypeId, computeNodeType);
-//    NodeType globalNodeType = new ToscaAnalyzerServiceImpl()
-//        .createInitSubstitutionNodeType(substitutionServiceTemplate,
-//            computeNodeType.getDerived_from());
-//    DataModelUtil
-//        .addNodeType(globalSubstitutionServiceTemplate, computeNodeTypeId, globalNodeType);
 
     return computeNodeTypeId;
   }
 
+  private String getComputeNodeType(String nodeType){
+    String computeTypeSuffix = getComputeTypeSuffix(nodeType);
+    return ToscaNodeType.COMPUTE_TYPE_PREFIX + "." + computeTypeSuffix;
+  }
+
   private void handleComputeNodeTemplate(ServiceTemplate serviceTemplate,
                                          ServiceTemplate substitutionServiceTemplate,
                                          List<UnifiedCompositionData> unifiedCompositionDataList,
@@ -1878,6 +1880,17 @@ public class UnifiedCompositionService {
     }
   }
 
+  private void updateComputeNodeType(ServiceTemplate serviceTemplate,
+                                     String nodeTemplateId,
+                                     NodeTemplate newComputeNodeTemplate) {
+    String computeNodeType = getComputeNodeType(newComputeNodeTemplate.getType());
+    NodeType origNodeType = serviceTemplate.getNode_types().get(newComputeNodeTemplate.getType());
+    DataModelUtil.removeNodeType(serviceTemplate, newComputeNodeTemplate.getType());
+    DataModelUtil.addNodeType(serviceTemplate, computeNodeType, origNodeType);
+    newComputeNodeTemplate.setType(computeNodeType);
+    DataModelUtil.addNodeTemplate(serviceTemplate, nodeTemplateId, newComputeNodeTemplate);
+  }
+
   private List<EntityConsolidationData> getComputeConsolidationDataList(
       List<UnifiedCompositionData> unifiedCompositionDataList) {
     List<EntityConsolidationData> computeConsolidationDataList = new ArrayList<>();
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/UnifiedCompositionCatalogInstance.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionCatalogInstance.java
index c1daf1891a..dfb40af698 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionCatalogInstance.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionCatalogInstance.java
@@ -62,5 +62,6 @@ public class UnifiedCompositionCatalogInstance implements UnifiedComposition {
     }
 
     unifiedCompositionService.cleanNodeTypes(serviceTemplate, unifiedComposotionDataList, context);
+    unifiedCompositionService.updateSubstitutionNodeTypePrefix(substitutionServiceTemplate.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 8530d5150d..d6b49ec35e 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
@@ -38,6 +38,7 @@ public class UnifiedCompositionNestedSingleCompute implements UnifiedComposition
               unifiedCompositionDataList.get(i), context);
       unifiedCompositionService
           .cleanUnifiedNestedEntities(serviceTemplate, unifiedCompositionDataList.get(i), context);
+      unifiedCompositionService.updateSubstitutionNodeTypePrefix(nestedServiceTemplate);
     }
   }
 }
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/UnifiedCompositionScalingInstances.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionScalingInstances.java
index 001655d2b0..9572f672dd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionScalingInstances.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionScalingInstances.java
@@ -49,5 +49,7 @@ public class UnifiedCompositionScalingInstances implements UnifiedComposition {
         .cleanUnifiedCompositionEntities(serviceTemplate, unifiedCompositionDataList, context);
 
     unifiedCompositionService.cleanNodeTypes(serviceTemplate, unifiedCompositionDataList, context);
+
+    unifiedCompositionService.updateSubstitutionNodeTypePrefix(substitutionServiceTemplate.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/UnifiedCompositionSingleSubstitution.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionSingleSubstitution.java
index a7078f2e5d..ef9555302c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionSingleSubstitution.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/unifiedcomposition/UnifiedCompositionSingleSubstitution.java
@@ -66,9 +66,11 @@ public class UnifiedCompositionSingleSubstitution implements UnifiedComposition
       unifiedCompositionService
           .cleanUnifiedCompositionEntities(serviceTemplate, singleSubstitutionUnifiedList, context);
 
+      unifiedCompositionService.updateSubstitutionNodeTypePrefix(substitutionServiceTemplate.get());
     }
 
     unifiedCompositionService
         .cleanNodeTypes(serviceTemplate, unifiedCompositionDataList, context);
+
   }
 }