Rename packages from openecomp to onap.

[sdc.git] / openecomp-be / lib / openecomp-sdc-translator-lib / openecomp-sdc-translator-core / src / main / java / org / openecomp / sdc / translator / services / heattotosca / impl / unifiedcomposition / UnifiedCompositionNestedSingleCompute.java

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 8530d51..78bdc7b 100644 (file)
--- 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
@@ -1,20 +1,20 @@
 package org.openecomp.sdc.translator.services.heattotosca.impl.unifiedcomposition;
 
 import org.apache.commons.collections4.CollectionUtils;
-import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
+import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
 import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData;
+import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.to.UnifiedCompositionTo;
 import org.openecomp.sdc.translator.services.heattotosca.UnifiedComposition;
 import org.openecomp.sdc.translator.services.heattotosca.UnifiedCompositionService;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class UnifiedCompositionNestedSingleCompute implements UnifiedComposition {
 
-  // There is no consolidation in NestedSingleCompute implemetation.
+  // There is no consolidation in NestedSingleCompute implementation.
   // In case of  nested single compute, if there is more than one entry in the
-  // unifiedComposotionDataList, each one should be handed seperatly, no consolidation between
+  // unifiedCompositionDataList, each one should be handed separately, no consolidation between
   // them.
   @Override
   public void createUnifiedComposition(ServiceTemplate serviceTemplate,
@@ -26,18 +26,16 @@ public class UnifiedCompositionNestedSingleCompute implements UnifiedComposition
       return;
     }
 
-    for (int i = 0; i < unifiedCompositionDataList.size(); i++) {
-      List<UnifiedCompositionData> nestedUnifiedCompositionDataList = new ArrayList<>();
-      nestedUnifiedCompositionDataList.add(unifiedCompositionDataList.get(i));
-
-      unifiedCompositionService
-          .handleUnifiedNestedDefinition(serviceTemplate, nestedServiceTemplate,
-              unifiedCompositionDataList.get(i), context);
-      unifiedCompositionService
-          .updateUnifiedNestedConnectivity(serviceTemplate, nestedServiceTemplate,
-              unifiedCompositionDataList.get(i), context);
+    UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(serviceTemplate, nestedServiceTemplate,
+        unifiedCompositionDataList, context, null);
+    for (UnifiedCompositionData unifiedCompositionData : unifiedCompositionDataList) {
+      unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo, unifiedCompositionData);
+      String nestedNodeTemplateId = unifiedCompositionData.getNestedTemplateConsolidationData().getNodeTemplateId();
       unifiedCompositionService
-          .cleanUnifiedNestedEntities(serviceTemplate, unifiedCompositionDataList.get(i), context);
+          .createNestedVfcInstanceGroup(nestedNodeTemplateId, unifiedCompositionTo, unifiedCompositionData);
+      unifiedCompositionService.updateUnifiedNestedConnectivity(unifiedCompositionTo, unifiedCompositionData);
+      unifiedCompositionService.cleanUnifiedNestedEntities(unifiedCompositionTo, unifiedCompositionData);
+      unifiedCompositionService.updateSubstitutionNodeTypePrefix(nestedServiceTemplate);
     }
   }
 }