summaryrefslogtreecommitdiffstats
path: root/openecomp-be
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2021-03-25 12:40:50 +0000
committerChristophe Closset <christophe.closset@intl.att.com>2021-03-25 16:41:14 +0000
commita45577d6d9e5a67ea8313b760b5180c974fc63d7 (patch)
treea8a5deca77fb26083ad85f586546c304d77f1a85 /openecomp-be
parentde9224b1ae01755c7cc46e4bdd1a50c1bc08936e (diff)
Fix CRITICAL BUGs
Change-Id: I2924e68c03a6b640644fd0360ca23f29f9bb5f5b Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3529
Diffstat (limited to 'openecomp-be')
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java1126
1 files changed, 562 insertions, 564 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java
index b2fa3e7666..bcaa12e8e5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/buildconsolidationdata/ConsolidationDataTestUtil.java
@@ -31,19 +31,27 @@ import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidati
import static org.openecomp.sdc.translator.services.heattotosca.buildconsolidationdata.TestConstants.TEST_SINGLE_NESTED_RESOURCE;
import com.fasterxml.jackson.databind.ObjectMapper;
- import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
-
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
import org.apache.commons.collections4.CollectionUtils;
import org.junit.Assert;
-import org.openecomp.sdc.tosca.datatypes.ToscaCapabilityType;
-import org.openecomp.sdc.tosca.datatypes.ToscaNodeType;
import org.onap.sdc.tosca.datatypes.model.GroupDefinition;
import org.onap.sdc.tosca.datatypes.model.NodeTemplate;
import org.onap.sdc.tosca.datatypes.model.NodeType;
import org.onap.sdc.tosca.datatypes.model.RequirementAssignment;
import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
-import org.openecomp.sdc.tosca.datatypes.ToscaRelationshipType;
+import org.openecomp.sdc.tosca.datatypes.ToscaNodeType;
import org.openecomp.sdc.tosca.services.DataModelUtil;
import org.openecomp.sdc.tosca.services.ToscaConstants;
import org.openecomp.sdc.tosca.services.impl.ToscaAnalyzerServiceImpl;
@@ -59,118 +67,103 @@ import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolida
import org.openecomp.sdc.translator.services.heattotosca.ConsolidationDataUtil;
import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-
public class ConsolidationDataTestUtil {
- public static void validateVolumeInConsolidationData(String computeNodeTemplateId,
- ComputeTemplateConsolidationData
- computeTemplateConsolidationData,
- ServiceTemplate expectedServiceTemplate,
- String testName) {
- Assert.assertNotNull(computeTemplateConsolidationData);
- //Get the volume information from consolidation data
- Multimap<String, RequirementAssignmentData> volumeConsolidationData =
- computeTemplateConsolidationData.getVolumes();
-
- if(testName.equals("Negative")) {
- Assert.assertNull(volumeConsolidationData);
- return;
- }
+ public static void validateVolumeInConsolidationData(String computeNodeTemplateId,
+ ComputeTemplateConsolidationData
+ computeTemplateConsolidationData,
+ ServiceTemplate expectedServiceTemplate,
+ String testName) {
+ Assert.assertNotNull(computeTemplateConsolidationData);
+ //Get the volume information from consolidation data
+ Multimap<String, RequirementAssignmentData> volumeConsolidationData =
+ computeTemplateConsolidationData.getVolumes();
+
+ if (testName.equals("Negative")) {
+ Assert.assertNull(volumeConsolidationData);
+ return;
+ }
- //Get the volume requirement information from the output translated template
- NodeTemplate computeNode = DataModelUtil.getNodeTemplate(expectedServiceTemplate,
- computeNodeTemplateId);
+ //Get the volume requirement information from the output translated template
+ NodeTemplate computeNode = DataModelUtil.getNodeTemplate(expectedServiceTemplate,
+ computeNodeTemplateId);
- if(!isComputeNodeType(expectedServiceTemplate, computeNode.getType()) ) {
- //According to toplogy only Compute->volume relationship is valid
- Assert.assertNull(volumeConsolidationData);
- return;
- }
+ if (!isComputeNodeType(expectedServiceTemplate, computeNode.getType())) {
+ //According to toplogy only Compute->volume relationship is valid
+ Assert.assertNull(volumeConsolidationData);
+ return;
+ }
- Assert.assertNotNull(computeNode);
- List<String> computeVolumeRequirementsNodes = new ArrayList<>();
- List<Map<String, RequirementAssignment>> requirementList = computeNode.getRequirements();
- if(requirementList != null){
- for(Map<String, RequirementAssignment> req : requirementList){
- Set<String> reqKeySet = req.keySet();
- for(String reqKey : reqKeySet){
- //populating the "node" property of all the requirements "local_storage" related to volume
- if(reqKey.equals(ToscaConstants.LOCAL_STORAGE_REQUIREMENT_ID)){
- RequirementAssignment requirementAssignment = new ObjectMapper().convertValue(req.get
- (reqKey), RequirementAssignment.class);
- computeVolumeRequirementsNodes.add(requirementAssignment.getNode());
- }
+ Assert.assertNotNull(computeNode);
+ List<String> computeVolumeRequirementsNodes = new ArrayList<>();
+ List<Map<String, RequirementAssignment>> requirementList = computeNode.getRequirements();
+ if (requirementList != null) {
+ for (Map<String, RequirementAssignment> req : requirementList) {
+ Set<String> reqKeySet = req.keySet();
+ for (String reqKey : reqKeySet) {
+ //populating the "node" property of all the requirements "local_storage" related to volume
+ if (reqKey.equals(ToscaConstants.LOCAL_STORAGE_REQUIREMENT_ID)) {
+ RequirementAssignment requirementAssignment = new ObjectMapper().convertValue(req.get
+ (reqKey), RequirementAssignment.class);
+ computeVolumeRequirementsNodes.add(requirementAssignment.getNode());
+ }
+ }
+ }
+ isVolumeComputeRequirement(computeVolumeRequirementsNodes, volumeConsolidationData);
}
- }
- isVolumeComputeRequirement(computeVolumeRequirementsNodes, volumeConsolidationData);
}
- }
private static void isVolumeComputeRequirement(List<String> computeVolumeRequirementsNodes,
Multimap<String, RequirementAssignmentData>
- volumeConsolidationData) {
+ volumeConsolidationData) {
Assert.assertEquals(computeVolumeRequirementsNodes.size(), volumeConsolidationData.size());
for (String volumeNodeTemplateId : computeVolumeRequirementsNodes) {
- Assert.assertNotNull(volumeConsolidationData.containsKey(volumeNodeTemplateId));
- Collection<RequirementAssignmentData> requirementAssignmentDataList = volumeConsolidationData.get
- (volumeNodeTemplateId);
+ Assert.assertTrue(volumeConsolidationData.containsKey(volumeNodeTemplateId));
+ Collection<RequirementAssignmentData> requirementAssignmentDataList = volumeConsolidationData.get(volumeNodeTemplateId);
for (RequirementAssignmentData requirementAssignmentData : requirementAssignmentDataList) {
- Assert.assertTrue(requirementAssignmentData.getRequirementId().equals(ToscaConstants
- .LOCAL_STORAGE_REQUIREMENT_ID));
+ Assert.assertEquals(ToscaConstants.LOCAL_STORAGE_REQUIREMENT_ID, requirementAssignmentData.getRequirementId());
}
}
}
-
- public static void validatePortsInConsolidationData(String computeNodeTemplateId,
- ComputeTemplateConsolidationData
- computeTemplateConsolidationData,
- ServiceTemplate outputServiceTemplate){
- Map<String,List<String>> consolidatedMap = computeTemplateConsolidationData.getPorts();
- Map<String,List<String>> expectedMap = getPortsInConsolidationData(outputServiceTemplate).get
- (computeNodeTemplateId);
- if(expectedMap == null && consolidatedMap == null){
- return;
- }
- for(String consolidatedKey : consolidatedMap.keySet()){
- List<String> consolidatedList = consolidatedMap.get(consolidatedKey);
- if (expectedMap != null) {
- List<String> expectedList = expectedMap.get(consolidatedKey);
- if (expectedList == null) {
- Assert.fail();
+ public static void validatePortsInConsolidationData(String computeNodeTemplateId,
+ ComputeTemplateConsolidationData
+ computeTemplateConsolidationData,
+ ServiceTemplate outputServiceTemplate) {
+ Map<String, List<String>> consolidatedMap = computeTemplateConsolidationData.getPorts();
+ Map<String, List<String>> expectedMap = getPortsInConsolidationData(outputServiceTemplate).get
+ (computeNodeTemplateId);
+ if (expectedMap == null && consolidatedMap == null) {
+ return;
}
- if (!CollectionUtils.isEqualCollection(consolidatedList, expectedList)) {
- Assert.fail();
+ for (String consolidatedKey : consolidatedMap.keySet()) {
+ List<String> consolidatedList = consolidatedMap.get(consolidatedKey);
+ if (expectedMap != null) {
+ List<String> expectedList = expectedMap.get(consolidatedKey);
+ if (expectedList == null) {
+ Assert.fail();
+ }
+ if (!CollectionUtils.isEqualCollection(consolidatedList, expectedList)) {
+ Assert.fail();
+ }
+ }
}
- }
}
- }
public static void validateDependsOnInConsolidationData(String computeNodeTemplateId,
ComputeTemplateConsolidationData
- computeTemplateConsolidationData,
+ computeTemplateConsolidationData,
ServiceTemplate outputServiceTemplate,
String testName) {
Map<String, NodeTemplate> outputNodeTemplates = outputServiceTemplate.getTopology_template()
- .getNode_templates();
+ .getNode_templates();
Multimap<String, RequirementAssignmentData> nodesConnectedIn =
- computeTemplateConsolidationData.getNodesConnectedIn();
+ computeTemplateConsolidationData.getNodesConnectedIn();
Multimap<String, RequirementAssignmentData> nodesConnectedOut =
- computeTemplateConsolidationData.getNodesConnectedOut();
+ computeTemplateConsolidationData.getNodesConnectedOut();
if (testName.equals(TEST_DEPENDS_ON_INVALID_DEPENDENCY_CANDIDATE) ||
- testName.equals(TEST_DEPENDS_ON_NO_DEPENDENCY)) {
+ testName.equals(TEST_DEPENDS_ON_NO_DEPENDENCY)) {
Assert.assertNull(nodesConnectedIn);
Assert.assertNull(nodesConnectedOut);
return;
@@ -197,131 +190,136 @@ public class ConsolidationDataTestUtil {
if (testName.equals(TEST_DEPENDS_ON_NODES_CONNECTED_OUT)) {
Assert.assertNull(nodesConnectedIn);
validateDependsOnNodesConnectedOut(computeNodeTemplateId, nodesConnectedOut,
- outputDependsOnNodeRequirementMap, outputServiceTemplate);
+ outputDependsOnNodeRequirementMap, outputServiceTemplate);
}
if (testName.equals(TEST_DEPENDS_ON_NODES_CONNECTED_IN)) {
Assert.assertNull(nodesConnectedOut);
validateDependsOnNodesConnectedIn(computeNodeTemplateId, nodesConnectedIn,
- outputDependsOnNodeRequirementMap,
- outputServiceTemplate);
+ outputDependsOnNodeRequirementMap,
+ outputServiceTemplate);
}
if (testName.equals(TEST_DEPENDS_ON_NODES_CONNECTED_IN_AND_OUT)) {
Assert.assertNotNull(nodesConnectedIn);
Assert.assertNotNull(nodesConnectedOut);
validateDependsOnNodesConnectedOut(computeNodeTemplateId, nodesConnectedOut,
- outputDependsOnNodeRequirementMap,
- outputServiceTemplate);
+ outputDependsOnNodeRequirementMap,
+ outputServiceTemplate);
validateDependsOnNodesConnectedIn(computeNodeTemplateId, nodesConnectedIn,
- outputDependsOnNodeRequirementMap,
- outputServiceTemplate);
+ outputDependsOnNodeRequirementMap,
+ outputServiceTemplate);
}
if (testName.equals(TEST_DEPENDS_ON_MULTIPLE_COMPUTE)) {
if (nodesConnectedOut != null) {
validateDependsOnNodesConnectedOut(computeNodeTemplateId, nodesConnectedOut,
- outputDependsOnNodeRequirementMap,
- outputServiceTemplate);
+ outputDependsOnNodeRequirementMap,
+ outputServiceTemplate);
}
if (nodesConnectedIn != null) {
validateDependsOnNodesConnectedIn(computeNodeTemplateId, nodesConnectedIn,
- outputDependsOnNodeRequirementMap,
- outputServiceTemplate);
+ outputDependsOnNodeRequirementMap,
+ outputServiceTemplate);
}
}
}
- private static void validateDependsOnNodesConnectedIn(String computeNodeTemplateId,
- Multimap<String, RequirementAssignmentData>
- nodesConnectedIn,
- Multimap<String, RequirementAssignment>
- outputDependsOnNodeRequirementMap,
- ServiceTemplate outputServiceTemplate) {
- ToscaAnalyzerServiceImpl analyzerService = new ToscaAnalyzerServiceImpl();
- for(String sourceNodeTemplateId : outputDependsOnNodeRequirementMap.keySet()) {
- Optional<NodeTemplate> sourceNodeTemplate = analyzerService.getNodeTemplateById
- (outputServiceTemplate, sourceNodeTemplateId);
- String sourceNodeType = sourceNodeTemplate.get().getType();
- for(Object obj : outputDependsOnNodeRequirementMap.get(sourceNodeTemplateId)){
- RequirementAssignment req = new ObjectMapper().convertValue(obj, RequirementAssignment
- .class);
- String targetNodeTemplateId = req.getNode();
- Optional<NodeTemplate> targetNodeTemplate = analyzerService.getNodeTemplateById
- (outputServiceTemplate, targetNodeTemplateId);
-
- String targetNodeType = targetNodeTemplate.get().getType();
- boolean isValidTargetForConnectedIn = false;
- if(isComputeNodeType(outputServiceTemplate, targetNodeType)) {
- isValidTargetForConnectedIn = true;
- } else if(isPortNodeType(outputServiceTemplate, targetNodeType)) {
- isValidTargetForConnectedIn = true;
- }
+ private static void validateDependsOnNodesConnectedIn(String computeNodeTemplateId,
+ Multimap<String, RequirementAssignmentData>
+ nodesConnectedIn,
+ Multimap<String, RequirementAssignment>
+ outputDependsOnNodeRequirementMap,
+ ServiceTemplate outputServiceTemplate) {
+ ToscaAnalyzerServiceImpl analyzerService = new ToscaAnalyzerServiceImpl();
+ for (String sourceNodeTemplateId : outputDependsOnNodeRequirementMap.keySet()) {
+ Optional<NodeTemplate> sourceNodeTemplate = analyzerService.getNodeTemplateById
+ (outputServiceTemplate, sourceNodeTemplateId);
+ String sourceNodeType = sourceNodeTemplate.get().getType();
+ for (Object obj : outputDependsOnNodeRequirementMap.get(sourceNodeTemplateId)) {
+ RequirementAssignment req = new ObjectMapper().convertValue(obj, RequirementAssignment
+ .class);
+ String targetNodeTemplateId = req.getNode();
+ Optional<NodeTemplate> targetNodeTemplate = analyzerService.getNodeTemplateById
+ (outputServiceTemplate, targetNodeTemplateId);
- if(isValidTargetForConnectedIn) {
- //Should be present if target node is compute or port
- if(computeNodeTemplateId.equals(sourceNodeTemplateId))
- Assert.assertTrue(nodesConnectedIn.containsKey(sourceNodeTemplateId));
- }
+ String targetNodeType = targetNodeTemplate.get().getType();
+ boolean isValidTargetForConnectedIn = false;
+ if (isComputeNodeType(outputServiceTemplate, targetNodeType)) {
+ isValidTargetForConnectedIn = true;
+ } else if (isPortNodeType(outputServiceTemplate, targetNodeType)) {
+ isValidTargetForConnectedIn = true;
+ }
- if(sourceNodeType.startsWith(ToscaNodeType.NOVA_SERVER)
- && (targetNodeType.startsWith(ToscaNodeType.NOVA_SERVER)
- || targetNodeType.startsWith(ToscaNodeType.NEUTRON_PORT)
- || targetNodeType.startsWith(ToscaNodeType.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE))) {
- //Ignore Compute->Port, Compute->Compute, Compute->Volume relationship
- Assert.assertFalse(nodesConnectedIn.containsKey(targetNodeTemplateId));
- }
+ if (isValidTargetForConnectedIn) {
+ //Should be present if target node is compute or port
+ if (computeNodeTemplateId.equals(sourceNodeTemplateId)) {
+ Assert.assertTrue(nodesConnectedIn.containsKey(sourceNodeTemplateId));
+ }
+ }
+
+ if (sourceNodeType.startsWith(ToscaNodeType.NOVA_SERVER)
+ && (targetNodeType.startsWith(ToscaNodeType.NOVA_SERVER)
+ || targetNodeType.startsWith(ToscaNodeType.NEUTRON_PORT)
+ || targetNodeType.startsWith(ToscaNodeType.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE))) {
+ //Ignore Compute->Port, Compute->Compute, Compute->Volume relationship
+ Assert.assertFalse(nodesConnectedIn.containsKey(targetNodeTemplateId));
+ }
- if(sourceNodeType.startsWith(ToscaNodeType.NEUTRON_PORT)
- && (targetNodeType.startsWith(ToscaNodeType.NOVA_SERVER)
- || targetNodeType.startsWith(ToscaNodeType.NEUTRON_PORT)
- || targetNodeType.startsWith(ToscaNodeType.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE))) {
- //Ignore Port->Port, Port->Compute, Port->Volume relationship
- Assert.assertFalse(nodesConnectedIn.containsKey(targetNodeTemplateId));
+ if (sourceNodeType.startsWith(ToscaNodeType.NEUTRON_PORT)
+ && (targetNodeType.startsWith(ToscaNodeType.NOVA_SERVER)
+ || targetNodeType.startsWith(ToscaNodeType.NEUTRON_PORT)
+ || targetNodeType.startsWith(ToscaNodeType.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE))) {
+ //Ignore Port->Port, Port->Compute, Port->Volume relationship
+ Assert.assertFalse(nodesConnectedIn.containsKey(targetNodeTemplateId));
+ }
+ }
}
- }
}
- }
- private static boolean isComputeNodeType(ServiceTemplate serviceTemplate,
- String nodeType) {
+ private static boolean isComputeNodeType(ServiceTemplate serviceTemplate,
+ String nodeType) {
- if(nodeType.equals(ToscaNodeType.NOVA_SERVER) ||
- nodeType.equals(ToscaNodeType.NATIVE_COMPUTE))
- return true;
+ if (nodeType.equals(ToscaNodeType.NOVA_SERVER) ||
+ nodeType.equals(ToscaNodeType.NATIVE_COMPUTE)) {
+ return true;
+ }
- Map<String, NodeType> nodeTypes = serviceTemplate.getNode_types();
- if(nodeTypes.containsKey(nodeType)) {
- NodeType nodeTypeInfo = nodeTypes.get(nodeType);
- if(nodeTypeInfo.getDerived_from().equals(ToscaNodeType.NOVA_SERVER))
- return true;
+ Map<String, NodeType> nodeTypes = serviceTemplate.getNode_types();
+ if (nodeTypes.containsKey(nodeType)) {
+ NodeType nodeTypeInfo = nodeTypes.get(nodeType);
+ if (nodeTypeInfo.getDerived_from().equals(ToscaNodeType.NOVA_SERVER)) {
+ return true;
+ }
+ }
+ return false;
}
- return false;
- }
-
- private static boolean isPortNodeType(ServiceTemplate serviceTemplate,
- String nodeType) {
- if(nodeType.equals(ToscaNodeType.NEUTRON_PORT) ||
- nodeType.equals(ToscaNodeType.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE))
- return true;
-
- Map<String, NodeType> nodeTypes = serviceTemplate.getNode_types();
- if(nodeTypes.containsKey(nodeType)) {
- NodeType nodeTypeInfo = nodeTypes.get(nodeType);
- if(nodeTypeInfo.getDerived_from().equals(ToscaNodeType.NEUTRON_PORT) ||
- nodeTypeInfo.getDerived_from().equals(ToscaNodeType.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE))
- return true;
+
+ private static boolean isPortNodeType(ServiceTemplate serviceTemplate,
+ String nodeType) {
+ if (nodeType.equals(ToscaNodeType.NEUTRON_PORT) ||
+ nodeType.equals(ToscaNodeType.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE)) {
+ return true;
+ }
+
+ Map<String, NodeType> nodeTypes = serviceTemplate.getNode_types();
+ if (nodeTypes.containsKey(nodeType)) {
+ NodeType nodeTypeInfo = nodeTypes.get(nodeType);
+ if (nodeTypeInfo.getDerived_from().equals(ToscaNodeType.NEUTRON_PORT) ||
+ nodeTypeInfo.getDerived_from().equals(ToscaNodeType.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE)) {
+ return true;
+ }
+ }
+ return false;
}
- return false;
- }
private static void validateDependsOnNodesConnectedOut(String computeNodeTemplateId,
Multimap<String, RequirementAssignmentData>
- nodesConnectedOut,
+ nodesConnectedOut,
Multimap<String, RequirementAssignment>
- outputDependsOnNodeRequirementMap,
+ outputDependsOnNodeRequirementMap,
ServiceTemplate outputServiceTemplate) {
ToscaAnalyzerServiceImpl analyzerService = new ToscaAnalyzerServiceImpl();
//Iterating the map <nodeTemplateId, all the requirements of that node>
@@ -329,7 +327,7 @@ public class ConsolidationDataTestUtil {
.entrySet()) {*/
for (String sourceNodeTemplateId : outputDependsOnNodeRequirementMap.keySet()) {
Optional<NodeTemplate> sourceNodeTemplate = analyzerService.getNodeTemplateById
- (outputServiceTemplate, sourceNodeTemplateId);
+ (outputServiceTemplate, sourceNodeTemplateId);
String sourceNodeType = sourceNodeTemplate.get().getType();
boolean isValidSourceForConnectedOut = false;
@@ -340,10 +338,10 @@ public class ConsolidationDataTestUtil {
}
for (Object obj : outputDependsOnNodeRequirementMap.get(sourceNodeTemplateId)) {
RequirementAssignment req = new ObjectMapper().convertValue(obj, RequirementAssignment
- .class);
+ .class);
String targetNodeTemplateId = req.getNode();
Optional<NodeTemplate> targetNodeTemplate = analyzerService.getNodeTemplateById
- (outputServiceTemplate, targetNodeTemplateId);
+ (outputServiceTemplate, targetNodeTemplateId);
String targetNodeType = targetNodeTemplate.get().getType();
if (isValidSourceForConnectedOut) {
@@ -354,17 +352,17 @@ public class ConsolidationDataTestUtil {
}
if (sourceNodeType.startsWith(ToscaNodeType.NOVA_SERVER)
- && (targetNodeType.startsWith(ToscaNodeType.NOVA_SERVER)
- || targetNodeType.startsWith(ToscaNodeType.NEUTRON_PORT)
- || targetNodeType.startsWith(ToscaNodeType.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE))) {
+ && (targetNodeType.startsWith(ToscaNodeType.NOVA_SERVER)
+ || targetNodeType.startsWith(ToscaNodeType.NEUTRON_PORT)
+ || targetNodeType.startsWith(ToscaNodeType.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE))) {
//Ignore Compute->Port, Compute->Compute, Compute->Volume relationship
Assert.assertFalse(nodesConnectedOut.containsKey(targetNodeTemplateId));
}
if (sourceNodeType.startsWith(ToscaNodeType.NEUTRON_PORT)
- && (targetNodeType.startsWith(ToscaNodeType.NOVA_SERVER)
- || targetNodeType.startsWith(ToscaNodeType.NEUTRON_PORT)
- || targetNodeType.startsWith(ToscaNodeType.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE))) {
+ && (targetNodeType.startsWith(ToscaNodeType.NOVA_SERVER)
+ || targetNodeType.startsWith(ToscaNodeType.NEUTRON_PORT)
+ || targetNodeType.startsWith(ToscaNodeType.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE))) {
//Ignore Port->Port, Port->Compute, Port->Volume relationship
Assert.assertFalse(nodesConnectedOut.containsKey(targetNodeTemplateId));
}
@@ -373,112 +371,113 @@ public class ConsolidationDataTestUtil {
}
- private static Map<String,Map<String,List<String>>> getPortsInConsolidationData(ServiceTemplate
- output){
- Map<String,Map<String,List<String>>> portMap = new LinkedHashMap<>();
- Map<String, NodeTemplate> nodeTempMap = output.getTopology_template().getNode_templates();
- for(String nodeName : nodeTempMap.keySet()){
- NodeTemplate node = nodeTempMap.get(nodeName);
- if(ToscaNodeType.NEUTRON_PORT.equals(node.getType()) || ToscaNodeType
- .CONTRAILV2_VIRTUAL_MACHINE_INTERFACE.equals(node.getType())){
- List<Map<String, RequirementAssignment>> reqAssignList = node.getRequirements();
- if(reqAssignList != null) {
- for (Map<String, RequirementAssignment> reqAssignMap : reqAssignList) {
- //RequirementAssignment req = reqAssignMap.get("binding");
- RequirementAssignment req = new ObjectMapper().convertValue(reqAssignMap.get("binding"),
- RequirementAssignment.class);
-
- if (req != null) {
- String portNode = req.getNode();
- if (!portMap.containsKey(portNode)) {
- portMap.put(portNode, new LinkedHashMap<>());
- }
- Map<String, List<String>> portTypMaps = portMap.get(portNode);
- String id = ConsolidationDataUtil.getPortType(nodeName, "a");
- if (!portTypMaps.containsKey(id)) {
- portTypMaps.put(id, new ArrayList<>());
- }
- List<String> portIds = portTypMaps.get(id);
- portIds.add(nodeName);
+ private static Map<String, Map<String, List<String>>> getPortsInConsolidationData(ServiceTemplate
+ output) {
+ Map<String, Map<String, List<String>>> portMap = new LinkedHashMap<>();
+ Map<String, NodeTemplate> nodeTempMap = output.getTopology_template().getNode_templates();
+ for (String nodeName : nodeTempMap.keySet()) {
+ NodeTemplate node = nodeTempMap.get(nodeName);
+ if (ToscaNodeType.NEUTRON_PORT.equals(node.getType()) || ToscaNodeType
+ .CONTRAILV2_VIRTUAL_MACHINE_INTERFACE.equals(node.getType())) {
+ List<Map<String, RequirementAssignment>> reqAssignList = node.getRequirements();
+ if (reqAssignList != null) {
+ for (Map<String, RequirementAssignment> reqAssignMap : reqAssignList) {
+ //RequirementAssignment req = reqAssignMap.get("binding");
+ RequirementAssignment req = new ObjectMapper().convertValue(reqAssignMap.get("binding"),
+ RequirementAssignment.class);
+
+ if (req != null) {
+ String portNode = req.getNode();
+ if (!portMap.containsKey(portNode)) {
+ portMap.put(portNode, new LinkedHashMap<>());
+ }
+ Map<String, List<String>> portTypMaps = portMap.get(portNode);
+ String id = ConsolidationDataUtil.getPortType(nodeName, "a");
+ if (!portTypMaps.containsKey(id)) {
+ portTypMaps.put(id, new ArrayList<>());
+ }
+ List<String> portIds = portTypMaps.get(id);
+ portIds.add(nodeName);
+ }
+ }
+ }
}
- }
}
- }
+ return portMap;
}
- return portMap;
- }
-
- public static void validateGroupsInConsolidationData(String computeNodeTemplateId,
- ComputeTemplateConsolidationData
- computeTemplateConsolidationData,
- ServiceTemplate expectedServiceTemplate) {
- Assert.assertNotNull(computeTemplateConsolidationData);
- List<String> groupIds = computeTemplateConsolidationData.getGroupIds();
- if (groupIds != null) {
- for (String groupId : groupIds) {
- isComputeGroupMember(expectedServiceTemplate, computeNodeTemplateId, groupId);
- }
+
+ public static void validateGroupsInConsolidationData(String computeNodeTemplateId,
+ ComputeTemplateConsolidationData
+ computeTemplateConsolidationData,
+ ServiceTemplate expectedServiceTemplate) {
+ Assert.assertNotNull(computeTemplateConsolidationData);
+ List<String> groupIds = computeTemplateConsolidationData.getGroupIds();
+ if (groupIds != null) {
+ for (String groupId : groupIds) {
+ isComputeGroupMember(expectedServiceTemplate, computeNodeTemplateId, groupId);
+ }
+ }
}
- }
-
- private static void isComputeGroupMember(ServiceTemplate expectedServiceTemplate, String
- computeNodeTemplateId, String groupId) {
- //Check if the collected group id is in the member list of the groups
- GroupDefinition group = expectedServiceTemplate.getTopology_template().getGroups().get(groupId);
- List<String> groupMembers = group.getMembers();
- Assert.assertNotNull(groupMembers);
- Assert.assertTrue(groupMembers.contains(computeNodeTemplateId));
- }
-
- public static void validateNestedConsolidationDataNodeTemplateIds(ConsolidationData consolidationData,
- Map<String, ServiceTemplate>
- expectedServiceTemplateModels ){
- Map<String,List<String>> consolidatedMap = getSubstituteNodeTemplateIds(consolidationData);
- Map<String,List<String>> expectedMap = getSubstituteMapping(expectedServiceTemplateModels);
- for(String consolidatedKey : consolidatedMap.keySet()){
- List<String> consolidatedList = consolidatedMap.get(consolidatedKey);
- List<String> expectedList = expectedMap.get(consolidatedKey);
- if(expectedList == null ){
- Assert.fail();
- } if(!CollectionUtils.isEqualCollection(consolidatedList,expectedList)){
- Assert.fail();
- }
+
+ private static void isComputeGroupMember(ServiceTemplate expectedServiceTemplate, String
+ computeNodeTemplateId, String groupId) {
+ //Check if the collected group id is in the member list of the groups
+ GroupDefinition group = expectedServiceTemplate.getTopology_template().getGroups().get(groupId);
+ List<String> groupMembers = group.getMembers();
+ Assert.assertNotNull(groupMembers);
+ Assert.assertTrue(groupMembers.contains(computeNodeTemplateId));
}
- }
-
- private static Map<String,List<String>> getSubstituteNodeTemplateIds(ConsolidationData
- consolidationData) {
- Map<String,List<String>> nestedNodeTemplateIdMap = new HashMap<>();
- NestedConsolidationData nestedConsolidationData =
- consolidationData.getNestedConsolidationData();
- Set<String> serviceTemplateFileNames =
- nestedConsolidationData.getAllServiceTemplateFileNames();
- for (String fileName : serviceTemplateFileNames) {
- FileNestedConsolidationData fileNestedConsolidationData =
- nestedConsolidationData.getFileNestedConsolidationData(fileName);
- if (Objects.isNull(fileNestedConsolidationData)) {
- continue;
- }
- Set<String> nestedNodeTemplateIds =
- fileNestedConsolidationData.getAllNestedNodeTemplateIds();
- if (nestedNodeTemplateIds != null) {
- List<String> fileNestedNodeTemplateIds = new ArrayList<>(nestedNodeTemplateIds);
- nestedNodeTemplateIdMap.put(fileName, fileNestedNodeTemplateIds);
- }
+
+ public static void validateNestedConsolidationDataNodeTemplateIds(ConsolidationData consolidationData,
+ Map<String, ServiceTemplate>
+ expectedServiceTemplateModels) {
+ Map<String, List<String>> consolidatedMap = getSubstituteNodeTemplateIds(consolidationData);
+ Map<String, List<String>> expectedMap = getSubstituteMapping(expectedServiceTemplateModels);
+ for (String consolidatedKey : consolidatedMap.keySet()) {
+ List<String> consolidatedList = consolidatedMap.get(consolidatedKey);
+ List<String> expectedList = expectedMap.get(consolidatedKey);
+ if (expectedList == null) {
+ Assert.fail();
+ }
+ if (!CollectionUtils.isEqualCollection(consolidatedList, expectedList)) {
+ Assert.fail();
+ }
+ }
+ }
+
+ private static Map<String, List<String>> getSubstituteNodeTemplateIds(ConsolidationData
+ consolidationData) {
+ Map<String, List<String>> nestedNodeTemplateIdMap = new HashMap<>();
+ NestedConsolidationData nestedConsolidationData =
+ consolidationData.getNestedConsolidationData();
+ Set<String> serviceTemplateFileNames =
+ nestedConsolidationData.getAllServiceTemplateFileNames();
+ for (String fileName : serviceTemplateFileNames) {
+ FileNestedConsolidationData fileNestedConsolidationData =
+ nestedConsolidationData.getFileNestedConsolidationData(fileName);
+ if (Objects.isNull(fileNestedConsolidationData)) {
+ continue;
+ }
+ Set<String> nestedNodeTemplateIds =
+ fileNestedConsolidationData.getAllNestedNodeTemplateIds();
+ if (nestedNodeTemplateIds != null) {
+ List<String> fileNestedNodeTemplateIds = new ArrayList<>(nestedNodeTemplateIds);
+ nestedNodeTemplateIdMap.put(fileName, fileNestedNodeTemplateIds);
+ }
+ }
+ return nestedNodeTemplateIdMap;
}
- return nestedNodeTemplateIdMap;
- }
private static Map<String, List<String>> getSubstituteMapping(Map<String, ServiceTemplate>
- expectedServiceTemplateModels) {
+ expectedServiceTemplateModels) {
Map<String, List<String>> map = new LinkedHashMap<>();
for (String key : expectedServiceTemplateModels.keySet()) {
ServiceTemplate serviceTemplate = expectedServiceTemplateModels.get(key);
if (serviceTemplate.getTopology_template() != null && serviceTemplate
- .getTopology_template().getNode_templates() != null) {
+ .getTopology_template().getNode_templates() != null) {
for (String key1 : serviceTemplate.getTopology_template().getNode_templates().keySet()) {
NodeTemplate nodeTemplate = serviceTemplate.getTopology_template().getNode_templates()
- .get(key1);
+ .get(key1);
if (nodeTemplate.getType().contains(ToscaNodeType.ABSTRACT_NODE_TYPE_PREFIX + "heat.")) {
List<String> subNodeTempIdList = map.computeIfAbsent(key, k -> new ArrayList<>());
subNodeTempIdList.add(key1);
@@ -490,10 +489,10 @@ public class ConsolidationDataTestUtil {
}
public static void validateComputeConnectivityIn(ComputeTemplateConsolidationData
- computeTemplateConsolidationData,
+ computeTemplateConsolidationData,
ServiceTemplate expectedServiceTemplate) {
Multimap<String, RequirementAssignmentData> nodesConnectedIn =
- computeTemplateConsolidationData.getNodesConnectedIn();
+ computeTemplateConsolidationData.getNodesConnectedIn();
if (nodesConnectedIn == null) {
return;
}
@@ -505,7 +504,7 @@ public class ConsolidationDataTestUtil {
ComputeTemplateConsolidationData computeTemplateConsolidationData,
ServiceTemplate expectedServiceTemplate) {
Multimap<String, RequirementAssignmentData> nodesConnectedOut =
- computeTemplateConsolidationData.getNodesConnectedOut();
+ computeTemplateConsolidationData.getNodesConnectedOut();
if (nodesConnectedOut == null) {
return;
}
@@ -516,7 +515,7 @@ public class ConsolidationDataTestUtil {
public static void validatePortConnectivityIn(PortTemplateConsolidationData portTemplateConsolidationData,
ServiceTemplate expectedServiceTemplate) {
Multimap<String, RequirementAssignmentData> nodesConnectedIn =
- portTemplateConsolidationData.getNodesConnectedIn();
+ portTemplateConsolidationData.getNodesConnectedIn();
if (nodesConnectedIn == null) {
return;
}
@@ -528,7 +527,7 @@ public class ConsolidationDataTestUtil {
PortTemplateConsolidationData portTemplateConsolidationData,
ServiceTemplate expectedServiceTemplate) {
Multimap<String, RequirementAssignmentData> nodesConnectedOut =
- portTemplateConsolidationData.getNodesConnectedOut();
+ portTemplateConsolidationData.getNodesConnectedOut();
if (nodesConnectedOut == null) {
return;
}
@@ -543,23 +542,23 @@ public class ConsolidationDataTestUtil {
for (String nodeIdConnTo : nodesConnected.keySet()) {
Collection<RequirementAssignmentData> connectToList = nodesConnected.get(nodeIdConnTo);
List<Map<String, RequirementAssignment>> requirementsList = expectedServiceTemplate
- .getTopology_template().getNode_templates()
- .get(nodeTemplateId != null ? nodeTemplateId : nodeIdConnTo).getRequirements();
+ .getTopology_template().getNode_templates()
+ .get(nodeTemplateId != null ? nodeTemplateId : nodeIdConnTo).getRequirements();
for (RequirementAssignmentData requirementAssignmentData : connectToList) {
for (Map<String, RequirementAssignment> requirementAssignmentMap : requirementsList) {
RequirementAssignment requirementAssignment =
- new ObjectMapper().convertValue(requirementAssignmentMap.values().iterator().next(),
- RequirementAssignment.class);
+ new ObjectMapper().convertValue(requirementAssignmentMap.values().iterator().next(),
+ RequirementAssignment.class);
if (requirementAssignment.getNode()
- .equals(requirementAssignmentData.getRequirementAssignment().getNode())) {
+ .equals(requirementAssignmentData.getRequirementAssignment().getNode())) {
Assert.assertEquals(requirementAssignment.getCapability(),
- requirementAssignmentData.getRequirementAssignment().getCapability());
+ requirementAssignmentData.getRequirementAssignment().getCapability());
Assert.assertEquals(requirementAssignment.getNode(),
- requirementAssignmentData.getRequirementAssignment().getNode());
+ requirementAssignmentData.getRequirementAssignment().getNode());
Assert.assertEquals(requirementAssignment.getRelationship(),
- requirementAssignmentData.getRequirementAssignment()
- .getRelationship());
+ requirementAssignmentData.getRequirementAssignment()
+ .getRelationship());
found = true;
}
}
@@ -571,167 +570,167 @@ public class ConsolidationDataTestUtil {
}
}
- public static void validateGetAttr(TranslationContext translationContext, String testName){
- ConsolidationData consolidationData = translationContext.getConsolidationData();
- Assert.assertNotNull(consolidationData);
- if(TestConstants.TEST_GET_ATTR_FOR_MORE_THAN_ONE_ATTR_IN_ATTR_LIST.equals(testName)){
- PortTemplateConsolidationData portTemplateConsolidationData = consolidationData
- .getPortConsolidationData().getFilePortConsolidationData("ep-jsa_netServiceTemplate.yaml")
- .getPortTemplateConsolidationData("VMI1");
- Assert.assertNotNull(portTemplateConsolidationData);
- Assert.assertEquals(2, portTemplateConsolidationData.getNodesGetAttrIn().size());
- List<GetAttrFuncData> attrFuncDataList = portTemplateConsolidationData.getNodesGetAttrIn()
- .get("FSB1");
- Assert.assertEquals(1,attrFuncDataList.size());
- Assert.assertEquals("name",attrFuncDataList.get(0).getFieldName());
- Assert.assertEquals("name",attrFuncDataList.get(0).getAttributeName());
-
- attrFuncDataList = portTemplateConsolidationData.getNodesGetAttrIn()
- .get("FSB2");
- Assert.assertEquals(1,attrFuncDataList.size());
- Assert.assertEquals("name",attrFuncDataList.get(0).getFieldName());
- Assert.assertEquals("virtual_machine_interface_allowed_address_pairs",attrFuncDataList.get(0).getAttributeName());
-
- ComputeTemplateConsolidationData computeTemplateConsolidationDataFSB2 = consolidationData
- .getComputeConsolidationData()
- .getFileComputeConsolidationData("ep-jsa_netServiceTemplate.yaml")
- .getTypeComputeConsolidationData("org.openecomp.resource.vfc.nodes.heat.FSB2")
- .getComputeTemplateConsolidationData("FSB2");
- Assert.assertEquals(1,computeTemplateConsolidationDataFSB2.getNodesGetAttrOut().size());
- List<GetAttrFuncData> attrFuncDataOutList = computeTemplateConsolidationDataFSB2
- .getNodesGetAttrOut().get("VMI1");
- Assert.assertEquals(1,attrFuncDataOutList.size());
- Assert.assertEquals("name",attrFuncDataOutList.get(0).getFieldName());
- Assert.assertEquals("virtual_machine_interface_allowed_address_pairs",attrFuncDataOutList
- .get(0).getAttributeName());
- ComputeTemplateConsolidationData computeTemplateConsolidationDataFSB1 = consolidationData
- .getComputeConsolidationData()
- .getFileComputeConsolidationData("ep-jsa_netServiceTemplate.yaml")
- .getTypeComputeConsolidationData("org.openecomp.resource.vfc.nodes.heat.FSB1")
- .getComputeTemplateConsolidationData("FSB1");
- Assert.assertEquals(1,computeTemplateConsolidationDataFSB1.getNodesGetAttrOut().size());
- List<GetAttrFuncData> attrFuncDataOutList2 = computeTemplateConsolidationDataFSB1
- .getNodesGetAttrOut().get("VMI1");
- Assert.assertEquals(1,attrFuncDataOutList2.size());
- Assert.assertEquals("name",attrFuncDataOutList2.get(0).getFieldName());
- Assert.assertEquals("name",attrFuncDataOutList2
- .get(0).getAttributeName());
- } else if(TestConstants.TEST_IGNORE_GET_ATTR_FROM_OUTPUT.equals(testName)){
- if(!consolidationData.getPortConsolidationData().getAllServiceTemplateFileNames().isEmpty()){
- Iterator<String> itr = consolidationData.getPortConsolidationData()
- .getFilePortConsolidationData("MainServiceTemplate.yaml").getAllPortNodeTemplateIds()
- .iterator();
- while(itr.hasNext()){
- String key = itr.next();
- PortTemplateConsolidationData portTemplateConsolidationData = consolidationData
- .getPortConsolidationData()
- .getFilePortConsolidationData("MainServiceTemplate.yaml")
- .getPortTemplateConsolidationData(key);
- Assert.assertNull(portTemplateConsolidationData.getOutputParametersGetAttrIn());
+ public static void validateGetAttr(TranslationContext translationContext, String testName) {
+ ConsolidationData consolidationData = translationContext.getConsolidationData();
+ Assert.assertNotNull(consolidationData);
+ if (TestConstants.TEST_GET_ATTR_FOR_MORE_THAN_ONE_ATTR_IN_ATTR_LIST.equals(testName)) {
+ PortTemplateConsolidationData portTemplateConsolidationData = consolidationData
+ .getPortConsolidationData().getFilePortConsolidationData("ep-jsa_netServiceTemplate.yaml")
+ .getPortTemplateConsolidationData("VMI1");
+ Assert.assertNotNull(portTemplateConsolidationData);
+ Assert.assertEquals(2, portTemplateConsolidationData.getNodesGetAttrIn().size());
+ List<GetAttrFuncData> attrFuncDataList = portTemplateConsolidationData.getNodesGetAttrIn()
+ .get("FSB1");
+ Assert.assertEquals(1, attrFuncDataList.size());
+ Assert.assertEquals("name", attrFuncDataList.get(0).getFieldName());
+ Assert.assertEquals("name", attrFuncDataList.get(0).getAttributeName());
+
+ attrFuncDataList = portTemplateConsolidationData.getNodesGetAttrIn()
+ .get("FSB2");
+ Assert.assertEquals(1, attrFuncDataList.size());
+ Assert.assertEquals("name", attrFuncDataList.get(0).getFieldName());
+ Assert.assertEquals("virtual_machine_interface_allowed_address_pairs", attrFuncDataList.get(0).getAttributeName());
+
+ ComputeTemplateConsolidationData computeTemplateConsolidationDataFSB2 = consolidationData
+ .getComputeConsolidationData()
+ .getFileComputeConsolidationData("ep-jsa_netServiceTemplate.yaml")
+ .getTypeComputeConsolidationData("org.openecomp.resource.vfc.nodes.heat.FSB2")
+ .getComputeTemplateConsolidationData("FSB2");
+ Assert.assertEquals(1, computeTemplateConsolidationDataFSB2.getNodesGetAttrOut().size());
+ List<GetAttrFuncData> attrFuncDataOutList = computeTemplateConsolidationDataFSB2
+ .getNodesGetAttrOut().get("VMI1");
+ Assert.assertEquals(1, attrFuncDataOutList.size());
+ Assert.assertEquals("name", attrFuncDataOutList.get(0).getFieldName());
+ Assert.assertEquals("virtual_machine_interface_allowed_address_pairs", attrFuncDataOutList
+ .get(0).getAttributeName());
+ ComputeTemplateConsolidationData computeTemplateConsolidationDataFSB1 = consolidationData
+ .getComputeConsolidationData()
+ .getFileComputeConsolidationData("ep-jsa_netServiceTemplate.yaml")
+ .getTypeComputeConsolidationData("org.openecomp.resource.vfc.nodes.heat.FSB1")
+ .getComputeTemplateConsolidationData("FSB1");
+ Assert.assertEquals(1, computeTemplateConsolidationDataFSB1.getNodesGetAttrOut().size());
+ List<GetAttrFuncData> attrFuncDataOutList2 = computeTemplateConsolidationDataFSB1
+ .getNodesGetAttrOut().get("VMI1");
+ Assert.assertEquals(1, attrFuncDataOutList2.size());
+ Assert.assertEquals("name", attrFuncDataOutList2.get(0).getFieldName());
+ Assert.assertEquals("name", attrFuncDataOutList2
+ .get(0).getAttributeName());
+ } else if (TestConstants.TEST_IGNORE_GET_ATTR_FROM_OUTPUT.equals(testName)) {
+ if (!consolidationData.getPortConsolidationData().getAllServiceTemplateFileNames().isEmpty()) {
+ Iterator<String> itr = consolidationData.getPortConsolidationData()
+ .getFilePortConsolidationData("MainServiceTemplate.yaml").getAllPortNodeTemplateIds()
+ .iterator();
+ while (itr.hasNext()) {
+ String key = itr.next();
+ PortTemplateConsolidationData portTemplateConsolidationData = consolidationData
+ .getPortConsolidationData()
+ .getFilePortConsolidationData("MainServiceTemplate.yaml")
+ .getPortTemplateConsolidationData(key);
+ Assert.assertNull(portTemplateConsolidationData.getOutputParametersGetAttrIn());
+ }
+ }
+ } else if (TestConstants.TEST_GET_ATTR_FOR_NOT_SUPPORTED_ATTR_IN_ATTR_LIST.equals(testName)) {
+ Assert.assertNull(consolidationData.getPortConsolidationData()
+ .getFilePortConsolidationData("MainServiceTemplate.yaml")
+ .getPortTemplateConsolidationData("FSB1_Internal2").getNodesGetAttrIn());
+ } else if (TestConstants.TEST_GET_ATTR_FOR_ONLY_RESOURCE_NAME.equals(testName)) {
+ PortTemplateConsolidationData portTemplateConsolidationData = consolidationData
+ .getPortConsolidationData().getFilePortConsolidationData("MainServiceTemplate.yaml")
+ .getPortTemplateConsolidationData("VMI1");
+ Assert.assertNotNull(portTemplateConsolidationData);
+ Assert.assertEquals("name", portTemplateConsolidationData.getNodesGetAttrIn().get("FSB1").
+ get(0).getFieldName());
+ Assert.assertEquals("tenant_id", portTemplateConsolidationData.getNodesGetAttrIn().get("FSB1").
+ get(0).getAttributeName());
+ } else if (TestConstants.TEST_GET_ATTR_FOR_NONE_TO_PORT_OR_COMPUTE.equals(testName)) {
+ ComputeTemplateConsolidationData computeTemplateConsolidationData = consolidationData
+ .getComputeConsolidationData()
+ .getFileComputeConsolidationData("MainServiceTemplate.yaml")
+ .getTypeComputeConsolidationData("org.openecomp.resource.vfc.nodes.heat.compute")
+ .getComputeTemplateConsolidationData("server_compute_get_attr_test");
+ Assert.assertEquals("user_data_format", computeTemplateConsolidationData
+ .getNodesGetAttrOut().get("server_pcm_001").get(0).getFieldName());
+ Assert.assertEquals("oam_net_gw", computeTemplateConsolidationData
+ .getNodesGetAttrOut().get("server_pcm_001").get(0).getAttributeName());
+ } else if (TestConstants.TEST_OUTPUT_GET_ATTR.equals(testName)) {
+ ComputeTemplateConsolidationData computeTemplateConsolidationData1 = consolidationData
+ .getComputeConsolidationData()
+ .getFileComputeConsolidationData("firstnet_fgi_frwlServiceTemplate.yaml")
+ .getTypeComputeConsolidationData("org.openecomp.resource.vfc.nodes.heat.cgi_fw")
+ .getComputeTemplateConsolidationData("CGI_FW_SERVER_1");
+ Assert.assertEquals("cgi_fw_01_left_mac_1", computeTemplateConsolidationData1
+ .getOutputParametersGetAttrIn()
+ .get(0).getFieldName());
+ Assert.assertEquals("addresses", computeTemplateConsolidationData1.getOutputParametersGetAttrIn()
+ .get(0).getAttributeName());
+ ComputeTemplateConsolidationData computeTemplateConsolidationData2 = consolidationData
+ .getComputeConsolidationData()
+ .getFileComputeConsolidationData("firstnet_fgi_frwlServiceTemplate.yaml")
+ .getTypeComputeConsolidationData("org.openecomp.resource.vfc.nodes.heat.cgi_fw")
+ .getComputeTemplateConsolidationData("CGI_FW_SERVER_2");
+ Assert.assertEquals(1, computeTemplateConsolidationData2
+ .getNodesGetAttrIn().get("CGI_FW_SERVER_2").size());
+ Assert.assertEquals("availability_zone", computeTemplateConsolidationData2
+ .getNodesGetAttrIn().get("CGI_FW_SERVER_2").get(0).getFieldName());
+ Assert.assertEquals("addresses", computeTemplateConsolidationData2
+ .getNodesGetAttrIn().get("CGI_FW_SERVER_2").get(0).getAttributeName());
+ Assert.assertEquals(1, computeTemplateConsolidationData2
+ .getNodesGetAttrOut().get("CGI_FW_SERVER_2").size());
+ Assert.assertEquals("availability_zone", computeTemplateConsolidationData2
+ .getNodesGetAttrOut().get("CGI_FW_SERVER_2").get(0).getFieldName());
+ Assert.assertEquals("addresses", computeTemplateConsolidationData2
+ .getNodesGetAttrOut().get("CGI_FW_SERVER_2").get(0).getAttributeName());
+ Assert.assertEquals("cgi_fw_01_left_mac_2", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(0).getFieldName());
+ Assert.assertEquals("addresses", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(0).getAttributeName());
+ Assert.assertEquals("cgi_fw_01_left_mac_3", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(1).getFieldName());
+ Assert.assertEquals("addresses", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(1).getAttributeName());
+ Assert.assertEquals("cgi_fw_01_left_mac_4", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(2).getFieldName());
+ Assert.assertEquals("addresses", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(2).getAttributeName());
+ Assert.assertEquals("cgi_fw_01_left_mac_5", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(3).getFieldName());
+ Assert.assertEquals("addresses", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(3).getAttributeName());
+ Assert.assertEquals("cgi_fw_01_left_mac_5", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(4).getFieldName());
+ Assert.assertEquals("addresses", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(4).getAttributeName());
+ Assert.assertEquals("cgi_fw_01_left_mac_6", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(5).getFieldName());
+ Assert.assertEquals("addresses", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(5).getAttributeName());
+ Assert.assertEquals("cgi_fw_01_left_mac_9", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(6).getFieldName());
+ Assert.assertEquals("addresses", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(6).getAttributeName());
+ Assert.assertEquals("cgi_fw_01_left_mac_10", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(7).getFieldName());
+ Assert.assertEquals("addresses", computeTemplateConsolidationData2
+ .getOutputParametersGetAttrIn().get(7).getAttributeName());
+ PortTemplateConsolidationData portTemplateConsolidationData = consolidationData
+ .getPortConsolidationData().getFilePortConsolidationData("firstnet_fgi_frwlServiceTemplate.yaml")
+ .getPortTemplateConsolidationData("contrail_vmi_subinterface");
+ Assert.assertEquals("cgi_fw_01_left_mac_7", portTemplateConsolidationData
+ .getOutputParametersGetAttrIn().get(0).getFieldName());
+ Assert.assertEquals("virtual_machine_interface_properties", portTemplateConsolidationData
+ .getOutputParametersGetAttrIn().get(0).getAttributeName());
+ Assert.assertEquals("cgi_fw_01_left_mac_8", portTemplateConsolidationData
+ .getOutputParametersGetAttrIn().get(1).getFieldName());
+ Assert.assertEquals("virtual_machine_interface_allowed_address_pairs",
+ portTemplateConsolidationData.getOutputParametersGetAttrIn()
+ .get(1).getAttributeName());
+ Assert.assertEquals("cgi_fw_01_left_mac_10", portTemplateConsolidationData
+ .getOutputParametersGetAttrIn().get(2).getFieldName());
+ Assert.assertEquals("virtual_machine_interface_allowed_address_pairs",
+ portTemplateConsolidationData.getOutputParametersGetAttrIn()
+ .get(2).getAttributeName());
}
- }
- } else if(TestConstants.TEST_GET_ATTR_FOR_NOT_SUPPORTED_ATTR_IN_ATTR_LIST.equals(testName)){
- Assert.assertNull(consolidationData.getPortConsolidationData()
- .getFilePortConsolidationData("MainServiceTemplate.yaml")
- .getPortTemplateConsolidationData("FSB1_Internal2").getNodesGetAttrIn());
- } else if(TestConstants.TEST_GET_ATTR_FOR_ONLY_RESOURCE_NAME.equals(testName)){
- PortTemplateConsolidationData portTemplateConsolidationData = consolidationData
- .getPortConsolidationData().getFilePortConsolidationData("MainServiceTemplate.yaml")
- .getPortTemplateConsolidationData("VMI1");
- Assert.assertNotNull(portTemplateConsolidationData);
- Assert.assertEquals("name",portTemplateConsolidationData.getNodesGetAttrIn().get("FSB1").
- get(0).getFieldName());
- Assert.assertEquals("tenant_id",portTemplateConsolidationData.getNodesGetAttrIn().get("FSB1").
- get(0).getAttributeName());
- } else if(TestConstants.TEST_GET_ATTR_FOR_NONE_TO_PORT_OR_COMPUTE.equals(testName)){
- ComputeTemplateConsolidationData computeTemplateConsolidationData = consolidationData
- .getComputeConsolidationData()
- .getFileComputeConsolidationData("MainServiceTemplate.yaml")
- .getTypeComputeConsolidationData("org.openecomp.resource.vfc.nodes.heat.compute")
- .getComputeTemplateConsolidationData("server_compute_get_attr_test");
- Assert.assertEquals("user_data_format",computeTemplateConsolidationData
- .getNodesGetAttrOut().get("server_pcm_001").get(0).getFieldName());
- Assert.assertEquals("oam_net_gw",computeTemplateConsolidationData
- .getNodesGetAttrOut().get("server_pcm_001").get(0).getAttributeName());
- } else if(TestConstants.TEST_OUTPUT_GET_ATTR.equals(testName)){
- ComputeTemplateConsolidationData computeTemplateConsolidationData1 = consolidationData
- .getComputeConsolidationData()
- .getFileComputeConsolidationData("firstnet_fgi_frwlServiceTemplate.yaml")
- .getTypeComputeConsolidationData("org.openecomp.resource.vfc.nodes.heat.cgi_fw")
- .getComputeTemplateConsolidationData("CGI_FW_SERVER_1");
- Assert.assertEquals("cgi_fw_01_left_mac_1",computeTemplateConsolidationData1
- .getOutputParametersGetAttrIn()
- .get(0).getFieldName());
- Assert.assertEquals("addresses",computeTemplateConsolidationData1.getOutputParametersGetAttrIn()
- .get(0).getAttributeName());
- ComputeTemplateConsolidationData computeTemplateConsolidationData2 = consolidationData
- .getComputeConsolidationData()
- .getFileComputeConsolidationData("firstnet_fgi_frwlServiceTemplate.yaml")
- .getTypeComputeConsolidationData("org.openecomp.resource.vfc.nodes.heat.cgi_fw")
- .getComputeTemplateConsolidationData("CGI_FW_SERVER_2");
- Assert.assertEquals(1,computeTemplateConsolidationData2
- .getNodesGetAttrIn().get("CGI_FW_SERVER_2").size());
- Assert.assertEquals("availability_zone",computeTemplateConsolidationData2
- .getNodesGetAttrIn().get("CGI_FW_SERVER_2").get(0).getFieldName());
- Assert.assertEquals("addresses",computeTemplateConsolidationData2
- .getNodesGetAttrIn().get("CGI_FW_SERVER_2").get(0).getAttributeName());
- Assert.assertEquals(1,computeTemplateConsolidationData2
- .getNodesGetAttrOut().get("CGI_FW_SERVER_2").size());
- Assert.assertEquals("availability_zone",computeTemplateConsolidationData2
- .getNodesGetAttrOut().get("CGI_FW_SERVER_2").get(0).getFieldName());
- Assert.assertEquals("addresses",computeTemplateConsolidationData2
- .getNodesGetAttrOut().get("CGI_FW_SERVER_2").get(0).getAttributeName());
- Assert.assertEquals("cgi_fw_01_left_mac_2",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(0).getFieldName());
- Assert.assertEquals("addresses",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(0).getAttributeName());
- Assert.assertEquals("cgi_fw_01_left_mac_3",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(1).getFieldName());
- Assert.assertEquals("addresses",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(1).getAttributeName());
- Assert.assertEquals("cgi_fw_01_left_mac_4",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(2).getFieldName());
- Assert.assertEquals("addresses",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(2).getAttributeName());
- Assert.assertEquals("cgi_fw_01_left_mac_5",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(3).getFieldName());
- Assert.assertEquals("addresses",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(3).getAttributeName());
- Assert.assertEquals("cgi_fw_01_left_mac_5",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(4).getFieldName());
- Assert.assertEquals("addresses",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(4).getAttributeName());
- Assert.assertEquals("cgi_fw_01_left_mac_6",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(5).getFieldName());
- Assert.assertEquals("addresses",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(5).getAttributeName());
- Assert.assertEquals("cgi_fw_01_left_mac_9",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(6).getFieldName());
- Assert.assertEquals("addresses",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(6).getAttributeName());
- Assert.assertEquals("cgi_fw_01_left_mac_10",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(7).getFieldName());
- Assert.assertEquals("addresses",computeTemplateConsolidationData2
- .getOutputParametersGetAttrIn().get(7).getAttributeName());
- PortTemplateConsolidationData portTemplateConsolidationData = consolidationData
- .getPortConsolidationData().getFilePortConsolidationData("firstnet_fgi_frwlServiceTemplate.yaml")
- .getPortTemplateConsolidationData("contrail_vmi_subinterface");
- Assert.assertEquals("cgi_fw_01_left_mac_7",portTemplateConsolidationData
- .getOutputParametersGetAttrIn().get(0).getFieldName());
- Assert.assertEquals("virtual_machine_interface_properties",portTemplateConsolidationData
- .getOutputParametersGetAttrIn().get(0).getAttributeName());
- Assert.assertEquals("cgi_fw_01_left_mac_8",portTemplateConsolidationData
- .getOutputParametersGetAttrIn().get(1).getFieldName());
- Assert.assertEquals("virtual_machine_interface_allowed_address_pairs",
- portTemplateConsolidationData.getOutputParametersGetAttrIn()
- .get(1).getAttributeName());
- Assert.assertEquals("cgi_fw_01_left_mac_10",portTemplateConsolidationData
- .getOutputParametersGetAttrIn().get(2).getFieldName());
- Assert.assertEquals("virtual_machine_interface_allowed_address_pairs",
- portTemplateConsolidationData.getOutputParametersGetAttrIn()
- .get(2).getAttributeName());
}
- }
public static void validateNestedConsolidationData(TranslationContext context,
String testName) {
@@ -739,9 +738,9 @@ public class ConsolidationDataTestUtil {
if (testName.equals(TEST_SINGLE_NESTED_RESOURCE)) {
String nestedNodeTemplateId = "server_pcm_001";
NestedTemplateConsolidationData nestedTemplateConsolidationData =
- consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
- .getNestedTemplateConsolidationData(nestedNodeTemplateId);
+ consolidationData.getNestedConsolidationData()
+ .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId);
//Validate basic null attributes
validateBasicNestedConsolidationData(nestedTemplateConsolidationData);
//Validate nodeTemplateId
@@ -752,23 +751,23 @@ public class ConsolidationDataTestUtil {
//Validate get attribute in
Map<String, List<GetAttrFuncData>> nodesGetAttrIn =
- nestedTemplateConsolidationData.getNodesGetAttrIn();
+ nestedTemplateConsolidationData.getNodesGetAttrIn();
String getAttrNodeTemplateId = "server_compute_get_attr_test";
List<GetAttrFuncData> getAttrFuncData = nodesGetAttrIn.get(getAttrNodeTemplateId);
Assert.assertNotNull(getAttrFuncData);
- Assert.assertEquals(getAttrFuncData.size(), 2);
- Assert.assertEquals(getAttrFuncData.get(0).getFieldName(), "metadata");
- Assert.assertEquals(getAttrFuncData.get(0).getAttributeName(), "server_pcm_id");
- Assert.assertEquals(getAttrFuncData.get(1).getFieldName(), "user_data_format");
- Assert.assertEquals(getAttrFuncData.get(1).getAttributeName(), "oam_net_gw");
+ Assert.assertEquals(2, getAttrFuncData.size());
+ Assert.assertEquals("metadata", getAttrFuncData.get(0).getFieldName());
+ Assert.assertEquals("server_pcm_id", getAttrFuncData.get(0).getAttributeName());
+ Assert.assertEquals("user_data_format", getAttrFuncData.get(1).getFieldName());
+ Assert.assertEquals("oam_net_gw", getAttrFuncData.get(1).getAttributeName());
//Validate output parameter get attribute in
List<GetAttrFuncData> outputParametersGetAttrIn =
- nestedTemplateConsolidationData.getOutputParametersGetAttrIn();
+ nestedTemplateConsolidationData.getOutputParametersGetAttrIn();
Assert.assertNotNull(outputParametersGetAttrIn);
- Assert.assertEquals(outputParametersGetAttrIn.size(), 1);
- Assert.assertEquals(outputParametersGetAttrIn.get(0).getFieldName(), "output_attr_1");
- Assert.assertEquals(outputParametersGetAttrIn.get(0).getAttributeName(), "pcm_vol");
+ Assert.assertEquals(1, outputParametersGetAttrIn.size());
+ Assert.assertEquals("output_attr_1", outputParametersGetAttrIn.get(0).getFieldName());
+ Assert.assertEquals("pcm_vol", outputParametersGetAttrIn.get(0).getAttributeName());
} else if (testName.equals(TEST_MULTIPLE_NESTED_RESOURCE)) {
List<String> nestedNodeTemplateIds = new ArrayList<>();
@@ -778,14 +777,14 @@ public class ConsolidationDataTestUtil {
for (String nestedNodeTemplateId : nestedNodeTemplateIds) {
NestedTemplateConsolidationData nestedTemplateConsolidationData =
- consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
- .getNestedTemplateConsolidationData(nestedNodeTemplateId);
+ consolidationData.getNestedConsolidationData()
+ .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId);
//Validate basic null attributes
validateBasicNestedConsolidationData(nestedTemplateConsolidationData);
//Validate nodeTemplateId
Assert.assertEquals(nestedTemplateConsolidationData.getNodeTemplateId(),
- nestedNodeTemplateId);
+ nestedNodeTemplateId);
if (!nestedNodeTemplateId.equals("server_pcm_001")) {
Assert.assertNull(nestedTemplateConsolidationData.getNodesConnectedIn());
}
@@ -794,102 +793,101 @@ public class ConsolidationDataTestUtil {
//Validate get attribute in
NestedTemplateConsolidationData nestedTemplateConsolidationData =
- consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
- .getNestedTemplateConsolidationData("server_pcm_002");
+ consolidationData.getNestedConsolidationData()
+ .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
+ .getNestedTemplateConsolidationData("server_pcm_002");
Map<String, List<GetAttrFuncData>> nodesGetAttrIn =
- nestedTemplateConsolidationData.getNodesGetAttrIn();
+ nestedTemplateConsolidationData.getNodesGetAttrIn();
String getAttrNodeTemplateId = "server_pcm_001";
List<GetAttrFuncData> getAttrFuncData = nodesGetAttrIn.get(getAttrNodeTemplateId);
Assert.assertNotNull(getAttrFuncData);
- Assert.assertEquals(getAttrFuncData.size(), 1);
- Assert.assertEquals(getAttrFuncData.get(0).getFieldName(), "user_data_format");
- Assert.assertEquals(getAttrFuncData.get(0).getAttributeName(), "pcm_vol");
+ Assert.assertEquals(1, getAttrFuncData.size());
+ Assert.assertEquals("user_data_format", getAttrFuncData.get(0).getFieldName());
+ Assert.assertEquals("pcm_vol", getAttrFuncData.get(0).getAttributeName());
//Validate output parameter get attribute in
List<GetAttrFuncData> outputParametersGetAttrIn =
- nestedTemplateConsolidationData.getOutputParametersGetAttrIn();
+ nestedTemplateConsolidationData.getOutputParametersGetAttrIn();
Assert.assertNotNull(outputParametersGetAttrIn);
- Assert.assertEquals(outputParametersGetAttrIn.size(), 1);
- Assert.assertEquals(outputParametersGetAttrIn.get(0).getFieldName(), "output_attr_2");
- Assert.assertEquals(outputParametersGetAttrIn.get(0).getAttributeName(), "oam_net_ip");
-
+ Assert.assertEquals(1, outputParametersGetAttrIn.size());
+ Assert.assertEquals("output_attr_2", outputParametersGetAttrIn.get(0).getFieldName());
+ Assert.assertEquals("oam_net_ip", outputParametersGetAttrIn.get(0).getAttributeName());
nestedTemplateConsolidationData = consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
- .getNestedTemplateConsolidationData("server_pcm_001");
+ .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
+ .getNestedTemplateConsolidationData("server_pcm_001");
nodesGetAttrIn = nestedTemplateConsolidationData.getNodesGetAttrIn();
getAttrNodeTemplateId = "server_pcm_002";
getAttrFuncData = nodesGetAttrIn.get(getAttrNodeTemplateId);
Assert.assertNotNull(getAttrFuncData);
- Assert.assertEquals(getAttrFuncData.size(), 1);
- Assert.assertEquals(getAttrFuncData.get(0).getFieldName(), "metadata");
- Assert.assertEquals(getAttrFuncData.get(0).getAttributeName(), "server_pcm_id");
+ Assert.assertEquals(1, getAttrFuncData.size());
+ Assert.assertEquals("metadata", getAttrFuncData.get(0).getFieldName());
+ Assert.assertEquals("server_pcm_id", getAttrFuncData.get(0).getAttributeName());
//Validate output parameter get attribute in
outputParametersGetAttrIn = nestedTemplateConsolidationData.getOutputParametersGetAttrIn();
Assert.assertNotNull(outputParametersGetAttrIn);
- Assert.assertEquals(outputParametersGetAttrIn.size(), 1);
- Assert.assertEquals(outputParametersGetAttrIn.get(0).getFieldName(), "output_attr_1");
- Assert.assertEquals(outputParametersGetAttrIn.get(0).getAttributeName(), "pcm_vol");
+ Assert.assertEquals(1, outputParametersGetAttrIn.size());
+ Assert.assertEquals("output_attr_1", outputParametersGetAttrIn.get(0).getFieldName());
+ Assert.assertEquals("pcm_vol", outputParametersGetAttrIn.get(0).getAttributeName());
nestedTemplateConsolidationData = consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
- .getNestedTemplateConsolidationData("server_pcm_003");
+ .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
+ .getNestedTemplateConsolidationData("server_pcm_003");
Assert.assertNull(nestedTemplateConsolidationData.getNodesGetAttrIn());
Assert.assertNull(nestedTemplateConsolidationData.getOutputParametersGetAttrIn());
} else if (testName.equals(TEST_MULTIPLE_MULTI_LEVEL_NESTED_RESOURCE)) {
String nestedNodeTemplateId = "test_nested";
NestedTemplateConsolidationData nestedTemplateConsolidationData =
- consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
- .getNestedTemplateConsolidationData(nestedNodeTemplateId);
+ consolidationData.getNestedConsolidationData()
+ .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId);
//Validate basic null attributes
validateBasicNestedConsolidationData(nestedTemplateConsolidationData);
//Validate nodeTemplateId
Assert.assertEquals(nestedTemplateConsolidationData.getNodeTemplateId(),
- nestedNodeTemplateId);
+ nestedNodeTemplateId);
//Validate nodes connected in (will only be populated for dependsOn relationships)
Multimap<String, RequirementAssignmentData> nodesConnectedIn =
- nestedTemplateConsolidationData.getNodesConnectedIn();
+ nestedTemplateConsolidationData.getNodesConnectedIn();
List<String> dependentNodes = new LinkedList<>();
dependentNodes.add("packet_mirror_network");
//Validate output parameter get attribute in
List<GetAttrFuncData> getAttrFuncData =
- nestedTemplateConsolidationData.getNodesGetAttrIn().get("packet_mirror_network");
+ nestedTemplateConsolidationData.getNodesGetAttrIn().get("packet_mirror_network");
Assert.assertNotNull(getAttrFuncData);
- Assert.assertEquals(getAttrFuncData.size(), 1);
- Assert.assertEquals(getAttrFuncData.get(0).getFieldName(), "shared");
- Assert.assertEquals(getAttrFuncData.get(0).getAttributeName(), "output_attr_1");
+ Assert.assertEquals(1, getAttrFuncData.size());
+ Assert.assertEquals("shared", getAttrFuncData.get(0).getFieldName());
+ Assert.assertEquals("output_attr_1", getAttrFuncData.get(0).getAttributeName());
Assert.assertNull(nestedTemplateConsolidationData.getOutputParametersGetAttrIn());
nestedNodeTemplateId = "test_nested2";
nestedTemplateConsolidationData = consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData("nestedServiceTemplate.yaml")
- .getNestedTemplateConsolidationData(nestedNodeTemplateId);
+ .getFileNestedConsolidationData("nestedServiceTemplate.yaml")
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId);
//Validate basic null attributes
validateBasicNestedConsolidationData(nestedTemplateConsolidationData);
//Validate nodeTemplateId
Assert.assertEquals(nestedTemplateConsolidationData.getNodeTemplateId(),
- nestedNodeTemplateId);
+ nestedNodeTemplateId);
Assert.assertNull(nestedTemplateConsolidationData.getNodesConnectedIn());
//Validate output parameter get attribute in
getAttrFuncData = nestedTemplateConsolidationData.getNodesGetAttrIn().get("server_cmaui_1");
Assert.assertNotNull(getAttrFuncData);
- Assert.assertEquals(getAttrFuncData.size(), 1);
- Assert.assertEquals(getAttrFuncData.get(0).getFieldName(), "metadata");
- Assert.assertEquals(getAttrFuncData.get(0).getAttributeName(), "availability_zone_0");
+ Assert.assertEquals(1, getAttrFuncData.size());
+ Assert.assertEquals("metadata", getAttrFuncData.get(0).getFieldName());
+ Assert.assertEquals("availability_zone_0", getAttrFuncData.get(0).getAttributeName());
List<GetAttrFuncData> outputParametersGetAttrIn1 =
- nestedTemplateConsolidationData.getOutputParametersGetAttrIn();
+ nestedTemplateConsolidationData.getOutputParametersGetAttrIn();
Assert.assertNotNull(outputParametersGetAttrIn1);
- Assert.assertEquals(outputParametersGetAttrIn1.size(), 1);
- Assert.assertEquals(outputParametersGetAttrIn1.get(0).getFieldName(), "output_attr_1");
- Assert.assertEquals(outputParametersGetAttrIn1.get(0).getAttributeName(), "availability_zone_0");
+ Assert.assertEquals(1, outputParametersGetAttrIn1.size());
+ Assert.assertEquals("output_attr_1", outputParametersGetAttrIn1.get(0).getFieldName());
+ Assert.assertEquals("availability_zone_0", outputParametersGetAttrIn1.get(0).getAttributeName());
}
}
private static void validateBasicNestedConsolidationData(NestedTemplateConsolidationData
- nestedTemplateConsolidationData) {
+ nestedTemplateConsolidationData) {
Assert.assertNull(nestedTemplateConsolidationData.getGroupIds());
Assert.assertNull(nestedTemplateConsolidationData.getNodesConnectedOut());
}
@@ -897,110 +895,110 @@ public class ConsolidationDataTestUtil {
public static void validateNestedNodesConnectedInSecurityRuleToPort(String testName, TranslationContext context) {
ConsolidationData consolidationData = context.getConsolidationData();
if (testName.equals(TEST_SECURITY_RULE_PORT_NESTED_CONNECTION) ||
- testName.equals(TestConstants.TEST_SECURITY_RULE_PORT_NESTED_SHARED_PORT)) {
+ testName.equals(TestConstants.TEST_SECURITY_RULE_PORT_NESTED_SHARED_PORT)) {
String nestedNodeTemplateId = "test_nested";
NestedTemplateConsolidationData nestedTemplateConsolidationData =
- consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
- .getNestedTemplateConsolidationData(nestedNodeTemplateId);
+ consolidationData.getNestedConsolidationData()
+ .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId);
//Validate basic null attributes
validateBasicNestedConsolidationData(nestedTemplateConsolidationData);
//Validate nodeTemplateId
Assert
- .assertEquals(nestedTemplateConsolidationData.getNodeTemplateId(), nestedNodeTemplateId);
+ .assertEquals(nestedTemplateConsolidationData.getNodeTemplateId(), nestedNodeTemplateId);
String securityRuleNodeTemplateId = "jsa_security_group1";
validateNestedNodesConnectedInSecurityRuleToPort(HeatToToscaUtil
- .getServiceTemplateFromContext(MAIN_SERVICE_TEMPLATE, context).get(),
- nestedNodeTemplateId, securityRuleNodeTemplateId,
- nestedTemplateConsolidationData);
+ .getServiceTemplateFromContext(MAIN_SERVICE_TEMPLATE, context).get(),
+ nestedNodeTemplateId, securityRuleNodeTemplateId,
+ nestedTemplateConsolidationData);
securityRuleNodeTemplateId = "jsa_security_group2";
validateNestedNodesConnectedInSecurityRuleToPort(HeatToToscaUtil
- .getServiceTemplateFromContext(MAIN_SERVICE_TEMPLATE, context).get(),
- nestedNodeTemplateId, securityRuleNodeTemplateId,
- nestedTemplateConsolidationData);
+ .getServiceTemplateFromContext(MAIN_SERVICE_TEMPLATE, context).get(),
+ nestedNodeTemplateId, securityRuleNodeTemplateId,
+ nestedTemplateConsolidationData);
if (testName.equals(TestConstants.TEST_SECURITY_RULE_PORT_NESTED_SHARED_PORT)) {
nestedNodeTemplateId = "test_nestedArrayParam";
Assert.assertEquals(nestedNodeTemplateId, consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
- .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodeTemplateId());
+ .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodeTemplateId());
Assert.assertNull(consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
- .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodesConnectedIn());
+ .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodesConnectedIn());
}
} else if (testName.equals(TEST_SECURITY_RULE_PORT_MULTI_LEVEL_NESTED_CONNECTION) ||
- testName.equals(TEST_SECURITY_RULE_PORT_MULTI_LEVEL_NESTED_SHARED_PORT)) {
+ testName.equals(TEST_SECURITY_RULE_PORT_MULTI_LEVEL_NESTED_SHARED_PORT)) {
String nestedNodeTemplateId = "test_nested2Level";
Assert.assertEquals(nestedNodeTemplateId, consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData("nested1ServiceTemplate.yaml")
- .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodeTemplateId());
+ .getFileNestedConsolidationData("nested1ServiceTemplate.yaml")
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodeTemplateId());
Assert.assertNull(consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData("nested1ServiceTemplate.yaml")
- .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodesConnectedIn());
+ .getFileNestedConsolidationData("nested1ServiceTemplate.yaml")
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodesConnectedIn());
nestedNodeTemplateId = "test_nested3Level";
Assert.assertEquals(nestedNodeTemplateId, consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData("nested2ServiceTemplate.yaml")
- .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodeTemplateId());
+ .getFileNestedConsolidationData("nested2ServiceTemplate.yaml")
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodeTemplateId());
Assert.assertNull(consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData("nested2ServiceTemplate.yaml")
- .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodesConnectedIn());
+ .getFileNestedConsolidationData("nested2ServiceTemplate.yaml")
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodesConnectedIn());
nestedNodeTemplateId = "test_nested4Level";
Assert.assertEquals(nestedNodeTemplateId, consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData("nested3ServiceTemplate.yaml")
- .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodeTemplateId());
+ .getFileNestedConsolidationData("nested3ServiceTemplate.yaml")
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodeTemplateId());
Assert.assertNull(consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData("nested3ServiceTemplate.yaml")
- .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodesConnectedIn());
+ .getFileNestedConsolidationData("nested3ServiceTemplate.yaml")
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodesConnectedIn());
//Validate main service template
nestedNodeTemplateId = "test_nested1Level";
NestedTemplateConsolidationData nestedTemplateConsolidationData =
- consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
- .getNestedTemplateConsolidationData(nestedNodeTemplateId);
+ consolidationData.getNestedConsolidationData()
+ .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId);
//Validate basic null attributes
validateBasicNestedConsolidationData(nestedTemplateConsolidationData);
//Validate nodeTemplateId
Assert
- .assertEquals(nestedTemplateConsolidationData.getNodeTemplateId(), nestedNodeTemplateId);
+ .assertEquals(nestedTemplateConsolidationData.getNodeTemplateId(), nestedNodeTemplateId);
String securityRuleNodeTemplateId = "jsa_security_group1";
validateNestedNodesConnectedInSecurityRuleToPort(HeatToToscaUtil
- .getServiceTemplateFromContext(MAIN_SERVICE_TEMPLATE, context).get(),
- nestedNodeTemplateId, securityRuleNodeTemplateId,
- nestedTemplateConsolidationData);
+ .getServiceTemplateFromContext(MAIN_SERVICE_TEMPLATE, context).get(),
+ nestedNodeTemplateId, securityRuleNodeTemplateId,
+ nestedTemplateConsolidationData);
securityRuleNodeTemplateId = "jsa_security_group2";
validateNestedNodesConnectedInSecurityRuleToPort(HeatToToscaUtil
- .getServiceTemplateFromContext(MAIN_SERVICE_TEMPLATE, context).get(),
- nestedNodeTemplateId, securityRuleNodeTemplateId,
- nestedTemplateConsolidationData);
+ .getServiceTemplateFromContext(MAIN_SERVICE_TEMPLATE, context).get(),
+ nestedNodeTemplateId, securityRuleNodeTemplateId,
+ nestedTemplateConsolidationData);
nestedNodeTemplateId = "test_resourceGroup";
nestedTemplateConsolidationData = consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
- .getNestedTemplateConsolidationData(nestedNodeTemplateId);
+ .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId);
//Validate basic null attributes
validateBasicNestedConsolidationData(nestedTemplateConsolidationData);
//Validate nodeTemplateId
Assert
- .assertEquals(nestedTemplateConsolidationData.getNodeTemplateId(), nestedNodeTemplateId);
+ .assertEquals(nestedTemplateConsolidationData.getNodeTemplateId(), nestedNodeTemplateId);
securityRuleNodeTemplateId = "jsa_security_group2";
validateNestedNodesConnectedInSecurityRuleToPort(HeatToToscaUtil
- .getServiceTemplateFromContext(MAIN_SERVICE_TEMPLATE, context).get(),
- nestedNodeTemplateId, securityRuleNodeTemplateId,
- nestedTemplateConsolidationData);
+ .getServiceTemplateFromContext(MAIN_SERVICE_TEMPLATE, context).get(),
+ nestedNodeTemplateId, securityRuleNodeTemplateId,
+ nestedTemplateConsolidationData);
securityRuleNodeTemplateId = "jsa_security_group2";
validateNestedNodesConnectedInSecurityRuleToPort(HeatToToscaUtil
- .getServiceTemplateFromContext(MAIN_SERVICE_TEMPLATE, context).get(),
- nestedNodeTemplateId, securityRuleNodeTemplateId,
- nestedTemplateConsolidationData);
+ .getServiceTemplateFromContext(MAIN_SERVICE_TEMPLATE, context).get(),
+ nestedNodeTemplateId, securityRuleNodeTemplateId,
+ nestedTemplateConsolidationData);
nestedNodeTemplateId = "test_nestedInvalidConnectionToNova";
Assert.assertEquals(nestedNodeTemplateId, consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
- .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodeTemplateId());
+ .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodeTemplateId());
Assert.assertNull(consolidationData.getNestedConsolidationData()
- .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
- .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodesConnectedIn());
+ .getFileNestedConsolidationData(MAIN_SERVICE_TEMPLATE)
+ .getNestedTemplateConsolidationData(nestedNodeTemplateId).getNodesConnectedIn());
}
}
@@ -1008,21 +1006,21 @@ public class ConsolidationDataTestUtil {
String nestedNodeTemplateId,
String securityRuleNodeTemplateId,
NestedTemplateConsolidationData
- nestedTemplateConsolidationData) {
+ nestedTemplateConsolidationData) {
Multimap<String, RequirementAssignmentData> consolidationDataNodesConnectedIn =
- nestedTemplateConsolidationData.getNodesConnectedIn();
+ nestedTemplateConsolidationData.getNodesConnectedIn();
Assert.assertNotNull(consolidationDataNodesConnectedIn);
NodeTemplate securityRuleNodeTemplate = DataModelUtil.getNodeTemplate(serviceTemplate,
- securityRuleNodeTemplateId);
+ securityRuleNodeTemplateId);
List<Map<String, RequirementAssignment>> securityRuleNodeTemplateRequirements =
- securityRuleNodeTemplate.getRequirements();
+ securityRuleNodeTemplate.getRequirements();
for (Map<String, RequirementAssignment> req : securityRuleNodeTemplateRequirements) {
String requirementId = req.keySet().toArray()[0].toString();
if (requirementId.equals(ToscaConstants.PORT_REQUIREMENT_ID)) {
RequirementAssignment requirementAssignment = req.get(requirementId);
if (requirementAssignment.getNode().equals(nestedNodeTemplateId)) {
validateSecurityRulePortNestedConsolidationData(requirementAssignment,
- securityRuleNodeTemplateId, consolidationDataNodesConnectedIn);
+ securityRuleNodeTemplateId, consolidationDataNodesConnectedIn);
}
}
}
@@ -1031,15 +1029,15 @@ public class ConsolidationDataTestUtil {
private static void validateSecurityRulePortNestedConsolidationData(RequirementAssignment requirementAssignment,
String securityRuleNodeTemplateId,
Multimap<String, RequirementAssignmentData>
- consolidationDataNodesConnectedIn) {
+ consolidationDataNodesConnectedIn) {
Collection<RequirementAssignmentData> requirementAssignmentDataList =
- consolidationDataNodesConnectedIn.get(securityRuleNodeTemplateId);
+ consolidationDataNodesConnectedIn.get(securityRuleNodeTemplateId);
Assert.assertNotNull(requirementAssignmentDataList);
boolean result = false;
for (RequirementAssignmentData data : requirementAssignmentDataList) {
RequirementAssignment dataRequirementAssignment = data.getRequirementAssignment();
result = DataModelUtil
- .compareRequirementAssignment(requirementAssignment, dataRequirementAssignment);
+ .compareRequirementAssignment(requirementAssignment, dataRequirementAssignment);
if (result) {
break;
}