package org.openecomp.sdc.translator.services.heattotosca;
-/**
- * Created by TALIO on 3/7/2017.
- */
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
+import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
+import org.openecomp.sdc.tosca.services.ToscaConstants;
+import org.openecomp.sdc.translator.SubInterfaceConsolidationDataTestInfo;
+import org.openecomp.sdc.translator.TestUtils;
+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.UnifiedCompositionMode;
+import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ConsolidationData;
+import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.GetAttrFuncData;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public class ConsolidationServiceTest {
- /*
+
@Spy
private TranslationContext translationContext = new TranslationContext();
private static String mainST = "MainServiceTemplate.yaml";
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.ScalingInstances);
+ Collections.singletonList(UnifiedCompositionMode.ScalingInstances);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.SingleSubstitution);
+ Collections.singletonList(UnifiedCompositionMode.SingleSubstitution);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.SingleSubstitution);
+ Collections.singletonList(UnifiedCompositionMode.SingleSubstitution);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.SingleSubstitution);
+ Collections.singletonList(UnifiedCompositionMode.SingleSubstitution);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.ScalingInstances);
+ Collections.singletonList(UnifiedCompositionMode.ScalingInstances);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.SingleSubstitution);
+ Collections.singletonList(UnifiedCompositionMode.SingleSubstitution);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(
- UnifiedCompositionMode.ScalingInstances, UnifiedCompositionMode.SingleSubstitution);
+ Arrays.asList(UnifiedCompositionMode.ScalingInstances,
+ UnifiedCompositionMode.SingleSubstitution);
verifyMainServiceTemplateConsolidation(2, expectedUnifiedModes, toscaServiceModel);
}
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.ScalingInstances);
+ Collections.singletonList(UnifiedCompositionMode.ScalingInstances);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.CatalogInstance);
+ Collections.singletonList(UnifiedCompositionMode.CatalogInstance);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.CatalogInstance);
+ Collections.singletonList(UnifiedCompositionMode.CatalogInstance);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
("/mock/services/heattotosca/consolidation/translatedfiles/computeportconsolidation/one_exCP_naming_diff",
null, null);
- TestUtils.initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+ TestUtils
+ .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.CatalogInstance);
+ Collections.singletonList(UnifiedCompositionMode.CatalogInstance);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
@Test
- public void testFalsePortConsolidationForOneDiffExpcNaming(){
+ public void testFalsePortConsolidationForOneDiffExpcNaming() {
}
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.CatalogInstance);
+ Collections.singletonList(UnifiedCompositionMode.CatalogInstance);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.CatalogInstance);
+ Collections.singletonList(UnifiedCompositionMode.CatalogInstance);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.CatalogInstance);
+ Collections.singletonList(UnifiedCompositionMode.CatalogInstance);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
TestUtils.initPortConsolidationData(mainST, consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Collections.singletonList("group_id_1"), null,
null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Collections.singletonList("group_id_1"), null,
null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_3",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Collections.singletonList("group_id_1"), null,
null,
consolidationData);
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.ScalingInstances);
+ Collections.singletonList(UnifiedCompositionMode.ScalingInstances);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id1"),
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id1"),
null, null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id1"),
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id1"),
null, null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"),
- Arrays.asList("cmaui_volume"), Arrays.asList("group_id1"), null, null,
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("group_id1"), null,
+ null,
portTypeToIdList,
consolidationData);
TestUtils.initPortConsolidationData(mainST, consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Collections.singletonList("group_id_1"), null,
null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Collections.singletonList("group_id_1"), null,
null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_3",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Collections.singletonList("group_id_1"), null,
null,
consolidationData);
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.ScalingInstances);
+ Collections.singletonList(UnifiedCompositionMode.ScalingInstances);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id1"), null, null,
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id1"), null, null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id1"),
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id1"),
null, null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_2"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id1"), null, null,
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_2"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id1"), null, null,
portTypeToIdList,
consolidationData);
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.CatalogInstance);
+ Collections.singletonList(UnifiedCompositionMode.CatalogInstance);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id1"), null, null,
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id1"), null, null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id1"),
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id1"),
null, null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume_1"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id1"),
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume_1"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id1"),
null, null,
portTypeToIdList,
consolidationData);
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.CatalogInstance);
+ Collections.singletonList(UnifiedCompositionMode.CatalogInstance);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id1"), null, null,
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id1"), null, null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id1"),
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id1"),
null, null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume_1"), Arrays.asList("group_id1"),
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume_1"),
+ Collections.singletonList("group_id1"),
null, null,
portTypeToIdList,
consolidationData);
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.CatalogInstance);
+ Collections.singletonList(UnifiedCompositionMode.CatalogInstance);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null,
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"), null,
null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
null, null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_2"),
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_2"),
null, null,
portTypeToIdList,
consolidationData);
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.CatalogInstance);
+ Collections.singletonList(UnifiedCompositionMode.CatalogInstance);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null,
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"), null,
null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
null, null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
null, null,
portTypeToIdList,
consolidationData);
TestUtils.initPortConsolidationData(mainST, consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Collections.singletonList("group_id_1"), null,
null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Collections.singletonList("group_id_1"), null,
null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_3",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Collections.singletonList("group_id_1"), null,
null,
consolidationData);
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.ScalingInstances);
+ Collections.singletonList(UnifiedCompositionMode.ScalingInstances);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null,
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"), null,
null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
null, null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
null, null,
portTypeToIdList,
consolidationData);
TestUtils.initPortConsolidationData(mainST, consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Collections.singletonList("group_id_1"), null,
null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Collections.singletonList("group_id_1"), null,
null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_3",
- Arrays.asList("node_in_2"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+ Collections.singletonList("node_in_2"), Collections.singletonList("net_id_1"),
+ Collections.singletonList("group_id_1"), null,
null,
consolidationData);
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.CatalogInstance);
+ Collections.singletonList(UnifiedCompositionMode.CatalogInstance);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null,
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"), null,
null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
null, null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
null, null,
portTypeToIdList,
consolidationData);
TestUtils.initPortConsolidationData(mainST, consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Collections.singletonList("group_id_1"), null,
null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"), Arrays.asList("group_id_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Collections.singletonList("group_id_1"), null,
null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_3",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_2"), Arrays.asList("group_id_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_2"),
+ Collections.singletonList("group_id_1"), null,
null,
consolidationData);
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.CatalogInstance);
+ Collections.singletonList(UnifiedCompositionMode.CatalogInstance);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null,
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"), null,
null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
null, null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
null, null,
portTypeToIdList,
consolidationData);
TestUtils.initPortConsolidationData(mainST, consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"),
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
Arrays.asList("group_id_1", "group_id_2"), null, null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"),
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
Arrays.asList("group_id_1", "group_id_2"), null, null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_3",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"),
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
Arrays.asList("group_id_1", "group_id_3"), null, null,
consolidationData);
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.CatalogInstance);
+ Collections.singletonList(UnifiedCompositionMode.CatalogInstance);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("node_1"), null,
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("node_1"), null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("node_2"), null,
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("node_2"), null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("node_3"), null,
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("node_3"), null,
portTypeToIdList,
consolidationData);
TestUtils.initPortConsolidationData(mainST, consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"),
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
Arrays.asList("group_id_1", "group_id_2"), null, null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"),
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
Arrays.asList("group_id_1", "group_id_2"), null, null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_3",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"),
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
Arrays.asList("group_id_1", "group_id_2"), null, null,
consolidationData);
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.ScalingInstances);
+ Collections.singletonList(UnifiedCompositionMode.ScalingInstances);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("server_ps02"), null,
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("server_ps02"), null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("node_1"), null,
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("node_1"), null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("node_2"), null,
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("node_2"), null,
portTypeToIdList,
consolidationData);
TestUtils.initPortConsolidationData(mainST, consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"),
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
Arrays.asList("group_id_1", "group_id_2"), null, null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"),
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
Arrays.asList("group_id_1", "group_id_2"), null, null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_3",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"),
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
Arrays.asList("group_id_1", "group_id_2"), null, null,
consolidationData);
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.CatalogInstance);
+ Collections.singletonList(UnifiedCompositionMode.CatalogInstance);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"), null,
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"), null,
null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
null, null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
null, null,
portTypeToIdList,
consolidationData);
List<String> portNodeTemplateIds =
Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3");
List<List<String>> nodesConnectedInIds =
- Arrays.asList(Arrays.asList("node_in_1"), Arrays.asList("node_in_1"),
- Arrays.asList("node_in_1"));
+ Arrays.asList(Collections.singletonList("node_in_1"),
+ Collections.singletonList("node_in_1"),
+ Collections.singletonList("node_in_1"));
List<List<String>> nodesConnectedOutIds =
- Arrays.asList(Arrays.asList("node_out_1"), Arrays.asList("node_out_1"),
- Arrays.asList("node_out_1"));
+ Arrays.asList(Collections.singletonList("node_out_1"),
+ Collections.singletonList("node_out_1"),
+ Collections.singletonList("node_out_1"));
List<List<String>> getAttrInIds =
- Arrays.asList(Arrays.asList("get_attr_1"), Arrays.asList("get_attr_2"),
- Arrays.asList("get_attr_3"));
+ Arrays.asList(Collections.singletonList("get_attr_1"),
+ Collections.singletonList("get_attr_2"),
+ Collections.singletonList("get_attr_3"));
List<List<String>> groupIds =
- Arrays.asList(Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
- "group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
- List<List<Pair<String, GetAttrFuncData>>> getAttrOut = Arrays.asList(null, null, null);
+ Arrays.asList(Arrays.asList("group_id_1", "group_id_2"),
+ Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
+ List<List<Pair<String, GetAttrFuncData>>> getAttrOut =
+ Arrays.asList(null, null, null);
TestUtils.updateMultiplePortConsolidationDatas(
mainST, portNodeTemplateIds, nodesConnectedInIds, nodesConnectedOutIds, groupIds,
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.ScalingInstances);
+ Collections.singletonList(UnifiedCompositionMode.ScalingInstances);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("node_1"), null,
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("node_1"), null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("node_2"), null,
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("node_2"), null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("node_3"), null,
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("node_3"), null,
portTypeToIdList,
consolidationData);
List<String> portNodeTemplateIds =
Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3");
List<List<String>> nodesConnectedInIds =
- Arrays.asList(Arrays.asList("node_in_1"), Arrays.asList("node_in_1"),
- Arrays.asList("node_in_1"));
+ Arrays.asList(Collections.singletonList("node_in_1"),
+ Collections.singletonList("node_in_1"),
+ Collections.singletonList("node_in_1"));
List<List<String>> nodesConnectedOutIds =
- Arrays.asList(Arrays.asList("node_out_1"), Arrays.asList("node_out_1"),
- Arrays.asList("node_out_1"));
+ Arrays.asList(Collections.singletonList("node_out_1"),
+ Collections.singletonList("node_out_1"),
+ Collections.singletonList("node_out_1"));
List<List<String>> getAttrInIds =
- Arrays.asList(Arrays.asList("get_attr_1"), Arrays.asList("get_attr_2"),
- Arrays.asList("cm01_port_1"));
+ Arrays.asList(Collections.singletonList("get_attr_1"),
+ Collections.singletonList("get_attr_2"),
+ Collections.singletonList("cm01_port_1"));
List<List<String>> groupIds =
- Arrays.asList(Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
- "group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
- List<List<Pair<String, GetAttrFuncData>>> getAttrOut = Arrays.asList(null, null, null);
+ Arrays.asList(Arrays.asList("group_id_1", "group_id_2"),
+ Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
+ List<List<Pair<String, GetAttrFuncData>>> getAttrOut =
+ Arrays.asList(null, null, null);
TestUtils.updateMultiplePortConsolidationDatas(
mainST, portNodeTemplateIds, nodesConnectedInIds, nodesConnectedOutIds, groupIds,
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.CatalogInstance);
+ Collections.singletonList(UnifiedCompositionMode.CatalogInstance);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("cm01_port_1"), null,
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("cm01_port_1"), null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("cm01_port_2"), null,
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("cm01_port_2"), null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("cm01_port_3"), null,
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("cm01_port_3"), null,
portTypeToIdList,
consolidationData);
List<String> portNodeTemplateIds =
Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3");
List<List<String>> nodesConnectedInIds =
- Arrays.asList(Arrays.asList("node_in_1"), Arrays.asList("node_in_1"),
- Arrays.asList("node_in_1"));
+ Arrays.asList(Collections.singletonList("node_in_1"),
+ Collections.singletonList("node_in_1"),
+ Collections.singletonList("node_in_1"));
List<List<String>> nodesConnectedOutIds =
- Arrays.asList(Arrays.asList("node_out_1"), Arrays.asList("node_out_1"),
- Arrays.asList("node_out_1"));
+ Arrays.asList(Collections.singletonList("node_out_1"),
+ Collections.singletonList("node_out_1"),
+ Collections.singletonList("node_out_1"));
List<List<String>> getAttrInIds =
- Arrays.asList(Arrays.asList("get_attr_1"), Arrays.asList("get_attr_2"),
- Arrays.asList("get_attr_3"));
+ Arrays.asList(Collections.singletonList("get_attr_1"),
+ Collections.singletonList("get_attr_2"),
+ Collections.singletonList("get_attr_3"));
List<List<String>> groupIds =
- Arrays.asList(Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
- "group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
- List<List<Pair<String, GetAttrFuncData>>> getAttrOut = Arrays.asList(null, null, null);
+ Arrays.asList(Arrays.asList("group_id_1", "group_id_2"),
+ Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
+ List<List<Pair<String, GetAttrFuncData>>> getAttrOut =
+ Arrays.asList(null, null, null);
TestUtils.updateMultiplePortConsolidationDatas(
mainST, portNodeTemplateIds, nodesConnectedInIds, nodesConnectedOutIds, groupIds,
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.ScalingInstances);
+ Collections.singletonList(UnifiedCompositionMode.ScalingInstances);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_1"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("cm01_port_1"),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("cm01_port_1", getAttrFuncData)),
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("cm01_port_1"),
+ Collections.singletonList(
+ new ImmutablePair<>("cm01_port_1", getAttrFuncData)),
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("cm01_port_1"),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("cm01_port_1", getAttrFuncData)),
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("cm01_port_1"),
+ Collections.singletonList(
+ new ImmutablePair<>("cm01_port_1", getAttrFuncData)),
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("cm01_port", "cm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("cm01_port_1"),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("cm01_port_1", getAttrFuncData)),
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("cm01_port_1"),
+ Collections.singletonList(
+ new ImmutablePair<>("cm01_port_1", getAttrFuncData)),
portTypeToIdList,
consolidationData);
TestUtils.initPortConsolidationData(mainST, consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"),
- Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("sm01_port_2"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Arrays.asList("group_id_1", "group_id_2"),
+ Collections.singletonList("sm01_port_2"), null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"),
- Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("sm01_port_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Arrays.asList("group_id_1", "group_id_2"),
+ Collections.singletonList("sm01_port_1"), null,
consolidationData);
TestUtils.updatePortConsolidationData(mainST, "cm01_port_3",
- Arrays.asList("node_in_1"), Arrays.asList("net_id_1"),
- Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("rm01_port_1"), null,
+ Collections.singletonList("node_in_1"), Collections.singletonList("net_id_1"),
+ Arrays.asList("group_id_1", "group_id_2"),
+ Collections.singletonList("rm01_port_1"), null,
consolidationData);
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.ScalingInstances);
+ Collections.singletonList(UnifiedCompositionMode.ScalingInstances);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("cm01_port_1"),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("cm01_port_1", getAttrFuncData)),
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("cm01_port_1"),
+ Collections.singletonList(
+ new ImmutablePair<>("cm01_port_1", getAttrFuncData)),
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("cm01_port_1"),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("cm01_port_1", getAttrFuncData)),
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("cm01_port_1"),
+ Collections.singletonList(
+ new ImmutablePair<>("cm01_port_1", getAttrFuncData)),
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("cm01_port_1"),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("sm01_port_1", getAttrFuncData)),
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("cm01_port_1"),
+ Collections.singletonList(
+ new ImmutablePair<>("sm01_port_1", getAttrFuncData)),
portTypeToIdList,
consolidationData);
TestUtils.initPortConsolidationData(mainST, consolidationData);
List<String> portNodeTemplateIds =
- Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3", "sm01_port_1", "sm01_port_2",
+ Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3", "sm01_port_1",
+ "sm01_port_2",
"sm01_port_3");
List<List<String>> nodesConnectedInIds =
- Arrays.asList(Arrays.asList("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList
- ("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList("node_in_1"),
- Arrays.asList("node_in_1"));
+ Arrays.asList(Collections.singletonList("node_in_1"),
+ Collections.singletonList("node_in_1"), Collections.singletonList
+ ("node_in_1"), Collections.singletonList("node_in_1"),
+ Collections.singletonList("node_in_1"),
+ Collections.singletonList("node_in_1"));
List<List<String>> nodesConnectedOutIds =
- Arrays.asList(Arrays.asList("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList
- ("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList("node_out_1"),
- Arrays.asList("node_out_1"));
+ Arrays.asList(Collections.singletonList("node_out_1"),
+ Collections.singletonList("node_out_1"), Collections.singletonList
+ ("node_out_1"), Collections.singletonList("node_out_1"),
+ Collections.singletonList("node_out_1"),
+ Collections.singletonList("node_out_1"));
List<List<String>> getAttrInIds =
- Arrays.asList(Arrays.asList("get_attr_1"), Arrays.asList("get_attr_2"), Arrays.asList
- ("get_attr_3"), Arrays.asList("get_attr_1"), Arrays.asList("get_attr_2"),
- Arrays.asList("get_attr_3"));
+ Arrays.asList(Collections.singletonList("get_attr_1"),
+ Collections.singletonList("get_attr_2"), Collections.singletonList
+ ("get_attr_3"), Collections.singletonList("get_attr_1"),
+ Collections.singletonList("get_attr_2"),
+ Collections.singletonList("get_attr_3"));
List<List<String>> groupIds =
- Arrays.asList(Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
- "group_id_2"), Arrays.asList("group_id_1", "group_id_2"),
- Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
+ Arrays.asList(Arrays.asList("group_id_1", "group_id_2"),
+ Arrays.asList("group_id_1",
+ "group_id_2"), Arrays.asList("group_id_1", "group_id_2"),
+ Arrays.asList("group_id_1", "group_id_2"),
+ Arrays.asList("group_id_1",
"group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
- List<List<Pair<String, GetAttrFuncData>>> getAttrOut = Arrays.asList(null, null, null, null,
- null, null);
+ List<List<Pair<String, GetAttrFuncData>>> getAttrOut =
+ Arrays.asList(null, null, null, null,
+ null, null);
TestUtils.updateMultiplePortConsolidationDatas(mainST, portNodeTemplateIds,
nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOut,
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.SingleSubstitution);
+ Collections.singletonList(UnifiedCompositionMode.SingleSubstitution);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("cm01_port_1"), null,
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("cm01_port_1"), null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("cm01_port_1"), null,
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("cm01_port_1"), null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("cm01_port_1"), null,
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("cm01_port_1"), null,
portTypeToIdList,
consolidationData);
GetAttrFuncData getAttrFuncData = new GetAttrFuncData("name", "s1_name");
List<String> portNodeTemplateIds =
- Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3", "sm01_port_1", "sm01_port_2",
+ Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3", "sm01_port_1",
+ "sm01_port_2",
"sm01_port_3");
List<List<String>> nodesConnectedInIds =
- Arrays.asList(Arrays.asList("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList
- ("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList("node_in_1"),
- Arrays.asList("node_in_1"));
+ Arrays.asList(Collections.singletonList("node_in_1"),
+ Collections.singletonList("node_in_1"), Collections.singletonList
+ ("node_in_1"), Collections.singletonList("node_in_1"),
+ Collections.singletonList("node_in_1"),
+ Collections.singletonList("node_in_1"));
List<List<String>> nodesConnectedOutIds =
- Arrays.asList(Arrays.asList("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList
- ("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList("node_out_1"),
- Arrays.asList("node_out_1"));
+ Arrays.asList(Collections.singletonList("node_out_1"),
+ Collections.singletonList("node_out_1"), Collections.singletonList
+ ("node_out_1"), Collections.singletonList("node_out_1"),
+ Collections.singletonList("node_out_1"),
+ Collections.singletonList("node_out_1"));
List<List<String>> getAttrInIds =
Arrays.asList(null, null, null, null, null, null);
List<List<String>> groupIds =
- Arrays.asList(Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
- "group_id_2"), Arrays.asList("group_id_1", "group_id_2"),
- Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
+ Arrays.asList(Arrays.asList("group_id_1", "group_id_2"),
+ Arrays.asList("group_id_1",
+ "group_id_2"), Arrays.asList("group_id_1", "group_id_2"),
+ Arrays.asList("group_id_1", "group_id_2"),
+ Arrays.asList("group_id_1",
"group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
List<List<Pair<String, GetAttrFuncData>>> getAttrOut = Arrays.asList(
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("sm01_port_1", getAttrFuncData)),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("sm01_port_2", getAttrFuncData)),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("sm01_port_3", getAttrFuncData)),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("cm01_port_1", getAttrFuncData)),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("cm01_port_2", getAttrFuncData)),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("cm01_port_3", getAttrFuncData)));
+ Collections.singletonList(
+ new ImmutablePair<>("sm01_port_1", getAttrFuncData)),
+ Collections.singletonList(
+ new ImmutablePair<>("sm01_port_2", getAttrFuncData)),
+ Collections.singletonList(
+ new ImmutablePair<>("sm01_port_3", getAttrFuncData)),
+ Collections.singletonList(
+ new ImmutablePair<>("cm01_port_1", getAttrFuncData)),
+ Collections.singletonList(
+ new ImmutablePair<>("cm01_port_2", getAttrFuncData)),
+ Collections.singletonList(
+ new ImmutablePair<>("cm01_port_3", getAttrFuncData)));
TestUtils.updateMultiplePortConsolidationDatas(mainST, portNodeTemplateIds,
nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOut,
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.ScalingInstances);
+ Collections.singletonList(UnifiedCompositionMode.ScalingInstances);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_1"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps01", Arrays.asList("cm01_port_1"), Arrays.asList
- ("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("cm01_port_1"), null,
+ computeNodeTypeName, "server_ps01", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList
+ ("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("cm01_port_1"), null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_2"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps02", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("cm01_port_1"), null,
+ computeNodeTypeName, "server_ps02", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("cm01_port_1"), null,
portTypeToIdList,
consolidationData);
portTypeToIdList.add(new ImmutablePair<>("sm01_port", "sm01_port_3"));
TestUtils.updateComputeTemplateConsolidationData(
mainST,
- computeNodeTypeName, "server_ps03", Arrays.asList("cm01_port_1"),
- Arrays.asList("cmaui_volume"), Arrays.asList("cmaui_volume"), Arrays.asList("group_id_1"),
- Arrays.asList("cm01_port_1"), null,
+ computeNodeTypeName, "server_ps03", Collections.singletonList("cm01_port_1"),
+ Collections.singletonList("cmaui_volume"), Collections.singletonList("cmaui_volume"),
+ Collections.singletonList("group_id_1"),
+ Collections.singletonList("cm01_port_1"), null,
portTypeToIdList,
consolidationData);
GetAttrFuncData getAttrFuncData = new GetAttrFuncData("name", "s1_name");
List<String> portNodeTemplateIds =
- Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3", "sm01_port_1", "sm01_port_2",
+ Arrays.asList("cm01_port_1", "cm01_port_2", "cm01_port_3", "sm01_port_1",
+ "sm01_port_2",
"sm01_port_3");
List<List<String>> nodesConnectedInIds =
- Arrays.asList(Arrays.asList("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList
- ("node_in_1"), Arrays.asList("node_in_1"), Arrays.asList("node_in_1"),
- Arrays.asList("node_in_1"));
+ Arrays.asList(Collections.singletonList("node_in_1"),
+ Collections.singletonList("node_in_1"), Collections.singletonList
+ ("node_in_1"), Collections.singletonList("node_in_1"),
+ Collections.singletonList("node_in_1"),
+ Collections.singletonList("node_in_1"));
List<List<String>> nodesConnectedOutIds =
- Arrays.asList(Arrays.asList("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList
- ("node_out_1"), Arrays.asList("node_out_1"), Arrays.asList("node_out_1"),
- Arrays.asList("node_out_1"));
+ Arrays.asList(Collections.singletonList("node_out_1"),
+ Collections.singletonList("node_out_1"), Collections.singletonList
+ ("node_out_1"), Collections.singletonList("node_out_1"),
+ Collections.singletonList("node_out_1"),
+ Collections.singletonList("node_out_1"));
List<List<String>> getAttrInIds =
Arrays.asList(null, null, null, null, null, null);
List<List<String>> groupIds =
- Arrays.asList(Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
- "group_id_2"), Arrays.asList("group_id_1", "group_id_2"),
- Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1",
+ Arrays.asList(Arrays.asList("group_id_1", "group_id_2"),
+ Arrays.asList("group_id_1", "group_id_2"), Arrays.asList("group_id_1", "group_id_2"),
+ Arrays.asList("group_id_1", "group_id_2"),
+ Arrays.asList("group_id_1",
"group_id_2"), Arrays.asList("group_id_1", "group_id_2"));
List<List<Pair<String, GetAttrFuncData>>> getAttrOut = Arrays.asList(
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("server_ps01", getAttrFuncData)),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("server_ps01", getAttrFuncData)),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("sm01_port_3", getAttrFuncData)),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("cm01_port_1", getAttrFuncData)),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("cm01_port_2", getAttrFuncData)),
- Arrays.asList(new ImmutablePair<String, GetAttrFuncData>("cm01_port_3", getAttrFuncData)));
+ Collections.singletonList(
+ new ImmutablePair<>("server_ps01", getAttrFuncData)),
+ Collections.singletonList(
+ new ImmutablePair<>("server_ps01", getAttrFuncData)),
+ Collections.singletonList(
+ new ImmutablePair<>("sm01_port_3", getAttrFuncData)),
+ Collections.singletonList(
+ new ImmutablePair<>("cm01_port_1", getAttrFuncData)),
+ Collections.singletonList(
+ new ImmutablePair<>("cm01_port_2", getAttrFuncData)),
+ Collections.singletonList(
+ new ImmutablePair<>("cm01_port_3", getAttrFuncData)));
TestUtils.updateMultiplePortConsolidationDatas(mainST, portNodeTemplateIds,
nodesConnectedInIds, nodesConnectedOutIds, groupIds, getAttrInIds, getAttrOut,
translationContext.setConsolidationData(consolidationData);
List<UnifiedCompositionMode> expectedUnifiedModes =
- Arrays.asList(UnifiedCompositionMode.SingleSubstitution);
+ Collections.singletonList(UnifiedCompositionMode.SingleSubstitution);
verifyMainServiceTemplateConsolidation(1, expectedUnifiedModes, toscaServiceModel);
}
String nestedServiceTemplateName = "nested-pcm_v0.1ServiceTemplate.yaml";
ConsolidationData consolidationData = new ConsolidationData();
- TestUtils.updateNestedConsolidationData(mainSTName, Arrays.asList("server_pcm_001"),
+ TestUtils.updateNestedConsolidationData(mainSTName, Collections.singletonList("server_pcm_001"),
consolidationData);
TestUtils.initComputeNodeTypeInConsolidationData(mainSTName,
"org.openecomp.resource.vfc.nodes.heat" +
String nestedServiceTemplateName = "nested-pcm_v0.1ServiceTemplate.yaml";
ConsolidationData consolidationData = new ConsolidationData();
- TestUtils.updateNestedConsolidationData(mainSTName, Arrays.asList("server_pcm_001"),
+ TestUtils.updateNestedConsolidationData(mainSTName, Collections.singletonList("server_pcm_001"),
consolidationData);
TestUtils.initComputeNodeTypeInConsolidationData(mainSTName,
"org.openecomp.resource.vfc.nodes.heat" +
"org.openecomp.resource.vfc.nodes.heat" +
".pcm_server", consolidationData);
- TestUtils.updateNestedConsolidationData(mainSTName, Arrays.asList("server_oam_001"),
+ TestUtils.updateNestedConsolidationData(mainSTName, Collections.singletonList("server_oam_001"),
consolidationData);
TestUtils.initComputeNodeTypeInConsolidationData(mainSTName,
"org.openecomp.resource.vfc.nodes.heat" +
String nestedServiceTemplateName = "nested-pcm_v0.1ServiceTemplate.yaml";
ConsolidationData consolidationData = new ConsolidationData();
- TestUtils.updateNestedConsolidationData(mainSTName, Arrays.asList("server_pcm_001"),
+ TestUtils.updateNestedConsolidationData(mainSTName, Collections.singletonList("server_pcm_001"),
consolidationData);
TestUtils.initComputeNodeTypeInConsolidationData(nestedServiceTemplateName,
"org.openecomp.resource.vfc.nodes.heat" +
".heat.pcm_server", "pcm_server_1", consolidationData);
TestUtils
- .updateNestedConsolidationData(nestedServiceTemplateName, Arrays.asList("server_pcm_002"),
+ .updateNestedConsolidationData(nestedServiceTemplateName,
+ Collections.singletonList("server_pcm_002"),
consolidationData);
TestUtils.initComputeNodeTemplateIdInConsolidationData(nestedServiceTemplateName,
"org.openecomp.resource.vfc.nodes" +
addMockServiceTemplateToContext(nestedServiceTemplateName, "nested-pcm_v0.1");
Mockito.doNothing().when(consolidationService).serviceTemplateConsolidation
- (translationContext.getTranslatedServiceTemplates().get(nestedServiceTemplateName), translationContext);
+ (translationContext.getTranslatedServiceTemplates().get(nestedServiceTemplateName),
+ translationContext);
verifySubstitutionServiceTemplateConsolidation
(1, translationContext.getTranslatedServiceTemplates().get(mainSTName),
translationContext.getTranslatedServiceTemplates().get(nestedServiceTemplateName),
String nestedServiceTemplateName = "nested-pcm_v0.1ServiceTemplate.yaml";
ConsolidationData consolidationData = new ConsolidationData();
- TestUtils.updateNestedConsolidationData(mainSTName, Arrays.asList("server_pcm_001"),
+ TestUtils.updateNestedConsolidationData(mainSTName, Collections.singletonList("server_pcm_001"),
consolidationData);
TestUtils.initComputeNodeTypeInConsolidationData(mainSTName,
"org.openecomp.resource.vfc.nodes.heat" +
".heat.pcm_server", "pcm_server", consolidationData);
TestUtils
- .updateNestedConsolidationData(nestedServiceTemplateName, Arrays.asList("nested_resource"),
+ .updateNestedConsolidationData(nestedServiceTemplateName,
+ Collections.singletonList("nested_resource"),
consolidationData);
translationContext.setConsolidationData(consolidationData);
UnifiedCompositionMode.SingleSubstitution);
}
+ @Test
+ public void testConsolidationPreConditionFalseDiffSubportTypes() throws IOException {
+ translationContext = new TranslationContext();
+ String computeNodeTypeName = "org.openecomp.resource.vfc.nodes.heat.ps_server";
+ ToscaServiceModel toscaServiceModel = TestUtils.loadToscaServiceModel
+ ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/different_subinterface_types",
+ null, null);
+
+ ConsolidationData consolidationData = new ConsolidationData();
+ generateComputeAndPortConsolidationData(computeNodeTypeName, consolidationData);
+
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_1", "nested1.yaml", 2,
+ "role_1", "interface_1", null, null, null, null, consolidationData));
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_2", "nested2.yaml", 2,
+ "role_2", "interface_2", null, null, null, null, consolidationData));
+ testConsolidation(1, toscaServiceModel, consolidationData, Collections.singletonList(UnifiedCompositionMode.SingleSubstitution));
+ }
+
+ private void generateComputeAndPortConsolidationData(String computeNodeTypeName,
+ ConsolidationData consolidationData) {
+ TestUtils
+ .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+
+ updateComputeConsolidationData("server_ps01", computeNodeTypeName, "cm01_port",
+ "cm01_port_1", consolidationData);
+
+ updateComputeConsolidationData("server_ps02", computeNodeTypeName, "cm01_port",
+ "cm01_port_2", consolidationData);
+
+ TestUtils.initPortConsolidationData(mainST, consolidationData);
+ TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
+ null, null, null, null, null,
+ consolidationData);
+ TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
+ null, null, null, null, null,
+ consolidationData);
+ }
+
+ @Test
+ public void testConsolidationPreConditionFalseDiffSubportNumber() throws IOException {
+ translationContext = new TranslationContext();
+ String computeNodeTypeName = "org.openecomp.resource.vfc.nodes.heat.ps_server";
+ ToscaServiceModel toscaServiceModel = TestUtils.loadToscaServiceModel
+ ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/different_subinterface_types",
+ null, null);
+
+ ConsolidationData consolidationData = new ConsolidationData();
+ generateComputeAndPortConsolidationData(computeNodeTypeName, consolidationData);
+
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_1", "nested1.yaml", 2,
+ "role_1", "interface_1", null, null, null, null, consolidationData));
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_2", "nested1.yaml", 2,
+ "role_2", "interface_2", null, null, null, null, consolidationData));
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_2", "nested1.yaml", 2,
+ "role_3", "interface_3", null, null, null, null, consolidationData));
+
+ testConsolidation(1, toscaServiceModel,
+ consolidationData, Collections.singletonList(UnifiedCompositionMode.SingleSubstitution));
+ }
+
+ @Test
+ public void testConsolidationRuleFalseDifferentCountInResourceGroup() throws IOException {
+ translationContext = new TranslationContext();
+ String computeNodeTypeName = "org.openecomp.resource.vfc.nodes.heat.ps_server";
+ ToscaServiceModel toscaServiceModel = TestUtils.loadToscaServiceModel
+ ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/different_subinterface_types",
+ null, null);
+
+ ConsolidationData consolidationData = new ConsolidationData();
+ generateComputeAndPortConsolidationData(computeNodeTypeName, consolidationData);
+
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_1", "nested1.yaml", 2,
+ "role_1", "interface_1", null, null, null, null, consolidationData));
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_2", "nested1.yaml", 3,
+ "role_1", "interface_2", null, null, null, null, consolidationData));
+
+ testConsolidation(1, toscaServiceModel,
+ consolidationData, Collections.singletonList(UnifiedCompositionMode.CatalogInstance));
+ }
+
+ @Test
+ public void testConsolidationRuleFalseDifferentNodesConnectedInToResourceGroup()
+ throws IOException {
+ translationContext = new TranslationContext();
+ String computeNodeTypeName = "org.openecomp.resource.vfc.nodes.heat.ps_server";
+ ToscaServiceModel toscaServiceModel = TestUtils.loadToscaServiceModel
+ ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/different_subinterface_types",
+ null, null);
+
+ ConsolidationData consolidationData = new ConsolidationData();
+ generateComputeAndPortConsolidationData(computeNodeTypeName, consolidationData);
+
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_1", "nested1.yaml", 2,
+ "role_1", "interface_1", Collections.singletonList("node_1"), null, null, null,
+ consolidationData));
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_2", "nested1.yaml", 2,
+ "role_1", "interface_2", Collections.singletonList("node_2"), null, null, null,
+ consolidationData));
+
+ testConsolidation(1, toscaServiceModel, consolidationData, Collections.singletonList(UnifiedCompositionMode.CatalogInstance));
+ }
+
+ @Test
+ public void testConsolidationRuleFalseDifferentNodesConnectedOutFromResourceGroup()
+ throws IOException {
+ translationContext = new TranslationContext();
+ String computeNodeTypeName = "org.openecomp.resource.vfc.nodes.heat.ps_server";
+ ToscaServiceModel toscaServiceModel = TestUtils.loadToscaServiceModel
+ ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/different_subinterface_types",
+ null, null);
+
+ ConsolidationData consolidationData = new ConsolidationData();
+ generateComputeAndPortConsolidationData(computeNodeTypeName, consolidationData);
+
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_1", "nested1.yaml", 2,
+ "role_1", "interface_1", null, Collections.singletonList("node_1"), null, null,
+ consolidationData));
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_2", "nested1.yaml", 2,
+ "role_1", "interface_2", null, Collections.singletonList("node_2"), null, null,
+ consolidationData));
+
+ testConsolidation(1, toscaServiceModel, consolidationData, Collections.singletonList(UnifiedCompositionMode.CatalogInstance));
+ }
+
+ @Test
+ public void testConsolidationRuleFalseGetAttrInBetweenSubInterfacesOfSameType()
+ throws IOException {
+ translationContext = new TranslationContext();
+ String computeNodeTypeName = "org.openecomp.resource.vfc.nodes.heat.ps_server";
+ ToscaServiceModel toscaServiceModel = TestUtils.loadToscaServiceModel
+ ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/different_subinterface_types",
+ null, null);
+
+ ConsolidationData consolidationData = new ConsolidationData();
+ generateComputeAndPortConsolidationData(computeNodeTypeName, consolidationData);
+
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_1", "nested1.yaml", 2,
+ "role_1", "interface_1", null, null, Collections.singletonList("in_node_1"), null,
+ consolidationData));
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_2", "nested1.yaml", 2,
+ "role_1", "interface_2", null, null, Collections.singletonList("interface_1"), null,
+ consolidationData));
+
+ testConsolidation(1, toscaServiceModel, consolidationData, Collections.singletonList(UnifiedCompositionMode.CatalogInstance));
+ }
+
+ @Test
+ public void testConsolidationRuleFalseGetAttrOutBetweenSubInterfacesOfSameType()
+ throws IOException {
+ translationContext = new TranslationContext();
+ String computeNodeTypeName = "org.openecomp.resource.vfc.nodes.heat.ps_server";
+ ToscaServiceModel toscaServiceModel = TestUtils.loadToscaServiceModel
+ ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/different_subinterface_types",
+ null, null);
+
+ ConsolidationData consolidationData = new ConsolidationData();
+ TestUtils
+ .initComputeNodeTypeInConsolidationData(mainST, computeNodeTypeName, consolidationData);
+
+ updateComputeConsolidationData("server_ps01", computeNodeTypeName, "cm01_port",
+ "cm01_port_1", consolidationData);
+ updateComputeConsolidationData("server_ps02", computeNodeTypeName, "cm01_port",
+ "cm01_port_2", consolidationData);
+
+ GetAttrFuncData getAttrFuncData = new GetAttrFuncData("name", "c1_name");
+ Pair<String, GetAttrFuncData> getAttrOutInvalid1 =
+ new ImmutablePair<>("interface_1", getAttrFuncData);
+ Pair<String, GetAttrFuncData> getAttrOutInvalid2 =
+ new ImmutablePair<>("interface_2", getAttrFuncData);
+
+ TestUtils.initPortConsolidationData(mainST, consolidationData);
+ TestUtils.updatePortConsolidationData(mainST, "cm01_port_1",
+ null, null, null, null, null,
+ consolidationData);
+ TestUtils.updatePortConsolidationData(mainST, "cm01_port_2",
+ null, null, null, null, null,
+ consolidationData);
+
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_1", "nested1.yaml", 2,
+ "role_1", "interface_1", null, null, null,
+ Collections.singletonList(getAttrOutInvalid1), consolidationData));
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_2", "nested1.yaml", 2,
+ "role_1", "interface_2", null, null, null,
+ Collections.singletonList(getAttrOutInvalid2), consolidationData));
+
+ testConsolidation(1, toscaServiceModel, consolidationData, Collections.singletonList(UnifiedCompositionMode.CatalogInstance));
+ }
+
+ @Test
+ public void testConsolidationRuleFalseDifferentRoleInResourceGroup() throws IOException {
+ translationContext = new TranslationContext();
+ String computeNodeTypeName = "org.openecomp.resource.vfc.nodes.heat.ps_server";
+ ToscaServiceModel toscaServiceModel = TestUtils.loadToscaServiceModel
+ ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/different_subinterface_types",
+ null, null);
+
+ ConsolidationData consolidationData = new ConsolidationData();
+ generateComputeAndPortConsolidationData(computeNodeTypeName, consolidationData);
+
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_1", "nested1.yaml", 2,
+ "role_1", "interface_1", null, null, null, null, consolidationData));
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_2", "nested1.yaml", 2,
+ "role_2", "interface_2", null, null, null, null, consolidationData));
+
+ testConsolidation(1, toscaServiceModel, consolidationData, Collections.singletonList(UnifiedCompositionMode.CatalogInstance));
+ }
+
+ @Test
+ public void testConsolidationRuleTrueForSubInterfaces() throws IOException {
+ translationContext = new TranslationContext();
+ String computeNodeTypeName = "org.openecomp.resource.vfc.nodes.heat.ps_server";
+ ToscaServiceModel toscaServiceModel = TestUtils.loadToscaServiceModel
+ ("/mock/services/heattotosca/consolidation/translatedfiles/pre_condition/different_subinterface_types",
+ null, null);
+
+ ConsolidationData consolidationData = new ConsolidationData();
+ generateComputeAndPortConsolidationData(computeNodeTypeName, consolidationData);
+
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_1", "nested1.yaml", 2,
+ "role_1", "interface_1", Collections.singletonList("node_1"),
+ Collections.singletonList("node_1"), null, null, consolidationData));
+ TestUtils
+ .addPortSubInterface(
+ new SubInterfaceConsolidationDataTestInfo(mainST, "cm01_port_2", "nested1.yaml", 2,
+ "role_1", "interface_2", Collections.singletonList("node_1"),
+ Collections.singletonList("node_1"), null, null, consolidationData));
+
+ testConsolidation(1, toscaServiceModel, consolidationData, Collections.singletonList(UnifiedCompositionMode.ScalingInstances));
+ }
+
+ private void testConsolidation(int times, ToscaServiceModel toscaServiceModel,
+ ConsolidationData consolidationData,
+ List<UnifiedCompositionMode> expectedUnifiedModes) {
+ Mockito.doNothing().when(unifiedCompositionServiceMock).createUnifiedComposition(
+ any(),
+ any(),
+ any(),
+ any(),
+ any());
+ translationContext.setConsolidationData(consolidationData);
+ verifyMainServiceTemplateConsolidation(times, expectedUnifiedModes, toscaServiceModel);
+ }
+
+ private void updateComputeConsolidationData(String computeNodeTemplateId,
+ String computeNodeTypeName,
+ String portType,
+ String portNodeTemplateId,
+ ConsolidationData consolidationData) {
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>(portType, portNodeTemplateId));
+
+ TestUtils.updateComputeTemplateConsolidationData(
+ mainST,
+ computeNodeTypeName, computeNodeTemplateId,
+ null, null, null, null, null, null,
+ portTypeToIdList, consolidationData);
+ }
+
private void verifyMainServiceTemplateConsolidation(int times,
List<UnifiedCompositionMode> expectedUnifiedCompositionModes,
.put(serviceTemplateFileName, serviceTemplate);
}
- */
}