import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
-import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate;
-import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
+import org.onap.sdc.tosca.datatypes.model.NodeTemplate;
+import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
import org.openecomp.sdc.tosca.services.DataModelUtil;
-import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil;
-import org.openecomp.sdc.tosca.services.YamlUtil;
+import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil;
+import org.onap.sdc.tosca.services.YamlUtil;
import org.openecomp.sdc.translator.TestUtils;
import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext;
import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData;
private static final String OUT_PREFIX = "/out";
private static final String FSB1_template = "FSB1_template";
private static final String FSB2_template = "FSB2_template";
- private static final String FSB3_template = "FSB3_template";
private static final String FSB1_INTERNAL = "FSB1_Internal";
private static final String FSB2_INTERNAL = "FSB2_Internal";
private static final String FSB1_INTERNAL_1 = "FSB1_Internal_1";
private static final String FSB1_INTERNAL_2 = "FSB1_Internal_2";
private static final String FSB2_INTERNAL_1 = "FSB2_Internal_1";
private static final String FSB2_INTERNAL_2 = "FSB2_Internal_2";
+
+ //New ports according to naming convention
+ //Ports with same port types
+ private static final String FSB1_INTERNAL_PORT_TYPE_0 = "FSB1_Internal_port_0";
+ private static final String FSB1_0_INTERNAL_PORT_0 = "FSB1_0_Internal_port_0";
+ private static final String FSB1_1_INTERNAL_PORT_0 = "FSB1_1_Internal_port_0";
+
+ //For compute type FSB
+ private static final String FSB_INTERNAL_PORT_TYPE_0 = "FSB_Internal_port_0";
+ private static final String FSB_INTERNAL_PORT_TYPE_1 = "FSB_Internal_port_1";
+ private static final String FSB_2_INTERNAL_PORT_0 = "FSB_2_Internal_port_0";
+ private static final String FSB_2_INTERNAL_PORT_1 = "FSB_2_Internal_port_1";
+ private static final String FSB_1_INTERNAL_PORT_0 = "FSB_1_Internal_port_0";
+ private static final String FSB_1_INTERNAL_PORT_1 = "FSB_1_Internal_port_1";
+
private static final String PORT = "port";
private static final String PORT_1 = "port_1";
private static final String PORT_2 = "port_2";
@Test
public void createSubstitutionStNoOutputParamAndDuplicatePortType() throws Exception {
List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_PORT_TYPE_0, FSB1_0_INTERNAL_PORT_0));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_PORT_TYPE_0, FSB1_1_INTERNAL_PORT_0));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_1, FSB1_INTERNAL_1));
portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/NoOutParamDuplicatePortType");
@Test
public void createSubstitutionStWithOutputParamNoConsolidation() throws Exception {
List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_1, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL_2, FSB2_INTERNAL_2));
portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation");
public void createSubstitutionStWithOutputParamWithConsolidation() throws Exception {
List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
- portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
- portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList1.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1));
+ portTypeToIdList1.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_1_INTERNAL_PORT_0));
loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/WithOutputParameters/consolidation");
UnifiedCompositionData unifiedCompositionData1 =
unifiedCompositionDataList.add(unifiedCompositionData1);
List<Pair<String, String>> portTypeToIdList2 = new ArrayList<>();
- portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2));
- portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1));
+ portTypeToIdList2.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_2_INTERNAL_PORT_1));
+ portTypeToIdList2.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0));
UnifiedCompositionData unifiedCompositionData2 =
createCompositionData(FSB2_template, portTypeToIdList2);
@Test
public void createSubstitutionStWithIndex() throws Exception {
List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_1_INTERNAL_PORT_0));
+ portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1));
portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/WithIndex");
UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template);
List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0));
portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
addPortDataToCompositionData(portTypeToIdList, data);
UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template);
List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_1, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_2, FSB1_INTERNAL_2));
addPortDataToCompositionData(portTypeToIdList, data);
List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template);
List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0));
+ portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1));
portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
addPortDataToCompositionData(portTypeToIdList, data);
UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template);
List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0));
portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
addPortDataToCompositionData(portTypeToIdList, data);
loadInputAndOutputData(BASE_DIRECTORY + "updGroupsConnectivity/noConsolidation");
UnifiedCompositionData data = createComputeUnifiedCompositionData("server_smp1");
List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(PORT, PORT_1));
- portTypeToIdList.add(new ImmutablePair<>(PORT, PORT_2));
+ portTypeToIdList.add(new ImmutablePair<>(PORT_1, PORT_1));
+ portTypeToIdList.add(new ImmutablePair<>(PORT_2, PORT_2));
addPortDataToCompositionData(portTypeToIdList, data);
//Add groups
@Test
public void updOutParamGetAttrInNoConsolidationTest() throws Exception {
List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_1, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL_2, FSB2_INTERNAL_2));
portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
loadInputAndOutputData(BASE_DIRECTORY + "updOutputGetAttrIn/noConsolidation");
public void updOutParamGetAttrInWithConsolidationTest() throws Exception {
List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
- portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
- portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL_1, FSB1_INTERNAL_1));
+ portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL_2, FSB2_INTERNAL_2));
loadInputAndOutputData(BASE_DIRECTORY + "updOutputGetAttrIn/consolidation");
UnifiedCompositionData unifiedCompositionData1 =
unifiedCompositionDataList.add(unifiedCompositionData1);
List<Pair<String, String>> portTypeToIdList2 = new ArrayList<>();
- portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2));
- portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1));
+ portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL_2, FSB1_INTERNAL_2));
+ portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL_1, FSB2_INTERNAL_1));
UnifiedCompositionData unifiedCompositionData2 =
createCompositionData(FSB2_template, portTypeToIdList2);
@Test
public void updNodeGetAttrInNoConsolidationTest() throws Exception {
List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0));
portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
loadInputAndOutputData(BASE_DIRECTORY + "updNodesGetAttrIn/noConsolidation");
public void updNodeGetAttrInWithConsolidationTest() throws Exception {
List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
- portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
- portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList1.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1));
+ portTypeToIdList1.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_1_INTERNAL_PORT_0));
loadInputAndOutputData(BASE_DIRECTORY + "updNodesGetAttrIn/consolidation");
UnifiedCompositionData unifiedCompositionData1 =
unifiedCompositionDataList.add(unifiedCompositionData1);
List<Pair<String, String>> portTypeToIdList2 = new ArrayList<>();
- portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2));
- portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1));
+ portTypeToIdList2.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_2_INTERNAL_PORT_1));
+ portTypeToIdList2.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0));
UnifiedCompositionData unifiedCompositionData2 =
createCompositionData(FSB2_template, portTypeToIdList2);
@Test
public void updNodesGetAttrFromInnerNodesTest() throws Exception {
List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_1_INTERNAL_PORT_0));
portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
loadInputAndOutputData(BASE_DIRECTORY +
public void updNodesGetAttrFromConsolidationNodesTest() throws Exception {
List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
- portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
- portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList1.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_1_INTERNAL_PORT_1));
+ portTypeToIdList1.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_1_INTERNAL_PORT_0));
loadInputAndOutputData(BASE_DIRECTORY +
"creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation");
unifiedCompositionDataList.add(unifiedCompositionData1);
List<Pair<String, String>> portTypeToIdList2 = new ArrayList<>();
- portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2));
- portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1));
+ portTypeToIdList2.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_2_INTERNAL_PORT_1));
+ portTypeToIdList2.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0));
UnifiedCompositionData unifiedCompositionData2 =
createCompositionData(FSB2_template, portTypeToIdList2);
loadInputAndOutputData(BASE_DIRECTORY + "fixNewAbstractNodeTemplate/noConsolidation");
List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_1, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL_2, FSB1_INTERNAL_2));
NodeTemplate cleanedComputeNodeTemplate =
getMockNode(
context.getTranslatedServiceTemplates()
.put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
- UnifiedCompositionData unifiedComposition = createUnifiedCompositionOnlyNested("server_pcm_001");
- UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(
- inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName), null,
- context, null);
- unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo, unifiedComposition);
+ UnifiedCompositionData unifiedComposition = createUnifiedCompositionOnlyNested("server_pcm_001");
+ UnifiedCompositionTo unifiedCompositionTo = new UnifiedCompositionTo(
+ inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName), null,
+ context, null);
+ unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo, unifiedComposition);
checkSTResults(expectedOutserviceTemplates, nestedFileName,
context.getTranslatedServiceTemplates().get(nestedFileName),
context.getTranslatedServiceTemplates()
.put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
- UnifiedCompositionData unifiedComposition =
- createUnifiedCompositionOnlyNested("server_pcm_001");
- UnifiedCompositionTo unifiedCompositionTo1 = new UnifiedCompositionTo(inputServiceTemplates
- .get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName1), null,
- context, null);
- unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo1, unifiedComposition);
- unifiedComposition = createUnifiedCompositionOnlyNested("server_oam_001");
- UnifiedCompositionTo unifiedCompositionTo2 = new UnifiedCompositionTo(inputServiceTemplates
- .get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName2), null,
- context, null);
- unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo2, unifiedComposition);
+ UnifiedCompositionData unifiedComposition =
+ createUnifiedCompositionOnlyNested("server_pcm_001");
+ UnifiedCompositionTo unifiedCompositionTo1 = new UnifiedCompositionTo(inputServiceTemplates
+ .get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName1), null,
+ context, null);
+ unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo1, unifiedComposition);
+ unifiedComposition = createUnifiedCompositionOnlyNested("server_oam_001");
+ UnifiedCompositionTo unifiedCompositionTo2 = new UnifiedCompositionTo(inputServiceTemplates
+ .get(MAIN_SERVICE_TEMPLATE_YAML), inputServiceTemplates.get(nestedFileName2), null,
+ context, null);
+ unifiedCompositionService.handleUnifiedNestedDefinition(unifiedCompositionTo2, unifiedComposition);
checkSTResults(expectedOutserviceTemplates, nestedFileName1,
context.getTranslatedServiceTemplates().get(nestedFileName1),
.put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
context.addUnifiedNestedNodeTemplateId(MAIN_SERVICE_TEMPLATE_YAML, "server_pcm_001", "abstract_pcm_server_0");
- Map<String, List<RequirementAssignmentData>> nodeConnectedInList =
+ Multimap<String, RequirementAssignmentData> nodeConnectedInList =
TestUtils.getNodeConnectedInList("server_pcm_001", inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
DEPENDENCY);
UnifiedCompositionData unifiedComposition =
.put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
context.addUnifiedNestedNodeTemplateId(MAIN_SERVICE_TEMPLATE_YAML, "server_pcm_001", "abstract_pcm_server_0");
- Map<String, List<RequirementAssignmentData>> nodeConnectedInList =
+ Multimap<String, RequirementAssignmentData> nodeConnectedInList =
TestUtils.getNodeConnectedInList("server_pcm_001", inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
DEPENDENCY);
UnifiedCompositionData unifiedComposition =
.put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
context.addUnifiedNestedNodeTemplateId(MAIN_SERVICE_TEMPLATE_YAML, "server_pcm_001", "abstract_pcm_server_0");
- Map<String, List<RequirementAssignmentData>> nodeConnectedInList =
+ Multimap<String, RequirementAssignmentData> nodeConnectedInList =
TestUtils.getNodeConnectedInList("server_pcm_001", inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
DEPENDENCY);
UnifiedCompositionData unifiedComposition =
loadInputAndOutputData(BASE_DIRECTORY + "inputoutputparamtype");
ConsolidationData consolidationData = new ConsolidationData();
List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>("FSB1_Port", "FSB1_Port_1"));
- portTypeToIdList.add(new ImmutablePair<>("VMI", "VMI_1"));
+ portTypeToIdList.add(new ImmutablePair<>("FSB1_Port_1", "FSB1_Port_1"));
+ portTypeToIdList.add(new ImmutablePair<>("VMI_1", "VMI_1"));
UnifiedCompositionData unifiedCompositionData = createCompositionData(FSB1, portTypeToIdList);
TestUtils.getRequirementAssignmentDataList(computeNodeTemplate, "local_storage");
List<RequirementAssignmentData> requirementAssignmentList =
(requirementAssignmentDataList.isPresent()) ? requirementAssignmentDataList.get() : null;
- Map<String, List<RequirementAssignmentData>> volume = null;
+ Multimap<String, RequirementAssignmentData> volume = null;
if (requirementAssignmentList != null) {
volume = getVolume(requirementAssignmentList);
}
NodeTemplate portNodeTemplate =
DataModelUtil.getNodeTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), port.getRight());
- Map<String, List<RequirementAssignmentData>> nodeConnectedOut =
+ Multimap<String, RequirementAssignmentData> nodeConnectedOut =
TestUtils.getNodeConnectedOutList(portNodeTemplate, "link");
PortTemplateConsolidationData portTemplateConsolidationData =
- TestUtils.createPortTemplateConsolidationData(port.getRight());
+ TestUtils.createPortTemplateConsolidationData(port.getRight(), port.getLeft());
portTemplateConsolidationData.setNodesConnectedOut(nodeConnectedOut);
unifiedCompositionData.addPortTemplateConsolidationData(portTemplateConsolidationData);
}
UnifiedCompositionData data2 = createComputeUnifiedCompositionData(FSB2_template);
List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- ImmutablePair<String, String> portTypePair1 = new ImmutablePair<>(FSB1_INTERNAL,
- FSB1_INTERNAL_1);
- ImmutablePair<String, String> portTypePair2 = new ImmutablePair<>(FSB2_INTERNAL,
- FSB2_INTERNAL_1);
+ ImmutablePair<String, String> portTypePair1 = new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0,
+ FSB_1_INTERNAL_PORT_0);
+ ImmutablePair<String, String> portTypePair2 = new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1,
+ FSB_1_INTERNAL_PORT_1);
portTypeToIdList.add(portTypePair1);
portTypeToIdList.add(portTypePair2);
addPortDataToCompositionData(portTypeToIdList, data1);
portTypeToIdList.remove(portTypePair1);
portTypeToIdList.remove(portTypePair2);
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_0, FSB_2_INTERNAL_PORT_0));
+ portTypeToIdList.add(new ImmutablePair<>(FSB_INTERNAL_PORT_TYPE_1, FSB_2_INTERNAL_PORT_1));
addPortDataToCompositionData(portTypeToIdList, data2);
unifiedCompositionDataList.add(data1);
DataModelUtil.getNodeTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), computeNodeTemplateId);
Optional<List<RequirementAssignmentData>> requirementAssignmentDataList =
TestUtils.getRequirementAssignmentDataList(computeNodeTemplate, "local_storage");
- Map<String, List<RequirementAssignmentData>> volume = null;
+ Multimap<String, RequirementAssignmentData> volume = null;
if (requirementAssignmentDataList.isPresent()) {
volume = getVolume(requirementAssignmentDataList.get());
}
UnifiedCompositionData data = new UnifiedCompositionData();
- Map<String, List<RequirementAssignmentData>> computeNodeConnectedOut =
+ Multimap<String, RequirementAssignmentData> computeNodeConnectedOut =
TestUtils.getNodeConnectedOutList(computeNodeTemplate, DEPENDENCY);
- Map<String, List<RequirementAssignmentData>> computeNodeConnectedIn =
+ Multimap<String, RequirementAssignmentData> computeNodeConnectedIn =
TestUtils
.getNodeConnectedInList(computeNodeTemplateId, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
DEPENDENCY);
}
}
}
- Map<String, List<RequirementAssignmentData>> portNodeConnectedOut =
+ Multimap<String, RequirementAssignmentData> portNodeConnectedOut =
TestUtils.getNodeConnectedOutList(portNodeTemplate, "link");
PortTemplateConsolidationData portTemplateConsolidationData = TestUtils
- .createPortTemplateConsolidationData(port.getRight());
+ .createPortTemplateConsolidationData(port.getRight(), port.getLeft());
portTemplateConsolidationData.setNodesConnectedOut(portNodeConnectedOut);
//Add node connected in info to test data
- Map<String, List<RequirementAssignmentData>> portNodeConnectedIn =
+ Multimap<String, RequirementAssignmentData> portNodeConnectedIn =
TestUtils.getNodeConnectedInList(port.getRight(), inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
PORT);
portTemplateConsolidationData.setNodesConnectedIn(portNodeConnectedIn);
addGetAttrForPort(data);
}
- private Map<String, List<RequirementAssignmentData>> getVolume(
+ private Multimap<String, RequirementAssignmentData> getVolume(
List<RequirementAssignmentData> requirementAssignmentList) {
- Map<String, List<RequirementAssignmentData>> volume = new HashMap<>();
+ Multimap<String, RequirementAssignmentData> volume = ArrayListMultimap.create();
for (RequirementAssignmentData requirementAssignmentData : requirementAssignmentList) {
String volumeNodeTemplateId = requirementAssignmentData.getRequirementAssignment().getNode();
- volume.computeIfAbsent(volumeNodeTemplateId, k -> new ArrayList<>());
- volume.get(volumeNodeTemplateId).add(requirementAssignmentData);
+ volume.put(volumeNodeTemplateId, requirementAssignmentData);
}
return volume;
}
private void addGetAttrForPort(UnifiedCompositionData unifiedCompositionData) {
for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData
.getPortTemplateConsolidationDataList()) {
- if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL_1)) {
+ if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB_1_INTERNAL_PORT_1)) {
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "network_name",
NETWORK_ID, JSA_NET1);
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, SIZE,
DEVICE_OWNER, CMAUI_VOLUME1);
- } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB2_INTERNAL_2)) {
+ } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB_2_INTERNAL_PORT_0)) {
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, TENANT_ID,
NETWORK_ID, JSA_NET1);
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "qos_policy",
private void addGetAttrForPortInnerUC(UnifiedCompositionData unifiedCompositionData) {
for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData
.getPortTemplateConsolidationDataList()) {
- if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL_1)) {
+ if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB_1_INTERNAL_PORT_1)) {
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, AVAILABILITY_ZONE,
MYATTR, FSB1_template);
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "metadata",
return yamlUtil.yamlToObject(resource.openStream(), NodeTemplate.class);
}
-}
\ No newline at end of file
+}