aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java')
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java320
1 files changed, 205 insertions, 115 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java
index 5b57a9ac37..642d7078ca 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java
@@ -7,23 +7,23 @@ import static org.mockito.Matchers.anyString;
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.core.utilities.yaml.YamlUtil;
+import org.openecomp.sdc.tosca.services.YamlUtil;
import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate;
import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
import org.openecomp.sdc.tosca.services.DataModelUtil;
-import org.openecomp.sdc.tosca.services.yamlutil.ToscaExtensionYamlUtil;
+import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil;
import org.openecomp.sdc.translator.TestUtils;
import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext;
import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionData;
import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedCompositionEntity;
import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition.UnifiedSubstitutionData;
import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.*;
-import org.openecomp.sdc.translator.services.heattotosca.impl.unifiedcomposition.UnifiedCompositionNestedSingleCompute;
import org.openecomp.sdc.translator.services.heattotosca.impl.unifiedcomposition.UnifiedCompositionSingleSubstitution;
import java.io.IOException;
@@ -71,7 +71,7 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList,
- context, null);
+ context, "org.openecomp.resource.vfc.nodes.heat.FSB1", null);
assertEquals(false, substitutionServiceTemplate.isPresent());
}
@@ -97,7 +97,7 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList,
- context, null);
+ context, "org.openecomp.resource.abstract.nodes.FSB1", null);
assertEquals(true, substitutionServiceTemplate.isPresent());
substitutionServiceTemplate
.ifPresent(
@@ -129,7 +129,7 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList,
- context, null);
+ context, "org.openecomp.resource.abstract.nodes.FSB1", null);
assertEquals(true, substitutionServiceTemplate.isPresent());
substitutionServiceTemplate
.ifPresent(
@@ -169,7 +169,7 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList,
- context, null);
+ context, "org.openecomp.resource.abstract.nodes.FSB1", null);
assertEquals(true, substitutionServiceTemplate.isPresent());
substitutionServiceTemplate
.ifPresent(
@@ -196,7 +196,7 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList,
- context, null);
+ context, "org.openecomp.resource.abstract.nodes.FSB1", null);
assertEquals(true, substitutionServiceTemplate.isPresent());
substitutionServiceTemplate
.ifPresent(
@@ -226,7 +226,7 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList,
- context, 2);
+ context,"org.openecomp.resource.abstract.nodes.FSB1", 2);
assertEquals(true, substitutionServiceTemplate.isPresent());
substitutionServiceTemplate
.ifPresent(
@@ -256,12 +256,15 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList,
- context, null);
+ context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
assertEquals(true, substitutionServiceTemplate.isPresent());
if (substitutionServiceTemplate.isPresent()) {
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+ unifiedCompositionDataList.get(0), null, context);
String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
- unifiedCompositionDataList,
+ unifiedCompositionDataList, substitutionNodeTypeId,
context, null);
validateAbstractSubstitute();
}
@@ -288,13 +291,16 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList
- , context, null);
+ , context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
assertEquals(true, substitutionServiceTemplate.isPresent());
if (substitutionServiceTemplate.isPresent()) {
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+ unifiedCompositionDataList.get(0), null, context);
String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
- unifiedCompositionDataList,
+ unifiedCompositionDataList, substitutionNodeTypeId,
context, null);
validateAbstractSubstitute();
}
@@ -314,12 +320,16 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList
- , context, null);
+ , context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
assertEquals(true, substitutionServiceTemplate.isPresent());
if (substitutionServiceTemplate.isPresent()) {
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
- (inputServiceTemplates.get(mainSTName),
- substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
validateAbstractSubstitute();
}
}
@@ -338,12 +348,16 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList
- , context, null);
+ , context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
assertEquals(true, substitutionServiceTemplate.isPresent());
if (substitutionServiceTemplate.isPresent()) {
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
- (inputServiceTemplates.get(mainSTName),
- substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
unifiedCompositionService
.updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -381,12 +395,16 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList
- , context, null);
+ , context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
assertEquals(true, substitutionServiceTemplate.isPresent());
if (substitutionServiceTemplate.isPresent()) {
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
- (inputServiceTemplates.get(mainSTName),
- substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
unifiedCompositionService
.updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -418,11 +436,15 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList
- , context, null);
+ , context, "org.openecomp.resource.abstract.nodes.QRouter", null);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
- (inputServiceTemplates.get(mainSTName),
- substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
unifiedCompositionService
.updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -446,11 +468,15 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList
- , context, null);
+ , context, "org.openecomp.resource.abstract.nodes.FSB", null);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
- (inputServiceTemplates.get(mainSTName),
- substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
unifiedCompositionService
.updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -481,11 +507,15 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList
- , context, null);
+ , context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
- (inputServiceTemplates.get(mainSTName),
- substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
unifiedCompositionService
.updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -507,11 +537,15 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList
- , context, null);
+ , context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
- (inputServiceTemplates.get(mainSTName),
- substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
unifiedCompositionService
.updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -546,11 +580,15 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList
- , context, null);
+ , context, "org.openecomp.resource.abstract.nodes.smp", null);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
- (inputServiceTemplates.get(mainSTName),
- substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
unifiedCompositionService
.updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -574,11 +612,15 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList
- , context, null);
+ , context, "org.openecomp.resource.vfc.nodes.heat.FSB", null);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate
- (inputServiceTemplates.get(mainSTName),
- substitutionServiceTemplate.get(), unifiedCompositionDataList, context, null);
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(mainSTName),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(mainSTName), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
unifiedCompositionService
.updateCompositionConnectivity(inputServiceTemplates.get(mainSTName),
@@ -760,7 +802,7 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList,
- context, null);
+ context, "org.openecomp.resource.abstract.nodes.FSB1", null);
assertEquals(true, substitutionServiceTemplate.isPresent());
substitutionServiceTemplate
.ifPresent(
@@ -801,7 +843,7 @@ public class UnifiedCompositionServiceTest {
Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
.createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(mainSTName),
unifiedCompositionDataList,
- context, null);
+ context, "org.openecomp.resource.abstract.nodes.FSB1", null);
assertEquals(true, substitutionServiceTemplate.isPresent());
substitutionServiceTemplate
.ifPresent(
@@ -964,7 +1006,7 @@ public class UnifiedCompositionServiceTest {
checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(mainSTName));
}
- @Test
+ @Ignore
public void testThreeNovaOfSameTypePreConditionFalse() throws IOException {
inputServiceTemplatesPath =
"/mock/services/heattotosca/unifiedComposition/pattern1b/noConsolidation/in";
@@ -1034,9 +1076,9 @@ public class UnifiedCompositionServiceTest {
context.getTranslatedServiceTemplates()
.put(mainSTName, inputServiceTemplates.get(mainSTName));
- List<UnifiedCompositionData> unifiedCompositionList = createUnifiedCompositionListOnlyNested("server_pcm_001");
+ UnifiedCompositionData unifiedComposition = createUnifiedCompositionOnlyNested("server_pcm_001");
unifiedCompositionService.handleUnifiedNestedDefinition(inputServiceTemplates.get(mainSTName),
- inputServiceTemplates.get(nestedFileName), unifiedCompositionList, context);
+ inputServiceTemplates.get(nestedFileName), unifiedComposition, context);
checkSTResults(expectedOutserviceTemplates, nestedFileName,
context.getTranslatedServiceTemplates().get(nestedFileName),
@@ -1080,13 +1122,13 @@ public class UnifiedCompositionServiceTest {
context.getTranslatedServiceTemplates()
.put(mainSTName, inputServiceTemplates.get(mainSTName));
- List<UnifiedCompositionData> unifiedCompositionList =
- createUnifiedCompositionListOnlyNested("server_pcm_001");
+ UnifiedCompositionData unifiedComposition =
+ createUnifiedCompositionOnlyNested("server_pcm_001");
unifiedCompositionService.handleUnifiedNestedDefinition(inputServiceTemplates.get(mainSTName),
- inputServiceTemplates.get(nestedFileName1), unifiedCompositionList, context);
- unifiedCompositionList = createUnifiedCompositionListOnlyNested("server_oam_001");
+ inputServiceTemplates.get(nestedFileName1), unifiedComposition, context);
+ unifiedComposition = createUnifiedCompositionOnlyNested("server_oam_001");
unifiedCompositionService.handleUnifiedNestedDefinition(inputServiceTemplates.get(mainSTName),
- inputServiceTemplates.get(nestedFileName2), unifiedCompositionList, context);
+ inputServiceTemplates.get(nestedFileName2), unifiedComposition, context);
checkSTResults(expectedOutserviceTemplates, nestedFileName1,
context.getTranslatedServiceTemplates().get(nestedFileName1),
@@ -1121,13 +1163,13 @@ public class UnifiedCompositionServiceTest {
Map<String, List<RequirementAssignmentData>> nodeConnectedInList =
TestUtils.getNodeConnectedInList("server_pcm_001", inputServiceTemplates.get(mainSTName),
"dependency");
- List<UnifiedCompositionData> unifiedCompositionList =
- createUnifiedCompositionListOnlyNested("server_pcm_001");
- unifiedCompositionList.get(0).getNestedTemplateConsolidationData()
+ UnifiedCompositionData unifiedComposition =
+ createUnifiedCompositionOnlyNested("server_pcm_001");
+ unifiedComposition.getNestedTemplateConsolidationData()
.setNodesConnectedIn(nodeConnectedInList);
unifiedCompositionService.updNestedCompositionNodesConnectedInConnectivity
- (inputServiceTemplates.get(mainSTName), unifiedCompositionList, context);
+ (inputServiceTemplates.get(mainSTName), unifiedComposition, context);
checkSTResults(expectedOutserviceTemplates, nestedFileName,
context.getTranslatedServiceTemplates().get(nestedFileName),
context.getTranslatedServiceTemplates()
@@ -1160,18 +1202,18 @@ public class UnifiedCompositionServiceTest {
Map<String, List<RequirementAssignmentData>> nodeConnectedInList =
TestUtils.getNodeConnectedInList("server_pcm_001", inputServiceTemplates.get(mainSTName),
"dependency");
- List<UnifiedCompositionData> unifiedCompositionList =
- createUnifiedCompositionListOnlyNested("server_pcm_001");
- addGetAttInUnifiedCompositionData(unifiedCompositionList.get(0)
+ UnifiedCompositionData unifiedComposition =
+ createUnifiedCompositionOnlyNested("server_pcm_001");
+ addGetAttInUnifiedCompositionData(unifiedComposition
.getNestedTemplateConsolidationData(), "tenant_id", "oam_net_gw", "packet_mirror_network");
- addGetAttInUnifiedCompositionData(unifiedCompositionList.get(0)
+ addGetAttInUnifiedCompositionData(unifiedComposition
.getNestedTemplateConsolidationData(), "user_data_format", "oam_net_gw",
"server_compute_get_attr_test");
- addGetAttInUnifiedCompositionData(unifiedCompositionList.get(0)
+ addGetAttInUnifiedCompositionData(unifiedComposition
.getNestedTemplateConsolidationData(), "metadata", "server_pcm_id",
"server_compute_get_attr_test");
unifiedCompositionService.updNestedCompositionNodesGetAttrInConnectivity
- (inputServiceTemplates.get(mainSTName), unifiedCompositionList, context);
+ (inputServiceTemplates.get(mainSTName), unifiedComposition, context);
checkSTResults(expectedOutserviceTemplates, nestedFileName,
context.getTranslatedServiceTemplates().get(nestedFileName),
context.getTranslatedServiceTemplates()
@@ -1203,14 +1245,14 @@ public class UnifiedCompositionServiceTest {
Map<String, List<RequirementAssignmentData>> nodeConnectedInList =
TestUtils.getNodeConnectedInList("server_pcm_001", inputServiceTemplates.get(mainSTName),
"dependency");
- List<UnifiedCompositionData> unifiedCompositionList =
- createUnifiedCompositionListOnlyNested("server_pcm_001");
- addOutputGetAttInUnifiedCompositionData(unifiedCompositionList.get(0)
+ UnifiedCompositionData unifiedComposition =
+ createUnifiedCompositionOnlyNested("server_pcm_001");
+ addOutputGetAttInUnifiedCompositionData(unifiedComposition
.getNestedTemplateConsolidationData(), "output_attr_1", "accessIPv4");
- addOutputGetAttInUnifiedCompositionData(unifiedCompositionList.get(0)
+ addOutputGetAttInUnifiedCompositionData(unifiedComposition
.getNestedTemplateConsolidationData(), "output_attr_2", "accessIPv6");
unifiedCompositionService.updNestedCompositionOutputParamGetAttrInConnectivity
- (inputServiceTemplates.get(mainSTName), unifiedCompositionList, context);
+ (inputServiceTemplates.get(mainSTName), unifiedComposition, context);
checkSTResults(expectedOutserviceTemplates, nestedFileName,
context.getTranslatedServiceTemplates().get(nestedFileName),
context.getTranslatedServiceTemplates()
@@ -1218,25 +1260,69 @@ public class UnifiedCompositionServiceTest {
.getTranslatedServiceTemplates().get(mainSTName));
}
- private List<UnifiedCompositionData> createUnifiedCompositionListOnlyNested(
- String nestedNodeTemplateId) {
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ @Test
+ public void testInputOutputParameterType() throws IOException{
+ inputServiceTemplatesPath =
+ "/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/in";
+ outputServiceTemplatesPath =
+ "/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out";
+ loadInputAndOutputData();
+ ConsolidationData consolidationData = new ConsolidationData();
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>("FSB1_Port", "FSB1_Port1"));
+ portTypeToIdList.add(new ImmutablePair<>("VMI", "VMI1"));
+
+ UnifiedCompositionData unifiedCompositionData = createCompositionData("FSB1", portTypeToIdList);
+
+ Map<String, NodeTemplate> nodeTemplates =
+ inputServiceTemplates.get(mainSTName).getTopology_template().getNode_templates();
+ for (Map.Entry<String, NodeTemplate> nodeTemplateEntry : nodeTemplates.entrySet() ) {
+ String nodeTemplateId = nodeTemplateEntry.getKey();
+ if (nodeTemplateId.equals("cmaui_volume_test_compute_properties")) {
+ Map<String, List<GetAttrFuncData>> nodesGetAttrIn =
+ TestUtils.getNodesGetAttrIn(nodeTemplateEntry.getValue(), nodeTemplateId);
+ unifiedCompositionData.getComputeTemplateConsolidationData()
+ .setNodesGetAttrIn(nodesGetAttrIn);
+ }
+
+ if (nodeTemplateId.equals("cmaui_volume_test_neutron_port_properties")) {
+ Map<String, List<GetAttrFuncData>> nodesGetAttrIn =
+ TestUtils.getNodesGetAttrIn(nodeTemplateEntry.getValue(), nodeTemplateId);
+ unifiedCompositionData.getPortTemplateConsolidationDataList().get(0)
+ .setNodesGetAttrIn(nodesGetAttrIn);
+ }
+
+ if (nodeTemplateId.equals("cmaui_volume_test_contrailv2_VMI_properties")) {
+ Map<String, List<GetAttrFuncData>> nodesGetAttrIn =
+ TestUtils.getNodesGetAttrIn(nodeTemplateEntry.getValue(), nodeTemplateId);
+ unifiedCompositionData.getPortTemplateConsolidationDataList().get(1)
+ .setNodesGetAttrIn(nodesGetAttrIn);
+ }
+ }
+
+ List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
+ unifiedCompositionDataList.add(unifiedCompositionData);
+
+ UnifiedCompositionSingleSubstitution unifiedCompositionSingleSubstitution =
+ new UnifiedCompositionSingleSubstitution();
+ unifiedCompositionSingleSubstitution
+ .createUnifiedComposition(inputServiceTemplates.get(mainSTName), null,
+ unifiedCompositionDataList, context);
+ checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(mainSTName));
+ System.out.println();
+
+ }
+
+
+ private UnifiedCompositionData createUnifiedCompositionOnlyNested(
+ String nestedNodeTemplateId) {
NestedTemplateConsolidationData nestedTemplateConsolidationData =
new NestedTemplateConsolidationData();
nestedTemplateConsolidationData.setNodeTemplateId(nestedNodeTemplateId);
UnifiedCompositionData unifiedCompositionData = new UnifiedCompositionData();
unifiedCompositionData.setNestedTemplateConsolidationData(nestedTemplateConsolidationData);
- unifiedCompositionDataList.add(unifiedCompositionData);
-
-
-// for (NestedTemplateConsolidationData nested : nestedConsolidationDatas) {
-// UnifiedCompositionData unifiedCompositionData = new UnifiedCompositionData();
-// unifiedCompositionData.setNestedTemplateConsolidationData(nested);
-// unifiedCompositionDataList.add(unifiedCompositionData);
-// }
-
- return unifiedCompositionDataList;
+ return unifiedCompositionData;
}
private void setUnifiedCompositionData(List<String> nodeTemplateIds) {
@@ -1359,21 +1445,25 @@ public class UnifiedCompositionServiceTest {
TestUtils.getRequirementAssignmentDataList(computeNodeTemplate, "local_storage");
List<RequirementAssignmentData> requirementAssignmentList =
(requirementAssignmentDataList.isPresent()) ? requirementAssignmentDataList.get() : null;
- Map<String, List<RequirementAssignmentData>> volume = getVolume(requirementAssignmentList);
-
+ Map<String, List<RequirementAssignmentData>> volume = null;
+ if (requirementAssignmentList != null) {
+ volume = getVolume(requirementAssignmentList);
+ }
unifiedCompositionData.setComputeTemplateConsolidationData(
TestUtils.createComputeTemplateConsolidationData(computeNodeTemplateId, portTypeToIdList,
volume));
- for (Pair<String, String> port : portTypeToIdList) {
- NodeTemplate portNodeTemplate =
- DataModelUtil.getNodeTemplate(inputServiceTemplates.get(mainSTName), port.getRight());
-
- Map<String, List<RequirementAssignmentData>> nodeConnectedOut =
- TestUtils.getNodeConnectedOutList(portNodeTemplate, "link");
- PortTemplateConsolidationData portTemplateConsolidationData =
- TestUtils.createPortTemplateConsolidationData(port.getRight());
- portTemplateConsolidationData.setNodesConnectedOut(nodeConnectedOut);
- unifiedCompositionData.addPortTemplateConsolidationData(portTemplateConsolidationData);
+ if (portTypeToIdList != null) {
+ for (Pair<String, String> port : portTypeToIdList) {
+ NodeTemplate portNodeTemplate =
+ DataModelUtil.getNodeTemplate(inputServiceTemplates.get(mainSTName), port.getRight());
+
+ Map<String, List<RequirementAssignmentData>> nodeConnectedOut =
+ TestUtils.getNodeConnectedOutList(portNodeTemplate, "link");
+ PortTemplateConsolidationData portTemplateConsolidationData =
+ TestUtils.createPortTemplateConsolidationData(port.getRight());
+ portTemplateConsolidationData.setNodesConnectedOut(nodeConnectedOut);
+ unifiedCompositionData.addPortTemplateConsolidationData(portTemplateConsolidationData);
+ }
}
return unifiedCompositionData;
}
@@ -1494,17 +1584,17 @@ public class UnifiedCompositionServiceTest {
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "network_name",
"network_id", "jsa_net1");
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "size",
- "addresses", "cmaui_volume1");
+ "device_owner", "cmaui_volume1");
} else if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB2_Internal2")) {
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "tenant_id",
"network_id", "jsa_net1");
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "qos_policy",
"network_id", "jsa_net1");
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "volume_type",
- "index", "cmaui_volume1");
+ "tenant_id", "cmaui_volume1");
} else if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB1_OAM")) {
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "size",
- "oam_index", "cmaui_volume1");
+ "status", "cmaui_volume1");
}
}
}
@@ -1514,12 +1604,12 @@ public class UnifiedCompositionServiceTest {
.getPortTemplateConsolidationDataList()) {
if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB2_Internal1")) {
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "volume_type",
- "index", "cmaui_volume3");
+ "tenant_id", "cmaui_volume3");
} else if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB1_Internal2")) {
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "size",
- "addresses", "cmaui_volume3");
+ "device_owner", "cmaui_volume3");
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "size",
- "oam_index", "cmaui_volume1");
+ "status", "cmaui_volume1");
}
}
}
@@ -1535,7 +1625,7 @@ public class UnifiedCompositionServiceTest {
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "name",
"myAttr", "FSB1_template");
addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "availability_zone",
- "index", "FSB1_template");
+ "tenant_id", "FSB1_template");
}
}
}
@@ -1553,7 +1643,7 @@ public class UnifiedCompositionServiceTest {
addGetAttInUnifiedCompositionData(unifiedCompositionData.getComputeTemplateConsolidationData(),
"volume_type", "addresses", "cmaui_volume3");
addGetAttInUnifiedCompositionData(unifiedCompositionData.getComputeTemplateConsolidationData(),
- "size", "oam_index", "cmaui_volume3");
+ "size", "user_data_format", "cmaui_volume3");
}
private void addOutputGetAttrInForComputeNoConsolidation(
@@ -1590,15 +1680,15 @@ public class UnifiedCompositionServiceTest {
.getPortTemplateConsolidationDataList()) {
if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB1_Internal1")) {
addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput2",
- "addresses");
+ "device_owner");
addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput3",
- "addresses");
+ "device_owner");
} else if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB2_Internal2")) {
addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput1",
- "index");
+ "tenant_id");
} else if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB1_OAM")) {
addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput2",
- "oam_index");
+ "user_data_format");
}
}
}
@@ -1609,10 +1699,10 @@ public class UnifiedCompositionServiceTest {
.getPortTemplateConsolidationDataList()) {
if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB2_Internal2")) {
addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput1",
- "index");
+ "tenant_id");
} else if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB1_Internal1")) {
addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput3",
- "accessIPv6");
+ "admin_state_up");
}
}
}
@@ -1623,10 +1713,10 @@ public class UnifiedCompositionServiceTest {
.getPortTemplateConsolidationDataList()) {
if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB2_Internal1")) {
addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput2",
- "oam_index");
+ "user_data_format");
} else if (portTemplateConsolidationData.getNodeTemplateId().equals("FSB1_Internal2")) {
addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, "complexOutput2",
- "addresses");
+ "device_owner");
}
}
}