aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib
diff options
context:
space:
mode:
authoreleonorali <eleonoral@amdocs.com>2018-03-12 16:39:47 +0200
committerAvi Gaffa <avi.gaffa@amdocs.com>2018-03-12 15:45:33 +0000
commit73d3b3812ddfa77919281af9b711a50cf3160c1f (patch)
treee917649b412124d86c0e77630ce27a8492257e8a /openecomp-be/lib
parentef21b4191ee2ef103c0d79cf7d8497570672c810 (diff)
Port Mirroring: Incorrect Interfaces list(2)
Defect 427115 - Port Mirroring: Incorrect Interfaces list - not correct Port Type Change-Id: I5a58f5a0acf9df455d294d2dbc0b84cb2c1e03e2 Issue-ID: SDC-1107 Signed-off-by: eleonorali <eleonoral@amdocs.com>
Diffstat (limited to 'openecomp-be/lib')
-rw-r--r--openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java3
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtilTest.java16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java3068
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml164
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml160
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/in/MainServiceTemplate.yaml28
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/out/MainServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/noConsolidation/in/MainServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/noConsolidation/out/MainServiceTemplate.yaml10
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml360
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml374
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml8
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml30
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/in/MainServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml36
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml24
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/in/MainServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml30
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml22
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml22
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/fixNewAbstractNodeTemplate/consolidation/out/MainServiceTemplate.yaml8
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/fixNewAbstractNodeTemplate/noConsolidation/in/MainServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/fixNewAbstractNodeTemplate/noConsolidation/out/MainServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/in/MainServiceTemplate.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/in/MainServiceTemplate.yaml22
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/in/MainServiceTemplate.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml12
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/in/MainServiceTemplate.yaml26
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/in/MainServiceTemplate.yaml22
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/in/MainServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml8
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/in/MainServiceTemplate.yaml30
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/out/MainServiceTemplate.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml24
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/in/MainServiceTemplate.yaml28
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml24
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml22
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/in/MainServiceTemplate.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml8
55 files changed, 2514 insertions, 2515 deletions
diff --git a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java
index 09e7bd4396..c3cac50ebe 100644
--- a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java
+++ b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java
@@ -6,9 +6,6 @@ import org.togglz.core.context.FeatureContext;
public enum ToggleableFeature implements Feature {
- @Label ("Forwarder Capability")
- FORWARDER_CAPABILITY,
-
@Label ("VLAN Tagging")
VLAN_TAGGING,
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java
index f5eac507f1..717f681073 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtil.java
@@ -651,7 +651,7 @@ public class ConsolidationDataUtil {
return portNodeTemplateId;
}
- String formattedName = portNodeTemplateId.replaceAll(DIGIT_REGEX + "$", "");
+ String formattedName = portNodeTemplateId.replaceAll(UNDERSCORE + DIGIT_REGEX + "$", "");
StringBuilder sb = new StringBuilder();
int count = 0;
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtilTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtilTest.java
index 3f294eb924..246bc478e6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtilTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationDataUtilTest.java
@@ -13,8 +13,10 @@ public class ConsolidationDataUtilTest {
private static final String PORT_TYPE_FORMAT_6 = "network_port22";
private static final String PORT_TYPE_FORMAT_7 = "a_network_11_port22";
private static final String PORT_TYPE_OUTPUT_1 = "a_network_port";
- private static final String PORT_TYPE_OUTPUT_2 = "network_port";
- private static final String PORT_TYPE_OUTPUT_3 = "a_network_11_port";
+ private static final String PORT_TYPE_OUTPUT_2 = "a_network_port22";
+ private static final String PORT_TYPE_OUTPUT_3 = "network_port";
+ private static final String PORT_TYPE_OUTPUT_4 = "network_port22";
+ private static final String PORT_TYPE_OUTPUT_5 = "a_network_11_port22";
@Test
public void testGetPortType_Empty() throws Exception {
@@ -47,7 +49,7 @@ public class ConsolidationDataUtilTest {
@Test
public void testGetPortType_Input_WithServerAndPortIndexWithoutUnderscore() throws Exception {
- assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_2), PORT_TYPE_OUTPUT_1);
+ assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_2), PORT_TYPE_OUTPUT_2);
}
@Test
@@ -57,21 +59,21 @@ public class ConsolidationDataUtilTest {
@Test
public void testGetPortType_Input_WithoutServerIndexAndWithPortIndexWithoutUnderscore() throws Exception {
- assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_4), PORT_TYPE_OUTPUT_1);
+ assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_4), PORT_TYPE_OUTPUT_2);
}
@Test
public void testGetPortType_Input_PortTypeWithIndex() throws Exception {
- assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_5), PORT_TYPE_OUTPUT_2);
+ assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_5), PORT_TYPE_OUTPUT_3);
}
@Test
public void testGetPortType_Input_PortIndexWithoutUnderscore() throws Exception {
- assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_6), PORT_TYPE_OUTPUT_2);
+ assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_6), PORT_TYPE_OUTPUT_4);
}
@Test
public void testGetPortType_Input_PortIndexAndDigitInBetween() throws Exception {
- assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_7), PORT_TYPE_OUTPUT_3);
+ assertEquals(ConsolidationDataUtil.getPortType(PORT_TYPE_FORMAT_7), PORT_TYPE_OUTPUT_5);
}
}
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 646aa47884..e239805710 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
@@ -16,10 +16,6 @@
package org.openecomp.sdc.translator.services.heattotosca;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
-
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.junit.Before;
@@ -60,1574 +56,1578 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Matchers.anyString;
+
public class UnifiedCompositionServiceTest {
- private static final String BASE_DIRECTORY = "/mock/services/heattotosca/unifiedComposition/";
- @InjectMocks
- @Spy
- UnifiedCompositionService unifiedCompositionService;
- @Spy
- TranslationContext context;
-
- private static final String IN_PREFIX = "/in";
- private static final String OUT_PREFIX = "/out";
- private static final String FSB1_template = "FSB1_template";
- private static final String FSB2_template = "FSB2_template";
- private static final String FSB3_template = "FSB3_template";
- private static final String FSB1_INTERNAL = "FSB1_Internal";
- private static final String FSB2_INTERNAL = "FSB2_Internal";
- private static final String FSB1_INTERNAL1 = "FSB1_Internal1";
- private static final String FSB1_INTERNAL2 = "FSB1_Internal2";
- private static final String FSB2_INTERNAL1 = "FSB2_Internal1";
- private static final String FSB2_INTERNAL2 = "FSB2_Internal2";
- private static final String PORT = "port";
- private static final String PORT1 = "port1";
- private static final String PORT2 = "port2";
- private static final String FSB1_OAM = "FSB1_OAM";
- private static final String ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1 = "org.openecomp.resource.abstract.nodes.FSB1";
- private static final String ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB = "org.openecomp.resource.vfc.nodes.heat.FSB";
- private static final String DEVICE_OWNER = "device_owner";
- private static final String COMPLEX_OUTPUT1 = "complexOutput1";
- private static final String COMPLEX_OUTPUT2 = "complexOutput2";
- private static final String COMPLEX_OUTPUT3 = "complexOutput3";
- private static final String USER_DATA_FORMAT = "user_data_format";
- private static final String TENANT_ID = "tenant_id";
- private static final String SIMPLE_OUTPUT1 = "simpleOutput1";
- private static final String SIMPLE_OUTPUT2 = "simpleOutput2";
- private static final String ADDRESSES = "addresses";
- private static final String CMAUI_VOLUME1 = "cmaui_volume1";
- private static final String CMAUI_VOLUME2 = "cmaui_volume2";
- private static final String CMAUI_VOLUME3 = "cmaui_volume3";
- private static final String ACCESS_IPv4 = "accessIPv4";
- private static final String ACCESS_IPv6 = "accessIPv6";
- private static final String FSB1 = "FSB1";
- private static final String MYATTR = "myAttr";
- private static final String VOLUME_TYPE = "volume_type";
- private static final String SIZE = "size";
- private static final String NETWORK_ID = "network_id";
- private static final String JSA_NET1 = "jsa_net1";
- private static final String STATUS = "status";
- private static final String AVAILABILITY_ZONE = "availability_zone";
- private static final String DEPENDENCY = "dependency";
-
- Map<String, ServiceTemplate> inputServiceTemplates;
- Map<String, ServiceTemplate> expectedOutserviceTemplates;
-
- private static final String MAIN_SERVICE_TEMPLATE_YAML = "MainServiceTemplate.yaml";
- private static final String GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE_YAML =
- "GlobalSubstitutionTypesServiceTemplate.yaml";
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- }
-
- //todo
- @Test
- public void createUnifiedComposition() throws Exception {
-
- }
-
- @Test
- public void createSubstitutionStNoConsolidationData() throws Exception {
- String path = BASE_DIRECTORY + "creSubstitutionServiceTemplate/NoOutParamDuplicatePortType";
- loadInputAndOutputData(path);
- ServiceTemplate expectedServiceTemplate =
- TestUtils.loadServiceTemplate(BASE_DIRECTORY +
- "creSubstitutionServiceTemplate/NoOutParamDuplicatePortType" + OUT_PREFIX);
-
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList,
- context, "org.openecomp.resource.vfc.nodes.heat.FSB1", null);
- assertEquals(false, substitutionServiceTemplate.isPresent());
- }
-
- @Test
- public void createSubstitutionStNoOutputParamAndDuplicatePortType() throws Exception {
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL1));
- portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
-
- loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/NoOutParamDuplicatePortType");
- UnifiedCompositionData unifiedCompositionData =
- createCompositionData(FSB1_template, portTypeToIdList);
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- unifiedCompositionDataList.add(unifiedCompositionData);
-
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList,
- context, ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1, null);
- assertEquals(true, substitutionServiceTemplate.isPresent());
- substitutionServiceTemplate
- .ifPresent(
- subServiceTemplate -> checkSTResults(expectedOutserviceTemplates,
- subServiceTemplate, context.getGlobalSubstitutionServiceTemplate(), null));
- }
-
- @Test
- public void createSubstitutionStWithOutputParamNoConsolidation() throws Exception {
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
- portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
-
- loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation");
- UnifiedCompositionData unifiedCompositionData =
- createCompositionData(FSB1_template, portTypeToIdList);
- addGetAttrForCompute(unifiedCompositionData);
- addGetAttrForPort(unifiedCompositionData);
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- unifiedCompositionDataList.add(unifiedCompositionData);
-
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList,
- context, ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1, null);
- assertEquals(true, substitutionServiceTemplate.isPresent());
- substitutionServiceTemplate
- .ifPresent(
- subServiceTemplate -> checkSTResults(expectedOutserviceTemplates,
- subServiceTemplate, context.getGlobalSubstitutionServiceTemplate(), null));
- }
-
- @Test
- public void createSubstitutionStWithOutputParamWithConsolidation() throws Exception {
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
- portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
-
- loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/WithOutputParameters/consolidation");
- UnifiedCompositionData unifiedCompositionData1 =
- createCompositionData(FSB1_template, portTypeToIdList1);
- addGetAttrForCompute(unifiedCompositionData1);
- addGetAttrForPort(unifiedCompositionData1);
- unifiedCompositionDataList.add(unifiedCompositionData1);
-
- List<Pair<String, String>> portTypeToIdList2 = new ArrayList<>();
- portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL2));
- portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL1));
-
- UnifiedCompositionData unifiedCompositionData2 =
- createCompositionData(FSB2_template, portTypeToIdList2);
- addGetAttrForCompute2(unifiedCompositionData2);
- addGetAttrForPort2(unifiedCompositionData2);
- unifiedCompositionDataList.add(unifiedCompositionData2);
-
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList,
- context, ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1, null);
- assertEquals(true, substitutionServiceTemplate.isPresent());
- substitutionServiceTemplate
- .ifPresent(
- subServiceTemplate -> checkSTResults(expectedOutserviceTemplates,
- subServiceTemplate, context.getGlobalSubstitutionServiceTemplate(), null));
- }
-
- @Test
- public void createSubstitutionStNoPorts() throws Exception {
- loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/NoPorts");
-
- UnifiedCompositionData unifiedCompositionData = new UnifiedCompositionData();
- unifiedCompositionData.setComputeTemplateConsolidationData(
- TestUtils.createComputeTemplateConsolidationData(FSB1_template, null, null));
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- unifiedCompositionDataList.add(unifiedCompositionData);
-
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList,
- context, ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1, null);
- assertEquals(true, substitutionServiceTemplate.isPresent());
- substitutionServiceTemplate
- .ifPresent(
- subServiceTemplate -> checkSTResults(expectedOutserviceTemplates,
- subServiceTemplate, context.getGlobalSubstitutionServiceTemplate(), null));
- }
-
-
- @Test
- public void createSubstitutionStWithIndex() throws Exception {
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
- portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
-
- loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/WithIndex");
- UnifiedCompositionData unifiedCompositionData =
- createCompositionData(FSB1_template, portTypeToIdList);
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- unifiedCompositionDataList.add(unifiedCompositionData);
-
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList,
- context,ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1, 2);
- assertEquals(true, substitutionServiceTemplate.isPresent());
- substitutionServiceTemplate
- .ifPresent(
- subServiceTemplate -> checkSTResults(expectedOutserviceTemplates,
- subServiceTemplate, context.getGlobalSubstitutionServiceTemplate(), null));
- }
-
-
- @Test
- public void createAbstractSubstituteOneComputeMultiplePortsDifferentTypesTest() throws Exception {
- loadInputAndOutputData(BASE_DIRECTORY + "createAbstractSubstitute/oneComputeMultiplePortsDiffType");
-
- UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template);
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
- portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
- addPortDataToCompositionData(portTypeToIdList, data);
-
- List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
- unifiedCompositionDataList.add(data);
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList,
- context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
- assertEquals(true, substitutionServiceTemplate.isPresent());
- if (substitutionServiceTemplate.isPresent()) {
- String substitutionNodeTypeId =
- unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList.get(0), null, context);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
- inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
- unifiedCompositionDataList, substitutionNodeTypeId,
- context, null);
- validateAbstractSubstitute();
+ private static final String BASE_DIRECTORY = "/mock/services/heattotosca/unifiedComposition/";
+ @InjectMocks
+ @Spy
+ UnifiedCompositionService unifiedCompositionService;
+ @Spy
+ TranslationContext context;
+
+ private static final String IN_PREFIX = "/in";
+ private static final String OUT_PREFIX = "/out";
+ private static final String FSB1_template = "FSB1_template";
+ private static final String FSB2_template = "FSB2_template";
+ private static final String FSB3_template = "FSB3_template";
+ private static final String FSB1_INTERNAL = "FSB1_Internal";
+ private static final String FSB2_INTERNAL = "FSB2_Internal";
+ private static final String FSB1_INTERNAL_1 = "FSB1_Internal_1";
+ private static final String FSB1_INTERNAL_2 = "FSB1_Internal_2";
+ private static final String FSB2_INTERNAL_1 = "FSB2_Internal_1";
+ private static final String FSB2_INTERNAL_2 = "FSB2_Internal_2";
+ private static final String PORT = "port";
+ private static final String PORT_1 = "port_1";
+ private static final String PORT_2 = "port_2";
+ private static final String FSB1_OAM = "FSB1_OAM";
+ private static final String ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1 = "org.openecomp.resource.abstract.nodes.FSB1";
+ private static final String ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB = "org.openecomp.resource.vfc.nodes.heat.FSB";
+ private static final String DEVICE_OWNER = "device_owner";
+ private static final String COMPLEX_OUTPUT1 = "complexOutput1";
+ private static final String COMPLEX_OUTPUT2 = "complexOutput2";
+ private static final String COMPLEX_OUTPUT3 = "complexOutput3";
+ private static final String USER_DATA_FORMAT = "user_data_format";
+ private static final String TENANT_ID = "tenant_id";
+ private static final String SIMPLE_OUTPUT1 = "simpleOutput1";
+ private static final String SIMPLE_OUTPUT2 = "simpleOutput2";
+ private static final String ADDRESSES = "addresses";
+ private static final String CMAUI_VOLUME1 = "cmaui_volume1";
+ private static final String CMAUI_VOLUME2 = "cmaui_volume2";
+ private static final String CMAUI_VOLUME3 = "cmaui_volume3";
+ private static final String ACCESS_IPv4 = "accessIPv4";
+ private static final String ACCESS_IPv6 = "accessIPv6";
+ private static final String FSB1 = "FSB1";
+ private static final String MYATTR = "myAttr";
+ private static final String VOLUME_TYPE = "volume_type";
+ private static final String SIZE = "size";
+ private static final String NETWORK_ID = "network_id";
+ private static final String JSA_NET1 = "jsa_net1";
+ private static final String STATUS = "status";
+ private static final String AVAILABILITY_ZONE = "availability_zone";
+ private static final String DEPENDENCY = "dependency";
+
+ Map<String, ServiceTemplate> inputServiceTemplates;
+ Map<String, ServiceTemplate> expectedOutserviceTemplates;
+
+ private static final String MAIN_SERVICE_TEMPLATE_YAML = "MainServiceTemplate.yaml";
+ private static final String GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE_YAML =
+ "GlobalSubstitutionTypesServiceTemplate.yaml";
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ }
+
+ //todo
+ @Test
+ public void createUnifiedComposition() throws Exception {
+
+ }
+
+ @Test
+ public void createSubstitutionStNoConsolidationData() throws Exception {
+ String path = BASE_DIRECTORY + "creSubstitutionServiceTemplate/NoOutParamDuplicatePortType";
+ loadInputAndOutputData(path);
+ ServiceTemplate expectedServiceTemplate =
+ TestUtils.loadServiceTemplate(BASE_DIRECTORY +
+ "creSubstitutionServiceTemplate/NoOutParamDuplicatePortType" + OUT_PREFIX);
+
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList,
+ context, "org.openecomp.resource.vfc.nodes.heat.FSB1", null);
+ assertEquals(false, substitutionServiceTemplate.isPresent());
+ }
+
+ @Test
+ public void createSubstitutionStNoOutputParamAndDuplicatePortType() throws Exception {
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
+
+ loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/NoOutParamDuplicatePortType");
+ UnifiedCompositionData unifiedCompositionData =
+ createCompositionData(FSB1_template, portTypeToIdList);
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ unifiedCompositionDataList.add(unifiedCompositionData);
+
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList,
+ context, ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1, null);
+ assertEquals(true, substitutionServiceTemplate.isPresent());
+ substitutionServiceTemplate
+ .ifPresent(
+ subServiceTemplate -> checkSTResults(expectedOutserviceTemplates,
+ subServiceTemplate, context.getGlobalSubstitutionServiceTemplate(), null));
+ }
+
+ @Test
+ public void createSubstitutionStWithOutputParamNoConsolidation() throws Exception {
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
+
+ loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation");
+ UnifiedCompositionData unifiedCompositionData =
+ createCompositionData(FSB1_template, portTypeToIdList);
+ addGetAttrForCompute(unifiedCompositionData);
+ addGetAttrForPort(unifiedCompositionData);
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ unifiedCompositionDataList.add(unifiedCompositionData);
+
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList,
+ context, ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1, null);
+ assertEquals(true, substitutionServiceTemplate.isPresent());
+ substitutionServiceTemplate
+ .ifPresent(
+ subServiceTemplate -> checkSTResults(expectedOutserviceTemplates,
+ subServiceTemplate, context.getGlobalSubstitutionServiceTemplate(), null));
+ }
+
+ @Test
+ public void createSubstitutionStWithOutputParamWithConsolidation() throws Exception {
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
+ portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+
+ loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/WithOutputParameters/consolidation");
+ UnifiedCompositionData unifiedCompositionData1 =
+ createCompositionData(FSB1_template, portTypeToIdList1);
+ addGetAttrForCompute(unifiedCompositionData1);
+ addGetAttrForPort(unifiedCompositionData1);
+ unifiedCompositionDataList.add(unifiedCompositionData1);
+
+ List<Pair<String, String>> portTypeToIdList2 = new ArrayList<>();
+ portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2));
+ portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1));
+
+ UnifiedCompositionData unifiedCompositionData2 =
+ createCompositionData(FSB2_template, portTypeToIdList2);
+ addGetAttrForCompute2(unifiedCompositionData2);
+ addGetAttrForPort2(unifiedCompositionData2);
+ unifiedCompositionDataList.add(unifiedCompositionData2);
+
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList,
+ context, ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1, null);
+ assertEquals(true, substitutionServiceTemplate.isPresent());
+ substitutionServiceTemplate
+ .ifPresent(
+ subServiceTemplate -> checkSTResults(expectedOutserviceTemplates,
+ subServiceTemplate, context.getGlobalSubstitutionServiceTemplate(), null));
+ }
+
+ @Test
+ public void createSubstitutionStNoPorts() throws Exception {
+ loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/NoPorts");
+
+ UnifiedCompositionData unifiedCompositionData = new UnifiedCompositionData();
+ unifiedCompositionData.setComputeTemplateConsolidationData(
+ TestUtils.createComputeTemplateConsolidationData(FSB1_template, null, null));
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ unifiedCompositionDataList.add(unifiedCompositionData);
+
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList,
+ context, ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1, null);
+ assertEquals(true, substitutionServiceTemplate.isPresent());
+ substitutionServiceTemplate
+ .ifPresent(
+ subServiceTemplate -> checkSTResults(expectedOutserviceTemplates,
+ subServiceTemplate, context.getGlobalSubstitutionServiceTemplate(), null));
+ }
+
+
+ @Test
+ public void createSubstitutionStWithIndex() throws Exception {
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
+
+ loadInputAndOutputData(BASE_DIRECTORY + "creSubstitutionServiceTemplate/WithIndex");
+ UnifiedCompositionData unifiedCompositionData =
+ createCompositionData(FSB1_template, portTypeToIdList);
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ unifiedCompositionDataList.add(unifiedCompositionData);
+
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList,
+ context,ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1, 2);
+ assertEquals(true, substitutionServiceTemplate.isPresent());
+ substitutionServiceTemplate
+ .ifPresent(
+ subServiceTemplate -> checkSTResults(expectedOutserviceTemplates,
+ subServiceTemplate, context.getGlobalSubstitutionServiceTemplate(), null));
+ }
+
+
+ @Test
+ public void createAbstractSubstituteOneComputeMultiplePortsDifferentTypesTest() throws Exception {
+ loadInputAndOutputData(BASE_DIRECTORY + "createAbstractSubstitute/oneComputeMultiplePortsDiffType");
+
+ UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template);
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
+ addPortDataToCompositionData(portTypeToIdList, data);
+
+ List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
+ unifiedCompositionDataList.add(data);
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList,
+ context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
+ assertEquals(true, substitutionServiceTemplate.isPresent());
+ if (substitutionServiceTemplate.isPresent()) {
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
+ validateAbstractSubstitute();
+ }
}
- }
-
-
- @Test
- public void createAbstractSubstituteOneComputeMultiplePortsSameTypesTest() throws Exception {
- loadInputAndOutputData(BASE_DIRECTORY + "createAbstractSubstitute/oneComputeMultiplePortsSameType");
-
- UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template);
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL2));
- addPortDataToCompositionData(portTypeToIdList, data);
-
- List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
- unifiedCompositionDataList.add(data);
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList
- , context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
-
- assertEquals(true, substitutionServiceTemplate.isPresent());
- if (substitutionServiceTemplate.isPresent()) {
- String substitutionNodeTypeId =
- unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList.get(0), null, context);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
- inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
- unifiedCompositionDataList, substitutionNodeTypeId,
- context, null);
- validateAbstractSubstitute();
+
+
+ @Test
+ public void createAbstractSubstituteOneComputeMultiplePortsSameTypesTest() throws Exception {
+ loadInputAndOutputData(BASE_DIRECTORY + "createAbstractSubstitute/oneComputeMultiplePortsSameType");
+
+ UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template);
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2));
+ addPortDataToCompositionData(portTypeToIdList, data);
+
+ List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
+ unifiedCompositionDataList.add(data);
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList
+ , context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
+
+ assertEquals(true, substitutionServiceTemplate.isPresent());
+ if (substitutionServiceTemplate.isPresent()) {
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
+ validateAbstractSubstitute();
+ }
}
- }
-
-
- @Test
- public void createAbstractSubstituteTwoComputesMultiplePorts() throws Exception {
- loadInputAndOutputData(BASE_DIRECTORY + "createAbstractSubstitute/twoComputesMultiplePorts");
- List<UnifiedCompositionData> unifiedCompositionDataList =
- createAbstractSubstituteCompositionDataComputeAndPort();
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList
- , context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
- assertEquals(true, substitutionServiceTemplate.isPresent());
- if (substitutionServiceTemplate.isPresent()) {
- String substitutionNodeTypeId =
- unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList.get(0), null, context);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
- inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
- unifiedCompositionDataList, substitutionNodeTypeId,
- context, null);
- validateAbstractSubstitute();
+
+
+ @Test
+ public void createAbstractSubstituteTwoComputesMultiplePorts() throws Exception {
+ loadInputAndOutputData(BASE_DIRECTORY + "createAbstractSubstitute/twoComputesMultiplePorts");
+ List<UnifiedCompositionData> unifiedCompositionDataList =
+ createAbstractSubstituteCompositionDataComputeAndPort();
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList
+ , context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
+ assertEquals(true, substitutionServiceTemplate.isPresent());
+ if (substitutionServiceTemplate.isPresent()) {
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
+ validateAbstractSubstitute();
+ }
}
- }
-
-
- @Test
- public void updNodesConnectedOutWithConsolidationTest() throws Exception {
- loadInputAndOutputData(BASE_DIRECTORY + "updNodesConnectedOut/consolidation");
- List<UnifiedCompositionData> unifiedCompositionDataList =
- createAbstractSubstituteCompositionDataComputeAndPort();
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList
- , context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
- assertEquals(true, substitutionServiceTemplate.isPresent());
- if (substitutionServiceTemplate.isPresent()) {
- String substitutionNodeTypeId =
- unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList.get(0), null, context);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
- inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
- unifiedCompositionDataList, substitutionNodeTypeId,
- context, null);
-
- unifiedCompositionService
- .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList, context);
- validateAbstractSubstitute();
+
+
+ @Test
+ public void updNodesConnectedOutWithConsolidationTest() throws Exception {
+ loadInputAndOutputData(BASE_DIRECTORY + "updNodesConnectedOut/consolidation");
+ List<UnifiedCompositionData> unifiedCompositionDataList =
+ createAbstractSubstituteCompositionDataComputeAndPort();
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList
+ , context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
+ assertEquals(true, substitutionServiceTemplate.isPresent());
+ if (substitutionServiceTemplate.isPresent()) {
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
+
+ unifiedCompositionService
+ .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList, context);
+ validateAbstractSubstitute();
+ }
}
- }
-
- private void validateAbstractSubstitute() {
- YamlUtil yamlUtil = new YamlUtil();
- assertEquals(yamlUtil.objectToYaml(expectedOutserviceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML)), yamlUtil
- .objectToYaml(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML)));
- }
-
-
- @Test
- public void updNodesConnectedOutNoConsolidationTest() throws Exception {
- loadInputAndOutputData(BASE_DIRECTORY + "updNodesConnectedOut/noConsolidation");
-
- UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template);
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
- portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
- addPortDataToCompositionData(portTypeToIdList, data);
-
- List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
- unifiedCompositionDataList.add(data);
-
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList
- , context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
- assertEquals(true, substitutionServiceTemplate.isPresent());
- if (substitutionServiceTemplate.isPresent()) {
- String substitutionNodeTypeId =
- unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList.get(0), null, context);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
- inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
- unifiedCompositionDataList, substitutionNodeTypeId,
- context, null);
-
- unifiedCompositionService
- .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList, context);
- validateAbstractSubstitute();
+
+ private void validateAbstractSubstitute() {
+ YamlUtil yamlUtil = new YamlUtil();
+ assertEquals(yamlUtil.objectToYaml(expectedOutserviceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML)), yamlUtil
+ .objectToYaml(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML)));
}
- }
-
-
- @Test
- public void updNodesConnectedInNoConsolidationTest() throws Exception {
- loadInputAndOutputData(BASE_DIRECTORY + "updNodesConnectedIn/noConsolidation");
-
- UnifiedCompositionData data = createComputeUnifiedCompositionData("QRouter");
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>("cdr_network_port", "cdr_network_port"));
- portTypeToIdList
- .add(new ImmutablePair<>("oam_private_net_network_port", "oam_private_net_network_port"));
- addPortDataToCompositionData(portTypeToIdList, data);
-
- List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
- unifiedCompositionDataList.add(data);
-
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList
- , context, "org.openecomp.resource.abstract.nodes.QRouter", null);
-
- String substitutionNodeTypeId =
- unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList.get(0), null, context);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
- inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
- unifiedCompositionDataList, substitutionNodeTypeId,
- context, null);
-
- unifiedCompositionService
- .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList, context);
- validateAbstractSubstitute();
- }
-
-
- @Test
- public void updNodesConnectedInWithConsolidationTest() throws Exception {
- loadInputAndOutputData(BASE_DIRECTORY + "updNodesConnectedIn/consolidation");
-
- List<UnifiedCompositionData> unifiedCompositionDataList =
- createAbstractSubstituteCompositionDataComputeAndPort();
-
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList
- , context, "org.openecomp.resource.abstract.nodes.FSB", null);
-
- String substitutionNodeTypeId =
- unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList.get(0), null, context);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
- inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
- unifiedCompositionDataList, substitutionNodeTypeId,
- context, null);
-
- unifiedCompositionService
- .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList, context);
- validateAbstractSubstitute();
- }
-
-
- @Test
- public void updVolumesNoConsolidationTest() throws Exception {
- loadInputAndOutputData(BASE_DIRECTORY + "updVolumes/noConsolidation");
-
- UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template);
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
- portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
- addPortDataToCompositionData(portTypeToIdList, data);
-
- List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
- unifiedCompositionDataList.add(data);
-
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList
- , context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
-
- String substitutionNodeTypeId =
- unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList.get(0), null, context);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
- inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
- unifiedCompositionDataList, substitutionNodeTypeId,
- context, null);
-
- unifiedCompositionService
- .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList, context);
- validateAbstractSubstitute();
- }
-
-
- @Test
- public void updVolumesWithConsolidationTest() throws Exception {
- loadInputAndOutputData(BASE_DIRECTORY + "updVolumes/consolidation");
- List<UnifiedCompositionData> unifiedCompositionDataList =
- createAbstractSubstituteCompositionDataComputeAndPort();
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList
- , context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
-
- String substitutionNodeTypeId =
- unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList.get(0), null, context);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
- inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
- unifiedCompositionDataList, substitutionNodeTypeId,
- context, null);
-
- unifiedCompositionService
- .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList, context);
- validateAbstractSubstitute();
- }
-
-
- @Test
- public void updGroupsNoConsolidationTest() throws Exception {
- loadInputAndOutputData(BASE_DIRECTORY + "updGroupsConnectivity/noConsolidation");
- UnifiedCompositionData data = createComputeUnifiedCompositionData("server_smp1");
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(PORT, PORT1));
- portTypeToIdList.add(new ImmutablePair<>(PORT, PORT2));
- addPortDataToCompositionData(portTypeToIdList, data);
-
- //Add groups
- List<String> computeGroupIdList =
- TestUtils.getGroupsForNode(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), "server_smp1");
- data.getComputeTemplateConsolidationData().setGroupIds(computeGroupIdList);
-
- List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
- unifiedCompositionDataList.add(data);
-
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList
- , context, "org.openecomp.resource.abstract.nodes.smp", null);
-
- String substitutionNodeTypeId =
- unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList.get(0), null, context);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
- inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
- unifiedCompositionDataList, substitutionNodeTypeId,
- context, null);
-
- unifiedCompositionService
- .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList, context);
- validateAbstractSubstitute();
- }
-
-
- @Test
- public void updGroupsWithConsolidationTest() throws Exception {
- loadInputAndOutputData(BASE_DIRECTORY + "updGroupsConnectivity/consolidation");
-
- List<UnifiedCompositionData> unifiedCompositionDataList =
- createAbstractSubstituteCompositionDataComputeAndPort();
-
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList
- , context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
-
- String substitutionNodeTypeId =
- unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList.get(0), null, context);
- String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
- inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
- unifiedCompositionDataList, substitutionNodeTypeId,
- context, null);
-
- unifiedCompositionService
- .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList, context);
- validateAbstractSubstitute();
- }
-
- @Test
- public void updOutParamGetAttrInNoConsolidationTest() throws Exception {
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
- portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
-
- loadInputAndOutputData(BASE_DIRECTORY + "updOutputGetAttrIn/noConsolidation");
- UnifiedCompositionData unifiedCompositionData =
- createCompositionData(FSB1_template, portTypeToIdList);
- addOutputGetAttrInForComputeNoConsolidation(unifiedCompositionData);
- addOutputGetAttrInForPortNoConsolidation(unifiedCompositionData);
-
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- unifiedCompositionDataList.add(unifiedCompositionData);
- Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
- (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
- Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
- anyString());
- unifiedCompositionService
- .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList, context);
-
- checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
- }
-
- @Test
- public void updOutParamGetAttrInWithConsolidationTest() throws Exception {
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
- portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
-
- loadInputAndOutputData(BASE_DIRECTORY + "updOutputGetAttrIn/consolidation");
- UnifiedCompositionData unifiedCompositionData1 =
- createCompositionData(FSB1_template, portTypeToIdList1);
- addOutputGetAttrInForCompute1WithConsolidation(unifiedCompositionData1);
- addOutputGetAttrInForPortWithConsolidation1(unifiedCompositionData1);
- unifiedCompositionDataList.add(unifiedCompositionData1);
-
- List<Pair<String, String>> portTypeToIdList2 = new ArrayList<>();
- portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL2));
- portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL1));
-
- UnifiedCompositionData unifiedCompositionData2 =
- createCompositionData(FSB2_template, portTypeToIdList2);
- unifiedCompositionDataList.add(unifiedCompositionData2);
- addOutputGetAttrInForCompute2WithConsolidation(unifiedCompositionData2);
- addOutputGetAttrInForPortWithConsolidation2(unifiedCompositionData2);
-
- Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
- (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
- Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
- anyString());
-
- unifiedCompositionService
- .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList, context);
-
- checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
- }
-
- @Test
- public void updNodeGetAttrInNoConsolidationTest() throws Exception {
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
- portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
-
- loadInputAndOutputData(BASE_DIRECTORY + "updNodesGetAttrIn/noConsolidation");
- UnifiedCompositionData unifiedCompositionData =
- createCompositionData(FSB1_template, portTypeToIdList);
- addGetAttrForCompute(unifiedCompositionData);
- addGetAttrForPort(unifiedCompositionData);
- addGetAttrForPortInnerUC(unifiedCompositionData);
-
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- unifiedCompositionDataList.add(unifiedCompositionData);
- Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
- (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
- Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
- anyString());
- unifiedCompositionService
- .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList, context);
-
- checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
- }
-
- @Test
- public void updNodeGetAttrInWithConsolidationTest() throws Exception {
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
- portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
-
- loadInputAndOutputData(BASE_DIRECTORY + "updNodesGetAttrIn/consolidation");
- UnifiedCompositionData unifiedCompositionData1 =
- createCompositionData(FSB1_template, portTypeToIdList1);
- addGetAttrForCompute(unifiedCompositionData1);
- addGetAttrForPort(unifiedCompositionData1);
- unifiedCompositionDataList.add(unifiedCompositionData1);
-
- List<Pair<String, String>> portTypeToIdList2 = new ArrayList<>();
- portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL2));
- portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL1));
-
- UnifiedCompositionData unifiedCompositionData2 =
- createCompositionData(FSB2_template, portTypeToIdList2);
- addGetAttrForCompute2(unifiedCompositionData2);
- addGetAttrForPort2(unifiedCompositionData2);
- unifiedCompositionDataList.add(unifiedCompositionData2);
-
-
- Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
- (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
- Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
- anyString());
-
- unifiedCompositionService
- .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList, context);
-
- checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
- }
-
-
- @Test
- public void updNodesGetAttrFromInnerNodesTest() throws Exception {
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
- portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
-
- loadInputAndOutputData(BASE_DIRECTORY +
- "creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation");
- UnifiedCompositionData unifiedCompositionData =
- createCompositionData(FSB1_template, portTypeToIdList);
- addGetAttrForCompute(unifiedCompositionData);
- addGetAttrForPort(unifiedCompositionData);
- addGetAttrForPortInnerUC(unifiedCompositionData);
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- unifiedCompositionDataList.add(unifiedCompositionData);
-
- Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
- anyString());
-
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList,
- context, ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1, null);
- assertEquals(true, substitutionServiceTemplate.isPresent());
- substitutionServiceTemplate
- .ifPresent(
- subServiceTemplate -> checkSTResults(expectedOutserviceTemplates,
- subServiceTemplate, context.getGlobalSubstitutionServiceTemplate(), null));
- }
-
-
- @Test
- public void updNodesGetAttrFromConsolidationNodesTest() throws Exception {
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
- portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
-
- loadInputAndOutputData(BASE_DIRECTORY +
- "creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation");
- UnifiedCompositionData unifiedCompositionData1 =
- createCompositionData(FSB1_template, portTypeToIdList1);
- addGetAttrForCompute(unifiedCompositionData1);
- addGetAttrForPort(unifiedCompositionData1);
- unifiedCompositionDataList.add(unifiedCompositionData1);
-
- List<Pair<String, String>> portTypeToIdList2 = new ArrayList<>();
- portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL2));
- portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL1));
-
- UnifiedCompositionData unifiedCompositionData2 =
- createCompositionData(FSB2_template, portTypeToIdList2);
- addGetAttrForCompute2(unifiedCompositionData2);
- addGetAttrForPort2(unifiedCompositionData2);
- unifiedCompositionDataList.add(unifiedCompositionData2);
-
- Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
- .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList,
- context, ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1, null);
- assertEquals(true, substitutionServiceTemplate.isPresent());
- substitutionServiceTemplate
- .ifPresent(
- subServiceTemplate -> checkSTResults(expectedOutserviceTemplates,
- subServiceTemplate, context.getGlobalSubstitutionServiceTemplate(), null));
- }
-
- @Test
- public void cleanMainServiceTemplateTestNoConsolidation() throws IOException {
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
- portTypeToIdList.add(new ImmutablePair<>("FSB_OAM", FSB1_OAM));
-
- loadInputAndOutputData(BASE_DIRECTORY + "cleanMainSt/noConsolidation");
- UnifiedCompositionData unifiedCompositionData =
- createCompositionData(FSB1_template, portTypeToIdList);
- addGetAttrForCompute(unifiedCompositionData);
- addGetAttrForPort(unifiedCompositionData);
-
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- unifiedCompositionDataList.add(unifiedCompositionData);
-
- NodeTemplate abstractNodeTemplate = getMockNode(
- BASE_DIRECTORY + "cleanMainSt/mockAbstractNodeTemplate.yaml");
- inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML).getTopology_template().getNode_templates()
- .put(FSB1, abstractNodeTemplate);
-
- Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
- anyString());
-
- unifiedCompositionService.
- cleanUnifiedCompositionEntities(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList, context);
-
- checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
- }
-
- @Test
- public void cleanMainServiceTemplateTestWithConsolidation() throws IOException {
- loadInputAndOutputData(BASE_DIRECTORY + "cleanMainSt/consolidation");
-
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
- portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
-
- UnifiedCompositionData unifiedCompositionData1 =
- createCompositionData(FSB1_template, portTypeToIdList1);
- addOutputGetAttrInForCompute1WithConsolidation(unifiedCompositionData1);
- addOutputGetAttrInForPortWithConsolidation1(unifiedCompositionData1);
- unifiedCompositionDataList.add(unifiedCompositionData1);
-
- List<Pair<String, String>> portTypeToIdList2 = new ArrayList<>();
- portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL2));
- portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL1));
-
- UnifiedCompositionData unifiedCompositionData2 =
- createCompositionData(FSB2_template, portTypeToIdList2);
- addOutputGetAttrInForCompute2WithConsolidation(unifiedCompositionData2);
- addOutputGetAttrInForPortWithConsolidation2(unifiedCompositionData2);
- unifiedCompositionDataList.add(unifiedCompositionData2);
-
- NodeTemplate abstractNodeTemplate = getMockNode(
- BASE_DIRECTORY + "cleanMainSt/mockAbstractNodeTemplate.yaml");
- inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML).getTopology_template().getNode_templates()
- .put(FSB1, abstractNodeTemplate);
-
- Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
- anyString());
-
- unifiedCompositionService.
- cleanUnifiedCompositionEntities(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- unifiedCompositionDataList, context);
-
- checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
- }
-
- @Test
- public void updateNewAbstractNodeTemplateNoConsolidation() throws IOException {
- loadInputAndOutputData(BASE_DIRECTORY + "fixNewAbstractNodeTemplate/noConsolidation");
-
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL2));
-
- NodeTemplate cleanedComputeNodeTemplate =
- getMockNode(
- BASE_DIRECTORY + "fixNewAbstractNodeTemplate/mockComputeNodeTemplate.yaml");
-
-
- context.setConsolidationData(
- createConsolidationData(Collections.singletonList(FSB1_template), portTypeToIdList));
- context.addCleanedNodeTemplate(MAIN_SERVICE_TEMPLATE_YAML, FSB1_template,
- UnifiedCompositionEntity.COMPUTE, cleanedComputeNodeTemplate);
- context.addCleanedNodeTemplate(MAIN_SERVICE_TEMPLATE_YAML, FSB1_INTERNAL1,
- UnifiedCompositionEntity.PORT, cleanedComputeNodeTemplate);
- context.addCleanedNodeTemplate(MAIN_SERVICE_TEMPLATE_YAML, FSB1_INTERNAL2,
- UnifiedCompositionEntity.PORT, cleanedComputeNodeTemplate);
-
- setUnifiedCompositionData(Arrays.asList(FSB1_template, FSB1_INTERNAL1, FSB1_INTERNAL2));
-
- unifiedCompositionService
- .updateUnifiedAbstractNodesConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), context);
-
- checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
- }
-
- @Test
- public void updateNewAbstractNodeTemplateWithConsolidation() throws IOException {
- loadInputAndOutputData(BASE_DIRECTORY + "fixNewAbstractNodeTemplate/consolidation");
-
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL1));
-
- NodeTemplate cleanedComputeNodeTemplate =
- getMockNode(
- BASE_DIRECTORY + "fixNewAbstractNodeTemplate/mockComputeNodeTemplate.yaml");
-
-
- context.setConsolidationData(
- createConsolidationData(Arrays.asList("FSB1_template_1", "FSB1_template_2"),
- portTypeToIdList));
- context.addCleanedNodeTemplate(MAIN_SERVICE_TEMPLATE_YAML, "FSB1_template_1",
- UnifiedCompositionEntity.COMPUTE, cleanedComputeNodeTemplate);
- context.addCleanedNodeTemplate(MAIN_SERVICE_TEMPLATE_YAML, "FSB1_template_2",
- UnifiedCompositionEntity.COMPUTE, cleanedComputeNodeTemplate);
- context.addCleanedNodeTemplate(MAIN_SERVICE_TEMPLATE_YAML, FSB1_INTERNAL1,
- UnifiedCompositionEntity.PORT, cleanedComputeNodeTemplate);
- context.addCleanedNodeTemplate(MAIN_SERVICE_TEMPLATE_YAML, FSB2_INTERNAL1,
- UnifiedCompositionEntity.PORT, cleanedComputeNodeTemplate);
-
- setUnifiedCompositionData(
- Arrays.asList("FSB1_template_1", "FSB1_template_2", FSB1_INTERNAL1, FSB2_INTERNAL1));
-
- unifiedCompositionService
- .updateUnifiedAbstractNodesConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), context);
-
- checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
- }
-
- @Ignore
- public void testThreeNovaOfSameTypePreConditionFalse() throws IOException {
- loadInputAndOutputData(BASE_DIRECTORY + "pattern1b/noConsolidation");
-
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
- portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL1));
- portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
-
- UnifiedCompositionData unifiedCompositionData1 =
- createCompositionData(FSB1_template, portTypeToIdList1);
- addOutputGetAttrInForCompute1WithConsolidation(unifiedCompositionData1);
- addOutputGetAttrInForPortWithConsolidation1(unifiedCompositionData1);
- unifiedCompositionDataList.add(unifiedCompositionData1);
-
- UnifiedCompositionData unifiedCompositionData2 =
- createCompositionData(FSB2_template, portTypeToIdList1);
- addOutputGetAttrInForCompute1WithConsolidation(unifiedCompositionData2);
- addOutputGetAttrInForPortWithConsolidation1(unifiedCompositionData2);
- unifiedCompositionDataList.add(unifiedCompositionData2);
-
- portTypeToIdList1.remove(1);
- UnifiedCompositionData unifiedCompositionData3 =
- createCompositionData(FSB3_template, portTypeToIdList1);
- addOutputGetAttrInForCompute1WithConsolidation(unifiedCompositionData3);
- addOutputGetAttrInForPortWithConsolidation1(unifiedCompositionData3);
- unifiedCompositionDataList.add(unifiedCompositionData3);
-
- UnifiedCompositionSingleSubstitution unifiedCompositionSingleSubstitution =
- new UnifiedCompositionSingleSubstitution();
- unifiedCompositionSingleSubstitution
- .createUnifiedComposition(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), null,
- unifiedCompositionDataList, context);
-
- checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
- }
-
- @Test
- public void testUnifiedNestedCompositionOneComputeInNested() throws IOException {
- loadInputAndOutputData(BASE_DIRECTORY + "pattern4/oneNestedNode");
-
- ConsolidationData consolidationData = new ConsolidationData();
- String nestedFileName = "nested-pcm_v0.1ServiceTemplate.yaml";
- TestUtils.updateNestedConsolidationData(MAIN_SERVICE_TEMPLATE_YAML, Collections.singletonList("server_pcm_001"),
- consolidationData);
-
- TestUtils.initComputeNodeTypeInConsolidationData(nestedFileName,
- "org.openecomp.resource.vfc.nodes.heat.pcm_server", consolidationData);
- TestUtils.initComputeNodeTemplateIdInConsolidationData(nestedFileName,
- "org.openecomp.resource.vfc.nodes.heat.pcm_server", "server_pcm", consolidationData);
-
- context.setConsolidationData(consolidationData);
- context.getTranslatedServiceTemplates()
- .put(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME,
- inputServiceTemplates.get(GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE_YAML));
- context.getTranslatedServiceTemplates()
- .put(nestedFileName, inputServiceTemplates.get(nestedFileName));
- context.getTranslatedServiceTemplates()
- .put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
-
- UnifiedCompositionData unifiedComposition = createUnifiedCompositionOnlyNested("server_pcm_001");
- unifiedCompositionService.handleUnifiedNestedDefinition(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- inputServiceTemplates.get(nestedFileName), unifiedComposition, context);
-
- checkSTResults(expectedOutserviceTemplates, nestedFileName,
- context.getTranslatedServiceTemplates().get(nestedFileName),
+
+
+ @Test
+ public void updNodesConnectedOutNoConsolidationTest() throws Exception {
+ loadInputAndOutputData(BASE_DIRECTORY + "updNodesConnectedOut/noConsolidation");
+
+ UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template);
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
+ addPortDataToCompositionData(portTypeToIdList, data);
+
+ List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
+ unifiedCompositionDataList.add(data);
+
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList
+ , context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
+ assertEquals(true, substitutionServiceTemplate.isPresent());
+ if (substitutionServiceTemplate.isPresent()) {
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
+
+ unifiedCompositionService
+ .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList, context);
+ validateAbstractSubstitute();
+ }
+ }
+
+
+ @Test
+ public void updNodesConnectedInNoConsolidationTest() throws Exception {
+ loadInputAndOutputData(BASE_DIRECTORY + "updNodesConnectedIn/noConsolidation");
+
+ UnifiedCompositionData data = createComputeUnifiedCompositionData("QRouter");
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>("cdr_network_port", "cdr_network_port"));
+ portTypeToIdList
+ .add(new ImmutablePair<>("oam_private_net_network_port", "oam_private_net_network_port"));
+ addPortDataToCompositionData(portTypeToIdList, data);
+
+ List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
+ unifiedCompositionDataList.add(data);
+
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList
+ , context, "org.openecomp.resource.abstract.nodes.QRouter", null);
+
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
+
+ unifiedCompositionService
+ .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList, context);
+ validateAbstractSubstitute();
+ }
+
+
+ @Test
+ public void updNodesConnectedInWithConsolidationTest() throws Exception {
+ loadInputAndOutputData(BASE_DIRECTORY + "updNodesConnectedIn/consolidation");
+
+ List<UnifiedCompositionData> unifiedCompositionDataList =
+ createAbstractSubstituteCompositionDataComputeAndPort();
+
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList
+ , context, "org.openecomp.resource.abstract.nodes.FSB", null);
+
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
+
+ unifiedCompositionService
+ .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList, context);
+ validateAbstractSubstitute();
+ }
+
+
+ @Test
+ public void updVolumesNoConsolidationTest() throws Exception {
+ loadInputAndOutputData(BASE_DIRECTORY + "updVolumes/noConsolidation");
+
+ UnifiedCompositionData data = createComputeUnifiedCompositionData(FSB1_template);
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
+ addPortDataToCompositionData(portTypeToIdList, data);
+
+ List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
+ unifiedCompositionDataList.add(data);
+
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList
+ , context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
+
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
+
+ unifiedCompositionService
+ .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList, context);
+ validateAbstractSubstitute();
+ }
+
+
+ @Test
+ public void updVolumesWithConsolidationTest() throws Exception {
+ loadInputAndOutputData(BASE_DIRECTORY + "updVolumes/consolidation");
+ List<UnifiedCompositionData> unifiedCompositionDataList =
+ createAbstractSubstituteCompositionDataComputeAndPort();
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList
+ , context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
+
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
+
+ unifiedCompositionService
+ .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList, context);
+ validateAbstractSubstitute();
+ }
+
+
+ @Test
+ public void updGroupsNoConsolidationTest() throws Exception {
+ loadInputAndOutputData(BASE_DIRECTORY + "updGroupsConnectivity/noConsolidation");
+ UnifiedCompositionData data = createComputeUnifiedCompositionData("server_smp1");
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>(PORT, PORT_1));
+ portTypeToIdList.add(new ImmutablePair<>(PORT, PORT_2));
+ addPortDataToCompositionData(portTypeToIdList, data);
+
+ //Add groups
+ List<String> computeGroupIdList =
+ TestUtils.getGroupsForNode(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), "server_smp1");
+ data.getComputeTemplateConsolidationData().setGroupIds(computeGroupIdList);
+
+ List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
+ unifiedCompositionDataList.add(data);
+
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList
+ , context, "org.openecomp.resource.abstract.nodes.smp", null);
+
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
+
+ unifiedCompositionService
+ .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList, context);
+ validateAbstractSubstitute();
+ }
+
+
+ @Test
+ public void updGroupsWithConsolidationTest() throws Exception {
+ loadInputAndOutputData(BASE_DIRECTORY + "updGroupsConnectivity/consolidation");
+
+ List<UnifiedCompositionData> unifiedCompositionDataList =
+ createAbstractSubstituteCompositionDataComputeAndPort();
+
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList
+ , context, ORG_OPENECOMP_RESOURCE_VFC_NODES_HEAT_FSB, null);
+
+ String substitutionNodeTypeId =
+ unifiedCompositionService.getSubstitutionNodeTypeId(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList.get(0), null, context);
+ String nodeTemplateId = unifiedCompositionService.createAbstractSubstituteNodeTemplate(
+ inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), substitutionServiceTemplate.get(),
+ unifiedCompositionDataList, substitutionNodeTypeId,
+ context, null);
+
+ unifiedCompositionService
+ .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList, context);
+ validateAbstractSubstitute();
+ }
+
+ @Test
+ public void updOutParamGetAttrInNoConsolidationTest() throws Exception {
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
+
+ loadInputAndOutputData(BASE_DIRECTORY + "updOutputGetAttrIn/noConsolidation");
+ UnifiedCompositionData unifiedCompositionData =
+ createCompositionData(FSB1_template, portTypeToIdList);
+ addOutputGetAttrInForComputeNoConsolidation(unifiedCompositionData);
+ addOutputGetAttrInForPortNoConsolidation(unifiedCompositionData);
+
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ unifiedCompositionDataList.add(unifiedCompositionData);
+ Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
+ (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
+ Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+ anyString());
+ unifiedCompositionService
+ .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList, context);
+
+ checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
+ }
+
+ @Test
+ public void updOutParamGetAttrInWithConsolidationTest() throws Exception {
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
+ portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+
+ loadInputAndOutputData(BASE_DIRECTORY + "updOutputGetAttrIn/consolidation");
+ UnifiedCompositionData unifiedCompositionData1 =
+ createCompositionData(FSB1_template, portTypeToIdList1);
+ addOutputGetAttrInForCompute1WithConsolidation(unifiedCompositionData1);
+ addOutputGetAttrInForPortWithConsolidation1(unifiedCompositionData1);
+ unifiedCompositionDataList.add(unifiedCompositionData1);
+
+ List<Pair<String, String>> portTypeToIdList2 = new ArrayList<>();
+ portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2));
+ portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1));
+
+ UnifiedCompositionData unifiedCompositionData2 =
+ createCompositionData(FSB2_template, portTypeToIdList2);
+ unifiedCompositionDataList.add(unifiedCompositionData2);
+ addOutputGetAttrInForCompute2WithConsolidation(unifiedCompositionData2);
+ addOutputGetAttrInForPortWithConsolidation2(unifiedCompositionData2);
+
+ Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
+ (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
+ Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+ anyString());
+
+ unifiedCompositionService
+ .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList, context);
+
+ checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
+ }
+
+ @Test
+ public void updNodeGetAttrInNoConsolidationTest() throws Exception {
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
+
+ loadInputAndOutputData(BASE_DIRECTORY + "updNodesGetAttrIn/noConsolidation");
+ UnifiedCompositionData unifiedCompositionData =
+ createCompositionData(FSB1_template, portTypeToIdList);
+ addGetAttrForCompute(unifiedCompositionData);
+ addGetAttrForPort(unifiedCompositionData);
+ addGetAttrForPortInnerUC(unifiedCompositionData);
+
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ unifiedCompositionDataList.add(unifiedCompositionData);
+ Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
+ (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
+ Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+ anyString());
+ unifiedCompositionService
+ .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList, context);
+
+ checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
+ }
+
+ @Test
+ public void updNodeGetAttrInWithConsolidationTest() throws Exception {
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
+ portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+
+ loadInputAndOutputData(BASE_DIRECTORY + "updNodesGetAttrIn/consolidation");
+ UnifiedCompositionData unifiedCompositionData1 =
+ createCompositionData(FSB1_template, portTypeToIdList1);
+ addGetAttrForCompute(unifiedCompositionData1);
+ addGetAttrForPort(unifiedCompositionData1);
+ unifiedCompositionDataList.add(unifiedCompositionData1);
+
+ List<Pair<String, String>> portTypeToIdList2 = new ArrayList<>();
+ portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2));
+ portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1));
+
+ UnifiedCompositionData unifiedCompositionData2 =
+ createCompositionData(FSB2_template, portTypeToIdList2);
+ addGetAttrForCompute2(unifiedCompositionData2);
+ addGetAttrForPort2(unifiedCompositionData2);
+ unifiedCompositionDataList.add(unifiedCompositionData2);
+
+
+ Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
+ (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
+ Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+ anyString());
+
+ unifiedCompositionService
+ .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList, context);
+
+ checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
+ }
+
+
+ @Test
+ public void updNodesGetAttrFromInnerNodesTest() throws Exception {
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_OAM, FSB1_OAM));
+
+ loadInputAndOutputData(BASE_DIRECTORY +
+ "creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation");
+ UnifiedCompositionData unifiedCompositionData =
+ createCompositionData(FSB1_template, portTypeToIdList);
+ addGetAttrForCompute(unifiedCompositionData);
+ addGetAttrForPort(unifiedCompositionData);
+ addGetAttrForPortInnerUC(unifiedCompositionData);
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ unifiedCompositionDataList.add(unifiedCompositionData);
+
+ Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+ anyString());
+
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList,
+ context, ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1, null);
+ assertEquals(true, substitutionServiceTemplate.isPresent());
+ substitutionServiceTemplate
+ .ifPresent(
+ subServiceTemplate -> checkSTResults(expectedOutserviceTemplates,
+ subServiceTemplate, context.getGlobalSubstitutionServiceTemplate(), null));
+ }
+
+
+ @Test
+ public void updNodesGetAttrFromConsolidationNodesTest() throws Exception {
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
+ portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+
+ loadInputAndOutputData(BASE_DIRECTORY +
+ "creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation");
+ UnifiedCompositionData unifiedCompositionData1 =
+ createCompositionData(FSB1_template, portTypeToIdList1);
+ addGetAttrForCompute(unifiedCompositionData1);
+ addGetAttrForPort(unifiedCompositionData1);
+ unifiedCompositionDataList.add(unifiedCompositionData1);
+
+ List<Pair<String, String>> portTypeToIdList2 = new ArrayList<>();
+ portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2));
+ portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1));
+
+ UnifiedCompositionData unifiedCompositionData2 =
+ createCompositionData(FSB2_template, portTypeToIdList2);
+ addGetAttrForCompute2(unifiedCompositionData2);
+ addGetAttrForPort2(unifiedCompositionData2);
+ unifiedCompositionDataList.add(unifiedCompositionData2);
+
+ Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
+ .createUnifiedSubstitutionServiceTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList,
+ context, ORG_OPENECOMP_RESOURCE_ABSTRACT_NODES_FSB1, null);
+ assertEquals(true, substitutionServiceTemplate.isPresent());
+ substitutionServiceTemplate
+ .ifPresent(
+ subServiceTemplate -> checkSTResults(expectedOutserviceTemplates,
+ subServiceTemplate, context.getGlobalSubstitutionServiceTemplate(), null));
+ }
+
+ @Test
+ public void cleanMainServiceTemplateTestNoConsolidation() throws IOException {
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>("FSB_OAM", FSB1_OAM));
+
+ loadInputAndOutputData(BASE_DIRECTORY + "cleanMainSt/noConsolidation");
+ UnifiedCompositionData unifiedCompositionData =
+ createCompositionData(FSB1_template, portTypeToIdList);
+ addGetAttrForCompute(unifiedCompositionData);
+ addGetAttrForPort(unifiedCompositionData);
+
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ unifiedCompositionDataList.add(unifiedCompositionData);
+
+ NodeTemplate abstractNodeTemplate = getMockNode(
+ BASE_DIRECTORY + "cleanMainSt/mockAbstractNodeTemplate.yaml");
+ inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML).getTopology_template().getNode_templates()
+ .put(FSB1, abstractNodeTemplate);
+
+ Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+ anyString());
+
+ unifiedCompositionService.
+ cleanUnifiedCompositionEntities(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList, context);
+
+ checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
+ }
+
+ @Test
+ public void cleanMainServiceTemplateTestWithConsolidation() throws IOException {
+ loadInputAndOutputData(BASE_DIRECTORY + "cleanMainSt/consolidation");
+
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
+ portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+
+ UnifiedCompositionData unifiedCompositionData1 =
+ createCompositionData(FSB1_template, portTypeToIdList1);
+ addOutputGetAttrInForCompute1WithConsolidation(unifiedCompositionData1);
+ addOutputGetAttrInForPortWithConsolidation1(unifiedCompositionData1);
+ unifiedCompositionDataList.add(unifiedCompositionData1);
+
+ List<Pair<String, String>> portTypeToIdList2 = new ArrayList<>();
+ portTypeToIdList2.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2));
+ portTypeToIdList2.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1));
+
+ UnifiedCompositionData unifiedCompositionData2 =
+ createCompositionData(FSB2_template, portTypeToIdList2);
+ addOutputGetAttrInForCompute2WithConsolidation(unifiedCompositionData2);
+ addOutputGetAttrInForPortWithConsolidation2(unifiedCompositionData2);
+ unifiedCompositionDataList.add(unifiedCompositionData2);
+
+ NodeTemplate abstractNodeTemplate = getMockNode(
+ BASE_DIRECTORY + "cleanMainSt/mockAbstractNodeTemplate.yaml");
+ inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML).getTopology_template().getNode_templates()
+ .put(FSB1, abstractNodeTemplate);
+
+ Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+ anyString());
+
+ unifiedCompositionService.
+ cleanUnifiedCompositionEntities(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ unifiedCompositionDataList, context);
+
+ checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
+ }
+
+ @Test
+ public void updateNewAbstractNodeTemplateNoConsolidation() throws IOException {
+ loadInputAndOutputData(BASE_DIRECTORY + "fixNewAbstractNodeTemplate/noConsolidation");
+
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2));
+
+ NodeTemplate cleanedComputeNodeTemplate =
+ getMockNode(
+ BASE_DIRECTORY + "fixNewAbstractNodeTemplate/mockComputeNodeTemplate.yaml");
+
+
+ context.setConsolidationData(
+ createConsolidationData(Collections.singletonList(FSB1_template), portTypeToIdList));
+ context.addCleanedNodeTemplate(MAIN_SERVICE_TEMPLATE_YAML, FSB1_template,
+ UnifiedCompositionEntity.COMPUTE, cleanedComputeNodeTemplate);
+ context.addCleanedNodeTemplate(MAIN_SERVICE_TEMPLATE_YAML, FSB1_INTERNAL_1,
+ UnifiedCompositionEntity.PORT, cleanedComputeNodeTemplate);
+ context.addCleanedNodeTemplate(MAIN_SERVICE_TEMPLATE_YAML, FSB1_INTERNAL_2,
+ UnifiedCompositionEntity.PORT, cleanedComputeNodeTemplate);
+
+ setUnifiedCompositionData(Arrays.asList(FSB1_template, FSB1_INTERNAL_1, FSB1_INTERNAL_2));
+
+ unifiedCompositionService
+ .updateUnifiedAbstractNodesConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), context);
+
+ checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
+ }
+
+ @Test
+ public void updateNewAbstractNodeTemplateWithConsolidation() throws IOException {
+ loadInputAndOutputData(BASE_DIRECTORY + "fixNewAbstractNodeTemplate/consolidation");
+
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_1));
+
+ NodeTemplate cleanedComputeNodeTemplate =
+ getMockNode(
+ BASE_DIRECTORY + "fixNewAbstractNodeTemplate/mockComputeNodeTemplate.yaml");
+
+
+ context.setConsolidationData(
+ createConsolidationData(Arrays.asList("FSB1_template_1", "FSB1_template_2"),
+ portTypeToIdList));
+ context.addCleanedNodeTemplate(MAIN_SERVICE_TEMPLATE_YAML, "FSB1_template_1",
+ UnifiedCompositionEntity.COMPUTE, cleanedComputeNodeTemplate);
+ context.addCleanedNodeTemplate(MAIN_SERVICE_TEMPLATE_YAML, "FSB1_template_2",
+ UnifiedCompositionEntity.COMPUTE, cleanedComputeNodeTemplate);
+ context.addCleanedNodeTemplate(MAIN_SERVICE_TEMPLATE_YAML, FSB1_INTERNAL_1,
+ UnifiedCompositionEntity.PORT, cleanedComputeNodeTemplate);
+ context.addCleanedNodeTemplate(MAIN_SERVICE_TEMPLATE_YAML, FSB2_INTERNAL_1,
+ UnifiedCompositionEntity.PORT, cleanedComputeNodeTemplate);
+
+ setUnifiedCompositionData(
+ Arrays.asList("FSB1_template_1", "FSB1_template_2", FSB1_INTERNAL_1, FSB2_INTERNAL_1));
+
+ unifiedCompositionService
+ .updateUnifiedAbstractNodesConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), context);
+
+ checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
+ }
+
+ @Ignore
+ public void testThreeNovaOfSameTypePreConditionFalse() throws IOException {
+ loadInputAndOutputData(BASE_DIRECTORY + "pattern1b/noConsolidation");
+
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ List<Pair<String, String>> portTypeToIdList1 = new ArrayList<>();
+ portTypeToIdList1.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_1));
+ portTypeToIdList1.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+
+ UnifiedCompositionData unifiedCompositionData1 =
+ createCompositionData(FSB1_template, portTypeToIdList1);
+ addOutputGetAttrInForCompute1WithConsolidation(unifiedCompositionData1);
+ addOutputGetAttrInForPortWithConsolidation1(unifiedCompositionData1);
+ unifiedCompositionDataList.add(unifiedCompositionData1);
+
+ UnifiedCompositionData unifiedCompositionData2 =
+ createCompositionData(FSB2_template, portTypeToIdList1);
+ addOutputGetAttrInForCompute1WithConsolidation(unifiedCompositionData2);
+ addOutputGetAttrInForPortWithConsolidation1(unifiedCompositionData2);
+ unifiedCompositionDataList.add(unifiedCompositionData2);
+
+ portTypeToIdList1.remove(1);
+ UnifiedCompositionData unifiedCompositionData3 =
+ createCompositionData(FSB3_template, portTypeToIdList1);
+ addOutputGetAttrInForCompute1WithConsolidation(unifiedCompositionData3);
+ addOutputGetAttrInForPortWithConsolidation1(unifiedCompositionData3);
+ unifiedCompositionDataList.add(unifiedCompositionData3);
+
+ UnifiedCompositionSingleSubstitution unifiedCompositionSingleSubstitution =
+ new UnifiedCompositionSingleSubstitution();
+ unifiedCompositionSingleSubstitution
+ .createUnifiedComposition(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), null,
+ unifiedCompositionDataList, context);
+
+ checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
+ }
+
+ @Test
+ public void testUnifiedNestedCompositionOneComputeInNested() throws IOException {
+ loadInputAndOutputData(BASE_DIRECTORY + "pattern4/oneNestedNode");
+
+ ConsolidationData consolidationData = new ConsolidationData();
+ String nestedFileName = "nested-pcm_v0.1ServiceTemplate.yaml";
+ TestUtils.updateNestedConsolidationData(MAIN_SERVICE_TEMPLATE_YAML, Collections.singletonList("server_pcm_001"),
+ consolidationData);
+
+ TestUtils.initComputeNodeTypeInConsolidationData(nestedFileName,
+ "org.openecomp.resource.vfc.nodes.heat.pcm_server", consolidationData);
+ TestUtils.initComputeNodeTemplateIdInConsolidationData(nestedFileName,
+ "org.openecomp.resource.vfc.nodes.heat.pcm_server", "server_pcm", consolidationData);
+
+ context.setConsolidationData(consolidationData);
+ context.getTranslatedServiceTemplates()
+ .put(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME,
+ inputServiceTemplates.get(GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE_YAML));
context.getTranslatedServiceTemplates()
- .get(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME), null);
- }
-
- @Test
- public void testTwoNestedWithOneCompute() throws IOException {
- loadInputAndOutputData(BASE_DIRECTORY + "pattern4/twoNestedWithOneCompute");
-
- ConsolidationData consolidationData = new ConsolidationData();
- String nestedFileName1 = "nested-pcm_v0.1ServiceTemplate.yaml";
- String nestedFileName2 = "nested-oam_v0.1ServiceTemplate.yaml";
-
- TestUtils.updateNestedConsolidationData(MAIN_SERVICE_TEMPLATE_YAML,
- Arrays.asList("server_pcm_001", "server_oam_001"), consolidationData);
-
- TestUtils.initComputeNodeTypeInConsolidationData(nestedFileName1,
- "org.openecomp.resource.vfc.nodes.heat.pcm_server", consolidationData);
- TestUtils.initComputeNodeTemplateIdInConsolidationData(nestedFileName1,
- "org.openecomp.resource.vfc.nodes.heat.pcm_server", "server_pcm", consolidationData);
- TestUtils.initComputeNodeTypeInConsolidationData(nestedFileName2,
- "org.openecomp.resource.vfc.nodes.heat.oam_server", consolidationData);
- TestUtils.initComputeNodeTemplateIdInConsolidationData(nestedFileName2,
- "org.openecomp.resource.vfc.nodes.heat.oam_server", "server_oam", consolidationData);
-
- context.setConsolidationData(consolidationData);
- context.getTranslatedServiceTemplates()
- .put(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME,
- inputServiceTemplates.get(GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE_YAML));
- context.getTranslatedServiceTemplates()
- .put(nestedFileName1, inputServiceTemplates.get(nestedFileName1));
- context.getTranslatedServiceTemplates()
- .put(nestedFileName2, inputServiceTemplates.get(nestedFileName2));
- context.getTranslatedServiceTemplates()
- .put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
-
- UnifiedCompositionData unifiedComposition =
- createUnifiedCompositionOnlyNested("server_pcm_001");
- unifiedCompositionService.handleUnifiedNestedDefinition(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- inputServiceTemplates.get(nestedFileName1), unifiedComposition, context);
- unifiedComposition = createUnifiedCompositionOnlyNested("server_oam_001");
- unifiedCompositionService.handleUnifiedNestedDefinition(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- inputServiceTemplates.get(nestedFileName2), unifiedComposition, context);
-
- checkSTResults(expectedOutserviceTemplates, nestedFileName1,
- context.getTranslatedServiceTemplates().get(nestedFileName1),
+ .put(nestedFileName, inputServiceTemplates.get(nestedFileName));
+ context.getTranslatedServiceTemplates()
+ .put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
+
+ UnifiedCompositionData unifiedComposition = createUnifiedCompositionOnlyNested("server_pcm_001");
+ unifiedCompositionService.handleUnifiedNestedDefinition(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ inputServiceTemplates.get(nestedFileName), unifiedComposition, context);
+
+ checkSTResults(expectedOutserviceTemplates, nestedFileName,
+ context.getTranslatedServiceTemplates().get(nestedFileName),
+ context.getTranslatedServiceTemplates()
+ .get(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME), null);
+ }
+
+ @Test
+ public void testTwoNestedWithOneCompute() throws IOException {
+ loadInputAndOutputData(BASE_DIRECTORY + "pattern4/twoNestedWithOneCompute");
+
+ ConsolidationData consolidationData = new ConsolidationData();
+ String nestedFileName1 = "nested-pcm_v0.1ServiceTemplate.yaml";
+ String nestedFileName2 = "nested-oam_v0.1ServiceTemplate.yaml";
+
+ TestUtils.updateNestedConsolidationData(MAIN_SERVICE_TEMPLATE_YAML,
+ Arrays.asList("server_pcm_001", "server_oam_001"), consolidationData);
+
+ TestUtils.initComputeNodeTypeInConsolidationData(nestedFileName1,
+ "org.openecomp.resource.vfc.nodes.heat.pcm_server", consolidationData);
+ TestUtils.initComputeNodeTemplateIdInConsolidationData(nestedFileName1,
+ "org.openecomp.resource.vfc.nodes.heat.pcm_server", "server_pcm", consolidationData);
+ TestUtils.initComputeNodeTypeInConsolidationData(nestedFileName2,
+ "org.openecomp.resource.vfc.nodes.heat.oam_server", consolidationData);
+ TestUtils.initComputeNodeTemplateIdInConsolidationData(nestedFileName2,
+ "org.openecomp.resource.vfc.nodes.heat.oam_server", "server_oam", consolidationData);
+
+ context.setConsolidationData(consolidationData);
context.getTranslatedServiceTemplates()
- .get(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME), null);
- checkSTResults(expectedOutserviceTemplates, nestedFileName2,
- context.getTranslatedServiceTemplates().get(nestedFileName2),
- null, null);
- }
-
- @Test
- public void testNestedCompositionNodesConnectedIn() throws IOException {
- loadInputAndOutputData(BASE_DIRECTORY + "pattern4/nestedNodesConnectedIn");
- ConsolidationData consolidationData = new ConsolidationData();
- String nestedFileName = "nested-pcm_v0.1ServiceTemplate.yaml";
- TestUtils.updateNestedConsolidationData(MAIN_SERVICE_TEMPLATE_YAML, Collections.singletonList("server_pcm_001"),
- consolidationData);
- context.getTranslatedServiceTemplates()
- .put(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME,
- inputServiceTemplates.get(GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE_YAML));
- context.getTranslatedServiceTemplates()
- .put(nestedFileName, inputServiceTemplates.get(nestedFileName));
- context.getTranslatedServiceTemplates()
- .put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
- context.addUnifiedNestedNodeTemplateId(MAIN_SERVICE_TEMPLATE_YAML, "server_pcm_001", "abstract_pcm_server_0");
-
- Map<String, List<RequirementAssignmentData>> nodeConnectedInList =
- TestUtils.getNodeConnectedInList("server_pcm_001", inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- DEPENDENCY);
- UnifiedCompositionData unifiedComposition =
- createUnifiedCompositionOnlyNested("server_pcm_001");
- unifiedComposition.getNestedTemplateConsolidationData()
- .setNodesConnectedIn(nodeConnectedInList);
-
- unifiedCompositionService.updNestedCompositionNodesConnectedInConnectivity
- (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedComposition, context);
- checkSTResults(expectedOutserviceTemplates, nestedFileName,
- context.getTranslatedServiceTemplates().get(nestedFileName),
+ .put(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME,
+ inputServiceTemplates.get(GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE_YAML));
context.getTranslatedServiceTemplates()
- .get(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME), context
- .getTranslatedServiceTemplates().get(MAIN_SERVICE_TEMPLATE_YAML));
- }
-
-
- @Test
- public void testNestedCompositionNodesGetAttrIn() throws IOException {
- loadInputAndOutputData(BASE_DIRECTORY + "pattern4/nestedNodesGetAttrIn");
- ConsolidationData consolidationData = new ConsolidationData();
- String nestedFileName = "nested-pcm_v0.1ServiceTemplate.yaml";
- TestUtils.updateNestedConsolidationData(MAIN_SERVICE_TEMPLATE_YAML, Collections.singletonList("server_pcm_001"),
- consolidationData);
- context.getTranslatedServiceTemplates()
- .put(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME,
- inputServiceTemplates.get(GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE_YAML));
- context.getTranslatedServiceTemplates()
- .put(nestedFileName, inputServiceTemplates.get(nestedFileName));
- context.getTranslatedServiceTemplates()
- .put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
- context.addUnifiedNestedNodeTemplateId(MAIN_SERVICE_TEMPLATE_YAML, "server_pcm_001", "abstract_pcm_server_0");
-
- Map<String, List<RequirementAssignmentData>> nodeConnectedInList =
- TestUtils.getNodeConnectedInList("server_pcm_001", inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- DEPENDENCY);
- UnifiedCompositionData unifiedComposition =
- createUnifiedCompositionOnlyNested("server_pcm_001");
- addGetAttInUnifiedCompositionData(unifiedComposition
- .getNestedTemplateConsolidationData(), TENANT_ID, "oam_net_gw", "packet_mirror_network");
- addGetAttInUnifiedCompositionData(unifiedComposition
- .getNestedTemplateConsolidationData(), USER_DATA_FORMAT, "oam_net_gw",
- "server_compute_get_attr_test");
- addGetAttInUnifiedCompositionData(unifiedComposition
- .getNestedTemplateConsolidationData(), "metadata", "server_pcm_id",
- "server_compute_get_attr_test");
- unifiedCompositionService.updNestedCompositionNodesGetAttrInConnectivity
- (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedComposition, context);
- checkSTResults(expectedOutserviceTemplates, nestedFileName,
- context.getTranslatedServiceTemplates().get(nestedFileName),
+ .put(nestedFileName1, inputServiceTemplates.get(nestedFileName1));
context.getTranslatedServiceTemplates()
- .get(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME), context
- .getTranslatedServiceTemplates().get(MAIN_SERVICE_TEMPLATE_YAML));
- }
-
- @Test
- public void testNestedCompositionOutputParamGetAttrIn() throws IOException {
- loadInputAndOutputData(BASE_DIRECTORY + "pattern4/nestedOutputParamGetAttrIn");
- ConsolidationData consolidationData = new ConsolidationData();
- String nestedFileName = "nested-pcm_v0.1ServiceTemplate.yaml";
- TestUtils.updateNestedConsolidationData(MAIN_SERVICE_TEMPLATE_YAML, Collections.singletonList("server_pcm_001"),
- consolidationData);
- context.getTranslatedServiceTemplates()
- .put(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME,
- inputServiceTemplates.get(GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE_YAML));
- context.getTranslatedServiceTemplates()
- .put(nestedFileName, inputServiceTemplates.get(nestedFileName));
- context.getTranslatedServiceTemplates()
- .put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
- context.addUnifiedNestedNodeTemplateId(MAIN_SERVICE_TEMPLATE_YAML, "server_pcm_001", "abstract_pcm_server_0");
-
- Map<String, List<RequirementAssignmentData>> nodeConnectedInList =
- TestUtils.getNodeConnectedInList("server_pcm_001", inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- DEPENDENCY);
- UnifiedCompositionData unifiedComposition =
- createUnifiedCompositionOnlyNested("server_pcm_001");
- addOutputGetAttInUnifiedCompositionData(unifiedComposition
- .getNestedTemplateConsolidationData(), "output_attr_1", ACCESS_IPv4);
- addOutputGetAttInUnifiedCompositionData(unifiedComposition
- .getNestedTemplateConsolidationData(), "output_attr_2", ACCESS_IPv6);
- unifiedCompositionService.updNestedCompositionOutputParamGetAttrInConnectivity
- (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedComposition, context);
- checkSTResults(expectedOutserviceTemplates, nestedFileName,
- context.getTranslatedServiceTemplates().get(nestedFileName),
+ .put(nestedFileName2, inputServiceTemplates.get(nestedFileName2));
context.getTranslatedServiceTemplates()
- .get(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME), context
- .getTranslatedServiceTemplates().get(MAIN_SERVICE_TEMPLATE_YAML));
- }
-
- @Test
- public void testInputOutputParameterType() throws IOException{
- loadInputAndOutputData(BASE_DIRECTORY + "inputoutputparamtype");
- 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(MAIN_SERVICE_TEMPLATE_YAML).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);
- }
+ .put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
+
+ UnifiedCompositionData unifiedComposition =
+ createUnifiedCompositionOnlyNested("server_pcm_001");
+ unifiedCompositionService.handleUnifiedNestedDefinition(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ inputServiceTemplates.get(nestedFileName1), unifiedComposition, context);
+ unifiedComposition = createUnifiedCompositionOnlyNested("server_oam_001");
+ unifiedCompositionService.handleUnifiedNestedDefinition(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ inputServiceTemplates.get(nestedFileName2), unifiedComposition, context);
+
+ checkSTResults(expectedOutserviceTemplates, nestedFileName1,
+ context.getTranslatedServiceTemplates().get(nestedFileName1),
+ context.getTranslatedServiceTemplates()
+ .get(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME), null);
+ checkSTResults(expectedOutserviceTemplates, nestedFileName2,
+ context.getTranslatedServiceTemplates().get(nestedFileName2),
+ null, null);
}
- List<UnifiedCompositionData> unifiedCompositionDataList = new LinkedList<>();
- unifiedCompositionDataList.add(unifiedCompositionData);
-
- UnifiedCompositionSingleSubstitution unifiedCompositionSingleSubstitution =
- new UnifiedCompositionSingleSubstitution();
- unifiedCompositionSingleSubstitution
- .createUnifiedComposition(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), null,
- unifiedCompositionDataList, context);
- checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
- System.out.println();
-
- }
-
-
- private UnifiedCompositionData createUnifiedCompositionOnlyNested(
- String nestedNodeTemplateId) {
- NestedTemplateConsolidationData nestedTemplateConsolidationData =
- new NestedTemplateConsolidationData();
- nestedTemplateConsolidationData.setNodeTemplateId(nestedNodeTemplateId);
- UnifiedCompositionData unifiedCompositionData = new UnifiedCompositionData();
- unifiedCompositionData.setNestedTemplateConsolidationData(nestedTemplateConsolidationData);
- return unifiedCompositionData;
- }
-
- private void setUnifiedCompositionData(List<String> nodeTemplateIds) {
- UnifiedSubstitutionData unifiedSubstitutionData =
- context.getUnifiedSubstitutionData().get(MAIN_SERVICE_TEMPLATE_YAML) == null ? new UnifiedSubstitutionData()
- : context.getUnifiedSubstitutionData().get(MAIN_SERVICE_TEMPLATE_YAML);
- Map<String, String> substitutionAbstractNodeIds = new HashMap<>();
- for (String id : nodeTemplateIds) {
- substitutionAbstractNodeIds.put(id, "FSB2");
+ @Test
+ public void testNestedCompositionNodesConnectedIn() throws IOException {
+ loadInputAndOutputData(BASE_DIRECTORY + "pattern4/nestedNodesConnectedIn");
+ ConsolidationData consolidationData = new ConsolidationData();
+ String nestedFileName = "nested-pcm_v0.1ServiceTemplate.yaml";
+ TestUtils.updateNestedConsolidationData(MAIN_SERVICE_TEMPLATE_YAML, Collections.singletonList("server_pcm_001"),
+ consolidationData);
+ context.getTranslatedServiceTemplates()
+ .put(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME,
+ inputServiceTemplates.get(GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE_YAML));
+ context.getTranslatedServiceTemplates()
+ .put(nestedFileName, inputServiceTemplates.get(nestedFileName));
+ context.getTranslatedServiceTemplates()
+ .put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
+ context.addUnifiedNestedNodeTemplateId(MAIN_SERVICE_TEMPLATE_YAML, "server_pcm_001", "abstract_pcm_server_0");
+
+ Map<String, List<RequirementAssignmentData>> nodeConnectedInList =
+ TestUtils.getNodeConnectedInList("server_pcm_001", inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ DEPENDENCY);
+ UnifiedCompositionData unifiedComposition =
+ createUnifiedCompositionOnlyNested("server_pcm_001");
+ unifiedComposition.getNestedTemplateConsolidationData()
+ .setNodesConnectedIn(nodeConnectedInList);
+
+ unifiedCompositionService.updNestedCompositionNodesConnectedInConnectivity
+ (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedComposition, context);
+ checkSTResults(expectedOutserviceTemplates, nestedFileName,
+ context.getTranslatedServiceTemplates().get(nestedFileName),
+ context.getTranslatedServiceTemplates()
+ .get(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME), context
+ .getTranslatedServiceTemplates().get(MAIN_SERVICE_TEMPLATE_YAML));
}
- substitutionAbstractNodeIds.put("", FSB1);
-
- unifiedSubstitutionData.setNodesRelatedAbstractNode(substitutionAbstractNodeIds);
- }
-
- private void checkSTResults(
- Map<String, ServiceTemplate> expectedOutserviceTemplates,
- ServiceTemplate substitutionServiceTemplate,
- ServiceTemplate gloablSubstitutionServiceTemplate, ServiceTemplate mainServiceTemplate) {
- YamlUtil yamlUtil = new YamlUtil();
- if (Objects.nonNull(substitutionServiceTemplate)) {
- String substitutionST = "SubstitutionServiceTemplate.yaml";
- assertEquals("difference substitution service template: ",
- yamlUtil.objectToYaml(expectedOutserviceTemplates.get(substitutionST)),
- yamlUtil.objectToYaml(substitutionServiceTemplate));
+
+ @Test
+ public void testNestedCompositionNodesGetAttrIn() throws IOException {
+ loadInputAndOutputData(BASE_DIRECTORY + "pattern4/nestedNodesGetAttrIn");
+ ConsolidationData consolidationData = new ConsolidationData();
+ String nestedFileName = "nested-pcm_v0.1ServiceTemplate.yaml";
+ TestUtils.updateNestedConsolidationData(MAIN_SERVICE_TEMPLATE_YAML, Collections.singletonList("server_pcm_001"),
+ consolidationData);
+ context.getTranslatedServiceTemplates()
+ .put(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME,
+ inputServiceTemplates.get(GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE_YAML));
+ context.getTranslatedServiceTemplates()
+ .put(nestedFileName, inputServiceTemplates.get(nestedFileName));
+ context.getTranslatedServiceTemplates()
+ .put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
+ context.addUnifiedNestedNodeTemplateId(MAIN_SERVICE_TEMPLATE_YAML, "server_pcm_001", "abstract_pcm_server_0");
+
+ Map<String, List<RequirementAssignmentData>> nodeConnectedInList =
+ TestUtils.getNodeConnectedInList("server_pcm_001", inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ DEPENDENCY);
+ UnifiedCompositionData unifiedComposition =
+ createUnifiedCompositionOnlyNested("server_pcm_001");
+ addGetAttInUnifiedCompositionData(unifiedComposition
+ .getNestedTemplateConsolidationData(), TENANT_ID, "oam_net_gw", "packet_mirror_network");
+ addGetAttInUnifiedCompositionData(unifiedComposition
+ .getNestedTemplateConsolidationData(), USER_DATA_FORMAT, "oam_net_gw",
+ "server_compute_get_attr_test");
+ addGetAttInUnifiedCompositionData(unifiedComposition
+ .getNestedTemplateConsolidationData(), "metadata", "server_pcm_id",
+ "server_compute_get_attr_test");
+ unifiedCompositionService.updNestedCompositionNodesGetAttrInConnectivity
+ (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedComposition, context);
+ checkSTResults(expectedOutserviceTemplates, nestedFileName,
+ context.getTranslatedServiceTemplates().get(nestedFileName),
+ context.getTranslatedServiceTemplates()
+ .get(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME), context
+ .getTranslatedServiceTemplates().get(MAIN_SERVICE_TEMPLATE_YAML));
}
- if (Objects.nonNull(gloablSubstitutionServiceTemplate)) {
- assertEquals("difference global substitution service template: ",
- yamlUtil.objectToYaml(expectedOutserviceTemplates.get(GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE_YAML)),
- yamlUtil.objectToYaml(gloablSubstitutionServiceTemplate));
+
+ @Test
+ public void testNestedCompositionOutputParamGetAttrIn() throws IOException {
+ loadInputAndOutputData(BASE_DIRECTORY + "pattern4/nestedOutputParamGetAttrIn");
+ ConsolidationData consolidationData = new ConsolidationData();
+ String nestedFileName = "nested-pcm_v0.1ServiceTemplate.yaml";
+ TestUtils.updateNestedConsolidationData(MAIN_SERVICE_TEMPLATE_YAML, Collections.singletonList("server_pcm_001"),
+ consolidationData);
+ context.getTranslatedServiceTemplates()
+ .put(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME,
+ inputServiceTemplates.get(GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE_YAML));
+ context.getTranslatedServiceTemplates()
+ .put(nestedFileName, inputServiceTemplates.get(nestedFileName));
+ context.getTranslatedServiceTemplates()
+ .put(MAIN_SERVICE_TEMPLATE_YAML, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
+ context.addUnifiedNestedNodeTemplateId(MAIN_SERVICE_TEMPLATE_YAML, "server_pcm_001", "abstract_pcm_server_0");
+
+ Map<String, List<RequirementAssignmentData>> nodeConnectedInList =
+ TestUtils.getNodeConnectedInList("server_pcm_001", inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ DEPENDENCY);
+ UnifiedCompositionData unifiedComposition =
+ createUnifiedCompositionOnlyNested("server_pcm_001");
+ addOutputGetAttInUnifiedCompositionData(unifiedComposition
+ .getNestedTemplateConsolidationData(), "output_attr_1", ACCESS_IPv4);
+ addOutputGetAttInUnifiedCompositionData(unifiedComposition
+ .getNestedTemplateConsolidationData(), "output_attr_2", ACCESS_IPv6);
+ unifiedCompositionService.updNestedCompositionOutputParamGetAttrInConnectivity
+ (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedComposition, context);
+ checkSTResults(expectedOutserviceTemplates, nestedFileName,
+ context.getTranslatedServiceTemplates().get(nestedFileName),
+ context.getTranslatedServiceTemplates()
+ .get(Constants.GLOBAL_SUBSTITUTION_TYPES_TEMPLATE_NAME), context
+ .getTranslatedServiceTemplates().get(MAIN_SERVICE_TEMPLATE_YAML));
+ }
+
+ @Test
+ public void testInputOutputParameterType() throws IOException{
+ loadInputAndOutputData(BASE_DIRECTORY + "inputoutputparamtype");
+ ConsolidationData consolidationData = new ConsolidationData();
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ portTypeToIdList.add(new ImmutablePair<>("FSB1_Port", "FSB1_Port_1"));
+ portTypeToIdList.add(new ImmutablePair<>("VMI", "VMI_1"));
+
+ UnifiedCompositionData unifiedCompositionData = createCompositionData(FSB1, portTypeToIdList);
+
+ Map<String, NodeTemplate> nodeTemplates =
+ inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML).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(MAIN_SERVICE_TEMPLATE_YAML), null,
+ unifiedCompositionDataList, context);
+ checkSTResults(expectedOutserviceTemplates, null, null, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML));
+ System.out.println();
+
}
- if (Objects.nonNull(mainServiceTemplate)) {
- assertEquals("difference main service template: ",
- yamlUtil.objectToYaml(expectedOutserviceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML)),
- yamlUtil.objectToYaml(mainServiceTemplate));
+
+
+ private UnifiedCompositionData createUnifiedCompositionOnlyNested(
+ String nestedNodeTemplateId) {
+ NestedTemplateConsolidationData nestedTemplateConsolidationData =
+ new NestedTemplateConsolidationData();
+ nestedTemplateConsolidationData.setNodeTemplateId(nestedNodeTemplateId);
+ UnifiedCompositionData unifiedCompositionData = new UnifiedCompositionData();
+ unifiedCompositionData.setNestedTemplateConsolidationData(nestedTemplateConsolidationData);
+ return unifiedCompositionData;
}
- }
-
- private void checkSTResults(
- Map<String, ServiceTemplate> expectedOutserviceTemplates,
- String nestedSTFileName, ServiceTemplate nestedServiceTemplate,
- ServiceTemplate gloablSubstitutionServiceTemplate, ServiceTemplate mainServiceTemplate) {
- YamlUtil yamlUtil = new YamlUtil();
-
- if (Objects.nonNull(nestedServiceTemplate)) {
- assertEquals("difference nested service template: ",
- yamlUtil.objectToYaml(expectedOutserviceTemplates.get(nestedSTFileName)),
- yamlUtil.objectToYaml(nestedServiceTemplate));
+
+ private void setUnifiedCompositionData(List<String> nodeTemplateIds) {
+ UnifiedSubstitutionData unifiedSubstitutionData =
+ context.getUnifiedSubstitutionData().get(MAIN_SERVICE_TEMPLATE_YAML) == null ? new UnifiedSubstitutionData()
+ : context.getUnifiedSubstitutionData().get(MAIN_SERVICE_TEMPLATE_YAML);
+ Map<String, String> substitutionAbstractNodeIds = new HashMap<>();
+ for (String id : nodeTemplateIds) {
+ substitutionAbstractNodeIds.put(id, "FSB2");
+ }
+
+ substitutionAbstractNodeIds.put("", FSB1);
+
+ unifiedSubstitutionData.setNodesRelatedAbstractNode(substitutionAbstractNodeIds);
}
- checkSTResults(expectedOutserviceTemplates, null, gloablSubstitutionServiceTemplate,
- mainServiceTemplate);
- }
-
-
- private void loadInputAndOutputData(String path) throws IOException {
- inputServiceTemplates = new HashMap<>();
- TestUtils.loadServiceTemplates(path + IN_PREFIX, new ToscaExtensionYamlUtil(),
- inputServiceTemplates);
- expectedOutserviceTemplates = new HashMap<>();
- TestUtils.loadServiceTemplates(path + OUT_PREFIX, new ToscaExtensionYamlUtil(),
- expectedOutserviceTemplates);
- }
-
-
- private void addGetAttInUnifiedCompositionData(EntityConsolidationData entityConsolidationData,
- String propertyName, String attributeName,
- String nodeTemplateId) {
- GetAttrFuncData getAttrFuncData = new GetAttrFuncData();
- getAttrFuncData.setAttributeName(attributeName);
- getAttrFuncData.setFieldName(propertyName);
- entityConsolidationData.addNodesGetAttrIn(nodeTemplateId, getAttrFuncData);
- }
-
- private void addOutputGetAttInUnifiedCompositionData(
- EntityConsolidationData entityConsolidationData,
- String outParamName, String attributeName) {
- GetAttrFuncData getAttrFuncData = new GetAttrFuncData();
- getAttrFuncData.setAttributeName(attributeName);
- getAttrFuncData.setFieldName(outParamName);
- entityConsolidationData.addOutputParamGetAttrIn(getAttrFuncData);
- }
-
- private ConsolidationData createConsolidationData(List<String> computeNodeIds,
- List<Pair<String, String>> portTypeToIdList) {
-
- ConsolidationData consolidationData = new ConsolidationData();
- String computeNodeTypeName = "org.openecomp.resource.vfc.nodes.heat.FSB2";
-
- TestUtils
- .initComputeNodeTypeInConsolidationData(MAIN_SERVICE_TEMPLATE_YAML, computeNodeTypeName, consolidationData);
- TestUtils.initPortConsolidationData(MAIN_SERVICE_TEMPLATE_YAML, consolidationData);
-
- for (String computeId : computeNodeIds) {
- ComputeTemplateConsolidationData computeTemplateConsolidationData =
- new ComputeTemplateConsolidationData();
- TestUtils.updatePortsInComputeTemplateConsolidationData(portTypeToIdList,
- computeTemplateConsolidationData);
- consolidationData.getComputeConsolidationData().getFileComputeConsolidationData(MAIN_SERVICE_TEMPLATE_YAML)
- .getTypeComputeConsolidationData(computeNodeTypeName)
- .setComputeTemplateConsolidationData(computeId,
- computeTemplateConsolidationData);
+
+ private void checkSTResults(
+ Map<String, ServiceTemplate> expectedOutserviceTemplates,
+ ServiceTemplate substitutionServiceTemplate,
+ ServiceTemplate gloablSubstitutionServiceTemplate, ServiceTemplate mainServiceTemplate) {
+ YamlUtil yamlUtil = new YamlUtil();
+ if (Objects.nonNull(substitutionServiceTemplate)) {
+ String substitutionST = "SubstitutionServiceTemplate.yaml";
+ assertEquals("difference substitution service template: ",
+ yamlUtil.objectToYaml(expectedOutserviceTemplates.get(substitutionST)),
+ yamlUtil.objectToYaml(substitutionServiceTemplate));
+ }
+ if (Objects.nonNull(gloablSubstitutionServiceTemplate)) {
+ assertEquals("difference global substitution service template: ",
+ yamlUtil.objectToYaml(expectedOutserviceTemplates.get(GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE_YAML)),
+ yamlUtil.objectToYaml(gloablSubstitutionServiceTemplate));
+ }
+ if (Objects.nonNull(mainServiceTemplate)) {
+ assertEquals("difference main service template: ",
+ yamlUtil.objectToYaml(expectedOutserviceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML)),
+ yamlUtil.objectToYaml(mainServiceTemplate));
+ }
}
- for (Pair<String, String> portTypeToId : portTypeToIdList) {
- consolidationData.getPortConsolidationData().getFilePortConsolidationData(MAIN_SERVICE_TEMPLATE_YAML)
- .setPortTemplateConsolidationData(portTypeToId.getRight(),
- new PortTemplateConsolidationData());
+ private void checkSTResults(
+ Map<String, ServiceTemplate> expectedOutserviceTemplates,
+ String nestedSTFileName, ServiceTemplate nestedServiceTemplate,
+ ServiceTemplate gloablSubstitutionServiceTemplate, ServiceTemplate mainServiceTemplate) {
+ YamlUtil yamlUtil = new YamlUtil();
+
+ if (Objects.nonNull(nestedServiceTemplate)) {
+ assertEquals("difference nested service template: ",
+ yamlUtil.objectToYaml(expectedOutserviceTemplates.get(nestedSTFileName)),
+ yamlUtil.objectToYaml(nestedServiceTemplate));
+ }
+ checkSTResults(expectedOutserviceTemplates, null, gloablSubstitutionServiceTemplate,
+ mainServiceTemplate);
}
- return consolidationData;
- }
-
- private UnifiedCompositionData createCompositionData(String computeNodeTemplateId,
- List<Pair<String, String>> portTypeToIdList) {
-
- UnifiedCompositionData unifiedCompositionData = new UnifiedCompositionData();
- NodeTemplate computeNodeTemplate =
- DataModelUtil.getNodeTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), computeNodeTemplateId);
- Optional<List<RequirementAssignmentData>> requirementAssignmentDataList =
- TestUtils.getRequirementAssignmentDataList(computeNodeTemplate, "local_storage");
- List<RequirementAssignmentData> requirementAssignmentList =
- (requirementAssignmentDataList.isPresent()) ? requirementAssignmentDataList.get() : null;
- Map<String, List<RequirementAssignmentData>> volume = null;
- if (requirementAssignmentList != null) {
- volume = getVolume(requirementAssignmentList);
+
+ private void loadInputAndOutputData(String path) throws IOException {
+ inputServiceTemplates = new HashMap<>();
+ TestUtils.loadServiceTemplates(path + IN_PREFIX, new ToscaExtensionYamlUtil(),
+ inputServiceTemplates);
+ expectedOutserviceTemplates = new HashMap<>();
+ TestUtils.loadServiceTemplates(path + OUT_PREFIX, new ToscaExtensionYamlUtil(),
+ expectedOutserviceTemplates);
}
- unifiedCompositionData.setComputeTemplateConsolidationData(
- TestUtils.createComputeTemplateConsolidationData(computeNodeTemplateId, portTypeToIdList,
- volume));
- if (portTypeToIdList != null) {
- for (Pair<String, String> port : portTypeToIdList) {
- NodeTemplate portNodeTemplate =
- DataModelUtil.getNodeTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), port.getRight());
-
- Map<String, List<RequirementAssignmentData>> nodeConnectedOut =
- TestUtils.getNodeConnectedOutList(portNodeTemplate, "link");
- PortTemplateConsolidationData portTemplateConsolidationData =
- TestUtils.createPortTemplateConsolidationData(port.getRight());
- portTemplateConsolidationData.setNodesConnectedOut(nodeConnectedOut);
- unifiedCompositionData.addPortTemplateConsolidationData(portTemplateConsolidationData);
- }
+
+
+ private void addGetAttInUnifiedCompositionData(EntityConsolidationData entityConsolidationData,
+ String propertyName, String attributeName,
+ String nodeTemplateId) {
+ GetAttrFuncData getAttrFuncData = new GetAttrFuncData();
+ getAttrFuncData.setAttributeName(attributeName);
+ getAttrFuncData.setFieldName(propertyName);
+ entityConsolidationData.addNodesGetAttrIn(nodeTemplateId, getAttrFuncData);
}
- return unifiedCompositionData;
- }
-
- private List<UnifiedCompositionData> createAbstractSubstituteCompositionDataComputeAndPort() {
- List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
- UnifiedCompositionData data1 = createComputeUnifiedCompositionData(FSB1_template);
- UnifiedCompositionData data2 = createComputeUnifiedCompositionData(FSB2_template);
-
- List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
- ImmutablePair<String, String> portTypePair1 = new ImmutablePair<>(FSB1_INTERNAL,
- FSB1_INTERNAL1);
- ImmutablePair<String, String> portTypePair2 = new ImmutablePair<>(FSB2_INTERNAL,
- FSB2_INTERNAL1);
- portTypeToIdList.add(portTypePair1);
- portTypeToIdList.add(portTypePair2);
- addPortDataToCompositionData(portTypeToIdList, data1);
- portTypeToIdList.remove(portTypePair1);
- portTypeToIdList.remove(portTypePair2);
- portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL2));
- portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL2));
- addPortDataToCompositionData(portTypeToIdList, data2);
-
- unifiedCompositionDataList.add(data1);
- unifiedCompositionDataList.add(data2);
- return unifiedCompositionDataList;
- }
-
-
- private UnifiedCompositionData createComputeUnifiedCompositionData(String computeNodeTemplateId) {
- NodeTemplate computeNodeTemplate =
- DataModelUtil.getNodeTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), computeNodeTemplateId);
- Optional<List<RequirementAssignmentData>> requirementAssignmentDataList =
- TestUtils.getRequirementAssignmentDataList(computeNodeTemplate, "local_storage");
- Map<String, List<RequirementAssignmentData>> volume = null;
- if (requirementAssignmentDataList.isPresent()) {
- volume = getVolume(requirementAssignmentDataList.get());
+
+ private void addOutputGetAttInUnifiedCompositionData(
+ EntityConsolidationData entityConsolidationData,
+ String outParamName, String attributeName) {
+ GetAttrFuncData getAttrFuncData = new GetAttrFuncData();
+ getAttrFuncData.setAttributeName(attributeName);
+ getAttrFuncData.setFieldName(outParamName);
+ entityConsolidationData.addOutputParamGetAttrIn(getAttrFuncData);
}
- UnifiedCompositionData data = new UnifiedCompositionData();
- Map<String, List<RequirementAssignmentData>> computeNodeConnectedOut =
- TestUtils.getNodeConnectedOutList(computeNodeTemplate, DEPENDENCY);
- Map<String, List<RequirementAssignmentData>> computeNodeConnectedIn =
+
+ private ConsolidationData createConsolidationData(List<String> computeNodeIds,
+ List<Pair<String, String>> portTypeToIdList) {
+
+ ConsolidationData consolidationData = new ConsolidationData();
+ String computeNodeTypeName = "org.openecomp.resource.vfc.nodes.heat.FSB2";
+
TestUtils
- .getNodeConnectedInList(computeNodeTemplateId, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- DEPENDENCY);
- ComputeTemplateConsolidationData computeTemplateConsolidationData = TestUtils
- .createComputeTemplateConsolidationData(computeNodeTemplateId, null, volume);
- List<String> computeNodeGroups =
- TestUtils.getGroupsForNode(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- computeNodeTemplateId);
- if (!computeNodeGroups.isEmpty()) {
- computeTemplateConsolidationData.setGroupIds(computeNodeGroups);
+ .initComputeNodeTypeInConsolidationData(MAIN_SERVICE_TEMPLATE_YAML, computeNodeTypeName, consolidationData);
+ TestUtils.initPortConsolidationData(MAIN_SERVICE_TEMPLATE_YAML, consolidationData);
+
+ for (String computeId : computeNodeIds) {
+ ComputeTemplateConsolidationData computeTemplateConsolidationData =
+ new ComputeTemplateConsolidationData();
+ TestUtils.updatePortsInComputeTemplateConsolidationData(portTypeToIdList,
+ computeTemplateConsolidationData);
+ consolidationData.getComputeConsolidationData().getFileComputeConsolidationData(MAIN_SERVICE_TEMPLATE_YAML)
+ .getTypeComputeConsolidationData(computeNodeTypeName)
+ .setComputeTemplateConsolidationData(computeId,
+ computeTemplateConsolidationData);
+ }
+
+ for (Pair<String, String> portTypeToId : portTypeToIdList) {
+ consolidationData.getPortConsolidationData().getFilePortConsolidationData(MAIN_SERVICE_TEMPLATE_YAML)
+ .setPortTemplateConsolidationData(portTypeToId.getRight(),
+ new PortTemplateConsolidationData());
+ }
+
+ return consolidationData;
}
- computeTemplateConsolidationData.setNodesConnectedOut(computeNodeConnectedOut);
- computeTemplateConsolidationData.setNodesConnectedIn(computeNodeConnectedIn);
- data.setComputeTemplateConsolidationData(computeTemplateConsolidationData);
- return data;
- }
-
- private void addPortDataToCompositionData(List<Pair<String, String>> portTypeToIdList,
- UnifiedCompositionData data) {
- ComputeTemplateConsolidationData computeTemplateConsolidationData = data
- .getComputeTemplateConsolidationData();
-
- for (Pair<String, String> port : portTypeToIdList) {
- NodeTemplate portNodeTemplate =
- DataModelUtil.getNodeTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), port.getRight());
-
- Optional<List<RequirementAssignmentData>> bindingReqList =
- TestUtils.getRequirementAssignmentDataList(portNodeTemplate, "binding");
-
- if (bindingReqList.isPresent()) {
- for (RequirementAssignmentData reqData : bindingReqList.get()) {
- String nodeId = reqData.getRequirementAssignment().getNode();
- if (nodeId.equals(computeTemplateConsolidationData.getNodeTemplateId())) {
- computeTemplateConsolidationData.addPort(port.getLeft(), port.getRight());
- }
+
+ private UnifiedCompositionData createCompositionData(String computeNodeTemplateId,
+ List<Pair<String, String>> portTypeToIdList) {
+
+ UnifiedCompositionData unifiedCompositionData = new UnifiedCompositionData();
+ NodeTemplate computeNodeTemplate =
+ DataModelUtil.getNodeTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), computeNodeTemplateId);
+ Optional<List<RequirementAssignmentData>> requirementAssignmentDataList =
+ TestUtils.getRequirementAssignmentDataList(computeNodeTemplate, "local_storage");
+ List<RequirementAssignmentData> requirementAssignmentList =
+ (requirementAssignmentDataList.isPresent()) ? requirementAssignmentDataList.get() : null;
+ Map<String, List<RequirementAssignmentData>> volume = null;
+ if (requirementAssignmentList != null) {
+ volume = getVolume(requirementAssignmentList);
+ }
+ unifiedCompositionData.setComputeTemplateConsolidationData(
+ TestUtils.createComputeTemplateConsolidationData(computeNodeTemplateId, portTypeToIdList,
+ volume));
+ if (portTypeToIdList != null) {
+ for (Pair<String, String> port : portTypeToIdList) {
+ NodeTemplate portNodeTemplate =
+ DataModelUtil.getNodeTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), port.getRight());
+
+ Map<String, List<RequirementAssignmentData>> nodeConnectedOut =
+ TestUtils.getNodeConnectedOutList(portNodeTemplate, "link");
+ PortTemplateConsolidationData portTemplateConsolidationData =
+ TestUtils.createPortTemplateConsolidationData(port.getRight());
+ portTemplateConsolidationData.setNodesConnectedOut(nodeConnectedOut);
+ unifiedCompositionData.addPortTemplateConsolidationData(portTemplateConsolidationData);
+ }
}
- }
- Map<String, List<RequirementAssignmentData>> portNodeConnectedOut =
- TestUtils.getNodeConnectedOutList(portNodeTemplate, "link");
- PortTemplateConsolidationData portTemplateConsolidationData = TestUtils
- .createPortTemplateConsolidationData(port.getRight());
- portTemplateConsolidationData.setNodesConnectedOut(portNodeConnectedOut);
-
- //Add node connected in info to test data
- Map<String, List<RequirementAssignmentData>> portNodeConnectedIn =
- TestUtils.getNodeConnectedInList(port.getRight(), inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
- PORT);
- portTemplateConsolidationData.setNodesConnectedIn(portNodeConnectedIn);
-
- //Add group infromation for ports
- List<String> portGroups =
- TestUtils.getGroupsForNode(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), port.getRight());
- portTemplateConsolidationData.setGroupIds(portGroups);
- data.addPortTemplateConsolidationData(portTemplateConsolidationData);
+ return unifiedCompositionData;
+ }
+ private List<UnifiedCompositionData> createAbstractSubstituteCompositionDataComputeAndPort() {
+ List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
+ UnifiedCompositionData data1 = createComputeUnifiedCompositionData(FSB1_template);
+ UnifiedCompositionData data2 = createComputeUnifiedCompositionData(FSB2_template);
+
+ List<Pair<String, String>> portTypeToIdList = new ArrayList<>();
+ ImmutablePair<String, String> portTypePair1 = new ImmutablePair<>(FSB1_INTERNAL,
+ FSB1_INTERNAL_1);
+ ImmutablePair<String, String> portTypePair2 = new ImmutablePair<>(FSB2_INTERNAL,
+ FSB2_INTERNAL_1);
+ portTypeToIdList.add(portTypePair1);
+ portTypeToIdList.add(portTypePair2);
+ addPortDataToCompositionData(portTypeToIdList, data1);
+ portTypeToIdList.remove(portTypePair1);
+ portTypeToIdList.remove(portTypePair2);
+ portTypeToIdList.add(new ImmutablePair<>(FSB1_INTERNAL, FSB1_INTERNAL_2));
+ portTypeToIdList.add(new ImmutablePair<>(FSB2_INTERNAL, FSB2_INTERNAL_2));
+ addPortDataToCompositionData(portTypeToIdList, data2);
+
+ unifiedCompositionDataList.add(data1);
+ unifiedCompositionDataList.add(data2);
+ return unifiedCompositionDataList;
}
- addGetAttrForCompute(data);
- addGetAttrForPort(data);
- }
-
- private Map<String, List<RequirementAssignmentData>> getVolume(
- List<RequirementAssignmentData> requirementAssignmentList) {
- Map<String, List<RequirementAssignmentData>> volume = new HashMap<>();
- for (RequirementAssignmentData requirementAssignmentData : requirementAssignmentList) {
- String volumeNodeTemplateId = requirementAssignmentData.getRequirementAssignment().getNode();
- volume.computeIfAbsent(volumeNodeTemplateId, k -> new ArrayList<>());
- volume.get(volumeNodeTemplateId).add(requirementAssignmentData);
+
+
+ private UnifiedCompositionData createComputeUnifiedCompositionData(String computeNodeTemplateId) {
+ NodeTemplate computeNodeTemplate =
+ DataModelUtil.getNodeTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), computeNodeTemplateId);
+ Optional<List<RequirementAssignmentData>> requirementAssignmentDataList =
+ TestUtils.getRequirementAssignmentDataList(computeNodeTemplate, "local_storage");
+ Map<String, List<RequirementAssignmentData>> volume = null;
+ if (requirementAssignmentDataList.isPresent()) {
+ volume = getVolume(requirementAssignmentDataList.get());
+ }
+ UnifiedCompositionData data = new UnifiedCompositionData();
+ Map<String, List<RequirementAssignmentData>> computeNodeConnectedOut =
+ TestUtils.getNodeConnectedOutList(computeNodeTemplate, DEPENDENCY);
+ Map<String, List<RequirementAssignmentData>> computeNodeConnectedIn =
+ TestUtils
+ .getNodeConnectedInList(computeNodeTemplateId, inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ DEPENDENCY);
+ ComputeTemplateConsolidationData computeTemplateConsolidationData = TestUtils
+ .createComputeTemplateConsolidationData(computeNodeTemplateId, null, volume);
+ List<String> computeNodeGroups =
+ TestUtils.getGroupsForNode(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ computeNodeTemplateId);
+ if (!computeNodeGroups.isEmpty()) {
+ computeTemplateConsolidationData.setGroupIds(computeNodeGroups);
+ }
+ computeTemplateConsolidationData.setNodesConnectedOut(computeNodeConnectedOut);
+ computeTemplateConsolidationData.setNodesConnectedIn(computeNodeConnectedIn);
+ data.setComputeTemplateConsolidationData(computeTemplateConsolidationData);
+ return data;
}
- return volume;
- }
-
- private void addGetAttrForPort(UnifiedCompositionData unifiedCompositionData) {
- for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData
- .getPortTemplateConsolidationDataList()) {
- if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL1)) {
- addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "network_name",
- NETWORK_ID, JSA_NET1);
- addGetAttInUnifiedCompositionData(portTemplateConsolidationData, SIZE,
- 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,
- TENANT_ID, CMAUI_VOLUME1);
- } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_OAM)) {
- addGetAttInUnifiedCompositionData(portTemplateConsolidationData, SIZE,
- STATUS, CMAUI_VOLUME1);
- }
+
+ private void addPortDataToCompositionData(List<Pair<String, String>> portTypeToIdList,
+ UnifiedCompositionData data) {
+ ComputeTemplateConsolidationData computeTemplateConsolidationData = data
+ .getComputeTemplateConsolidationData();
+
+ for (Pair<String, String> port : portTypeToIdList) {
+ NodeTemplate portNodeTemplate =
+ DataModelUtil.getNodeTemplate(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), port.getRight());
+
+ Optional<List<RequirementAssignmentData>> bindingReqList =
+ TestUtils.getRequirementAssignmentDataList(portNodeTemplate, "binding");
+
+ if (bindingReqList.isPresent()) {
+ for (RequirementAssignmentData reqData : bindingReqList.get()) {
+ String nodeId = reqData.getRequirementAssignment().getNode();
+ if (nodeId.equals(computeTemplateConsolidationData.getNodeTemplateId())) {
+ computeTemplateConsolidationData.addPort(port.getLeft(), port.getRight());
+ }
+ }
+ }
+ Map<String, List<RequirementAssignmentData>> portNodeConnectedOut =
+ TestUtils.getNodeConnectedOutList(portNodeTemplate, "link");
+ PortTemplateConsolidationData portTemplateConsolidationData = TestUtils
+ .createPortTemplateConsolidationData(port.getRight());
+ portTemplateConsolidationData.setNodesConnectedOut(portNodeConnectedOut);
+
+ //Add node connected in info to test data
+ Map<String, List<RequirementAssignmentData>> portNodeConnectedIn =
+ TestUtils.getNodeConnectedInList(port.getRight(), inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
+ PORT);
+ portTemplateConsolidationData.setNodesConnectedIn(portNodeConnectedIn);
+
+ //Add group infromation for ports
+ List<String> portGroups =
+ TestUtils.getGroupsForNode(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), port.getRight());
+ portTemplateConsolidationData.setGroupIds(portGroups);
+ data.addPortTemplateConsolidationData(portTemplateConsolidationData);
+
+ }
+ addGetAttrForCompute(data);
+ addGetAttrForPort(data);
}
- }
-
- private void addGetAttrForPort2(UnifiedCompositionData unifiedCompositionData) {
- for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData
- .getPortTemplateConsolidationDataList()) {
- if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB2_INTERNAL1)) {
- addGetAttInUnifiedCompositionData(portTemplateConsolidationData, VOLUME_TYPE,
- TENANT_ID, CMAUI_VOLUME3);
- } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL2)) {
- addGetAttInUnifiedCompositionData(portTemplateConsolidationData, SIZE,
- DEVICE_OWNER, CMAUI_VOLUME3);
- addGetAttInUnifiedCompositionData(portTemplateConsolidationData, SIZE,
- STATUS, CMAUI_VOLUME1);
- }
+
+ private Map<String, List<RequirementAssignmentData>> getVolume(
+ List<RequirementAssignmentData> requirementAssignmentList) {
+ Map<String, List<RequirementAssignmentData>> volume = new HashMap<>();
+ for (RequirementAssignmentData requirementAssignmentData : requirementAssignmentList) {
+ String volumeNodeTemplateId = requirementAssignmentData.getRequirementAssignment().getNode();
+ volume.computeIfAbsent(volumeNodeTemplateId, k -> new ArrayList<>());
+ volume.get(volumeNodeTemplateId).add(requirementAssignmentData);
+ }
+ return volume;
}
- }
-
- private void addGetAttrForPortInnerUC(UnifiedCompositionData unifiedCompositionData) {
- for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData
- .getPortTemplateConsolidationDataList()) {
- if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL1)) {
- addGetAttInUnifiedCompositionData(portTemplateConsolidationData, AVAILABILITY_ZONE,
- MYATTR, FSB1_template);
- addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "metadata",
- MYATTR, FSB1_template);
- addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "name",
- MYATTR, FSB1_template);
- addGetAttInUnifiedCompositionData(portTemplateConsolidationData, AVAILABILITY_ZONE,
- TENANT_ID, FSB1_template);
- }
+
+ private void addGetAttrForPort(UnifiedCompositionData unifiedCompositionData) {
+ for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData
+ .getPortTemplateConsolidationDataList()) {
+ if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL_1)) {
+ addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "network_name",
+ NETWORK_ID, JSA_NET1);
+ addGetAttInUnifiedCompositionData(portTemplateConsolidationData, SIZE,
+ DEVICE_OWNER, CMAUI_VOLUME1);
+ } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB2_INTERNAL_2)) {
+ addGetAttInUnifiedCompositionData(portTemplateConsolidationData, TENANT_ID,
+ NETWORK_ID, JSA_NET1);
+ addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "qos_policy",
+ NETWORK_ID, JSA_NET1);
+ addGetAttInUnifiedCompositionData(portTemplateConsolidationData, VOLUME_TYPE,
+ TENANT_ID, CMAUI_VOLUME1);
+ } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_OAM)) {
+ addGetAttInUnifiedCompositionData(portTemplateConsolidationData, SIZE,
+ STATUS, CMAUI_VOLUME1);
+ }
+ }
+ }
+
+ private void addGetAttrForPort2(UnifiedCompositionData unifiedCompositionData) {
+ for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData
+ .getPortTemplateConsolidationDataList()) {
+ if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB2_INTERNAL_1)) {
+ addGetAttInUnifiedCompositionData(portTemplateConsolidationData, VOLUME_TYPE,
+ TENANT_ID, CMAUI_VOLUME3);
+ } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL_2)) {
+ addGetAttInUnifiedCompositionData(portTemplateConsolidationData, SIZE,
+ DEVICE_OWNER, CMAUI_VOLUME3);
+ addGetAttInUnifiedCompositionData(portTemplateConsolidationData, SIZE,
+ STATUS, CMAUI_VOLUME1);
+ }
+ }
+ }
+
+ private void addGetAttrForPortInnerUC(UnifiedCompositionData unifiedCompositionData) {
+ for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData
+ .getPortTemplateConsolidationDataList()) {
+ if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL_1)) {
+ addGetAttInUnifiedCompositionData(portTemplateConsolidationData, AVAILABILITY_ZONE,
+ MYATTR, FSB1_template);
+ addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "metadata",
+ MYATTR, FSB1_template);
+ addGetAttInUnifiedCompositionData(portTemplateConsolidationData, "name",
+ MYATTR, FSB1_template);
+ addGetAttInUnifiedCompositionData(portTemplateConsolidationData, AVAILABILITY_ZONE,
+ TENANT_ID, FSB1_template);
+ }
+ }
+ }
+
+ private void addGetAttrForCompute(UnifiedCompositionData unifiedCompositionData) {
+ addGetAttInUnifiedCompositionData(unifiedCompositionData.getComputeTemplateConsolidationData(),
+ "dhcp_agent_ids", ADDRESSES, JSA_NET1);
+ addGetAttInUnifiedCompositionData(unifiedCompositionData.getComputeTemplateConsolidationData(),
+ VOLUME_TYPE, ADDRESSES, CMAUI_VOLUME1);
+ addGetAttInUnifiedCompositionData(unifiedCompositionData.getComputeTemplateConsolidationData(),
+ SIZE, ACCESS_IPv6, CMAUI_VOLUME2);
+ }
+
+ private void addGetAttrForCompute2(UnifiedCompositionData unifiedCompositionData) {
+ addGetAttInUnifiedCompositionData(unifiedCompositionData.getComputeTemplateConsolidationData(),
+ VOLUME_TYPE, ADDRESSES, CMAUI_VOLUME3);
+ addGetAttInUnifiedCompositionData(unifiedCompositionData.getComputeTemplateConsolidationData(),
+ SIZE, USER_DATA_FORMAT, CMAUI_VOLUME3);
+ }
+
+ private void addOutputGetAttrInForComputeNoConsolidation(
+ UnifiedCompositionData unifiedCompositionData) {
+ addOutputGetAttInUnifiedCompositionData(unifiedCompositionData
+ .getComputeTemplateConsolidationData(), SIMPLE_OUTPUT1, ACCESS_IPv4);
+ addOutputGetAttInUnifiedCompositionData(unifiedCompositionData
+ .getComputeTemplateConsolidationData(), SIMPLE_OUTPUT2, ADDRESSES);
+ addOutputGetAttInUnifiedCompositionData(unifiedCompositionData
+ .getComputeTemplateConsolidationData(), COMPLEX_OUTPUT1, ADDRESSES);
+ addOutputGetAttInUnifiedCompositionData(unifiedCompositionData
+ .getComputeTemplateConsolidationData(), COMPLEX_OUTPUT3, ACCESS_IPv6);
+
}
- }
-
- private void addGetAttrForCompute(UnifiedCompositionData unifiedCompositionData) {
- addGetAttInUnifiedCompositionData(unifiedCompositionData.getComputeTemplateConsolidationData(),
- "dhcp_agent_ids", ADDRESSES, JSA_NET1);
- addGetAttInUnifiedCompositionData(unifiedCompositionData.getComputeTemplateConsolidationData(),
- VOLUME_TYPE, ADDRESSES, CMAUI_VOLUME1);
- addGetAttInUnifiedCompositionData(unifiedCompositionData.getComputeTemplateConsolidationData(),
- SIZE, ACCESS_IPv6, CMAUI_VOLUME2);
- }
-
- private void addGetAttrForCompute2(UnifiedCompositionData unifiedCompositionData) {
- addGetAttInUnifiedCompositionData(unifiedCompositionData.getComputeTemplateConsolidationData(),
- VOLUME_TYPE, ADDRESSES, CMAUI_VOLUME3);
- addGetAttInUnifiedCompositionData(unifiedCompositionData.getComputeTemplateConsolidationData(),
- SIZE, USER_DATA_FORMAT, CMAUI_VOLUME3);
- }
-
- private void addOutputGetAttrInForComputeNoConsolidation(
- UnifiedCompositionData unifiedCompositionData) {
- addOutputGetAttInUnifiedCompositionData(unifiedCompositionData
- .getComputeTemplateConsolidationData(), SIMPLE_OUTPUT1, ACCESS_IPv4);
- addOutputGetAttInUnifiedCompositionData(unifiedCompositionData
- .getComputeTemplateConsolidationData(), SIMPLE_OUTPUT2, ADDRESSES);
- addOutputGetAttInUnifiedCompositionData(unifiedCompositionData
- .getComputeTemplateConsolidationData(), COMPLEX_OUTPUT1, ADDRESSES);
- addOutputGetAttInUnifiedCompositionData(unifiedCompositionData
- .getComputeTemplateConsolidationData(), COMPLEX_OUTPUT3, ACCESS_IPv6);
-
- }
-
- private void addOutputGetAttrInForCompute1WithConsolidation(
- UnifiedCompositionData unifiedCompositionData) {
- addOutputGetAttInUnifiedCompositionData(unifiedCompositionData
- .getComputeTemplateConsolidationData(), SIMPLE_OUTPUT1, ACCESS_IPv4);
- addOutputGetAttInUnifiedCompositionData(unifiedCompositionData
- .getComputeTemplateConsolidationData(), COMPLEX_OUTPUT1, ADDRESSES);
-
- }
-
- private void addOutputGetAttrInForCompute2WithConsolidation(
- UnifiedCompositionData unifiedCompositionData) {
- addOutputGetAttInUnifiedCompositionData(unifiedCompositionData
- .getComputeTemplateConsolidationData(), SIMPLE_OUTPUT2, ADDRESSES);
- }
-
- private void addOutputGetAttrInForPortNoConsolidation(
- UnifiedCompositionData unifiedCompositionData) {
- for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData
- .getPortTemplateConsolidationDataList()) {
- if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL1)) {
- addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT2,
- DEVICE_OWNER);
- addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT3,
- DEVICE_OWNER);
- } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB2_INTERNAL2)) {
- addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT1,
- TENANT_ID);
- } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_OAM)) {
- addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT2,
- USER_DATA_FORMAT);
- }
+
+ private void addOutputGetAttrInForCompute1WithConsolidation(
+ UnifiedCompositionData unifiedCompositionData) {
+ addOutputGetAttInUnifiedCompositionData(unifiedCompositionData
+ .getComputeTemplateConsolidationData(), SIMPLE_OUTPUT1, ACCESS_IPv4);
+ addOutputGetAttInUnifiedCompositionData(unifiedCompositionData
+ .getComputeTemplateConsolidationData(), COMPLEX_OUTPUT1, ADDRESSES);
+
}
- }
-
- private void addOutputGetAttrInForPortWithConsolidation1(
- UnifiedCompositionData unifiedCompositionData) {
- for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData
- .getPortTemplateConsolidationDataList()) {
- if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB2_INTERNAL2)) {
- addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT1,
- TENANT_ID);
- } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL1)) {
- addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT3,
- "admin_state_up");
- }
+
+ private void addOutputGetAttrInForCompute2WithConsolidation(
+ UnifiedCompositionData unifiedCompositionData) {
+ addOutputGetAttInUnifiedCompositionData(unifiedCompositionData
+ .getComputeTemplateConsolidationData(), SIMPLE_OUTPUT2, ADDRESSES);
}
- }
-
- private void addOutputGetAttrInForPortWithConsolidation2(
- UnifiedCompositionData unifiedCompositionData) {
- for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData
- .getPortTemplateConsolidationDataList()) {
- if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB2_INTERNAL1)) {
- addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT2,
- USER_DATA_FORMAT);
- } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL2)) {
- addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT2,
- DEVICE_OWNER);
- }
+
+ private void addOutputGetAttrInForPortNoConsolidation(
+ UnifiedCompositionData unifiedCompositionData) {
+ for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData
+ .getPortTemplateConsolidationDataList()) {
+ if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL_1)) {
+ addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT2,
+ DEVICE_OWNER);
+ addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT3,
+ DEVICE_OWNER);
+ } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB2_INTERNAL_2)) {
+ addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT1,
+ TENANT_ID);
+ } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_OAM)) {
+ addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT2,
+ USER_DATA_FORMAT);
+ }
+ }
}
- }
- private NodeTemplate getMockNode(String path) throws IOException {
- URL resource = this.getClass().getResource(path);
- YamlUtil yamlUtil = new YamlUtil();
- return yamlUtil.yamlToObject(resource.openStream(), NodeTemplate.class);
- }
+ private void addOutputGetAttrInForPortWithConsolidation1(
+ UnifiedCompositionData unifiedCompositionData) {
+ for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData
+ .getPortTemplateConsolidationDataList()) {
+ if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB2_INTERNAL_2)) {
+ addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT1,
+ TENANT_ID);
+ } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL_1)) {
+ addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT3,
+ "admin_state_up");
+ }
+ }
+ }
+
+ private void addOutputGetAttrInForPortWithConsolidation2(
+ UnifiedCompositionData unifiedCompositionData) {
+ for (PortTemplateConsolidationData portTemplateConsolidationData : unifiedCompositionData
+ .getPortTemplateConsolidationDataList()) {
+ if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB2_INTERNAL_1)) {
+ addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT2,
+ USER_DATA_FORMAT);
+ } else if (portTemplateConsolidationData.getNodeTemplateId().equals(FSB1_INTERNAL_2)) {
+ addOutputGetAttInUnifiedCompositionData(portTemplateConsolidationData, COMPLEX_OUTPUT2,
+ DEVICE_OWNER);
+ }
+ }
+ }
+
+ private NodeTemplate getMockNode(String path) throws IOException {
+ URL resource = this.getClass().getResource(path);
+ YamlUtil yamlUtil = new YamlUtil();
+ return yamlUtil.yamlToObject(resource.openStream(), NodeTemplate.class);
+ }
} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5514ce8ca4..9c61fde7b6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,26 +8,12 @@ node_types:
org.openecomp.resource.abstract.nodes.smp:
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
- port_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_port_network:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
compute_smp_name:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_port_subnetpoolid:
- type: string
- required: true
- status: SUPPORTED
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -42,33 +28,43 @@ node_types:
status: SUPPORTED
entry_schema:
type: string
- port_port_vlan_requirements:
+ port_port1_replacement_policy:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_port_network_role_tag:
- type: string
+ type: string
+ port_port1_network:
+ type: list
required: true
status: SUPPORTED
+ entry_schema:
+ type: string
vm_flavor_name:
type: string
required: true
status: SUPPORTED
+ port_port1_network_role:
+ type: string
+ required: true
+ status: SUPPORTED
+ port_port1_order:
+ type: integer
+ required: true
+ status: SUPPORTED
compute_smp_user_data_format:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_port_ip_requirements:
+ port_port1_vlan_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_port_network_role:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_port1_network_role_tag:
type: string
required: true
status: SUPPORTED
@@ -76,26 +72,30 @@ node_types:
type: string
required: true
status: SUPPORTED
- compute_smp_metadata:
+ port_port1_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ status: SUPPORTED
+ port_port1_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: json
- port_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_port1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_port_replacement_policy:
- type: list
+ port_port1_subnetpoolid:
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
- port_port_order:
- type: integer
+ compute_smp_metadata:
+ type: list
required: true
status: SUPPORTED
+ entry_schema:
+ type: json
compute_smp_scheduler_hints:
type: list
required: true
@@ -103,14 +103,14 @@ node_types:
entry_schema:
type: json
requirements:
- - dependency_smp_port:
+ - dependency_smp_port1:
capability: tosca.capabilities.Node
node: tosca.nodes.Root
relationship: tosca.relationships.DependsOn
occurrences:
- 0
- UNBOUNDED
- - link_smp_port:
+ - link_smp_port1:
capability: tosca.capabilities.network.Linkable
relationship: tosca.relationships.network.LinksTo
occurrences:
@@ -131,6 +131,12 @@ node_types:
- 0
- UNBOUNDED
capabilities:
+ network.outgoing.bytes_smp_port1:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ occurrences:
+ - 1
+ - UNBOUNDED
scalable_smp:
type: tosca.capabilities.Scalable
occurrences:
@@ -141,46 +147,42 @@ node_types:
occurrences:
- 1
- UNBOUNDED
+ binding_smp_port1:
+ type: tosca.capabilities.network.Bindable
+ valid_source_types:
+ - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+ occurrences:
+ - 0
+ - UNBOUNDED
memory.resident_smp:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- disk.usage_smp:
+ network.incoming.bytes_smp_port1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- disk.device.write.bytes_smp:
+ disk.usage_smp:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- network.outpoing.packets_smp_port:
+ disk.device.write.bytes_smp:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- attachment_smp_port:
- type: tosca.capabilities.Attachment
- occurrences:
- - 1
- - UNBOUNDED
os_smp:
type: tosca.capabilities.OperatingSystem
occurrences:
- 1
- UNBOUNDED
- network.incoming.bytes_smp_port:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
binding_smp:
type: tosca.capabilities.network.Bindable
occurrences:
@@ -192,14 +194,15 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- instance_smp:
+ network.incoming.packets_smp_port1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- forwarder_smp_port:
- type: org.openecomp.capabilities.Forwarder
+ instance_smp:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
@@ -216,12 +219,6 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- network.outgoing.packets.rate_smp_port:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
disk.read.bytes_smp:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -240,25 +237,35 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- network.incoming.packets_smp_port:
+ disk.device.write.bytes.rate_smp:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- disk.device.write.bytes.rate_smp:
+ disk.capacity_smp:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- disk.capacity_smp:
+ feature_smp_port1:
+ type: tosca.capabilities.Node
+ occurrences:
+ - 1
+ - UNBOUNDED
+ disk.device.read.bytes.rate_smp:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- disk.device.read.bytes.rate_smp:
+ attachment_smp_port1:
+ type: tosca.capabilities.Attachment
+ occurrences:
+ - 1
+ - UNBOUNDED
+ network.outgoing.bytes.rate_smp_port1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
@@ -276,18 +283,19 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- feature_smp_port:
- type: tosca.capabilities.Node
+ disk.root.size_smp:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- disk.root.size_smp:
+ disk.write.requests_smp:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- disk.write.requests_smp:
+ network.outpoing.packets_smp_port1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
@@ -317,7 +325,7 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- network.outgoing.bytes_smp_port:
+ network.incoming.bytes.rate_smp_port1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
@@ -359,56 +367,48 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- network.incoming.packets.rate_smp_port:
+ disk.iops_smp:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- network.incoming.bytes.rate_smp_port:
+ disk.read.bytes.rate_smp:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- binding_smp_port:
- type: tosca.capabilities.network.Bindable
- valid_source_types:
- - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- occurrences:
- - 0
- - UNBOUNDED
- disk.iops_smp:
+ cpu_util_smp:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- disk.read.bytes.rate_smp:
+ disk.write.bytes_smp:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- network.outgoing.bytes.rate_smp_port:
+ memory.usage_smp:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- cpu_util_smp:
+ network.incoming.packets.rate_smp_port1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- disk.write.bytes_smp:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ forwarder_smp_port1:
+ type: org.openecomp.capabilities.Forwarder
occurrences:
- 1
- UNBOUNDED
- memory.usage_smp:
+ network.outgoing.packets.rate_smp_port1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml
index 3ff238743d..c83b3f41fd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml
@@ -111,20 +111,21 @@ topology_template:
directives:
- substitutable
properties:
- port_port_mac_requirements:
- mac_count_required:
- is_required: false
- port_port_network:
- - get_input: port_name
compute_smp_name:
- get_input: smp_name_1
compute_smp_availability_zone:
- get_input: availability_zone_0
+ port_port1_replacement_policy:
+ - AUTO
+ port_port1_network:
+ - get_input: port_name
vm_flavor_name:
get_input: flavor_smp_name
compute_smp_user_data_format:
- RAW
- port_port_ip_requirements:
+ vm_image_name:
+ get_input: image_smp_name
+ port_port1_ip_requirements:
- ip_version: 4
ip_count_required:
is_required: false
@@ -135,16 +136,15 @@ topology_template:
is_required: false
floating_ip_count_required:
is_required: false
- vm_image_name:
- get_input: image_smp_name
+ port_port1_mac_requirements:
+ mac_count_required:
+ is_required: false
compute_smp_metadata:
- jx_vm_role: smp2
vnf_id:
get_input: vnf_id
jx_lab_name:
get_input: lab_name
- port_port_replacement_policy:
- - AUTO
compute_smp_scheduler_hints:
- group: BE_Affinity_group
service_template_filter:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
index 643df5c578..6fe26aad39 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
@@ -11,22 +11,11 @@ node_types:
derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
topology_template:
inputs:
- port_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_port_network:
- type: list
- required: true
- entry_schema:
- type: string
compute_smp_name:
type: list
required: true
entry_schema:
type: string
- port_port_subnetpoolid:
- type: string
- required: true
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -39,81 +28,92 @@ topology_template:
required: true
entry_schema:
type: string
- port_port_vlan_requirements:
+ port_port1_replacement_policy:
type: list
required: true
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_port_network_role_tag:
- type: string
+ type: string
+ port_port1_network:
+ type: list
required: true
+ entry_schema:
+ type: string
vm_flavor_name:
type: string
required: true
+ port_port1_network_role:
+ type: string
+ required: true
+ port_port1_order:
+ type: integer
+ required: true
compute_smp_user_data_format:
type: list
required: true
entry_schema:
type: string
- port_port_ip_requirements:
+ port_port1_vlan_requirements:
type: list
required: true
entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- port_port_network_role:
+ type: org.openecomp.datatypes.network.VlanRequirements
+ port_port1_network_role_tag:
type: string
required: true
vm_image_name:
type: string
required: true
- compute_smp_metadata:
+ port_port1_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ port_port1_ip_requirements:
type: list
required: true
entry_schema:
- type: json
- port_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
+ type: org.openecomp.datatypes.network.IpRequirements
+ port_port1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_port_replacement_policy:
+ port_port1_subnetpoolid:
+ type: string
+ required: true
+ compute_smp_metadata:
type: list
required: true
entry_schema:
- type: string
- port_port_order:
- type: integer
- required: true
+ type: json
compute_smp_scheduler_hints:
type: list
required: true
entry_schema:
type: json
node_templates:
- smp_port:
+ smp_port1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
exCP_naming:
- get_input: port_port_exCP_naming
+ get_input: port_port1_exCP_naming
replacement_policy:
get_input:
- - port_port_replacement_policy
+ - port_port1_replacement_policy
- index_value
vlan_requirements:
- get_input: port_port_vlan_requirements
+ get_input: port_port1_vlan_requirements
ip_requirements:
- get_input: port_port_ip_requirements
+ get_input: port_port1_ip_requirements
network_role_tag:
- get_input: port_port_network_role_tag
+ get_input: port_port1_network_role_tag
mac_requirements:
- get_input: port_port_mac_requirements
+ get_input: port_port1_mac_requirements
order:
- get_input: port_port_order
+ get_input: port_port1_order
network_role:
- get_input: port_port_network_role
+ get_input: port_port1_network_role
subnetpoolid:
- get_input: port_port_subnetpoolid
+ get_input: port_port1_subnetpoolid
network:
get_input:
- - port_port_network
+ - port_port1_network
- index_value
requirements:
- binding:
@@ -150,54 +150,51 @@ topology_template:
substitution_mappings:
node_type: org.openecomp.resource.abstract.nodes.smp
capabilities:
+ network.outgoing.bytes_smp_port1:
+ - smp_port1
+ - network.outgoing.bytes
scalable_smp:
- smp
- scalable
feature_smp:
- smp
- feature
+ binding_smp_port1:
+ - smp_port1
+ - binding
memory.resident_smp:
- smp
- memory.resident
+ network.incoming.bytes_smp_port1:
+ - smp_port1
+ - network.incoming.bytes
disk.usage_smp:
- smp
- disk.usage
disk.device.write.bytes_smp:
- smp
- disk.device.write.bytes
- network.outpoing.packets_smp_port:
- - smp_port
- - network.outpoing.packets
- attachment_smp_port:
- - smp_port
- - attachment
os_smp:
- smp
- os
- network.incoming.bytes_smp_port:
- - smp_port
- - network.incoming.bytes
binding_smp:
- smp
- binding
disk.allocation_smp:
- smp
- disk.allocation
+ network.incoming.packets_smp_port1:
+ - smp_port1
+ - network.incoming.packets
instance_smp:
- smp
- instance
- forwarder_smp_port:
- - smp_port
- - forwarder
host_smp:
- smp
- host
disk.device.usage_smp:
- smp
- disk.device.usage
- network.outgoing.packets.rate_smp_port:
- - smp_port
- - network.outgoing.packets.rate
disk.read.bytes_smp:
- smp
- disk.read.bytes
@@ -207,33 +204,39 @@ topology_template:
disk.write.bytes.rate_smp:
- smp
- disk.write.bytes.rate
- network.incoming.packets_smp_port:
- - smp_port
- - network.incoming.packets
disk.device.write.bytes.rate_smp:
- smp
- disk.device.write.bytes.rate
disk.capacity_smp:
- smp
- disk.capacity
+ feature_smp_port1:
+ - smp_port1
+ - feature
disk.device.read.bytes.rate_smp:
- smp
- disk.device.read.bytes.rate
+ attachment_smp_port1:
+ - smp_port1
+ - attachment
+ network.outgoing.bytes.rate_smp_port1:
+ - smp_port1
+ - network.outgoing.bytes.rate
disk.device.latency_smp:
- smp
- disk.device.latency
disk.device.write.requests.rate_smp:
- smp
- disk.device.write.requests.rate
- feature_smp_port:
- - smp_port
- - feature
disk.root.size_smp:
- smp
- disk.root.size
disk.write.requests_smp:
- smp
- disk.write.requests
+ network.outpoing.packets_smp_port1:
+ - smp_port1
+ - network.outpoing.packets
cpu.delta_smp:
- smp
- cpu.delta
@@ -246,9 +249,9 @@ topology_template:
disk.device.iops_smp:
- smp
- disk.device.iops
- network.outgoing.bytes_smp_port:
- - smp_port
- - network.outgoing.bytes
+ network.incoming.bytes.rate_smp_port1:
+ - smp_port1
+ - network.incoming.bytes.rate
disk.device.allocation_smp:
- smp
- disk.device.allocation
@@ -267,24 +270,12 @@ topology_template:
disk.latency_smp:
- smp
- disk.latency
- network.incoming.packets.rate_smp_port:
- - smp_port
- - network.incoming.packets.rate
- network.incoming.bytes.rate_smp_port:
- - smp_port
- - network.incoming.bytes.rate
- binding_smp_port:
- - smp_port
- - binding
disk.iops_smp:
- smp
- disk.iops
disk.read.bytes.rate_smp:
- smp
- disk.read.bytes.rate
- network.outgoing.bytes.rate_smp_port:
- - smp_port
- - network.outgoing.bytes.rate
cpu_util_smp:
- smp
- cpu_util
@@ -294,6 +285,15 @@ topology_template:
memory.usage_smp:
- smp
- memory.usage
+ network.incoming.packets.rate_smp_port1:
+ - smp_port1
+ - network.incoming.packets.rate
+ forwarder_smp_port1:
+ - smp_port1
+ - forwarder
+ network.outgoing.packets.rate_smp_port1:
+ - smp_port1
+ - network.outgoing.packets.rate
disk.read.requests_smp:
- smp
- disk.read.requests
@@ -310,15 +310,15 @@ topology_template:
- smp
- disk.device.read.requests
requirements:
- link_smp_port:
- - smp_port
- - link
+ dependency_smp_port1:
+ - smp_port1
+ - dependency
dependency_smp:
- smp
- dependency
- dependency_smp_port:
- - smp_port
- - dependency
+ link_smp_port1:
+ - smp_port1
+ - link
local_storage_smp:
- smp
- local_storage
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 76856f62be..17285f8444 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -22,16 +22,16 @@ node_types:
type: string
required: true
status: SUPPORTED
- port_pd01_port1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
port_pd01_port2_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
+ port_pd01_port1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
+ status: SUPPORTED
port_pd01_port2_ip_requirements:
type: list
required: true
@@ -80,14 +80,14 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_pd01_port1_order:
- type: integer
- required: true
- status: SUPPORTED
port_pd01_port2_network_role_tag:
type: string
required: true
status: SUPPORTED
+ port_pd01_port1_order:
+ type: integer
+ required: true
+ status: SUPPORTED
port_pd01_port1_network_role:
type: string
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml
index bcd3451776..993c99c66f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml
@@ -835,11 +835,11 @@ topology_template:
port_pd01_port1_network:
- get_input: oam_net_name
port_pd01_port1_network_role_tag: oam
+ port_pd01_port2_network:
+ - get_input: oam_net_name
port_pd01_port1_mac_requirements:
mac_count_required:
is_required: false
- port_pd01_port2_network:
- - get_input: oam_net_name
port_pd01_port2_ip_requirements:
- ip_version: 4
ip_count_required:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml
index 322991e37b..20ce78d7f1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml
@@ -22,14 +22,14 @@ topology_template:
port_pd01_port1_network_role_tag:
type: string
required: true
- port_pd01_port1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
port_pd01_port2_network:
type: list
required: true
entry_schema:
type: string
+ port_pd01_port1_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
port_pd01_port2_ip_requirements:
type: list
required: true
@@ -69,12 +69,12 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_pd01_port1_order:
- type: integer
- required: true
port_pd01_port2_network_role_tag:
type: string
required: true
+ port_pd01_port1_order:
+ type: integer
+ required: true
port_pd01_port1_network_role:
type: string
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/in/MainServiceTemplate.yaml
index 784a841cad..d24e318ad8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/in/MainServiceTemplate.yaml
@@ -106,7 +106,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -117,7 +117,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -128,7 +128,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB2_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -143,7 +143,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -164,7 +164,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -172,11 +172,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB1
@@ -312,10 +312,10 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB2_Internal1
- - FSB1_Internal1
- - FSB1_Internal2
+ - FSB2_Internal_2
+ - FSB2_Internal_1
+ - FSB1_Internal_1
+ - FSB1_Internal_2
- FSB1_template
- FSB2_template
outputs:
@@ -324,10 +324,10 @@ topology_template:
simpleOutput2:
value: {get_attribute: [ FSB2_template, addresses, key1 ] }
complexOutput1:
- value: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,index ] } ]}
+ value: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,index ] } ]}
complexOutput2:
description: cgi fw01 left interface Mac-Address
- value: { get_attribute: [FSB1_Internal2, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB2_Internal1,oam_index ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ value: { get_attribute: [FSB1_Internal_2, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB2_Internal_1,oam_index ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
complexOutput3:
description: cgi fw01 left interface Mac-Address
- value: { get_input: [a, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB1_Internal1,accessIPv6 ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ value: { get_input: [a, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB1_Internal_1,accessIPv6 ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/out/MainServiceTemplate.yaml
index 81881e3171..c673099252 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/consolidation/out/MainServiceTemplate.yaml
@@ -112,7 +112,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -120,11 +120,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
cmaui_volume1:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
@@ -229,18 +229,18 @@ topology_template:
- FSB1_template
- addresses
- get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- index
complexOutput2:
description: cgi fw01 left interface Mac-Address
value:
get_attribute:
- - FSB1_Internal2
+ - FSB1_Internal_2
- addresses
- get_input:
- CMAUI_volume_type
- get_attribute:
- - FSB2_Internal1
+ - FSB2_Internal_1
- oam_index
- 0
- OS-EXT-IPS-MAC:mac_addr
@@ -253,7 +253,7 @@ topology_template:
- get_input:
- CMAUI_volume_type
- get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- accessIPv6
- 0
- OS-EXT-IPS-MAC:mac_addr
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/noConsolidation/in/MainServiceTemplate.yaml
index db06287d1a..8914a44c21 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/noConsolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/noConsolidation/in/MainServiceTemplate.yaml
@@ -106,7 +106,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -117,7 +117,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -154,7 +154,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -162,11 +162,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB1
@@ -228,8 +228,8 @@ topology_template:
cmaui_volume1:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
- volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,index ] } ]}
- size: { get_attribute: [FSB1_Internal1, addresses, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,oam_index ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,index ] } ]}
+ size: { get_attribute: [FSB1_Internal_1, addresses, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,oam_index ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
cmaui_volume2:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
@@ -247,7 +247,7 @@ topology_template:
- cmaui_volume1
- cmaui_volume2
- jsa_net1
- - FSB2_Internal2
- - FSB1_Internal1
+ - FSB2_Internal_2
+ - FSB1_Internal_1
- FSB1_OAM
- FSB1_template
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/noConsolidation/out/MainServiceTemplate.yaml
index 3bcdf3d9bf..58a847513c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/cleanMainSt/noConsolidation/out/MainServiceTemplate.yaml
@@ -112,7 +112,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -120,11 +120,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
cmaui_volume1:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
@@ -134,11 +134,11 @@ topology_template:
- FSB1_template
- addresses
- get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- index
size:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- addresses
- get_input:
- CMAUI_volume_type
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml
index dc7c6e61fd..98e3bacbad 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/in/MainServiceTemplate.yaml
@@ -287,7 +287,7 @@ topology_template:
type: string
description: Internal1_external
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -298,7 +298,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -309,7 +309,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -423,8 +423,8 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB2_Internal1
- - FSB1_Internal1
+ - FSB2_Internal_2
+ - FSB2_Internal_1
+ - FSB1_Internal_1
- FSB1_OAM
- FSB1_template \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a7b33349d1..0cc801ed3d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -18,10 +18,18 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_FSB2_Internal_2_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
+ status: SUPPORTED
port_FSB1_Internal_subnetpoolid:
type: string
required: true
status: SUPPORTED
+ port_FSB2_Internal_2_subnetpoolid:
+ type: string
+ required: true
+ status: SUPPORTED
port_FSB1_OAM_subnetpoolid:
type: string
required: true
@@ -32,8 +40,8 @@ node_types:
status: SUPPORTED
entry_schema:
type: json
- port_FSB2_Internal2_network_role_tag:
- type: string
+ port_FSB2_Internal_1_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
port_FSB1_OAM_exCP_naming:
@@ -46,46 +54,38 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_FSB2_Internal1_exCP_naming:
- type: org.openecomp.datatypes.Naming
+ port_FSB2_Internal_2_order:
+ type: integer
required: true
status: SUPPORTED
- vm_flavor_name:
+ port_FSB2_Internal_1_mac_address:
type: string
required: true
status: SUPPORTED
- port_FSB2_Internal2_exCP_naming:
- type: org.openecomp.datatypes.Naming
+ vm_flavor_name:
+ type: string
required: true
status: SUPPORTED
- port_FSB2_Internal2_network_role:
+ port_FSB2_Internal_2_mac_address:
type: string
required: true
status: SUPPORTED
- port_FSB2_Internal1_ip_requirements:
+ port_FSB2_Internal_1_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_FSB2_Internal1_network_role:
- type: string
+ port_FSB2_Internal_2_vlan_requirements:
+ type: list
required: true
status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_FSB1_Internal_network_role_tag:
type: string
required: true
status: SUPPORTED
- port_FSB2_Internal1_mac_address:
- type: string
- required: true
- status: SUPPORTED
- port_FSB2_Internal1_vlan_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
port_FSB1_OAM_vlan_requirements:
type: list
required: true
@@ -102,34 +102,18 @@ node_types:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
- port_FSB1_Internal_network_role:
- type: string
- required: true
- status: SUPPORTED
- port_FSB2_Internal1_network:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- port_FSB1_OAM_mac_requirements:
+ port_FSB2_Internal_1_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_FSB2_Internal2_mac_address:
+ port_FSB1_Internal_network_role:
type: string
required: true
status: SUPPORTED
- port_FSB2_Internal2_mac_requirements:
+ port_FSB1_OAM_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
status: SUPPORTED
- port_FSB2_Internal2_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
compute_FSB1_availability_zone:
type: list
required: true
@@ -150,57 +134,61 @@ node_types:
status: SUPPORTED
constraints:
- greater_or_equal: 0
- port_FSB2_Internal2_network:
+ port_FSB2_Internal_1_order:
+ type: integer
+ required: true
+ status: SUPPORTED
+ port_FSB2_Internal_2_ip_requirements:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: string
+ type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_OAM_order:
type: integer
required: true
status: SUPPORTED
+ port_FSB2_Internal_1_vlan_requirements:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_FSB1_OAM_network:
type: list
required: true
status: SUPPORTED
entry_schema:
type: string
- port_FSB2_Internal2_vlan_requirements:
+ port_FSB2_Internal_1_network:
type: list
required: true
status: SUPPORTED
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_FSB2_Internal1_order:
- type: integer
+ type: string
+ port_FSB2_Internal_2_network:
+ type: list
required: true
status: SUPPORTED
- port_FSB2_Internal2_subnetpoolid:
+ entry_schema:
+ type: string
+ port_FSB2_Internal_2_network_role:
type: string
required: true
status: SUPPORTED
- port_FSB1_Internal_order:
- type: integer
- required: true
- status: SUPPORTED
- port_FSB2_Internal1_network_role_tag:
+ port_FSB2_Internal_1_network_role_tag:
type: string
required: true
status: SUPPORTED
- port_FSB2_Internal1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
+ port_FSB1_Internal_order:
+ type: integer
required: true
status: SUPPORTED
port_FSB1_OAM_network_role:
type: string
required: true
status: SUPPORTED
- port_FSB2_Internal2_order:
- type: integer
- required: true
- status: SUPPORTED
- port_FSB2_Internal1_subnetpoolid:
+ port_FSB2_Internal_1_network_role:
type: string
required: true
status: SUPPORTED
@@ -224,6 +212,18 @@ node_types:
status: SUPPORTED
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+ port_FSB2_Internal_2_network_role_tag:
+ type: string
+ required: true
+ status: SUPPORTED
+ port_FSB2_Internal_2_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ status: SUPPORTED
+ port_FSB2_Internal_1_subnetpoolid:
+ type: string
+ required: true
+ status: SUPPORTED
requirements:
- dependency_FSB1_FSB1_Internal:
capability: tosca.capabilities.Node
@@ -238,78 +238,66 @@ node_types:
occurrences:
- 1
- 1
- - dependency_FSB1_FSB1_OAM:
+ - dependency_FSB1_FSB2_Internal_1:
capability: tosca.capabilities.Node
node: tosca.nodes.Root
relationship: tosca.relationships.DependsOn
occurrences:
- 0
- UNBOUNDED
- - link_FSB1_FSB1_OAM:
+ - link_FSB1_FSB2_Internal_1:
capability: tosca.capabilities.network.Linkable
relationship: tosca.relationships.network.LinksTo
occurrences:
- 1
- 1
- - dependency_FSB1_FSB2_Internal2:
+ - dependency_FSB1_FSB2_Internal_2:
capability: tosca.capabilities.Node
node: tosca.nodes.Root
relationship: tosca.relationships.DependsOn
occurrences:
- 0
- UNBOUNDED
- - link_FSB1_FSB2_Internal2:
+ - link_FSB1_FSB2_Internal_2:
capability: tosca.capabilities.network.Linkable
relationship: tosca.relationships.network.LinksTo
occurrences:
- 1
- 1
- - dependency_FSB1:
+ - dependency_FSB1_FSB1_OAM:
capability: tosca.capabilities.Node
node: tosca.nodes.Root
relationship: tosca.relationships.DependsOn
occurrences:
- 0
- UNBOUNDED
- - local_storage_FSB1:
- capability: tosca.capabilities.Attachment
- node: tosca.nodes.BlockStorage
- relationship: tosca.relationships.AttachesTo
+ - link_FSB1_FSB1_OAM:
+ capability: tosca.capabilities.network.Linkable
+ relationship: tosca.relationships.network.LinksTo
occurrences:
- - 0
- - UNBOUNDED
- - dependency_FSB1_FSB2_Internal1:
+ - 1
+ - 1
+ - dependency_FSB1:
capability: tosca.capabilities.Node
node: tosca.nodes.Root
relationship: tosca.relationships.DependsOn
occurrences:
- 0
- UNBOUNDED
- - link_FSB1_FSB2_Internal1:
- capability: tosca.capabilities.network.Linkable
- relationship: tosca.relationships.network.LinksTo
- occurrences:
- - 1
- - 1
- capabilities:
- network.incoming.packets_FSB1_FSB2_Internal2:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ - local_storage_FSB1:
+ capability: tosca.capabilities.Attachment
+ node: tosca.nodes.BlockStorage
+ relationship: tosca.relationships.AttachesTo
occurrences:
- - 1
+ - 0
- UNBOUNDED
+ capabilities:
network.incoming.bytes.rate_FSB1_FSB1_OAM:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- network.incoming.packets_FSB1_FSB2_Internal1:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
network.outgoing.bytes_FSB1_FSB1_OAM:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -334,6 +322,20 @@ node_types:
occurrences:
- 1
- UNBOUNDED
+ binding_FSB1_FSB2_Internal_2:
+ type: tosca.capabilities.network.Bindable
+ valid_source_types:
+ - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+ occurrences:
+ - 0
+ - UNBOUNDED
+ binding_FSB1_FSB2_Internal_1:
+ type: tosca.capabilities.network.Bindable
+ valid_source_types:
+ - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+ occurrences:
+ - 0
+ - UNBOUNDED
disk.allocation_FSB1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -376,17 +378,23 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- feature_FSB1:
- type: tosca.capabilities.Node
+ network.incoming.packets.rate_FSB1_FSB2_Internal_2:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- network.outgoing.bytes_FSB1_FSB2_Internal1:
+ network.incoming.packets.rate_FSB1_FSB2_Internal_1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
+ feature_FSB1:
+ type: tosca.capabilities.Node
+ occurrences:
+ - 1
+ - UNBOUNDED
network.incoming.packets.rate_FSB1_FSB1_Internal:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -399,6 +407,18 @@ node_types:
occurrences:
- 1
- UNBOUNDED
+ network.incoming.packets_FSB1_FSB2_Internal_1:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ occurrences:
+ - 1
+ - UNBOUNDED
+ network.incoming.packets_FSB1_FSB2_Internal_2:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ occurrences:
+ - 1
+ - UNBOUNDED
forwarder_FSB1_FSB1_OAM:
type: org.openecomp.capabilities.Forwarder
occurrences:
@@ -427,13 +447,6 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- binding_FSB1_FSB2_Internal1:
- type: tosca.capabilities.network.Bindable
- valid_source_types:
- - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- occurrences:
- - 0
- - UNBOUNDED
disk.write.requests.rate_FSB1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -445,13 +458,6 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- binding_FSB1_FSB2_Internal2:
- type: tosca.capabilities.network.Bindable
- valid_source_types:
- - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- occurrences:
- - 0
- - UNBOUNDED
instance_FSB1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -464,13 +470,33 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- attachment_FSB1_FSB2_Internal2:
- type: tosca.capabilities.Attachment
+ network.outpoing.packets_FSB1_FSB2_Internal_2:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- attachment_FSB1_FSB2_Internal1:
- type: tosca.capabilities.Attachment
+ network.outgoing.bytes.rate_FSB1_FSB2_Internal_1:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ occurrences:
+ - 1
+ - UNBOUNDED
+ network.outgoing.bytes.rate_FSB1_FSB2_Internal_2:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ occurrences:
+ - 1
+ - UNBOUNDED
+ network.outgoing.bytes_FSB1_FSB2_Internal_1:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ occurrences:
+ - 1
+ - UNBOUNDED
+ network.outgoing.bytes_FSB1_FSB2_Internal_2:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
@@ -480,6 +506,12 @@ node_types:
occurrences:
- 1
- UNBOUNDED
+ network.outpoing.packets_FSB1_FSB2_Internal_1:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ occurrences:
+ - 1
+ - UNBOUNDED
disk.write.bytes_FSB1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -510,12 +542,6 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- network.incoming.packets.rate_FSB1_FSB2_Internal2:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
disk.ephemeral.size_FSB1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -533,7 +559,13 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- network.incoming.packets.rate_FSB1_FSB2_Internal1:
+ network.outgoing.packets.rate_FSB1_FSB2_Internal_1:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ occurrences:
+ - 1
+ - UNBOUNDED
+ network.outgoing.packets.rate_FSB1_FSB2_Internal_2:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
@@ -557,24 +589,12 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- network.incoming.bytes_FSB1_FSB2_Internal2:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
network.incoming.packets_FSB1_FSB1_Internal:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- network.incoming.bytes_FSB1_FSB2_Internal1:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
attachment_FSB1_FSB1_Internal:
type: tosca.capabilities.Attachment
occurrences:
@@ -639,6 +659,18 @@ node_types:
occurrences:
- 1
- UNBOUNDED
+ network.incoming.bytes_FSB1_FSB2_Internal_1:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ occurrences:
+ - 1
+ - UNBOUNDED
+ network.incoming.bytes_FSB1_FSB2_Internal_2:
+ type: org.openecomp.capabilities.metric.Ceilometer
+ description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ occurrences:
+ - 1
+ - UNBOUNDED
host_FSB1:
type: tosca.capabilities.Container
valid_source_types:
@@ -669,29 +701,12 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- network.incoming.bytes.rate_FSB1_FSB2_Internal2:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- network.incoming.bytes.rate_FSB1_FSB2_Internal1:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
network.incoming.bytes_FSB1_FSB1_Internal:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- forwarder_FSB1_FSB2_Internal2:
- type: org.openecomp.capabilities.Forwarder
- occurrences:
- - 1
- - UNBOUNDED
disk.device.write.bytes.rate_FSB1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -704,41 +719,30 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- forwarder_FSB1_FSB2_Internal1:
- type: org.openecomp.capabilities.Forwarder
- occurrences:
- - 1
- - UNBOUNDED
endpoint_FSB1:
type: tosca.capabilities.Endpoint.Admin
occurrences:
- 1
- UNBOUNDED
- network.outgoing.bytes_FSB1_FSB2_Internal2:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
network.outgoing.packets.rate_FSB1_FSB1_Internal:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- network.outgoing.packets.rate_FSB1_FSB2_Internal2:
+ network.incoming.bytes.rate_FSB1_FSB2_Internal_2:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- network.incoming.bytes.rate_FSB1_FSB1_Internal:
+ network.incoming.bytes.rate_FSB1_FSB2_Internal_1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- network.outgoing.packets.rate_FSB1_FSB2_Internal1:
+ network.incoming.bytes.rate_FSB1_FSB1_Internal:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
@@ -750,55 +754,46 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- network.outpoing.packets_FSB1_FSB2_Internal1:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
- occurrences:
- - 1
- - UNBOUNDED
- network.outpoing.packets_FSB1_FSB2_Internal2:
+ memory.usage_FSB1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- memory.usage_FSB1:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ feature_FSB1_FSB2_Internal_2:
+ type: tosca.capabilities.Node
occurrences:
- 1
- UNBOUNDED
- network.outgoing.bytes.rate_FSB1_FSB2_Internal1:
+ disk.read.requests_FSB1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- network.outgoing.bytes.rate_FSB1_FSB2_Internal2:
+ disk.device.write.requests_FSB1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- UNBOUNDED
- disk.read.requests_FSB1:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ attachment_FSB1_FSB2_Internal_1:
+ type: tosca.capabilities.Attachment
occurrences:
- 1
- UNBOUNDED
- disk.device.write.requests_FSB1:
- type: org.openecomp.capabilities.metric.Ceilometer
- description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+ forwarder_FSB1_FSB2_Internal_2:
+ type: org.openecomp.capabilities.Forwarder
occurrences:
- 1
- UNBOUNDED
- feature_FSB1_FSB2_Internal1:
+ feature_FSB1_FSB2_Internal_1:
type: tosca.capabilities.Node
occurrences:
- 1
- UNBOUNDED
- feature_FSB1_FSB2_Internal2:
- type: tosca.capabilities.Node
+ attachment_FSB1_FSB2_Internal_2:
+ type: tosca.capabilities.Attachment
occurrences:
- 1
- UNBOUNDED
@@ -808,6 +803,11 @@ node_types:
occurrences:
- 1
- UNBOUNDED
+ forwarder_FSB1_FSB2_Internal_1:
+ type: org.openecomp.capabilities.Forwarder
+ occurrences:
+ - 1
+ - UNBOUNDED
disk.device.iops_FSB1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
index ad54850b6d..535fa50cf3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
@@ -19,9 +19,15 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
+ port_FSB2_Internal_2_mac_requirements:
+ type: org.openecomp.datatypes.network.MacRequirements
+ required: true
port_FSB1_Internal_subnetpoolid:
type: string
required: true
+ port_FSB2_Internal_2_subnetpoolid:
+ type: string
+ required: true
port_FSB1_OAM_subnetpoolid:
type: string
required: true
@@ -30,8 +36,8 @@ topology_template:
required: true
entry_schema:
type: json
- port_FSB2_Internal2_network_role_tag:
- type: string
+ port_FSB2_Internal_1_exCP_naming:
+ type: org.openecomp.datatypes.Naming
required: true
port_FSB1_OAM_exCP_naming:
type: org.openecomp.datatypes.Naming
@@ -41,37 +47,31 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_FSB2_Internal1_exCP_naming:
- type: org.openecomp.datatypes.Naming
+ port_FSB2_Internal_2_order:
+ type: integer
required: true
- vm_flavor_name:
+ port_FSB2_Internal_1_mac_address:
type: string
required: true
- port_FSB2_Internal2_exCP_naming:
- type: org.openecomp.datatypes.Naming
+ vm_flavor_name:
+ type: string
required: true
- port_FSB2_Internal2_network_role:
+ port_FSB2_Internal_2_mac_address:
type: string
required: true
- port_FSB2_Internal1_ip_requirements:
+ port_FSB2_Internal_1_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
- port_FSB2_Internal1_network_role:
- type: string
- required: true
- port_FSB1_Internal_network_role_tag:
- type: string
- required: true
- port_FSB2_Internal1_mac_address:
- type: string
- required: true
- port_FSB2_Internal1_vlan_requirements:
+ port_FSB2_Internal_2_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
+ port_FSB1_Internal_network_role_tag:
+ type: string
+ required: true
port_FSB1_OAM_vlan_requirements:
type: list
required: true
@@ -85,28 +85,15 @@ topology_template:
port_FSB1_Internal_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
- port_FSB1_Internal_network_role:
- type: string
- required: true
- port_FSB2_Internal1_network:
- type: list
- required: true
- entry_schema:
- type: string
- port_FSB1_OAM_mac_requirements:
+ port_FSB2_Internal_1_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_FSB2_Internal2_mac_address:
+ port_FSB1_Internal_network_role:
type: string
required: true
- port_FSB2_Internal2_mac_requirements:
+ port_FSB1_OAM_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
- port_FSB2_Internal2_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
compute_FSB1_availability_zone:
type: list
required: true
@@ -124,46 +111,50 @@ topology_template:
default: 0
constraints:
- greater_or_equal: 0
- port_FSB2_Internal2_network:
+ port_FSB2_Internal_1_order:
+ type: integer
+ required: true
+ port_FSB2_Internal_2_ip_requirements:
type: list
required: true
entry_schema:
- type: string
+ type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_OAM_order:
type: integer
required: true
+ port_FSB2_Internal_1_vlan_requirements:
+ type: list
+ required: true
+ entry_schema:
+ type: org.openecomp.datatypes.network.VlanRequirements
port_FSB1_OAM_network:
type: list
required: true
entry_schema:
type: string
- port_FSB2_Internal2_vlan_requirements:
+ port_FSB2_Internal_1_network:
type: list
required: true
entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_FSB2_Internal1_order:
- type: integer
+ type: string
+ port_FSB2_Internal_2_network:
+ type: list
required: true
- port_FSB2_Internal2_subnetpoolid:
+ entry_schema:
+ type: string
+ port_FSB2_Internal_2_network_role:
type: string
required: true
- port_FSB1_Internal_order:
- type: integer
- required: true
- port_FSB2_Internal1_network_role_tag:
+ port_FSB2_Internal_1_network_role_tag:
type: string
required: true
- port_FSB2_Internal1_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
+ port_FSB1_Internal_order:
+ type: integer
required: true
port_FSB1_OAM_network_role:
type: string
required: true
- port_FSB2_Internal2_order:
- type: integer
- required: true
- port_FSB2_Internal1_subnetpoolid:
+ port_FSB2_Internal_1_network_role:
type: string
required: true
port_FSB1_OAM_network_role_tag:
@@ -182,6 +173,15 @@ topology_template:
required: true
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
+ port_FSB2_Internal_2_network_role_tag:
+ type: string
+ required: true
+ port_FSB2_Internal_2_exCP_naming:
+ type: org.openecomp.datatypes.Naming
+ required: true
+ port_FSB2_Internal_1_subnetpoolid:
+ type: string
+ required: true
node_templates:
FSB1_FSB1_Internal:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -213,63 +213,93 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1
relationship: tosca.relationships.network.BindsTo
- FSB1_FSB1_OAM:
+ FSB1_FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
exCP_naming:
- get_input: port_FSB1_OAM_exCP_naming
+ get_input: port_FSB2_Internal_1_exCP_naming
vlan_requirements:
- get_input: port_FSB1_OAM_vlan_requirements
+ get_input: port_FSB2_Internal_1_vlan_requirements
ip_requirements:
- get_input: port_FSB1_OAM_ip_requirements
+ get_input: port_FSB2_Internal_1_ip_requirements
network_role_tag:
- get_input: port_FSB1_OAM_network_role_tag
+ get_input: port_FSB2_Internal_1_network_role_tag
mac_requirements:
- get_input: port_FSB1_OAM_mac_requirements
+ get_input: port_FSB2_Internal_1_mac_requirements
order:
- get_input: port_FSB1_OAM_order
+ get_input: port_FSB2_Internal_1_order
network_role:
- get_input: port_FSB1_OAM_network_role
+ get_input: port_FSB2_Internal_1_network_role
subnetpoolid:
- get_input: port_FSB1_OAM_subnetpoolid
- fixed_ips:
+ get_input: port_FSB2_Internal_1_subnetpoolid
+ network:
get_input:
- - port_FSB1_OAM_fixed_ips
+ - port_FSB2_Internal_1_network
- index_value
+ mac_address:
+ get_input: port_FSB2_Internal_1_mac_address
+ requirements:
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: FSB1
+ relationship: tosca.relationships.network.BindsTo
+ FSB1_FSB2_Internal_2:
+ type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+ properties:
+ exCP_naming:
+ get_input: port_FSB2_Internal_2_exCP_naming
+ vlan_requirements:
+ get_input: port_FSB2_Internal_2_vlan_requirements
+ ip_requirements:
+ get_input: port_FSB2_Internal_2_ip_requirements
+ network_role_tag:
+ get_input: port_FSB2_Internal_2_network_role_tag
+ mac_requirements:
+ get_input: port_FSB2_Internal_2_mac_requirements
+ order:
+ get_input: port_FSB2_Internal_2_order
+ network_role:
+ get_input: port_FSB2_Internal_2_network_role
+ subnetpoolid:
+ get_input: port_FSB2_Internal_2_subnetpoolid
network:
get_input:
- - port_FSB1_OAM_network
+ - port_FSB2_Internal_2_network
- index_value
+ mac_address:
+ get_input: port_FSB2_Internal_2_mac_address
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
node: FSB1
relationship: tosca.relationships.network.BindsTo
- FSB1_FSB2_Internal2:
+ FSB1_FSB1_OAM:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
exCP_naming:
- get_input: port_FSB2_Internal2_exCP_naming
+ get_input: port_FSB1_OAM_exCP_naming
vlan_requirements:
- get_input: port_FSB2_Internal2_vlan_requirements
+ get_input: port_FSB1_OAM_vlan_requirements
ip_requirements:
- get_input: port_FSB2_Internal2_ip_requirements
+ get_input: port_FSB1_OAM_ip_requirements
network_role_tag:
- get_input: port_FSB2_Internal2_network_role_tag
+ get_input: port_FSB1_OAM_network_role_tag
mac_requirements:
- get_input: port_FSB2_Internal2_mac_requirements
+ get_input: port_FSB1_OAM_mac_requirements
order:
- get_input: port_FSB2_Internal2_order
+ get_input: port_FSB1_OAM_order
network_role:
- get_input: port_FSB2_Internal2_network_role
+ get_input: port_FSB1_OAM_network_role
subnetpoolid:
- get_input: port_FSB2_Internal2_subnetpoolid
+ get_input: port_FSB1_OAM_subnetpoolid
+ fixed_ips:
+ get_input:
+ - port_FSB1_OAM_fixed_ips
+ - index_value
network:
get_input:
- - port_FSB2_Internal2_network
+ - port_FSB1_OAM_network
- index_value
- mac_address:
- get_input: port_FSB2_Internal2_mac_address
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -299,48 +329,12 @@ topology_template:
nimbus-ethernet:
type: tosca.artifacts.Deployment
file: ../Artifacts/nimbus-ethernet
- FSB1_FSB2_Internal1:
- type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
- properties:
- exCP_naming:
- get_input: port_FSB2_Internal1_exCP_naming
- vlan_requirements:
- get_input: port_FSB2_Internal1_vlan_requirements
- ip_requirements:
- get_input: port_FSB2_Internal1_ip_requirements
- network_role_tag:
- get_input: port_FSB2_Internal1_network_role_tag
- mac_requirements:
- get_input: port_FSB2_Internal1_mac_requirements
- order:
- get_input: port_FSB2_Internal1_order
- network_role:
- get_input: port_FSB2_Internal1_network_role
- subnetpoolid:
- get_input: port_FSB2_Internal1_subnetpoolid
- network:
- get_input:
- - port_FSB2_Internal1_network
- - index_value
- mac_address:
- get_input: port_FSB2_Internal1_mac_address
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: FSB1
- relationship: tosca.relationships.network.BindsTo
substitution_mappings:
node_type: org.openecomp.resource.abstract.nodes.FSB1
capabilities:
- network.incoming.packets_FSB1_FSB2_Internal2:
- - FSB1_FSB2_Internal2
- - network.incoming.packets
network.incoming.bytes.rate_FSB1_FSB1_OAM:
- FSB1_FSB1_OAM
- network.incoming.bytes.rate
- network.incoming.packets_FSB1_FSB2_Internal1:
- - FSB1_FSB2_Internal1
- - network.incoming.packets
network.outgoing.bytes_FSB1_FSB1_OAM:
- FSB1_FSB1_OAM
- network.outgoing.bytes
@@ -353,6 +347,12 @@ topology_template:
disk.device.latency_FSB1:
- FSB1
- disk.device.latency
+ binding_FSB1_FSB2_Internal_2:
+ - FSB1_FSB2_Internal_2
+ - binding
+ binding_FSB1_FSB2_Internal_1:
+ - FSB1_FSB2_Internal_1
+ - binding
disk.allocation_FSB1:
- FSB1
- disk.allocation
@@ -374,18 +374,27 @@ topology_template:
disk.root.size_FSB1:
- FSB1
- disk.root.size
+ network.incoming.packets.rate_FSB1_FSB2_Internal_2:
+ - FSB1_FSB2_Internal_2
+ - network.incoming.packets.rate
+ network.incoming.packets.rate_FSB1_FSB2_Internal_1:
+ - FSB1_FSB2_Internal_1
+ - network.incoming.packets.rate
feature_FSB1:
- FSB1
- feature
- network.outgoing.bytes_FSB1_FSB2_Internal1:
- - FSB1_FSB2_Internal1
- - network.outgoing.bytes
network.incoming.packets.rate_FSB1_FSB1_Internal:
- FSB1_FSB1_Internal
- network.incoming.packets.rate
network.outgoing.bytes_FSB1_FSB1_Internal:
- FSB1_FSB1_Internal
- network.outgoing.bytes
+ network.incoming.packets_FSB1_FSB2_Internal_1:
+ - FSB1_FSB2_Internal_1
+ - network.incoming.packets
+ network.incoming.packets_FSB1_FSB2_Internal_2:
+ - FSB1_FSB2_Internal_2
+ - network.incoming.packets
forwarder_FSB1_FSB1_OAM:
- FSB1_FSB1_OAM
- forwarder
@@ -401,33 +410,39 @@ topology_template:
cpu_FSB1:
- FSB1
- cpu
- binding_FSB1_FSB2_Internal1:
- - FSB1_FSB2_Internal1
- - binding
disk.write.requests.rate_FSB1:
- FSB1
- disk.write.requests.rate
feature_FSB1_FSB1_OAM:
- FSB1_FSB1_OAM
- feature
- binding_FSB1_FSB2_Internal2:
- - FSB1_FSB2_Internal2
- - binding
instance_FSB1:
- FSB1
- instance
disk.device.read.bytes.rate_FSB1:
- FSB1
- disk.device.read.bytes.rate
- attachment_FSB1_FSB2_Internal2:
- - FSB1_FSB2_Internal2
- - attachment
- attachment_FSB1_FSB2_Internal1:
- - FSB1_FSB2_Internal1
- - attachment
+ network.outpoing.packets_FSB1_FSB2_Internal_2:
+ - FSB1_FSB2_Internal_2
+ - network.outpoing.packets
+ network.outgoing.bytes.rate_FSB1_FSB2_Internal_1:
+ - FSB1_FSB2_Internal_1
+ - network.outgoing.bytes.rate
+ network.outgoing.bytes.rate_FSB1_FSB2_Internal_2:
+ - FSB1_FSB2_Internal_2
+ - network.outgoing.bytes.rate
+ network.outgoing.bytes_FSB1_FSB2_Internal_1:
+ - FSB1_FSB2_Internal_1
+ - network.outgoing.bytes
+ network.outgoing.bytes_FSB1_FSB2_Internal_2:
+ - FSB1_FSB2_Internal_2
+ - network.outgoing.bytes
cpu.delta_FSB1:
- FSB1
- cpu.delta
+ network.outpoing.packets_FSB1_FSB2_Internal_1:
+ - FSB1_FSB2_Internal_1
+ - network.outpoing.packets
disk.write.bytes_FSB1:
- FSB1
- disk.write.bytes
@@ -443,9 +458,6 @@ topology_template:
disk.device.read.requests_FSB1:
- FSB1
- disk.device.read.requests
- network.incoming.packets.rate_FSB1_FSB2_Internal2:
- - FSB1_FSB2_Internal2
- - network.incoming.packets.rate
disk.ephemeral.size_FSB1:
- FSB1
- disk.ephemeral.size
@@ -455,9 +467,12 @@ topology_template:
disk.device.write.bytes_FSB1:
- FSB1
- disk.device.write.bytes
- network.incoming.packets.rate_FSB1_FSB2_Internal1:
- - FSB1_FSB2_Internal1
- - network.incoming.packets.rate
+ network.outgoing.packets.rate_FSB1_FSB2_Internal_1:
+ - FSB1_FSB2_Internal_1
+ - network.outgoing.packets.rate
+ network.outgoing.packets.rate_FSB1_FSB2_Internal_2:
+ - FSB1_FSB2_Internal_2
+ - network.outgoing.packets.rate
network.outgoing.packets.rate_FSB1_FSB1_OAM:
- FSB1_FSB1_OAM
- network.outgoing.packets.rate
@@ -467,15 +482,9 @@ topology_template:
attachment_FSB1_FSB1_OAM:
- FSB1_FSB1_OAM
- attachment
- network.incoming.bytes_FSB1_FSB2_Internal2:
- - FSB1_FSB2_Internal2
- - network.incoming.bytes
network.incoming.packets_FSB1_FSB1_Internal:
- FSB1_FSB1_Internal
- network.incoming.packets
- network.incoming.bytes_FSB1_FSB2_Internal1:
- - FSB1_FSB2_Internal1
- - network.incoming.bytes
attachment_FSB1_FSB1_Internal:
- FSB1_FSB1_Internal
- attachment
@@ -509,6 +518,12 @@ topology_template:
network.outpoing.packets_FSB1_FSB1_OAM:
- FSB1_FSB1_OAM
- network.outpoing.packets
+ network.incoming.bytes_FSB1_FSB2_Internal_1:
+ - FSB1_FSB2_Internal_1
+ - network.incoming.bytes
+ network.incoming.bytes_FSB1_FSB2_Internal_2:
+ - FSB1_FSB2_Internal_2
+ - network.incoming.bytes
host_FSB1:
- FSB1
- host
@@ -524,82 +539,70 @@ topology_template:
disk.write.requests_FSB1:
- FSB1
- disk.write.requests
- network.incoming.bytes.rate_FSB1_FSB2_Internal2:
- - FSB1_FSB2_Internal2
- - network.incoming.bytes.rate
- network.incoming.bytes.rate_FSB1_FSB2_Internal1:
- - FSB1_FSB2_Internal1
- - network.incoming.bytes.rate
network.incoming.bytes_FSB1_FSB1_Internal:
- FSB1_FSB1_Internal
- network.incoming.bytes
- forwarder_FSB1_FSB2_Internal2:
- - FSB1_FSB2_Internal2
- - forwarder
disk.device.write.bytes.rate_FSB1:
- FSB1
- disk.device.write.bytes.rate
network.outgoing.bytes.rate_FSB1_FSB1_Internal:
- FSB1_FSB1_Internal
- network.outgoing.bytes.rate
- forwarder_FSB1_FSB2_Internal1:
- - FSB1_FSB2_Internal1
- - forwarder
endpoint_FSB1:
- FSB1
- endpoint
- network.outgoing.bytes_FSB1_FSB2_Internal2:
- - FSB1_FSB2_Internal2
- - network.outgoing.bytes
network.outgoing.packets.rate_FSB1_FSB1_Internal:
- FSB1_FSB1_Internal
- network.outgoing.packets.rate
- network.outgoing.packets.rate_FSB1_FSB2_Internal2:
- - FSB1_FSB2_Internal2
- - network.outgoing.packets.rate
+ network.incoming.bytes.rate_FSB1_FSB2_Internal_2:
+ - FSB1_FSB2_Internal_2
+ - network.incoming.bytes.rate
+ network.incoming.bytes.rate_FSB1_FSB2_Internal_1:
+ - FSB1_FSB2_Internal_1
+ - network.incoming.bytes.rate
network.incoming.bytes.rate_FSB1_FSB1_Internal:
- FSB1_FSB1_Internal
- network.incoming.bytes.rate
- network.outgoing.packets.rate_FSB1_FSB2_Internal1:
- - FSB1_FSB2_Internal1
- - network.outgoing.packets.rate
disk.latency_FSB1:
- FSB1
- disk.latency
- network.outpoing.packets_FSB1_FSB2_Internal1:
- - FSB1_FSB2_Internal1
- - network.outpoing.packets
- network.outpoing.packets_FSB1_FSB2_Internal2:
- - FSB1_FSB2_Internal2
- - network.outpoing.packets
memory.usage_FSB1:
- FSB1
- memory.usage
- network.outgoing.bytes.rate_FSB1_FSB2_Internal1:
- - FSB1_FSB2_Internal1
- - network.outgoing.bytes.rate
- network.outgoing.bytes.rate_FSB1_FSB2_Internal2:
- - FSB1_FSB2_Internal2
- - network.outgoing.bytes.rate
+ feature_FSB1_FSB2_Internal_2:
+ - FSB1_FSB2_Internal_2
+ - feature
disk.read.requests_FSB1:
- FSB1
- disk.read.requests
disk.device.write.requests_FSB1:
- FSB1
- disk.device.write.requests
- feature_FSB1_FSB2_Internal1:
- - FSB1_FSB2_Internal1
- - feature
- feature_FSB1_FSB2_Internal2:
- - FSB1_FSB2_Internal2
+ attachment_FSB1_FSB2_Internal_1:
+ - FSB1_FSB2_Internal_1
+ - attachment
+ forwarder_FSB1_FSB2_Internal_2:
+ - FSB1_FSB2_Internal_2
+ - forwarder
+ feature_FSB1_FSB2_Internal_1:
+ - FSB1_FSB2_Internal_1
- feature
+ attachment_FSB1_FSB2_Internal_2:
+ - FSB1_FSB2_Internal_2
+ - attachment
disk.iops_FSB1:
- FSB1
- disk.iops
+ forwarder_FSB1_FSB2_Internal_1:
+ - FSB1_FSB2_Internal_1
+ - forwarder
disk.device.iops_FSB1:
- FSB1
- disk.device.iops
requirements:
+ link_FSB1_FSB2_Internal_2:
+ - FSB1_FSB2_Internal_2
+ - link
link_FSB1_FSB1_OAM:
- FSB1_FSB1_OAM
- link
@@ -609,24 +612,21 @@ topology_template:
dependency_FSB1:
- FSB1
- dependency
+ link_FSB1_FSB2_Internal_1:
+ - FSB1_FSB2_Internal_1
+ - link
dependency_FSB1_FSB1_Internal:
- FSB1_FSB1_Internal
- dependency
link_FSB1_FSB1_Internal:
- FSB1_FSB1_Internal
- link
- link_FSB1_FSB2_Internal2:
- - FSB1_FSB2_Internal2
- - link
local_storage_FSB1:
- FSB1
- local_storage
- dependency_FSB1_FSB2_Internal2:
- - FSB1_FSB2_Internal2
+ dependency_FSB1_FSB2_Internal_2:
+ - FSB1_FSB2_Internal_2
- dependency
- link_FSB1_FSB2_Internal1:
- - FSB1_FSB2_Internal1
- - link
- dependency_FSB1_FSB2_Internal1:
- - FSB1_FSB2_Internal1
+ dependency_FSB1_FSB2_Internal_1:
+ - FSB1_FSB2_Internal_1
- dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml
index d9047f9162..6755ef4b77 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/in/MainServiceTemplate.yaml
@@ -287,7 +287,7 @@ topology_template:
type: string
description: Internal1_external
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -298,7 +298,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -412,7 +412,7 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB1_Internal1
+ - FSB2_Internal_2
+ - FSB1_Internal_1
- FSB1_OAM
- FSB1_template \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml
index e1099bde90..f7c9292c6a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/in/MainServiceTemplate.yaml
@@ -106,7 +106,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
network: Internal2-net
@@ -115,7 +115,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -125,7 +125,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB2_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -140,7 +140,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -161,7 +161,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -169,11 +169,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB1
@@ -258,8 +258,8 @@ topology_template:
cmaui_volume1:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
- volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,tenant_id ] } ]}
- size: { get_attribute: [FSB1_Internal1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_Internal2,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]}
+ size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_Internal_2,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
cmaui_volume2:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
@@ -269,8 +269,8 @@ topology_template:
cmaui_volume3:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
- volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal1,tenant_id ] } ]}
- size: { get_attribute: [FSB1_Internal2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal_1,tenant_id ] } ]}
+ size: { get_attribute: [FSB1_Internal_2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
groups:
ep-jsa_net_group:
type: org.openecomp.groups.heat.HeatStack
@@ -279,9 +279,9 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB2_Internal1
- - FSB1_Internal1
- - FSB1_Internal2
+ - FSB2_Internal_2
+ - FSB2_Internal_1
+ - FSB1_Internal_1
+ - FSB1_Internal_2
- FSB1_template
- FSB2_template \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/in/MainServiceTemplate.yaml
index bda72f8c8f..edd1ed42ad 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/in/MainServiceTemplate.yaml
@@ -287,7 +287,7 @@ topology_template:
type: string
description: Internal1_external
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -298,7 +298,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -335,7 +335,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -343,11 +343,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB1
@@ -409,8 +409,8 @@ topology_template:
cmaui_volume1:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
- volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,tenant_id ] } ]}
- size: { get_attribute: [FSB1_Internal1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]}
+ size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
cmaui_volume2:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
@@ -425,7 +425,7 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB1_Internal1
+ - FSB2_Internal_2
+ - FSB1_Internal_1
- FSB1_OAM
- FSB1_template \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml
index 5d7542f1a4..d8a7a103fd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/in/MainServiceTemplate.yaml
@@ -106,7 +106,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
network: Internal2-net
@@ -116,7 +116,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -126,12 +126,12 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB2_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
get_input: fsb1-Internal1-mac
- network: {get_attribute: [FSB2_Internal1, att]}
+ network: {get_attribute: [FSB2_Internal_1, att]}
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -141,12 +141,12 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
get_input: fsb1-Internal1-mac
- network: {get_attribute: [FSB2_Internal1, att]}
+ network: {get_attribute: [FSB2_Internal_1, att]}
requirements:
- binding:
capability: tosca.capabilities.network.Bindable
@@ -162,7 +162,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -170,11 +170,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB1
@@ -239,7 +239,7 @@ topology_template:
availability_zone:
get_input: fsb_zone
name:
- get_attribute: [FSB1_Internal1, name]
+ get_attribute: [FSB1_Internal_1, name]
artifacts:
nimbus-ethernet-gw:
type: tosca.artifacts.Deployment
@@ -259,8 +259,8 @@ topology_template:
cmaui_volume1:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
- volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,tenant_id ] } ]}
- size: { get_attribute: [FSB1_Internal1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_Internal2,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]}
+ size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_Internal_2,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
cmaui_volume2:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
@@ -270,8 +270,8 @@ topology_template:
cmaui_volume3:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
- volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal1,tenant_id ] } ]}
- size: { get_attribute: [FSB1_Internal2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal_1,tenant_id ] } ]}
+ size: { get_attribute: [FSB1_Internal_2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
groups:
ep-jsa_net_group:
type: org.openecomp.groups.heat.HeatStack
@@ -280,9 +280,9 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB2_Internal1
- - FSB1_Internal1
- - FSB1_Internal2
+ - FSB2_Internal_2
+ - FSB2_Internal_1
+ - FSB1_Internal_1
+ - FSB1_Internal_2
- FSB1_template
- FSB2_template \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml
index d896f4bda2..f80a76a708 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/in/MainServiceTemplate.yaml
@@ -287,7 +287,7 @@ topology_template:
type: string
description: Internal1_external
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -298,7 +298,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -335,7 +335,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -343,11 +343,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB1
@@ -355,11 +355,11 @@ topology_template:
flavor:
get_input: fsb1-flavor
availability_zone:
- get_attribute: [ FSB1_Internal1, myAttr, get_attribute: [FSB1_Internal1, index] ]
+ get_attribute: [ FSB1_Internal_1, myAttr, get_attribute: [FSB1_Internal_1, index] ]
metadata:
- get_attribute: [ FSB1_Internal1, myAttr, get_input: index ]
+ get_attribute: [ FSB1_Internal_1, myAttr, get_input: index ]
name:
- get_attribute: [ FSB1_Internal1, myAttr, get_attribute: [jsa_net1, index] ]
+ get_attribute: [ FSB1_Internal_1, myAttr, get_attribute: [jsa_net1, index] ]
artifacts:
nimbus-ethernet-gw:
type: tosca.artifacts.Deployment
@@ -379,8 +379,8 @@ topology_template:
cmaui_volume1:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
- volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,tenant_id ] } ]}
- size: { get_attribute: [FSB1_Internal1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]}
+ size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
cmaui_volume2:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
@@ -395,7 +395,7 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB1_Internal1
+ - FSB2_Internal_2
+ - FSB1_Internal_1
- FSB1_OAM
- FSB1_template \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml
index 304799b589..d15b80d448 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/in/MainServiceTemplate.yaml
@@ -67,7 +67,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -78,7 +78,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -115,7 +115,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -123,11 +123,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -181,7 +181,7 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB1_Internal1
+ - FSB2_Internal_2
+ - FSB1_Internal_1
- FSB1_OAM
- FSB1_template \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml
index 7912c41037..62e3c5574a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsDiffType/out/MainServiceTemplate.yaml
@@ -68,7 +68,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -79,7 +79,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -116,7 +116,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -124,11 +124,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -222,7 +222,7 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB1_Internal1
+ - FSB2_Internal_2
+ - FSB1_Internal_1
- FSB1_OAM
- FSB1_template
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/in/MainServiceTemplate.yaml
index d08dd91968..af1fd69d98 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/in/MainServiceTemplate.yaml
@@ -61,7 +61,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -72,7 +72,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -93,7 +93,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -101,11 +101,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB1_Internal2
+ - FSB1_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB1_Internal2
+ - FSB1_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -159,6 +159,6 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB1_Internal2
- - FSB1_Internal1
+ - FSB1_Internal_2
+ - FSB1_Internal_1
- FSB1_template \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml
index 55e4754bb4..9fa9796f84 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/oneComputeMultiplePortsSameType/out/MainServiceTemplate.yaml
@@ -63,7 +63,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -74,7 +74,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -95,7 +95,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -103,11 +103,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB1_Internal2
+ - FSB1_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB1_Internal2
+ - FSB1_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -158,20 +158,20 @@ topology_template:
directives:
- substitutable
properties:
- port_FSB1_Internal1_mac_address:
- get_input: fsb1-Internal1-mac
- port_FSB1_Internal2_network:
- - Internal2-net
- port_FSB1_Internal1_network:
- - Internal1-net
vm_flavor_name:
get_input: fsb-flavor
- port_FSB1_Internal2_mac_address:
- get_input: fsb1-Internal1-mac
vm_image_name:
get_input: fsb-image
compute_FSB_admin_pass:
- STATIC-DATA-FSB1
+ port_FSB1_Internal_1_mac_address:
+ get_input: fsb1-Internal1-mac
+ port_FSB1_Internal_1_network:
+ - Internal1-net
+ port_FSB1_Internal_2_mac_address:
+ get_input: fsb1-Internal1-mac
+ port_FSB1_Internal_2_network:
+ - Internal2-net
compute_FSB_metadata:
- write_files:
- path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0
@@ -196,6 +196,6 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB1_Internal2
- - FSB1_Internal1
+ - FSB1_Internal_2
+ - FSB1_Internal_1
- FSB1_template
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml
index 21715db6f6..646d5e4091 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/in/MainServiceTemplate.yaml
@@ -87,7 +87,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -98,7 +98,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB2_template
relationship: tosca.relationships.network.BindsTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -109,7 +109,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -124,7 +124,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -145,7 +145,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -153,11 +153,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -242,9 +242,9 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB1_Internal1
- - FSB1_Internal2
- - FSB2_Internal1
- - FSB2_Internal2
+ - FSB1_Internal_1
+ - FSB1_Internal_2
+ - FSB2_Internal_1
+ - FSB2_Internal_2
- FSB1_template
- FSB2_template \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml
index 0a226df009..ca75560607 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml
@@ -88,7 +88,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -99,7 +99,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB2_template
relationship: tosca.relationships.network.BindsTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -110,7 +110,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -125,7 +125,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -146,7 +146,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -154,11 +154,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -289,9 +289,9 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB1_Internal1
- - FSB1_Internal2
- - FSB2_Internal1
- - FSB2_Internal2
+ - FSB1_Internal_1
+ - FSB1_Internal_2
+ - FSB2_Internal_1
+ - FSB2_Internal_2
- FSB1_template
- FSB2_template
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/fixNewAbstractNodeTemplate/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/fixNewAbstractNodeTemplate/consolidation/out/MainServiceTemplate.yaml
index 9715d3c129..9a60df6834 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/fixNewAbstractNodeTemplate/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/fixNewAbstractNodeTemplate/consolidation/out/MainServiceTemplate.yaml
@@ -170,8 +170,8 @@ topology_template:
properties:
network_name:
get_attribute:
- - FSB2
- - FSB2_FSB1_Internal_network_id
+ - FSB1_Internal1
+ - network_id
dhcp_agent_ids_1:
get_attribute:
- FSB2
@@ -186,8 +186,8 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2
- - FSB2_FSB2_Internal_network_id
+ - FSB2_Internal1
+ - network_id
port_FSB1_Internal_mac_address:
- get_input: fsb1-Internal1-mac
groups:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/fixNewAbstractNodeTemplate/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/fixNewAbstractNodeTemplate/noConsolidation/in/MainServiceTemplate.yaml
index 508c67cffc..9fc458b8ef 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/fixNewAbstractNodeTemplate/noConsolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/fixNewAbstractNodeTemplate/noConsolidation/in/MainServiceTemplate.yaml
@@ -112,7 +112,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -120,11 +120,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
cmaui_volume1:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
@@ -134,11 +134,11 @@ topology_template:
- FSB1_template
- addresses
- get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- index
size:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- addresses
- get_input:
- CMAUI_volume_type
@@ -170,7 +170,7 @@ topology_template:
properties:
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -178,7 +178,7 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB1_Internal2
+ - FSB1_Internal_2
- network_id
port_FSB1_Internal_mac_address:
- get_input: fsb1-Internal1-mac
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/fixNewAbstractNodeTemplate/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/fixNewAbstractNodeTemplate/noConsolidation/out/MainServiceTemplate.yaml
index a94f9fa87b..5480ffabd1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/fixNewAbstractNodeTemplate/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/fixNewAbstractNodeTemplate/noConsolidation/out/MainServiceTemplate.yaml
@@ -112,7 +112,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -120,11 +120,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
cmaui_volume1:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
@@ -134,11 +134,11 @@ topology_template:
- FSB1_template
- addresses
- get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- index
size:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- addresses
- get_input:
- CMAUI_volume_type
@@ -171,7 +171,7 @@ topology_template:
network_name:
get_attribute:
- FSB2
- - FSB2_FSB1_Internal1_network_id
+ - FSB2_FSB1_Internal_1_network_id
dhcp_agent_ids:
get_attribute:
- FSB2
@@ -179,7 +179,7 @@ topology_template:
tenant_id:
get_attribute:
- FSB2
- - FSB2_FSB1_Internal2_network_id
+ - FSB2_FSB1_Internal_2_network_id
port_FSB1_Internal_mac_address:
- get_input: fsb1-Internal1-mac
groups:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/in/MainServiceTemplate.yaml
index 4e939ca9d8..1b3103382a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/in/MainServiceTemplate.yaml
@@ -47,7 +47,7 @@ topology_template:
description: fsb1-flavor
node_templates:
- VMI1:
+ VMI_1:
type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
properties:
name:
@@ -71,9 +71,9 @@ topology_template:
get_input: fsb_zone
name:
get_attribute:
- - VMI1
+ - VMI_1
- name
- FSB1_Port1:
+ FSB1_Port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -116,50 +116,50 @@ topology_template:
cmaui_volume_test_neutron_port_properties:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
- availability_zone: {get_attribute: [FSB1_Port1, ip_address ] }
- backup_id: {get_attribute: [FSB1_Port1, network ] }
- #description: {get_attribute: [FSB1_Port1, subnet ] }
- image: {get_attribute: [FSB1_Port1, admin_state_up ] }
- metadata: {get_attribute: [FSB1_Port1, allowed_address_pairs ] }
- multiattach: {get_attribute: [FSB1_Port1, "binding:vnic_type" ] }
- name: {get_attribute: [FSB1_Port1, device_id ] }
- read_only: {get_attribute: [FSB1_Port1, device_owner ] }
- scheduler_hints: {get_attribute: [FSB1_Port1, fixed_ips ] }
- #size: {get_attribute: [FSB1_Port1, mac_address ] }
- snapshot_id: {get_attribute: [FSB1_Port1, name ] }
- source_volid: {get_attribute: [FSB1_Port1, port_security_enabled ] }
- volume_id: {get_attribute: [FSB1_Port1, qos_policy ] }
- volume_type: {get_attribute: [FSB1_Port1, security_groups ] }
- delete_on_termination: {get_attribute: [FSB1_Port1, value_specs ] }
- volume_size: {get_attribute: [FSB1_Port1, replacement_policy ] }
- device_type: {get_attribute: [FSB1_Port1, show ] }
- disk_bus: {get_attribute: [FSB1_Port1, subnets ] }
- swap_size: {get_attribute: [FSB1_Port1, tenant_id ] }
+ availability_zone: {get_attribute: [FSB1_Port_1, ip_address ] }
+ backup_id: {get_attribute: [FSB1_Port_1, network ] }
+ #description: {get_attribute: [FSB1_Port_1, subnet ] }
+ image: {get_attribute: [FSB1_Port_1, admin_state_up ] }
+ metadata: {get_attribute: [FSB1_Port_1, allowed_address_pairs ] }
+ multiattach: {get_attribute: [FSB1_Port_1, "binding:vnic_type" ] }
+ name: {get_attribute: [FSB1_Port_1, device_id ] }
+ read_only: {get_attribute: [FSB1_Port_1, device_owner ] }
+ scheduler_hints: {get_attribute: [FSB1_Port_1, fixed_ips ] }
+ #size: {get_attribute: [FSB1_Port_1, mac_address ] }
+ snapshot_id: {get_attribute: [FSB1_Port_1, name ] }
+ source_volid: {get_attribute: [FSB1_Port_1, port_security_enabled ] }
+ volume_id: {get_attribute: [FSB1_Port_1, qos_policy ] }
+ volume_type: {get_attribute: [FSB1_Port_1, security_groups ] }
+ delete_on_termination: {get_attribute: [FSB1_Port_1, value_specs ] }
+ volume_size: {get_attribute: [FSB1_Port_1, replacement_policy ] }
+ device_type: {get_attribute: [FSB1_Port_1, show ] }
+ disk_bus: {get_attribute: [FSB1_Port_1, subnets ] }
+ swap_size: {get_attribute: [FSB1_Port_1, tenant_id ] }
cmaui_volume_test_contrailv2_VMI_properties:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
- availability_zone: {get_attribute: [VMI1, virtual_machine_interface_mac_addresses ] }
- #backup_id: {get_attribute: [VMI1, mac_address ] }
- description: {get_attribute: [VMI1, virtual_network_refs ] }
- image: {get_attribute: [VMI1, port_tuple_refs ] }
- metadata: {get_attribute: [VMI1, security_group_refs ] }
- multiattach: {get_attribute: [VMI1, virtual_machine_interface_properties ] }
- name: {get_attribute: [VMI1, name ] }
- #read_only: {get_attribute: [VMI1, service_interface_type ] }
- #scheduler_hints: {get_attribute: [VMI1, sub_interface_vlan_tag ] }
- size: {get_attribute: [VMI1, virtual_machine_interface_allowed_address_pairs ] }
- #snapshot_id: {get_attribute: [VMI1, allowed_address_pair ] }
- #source_volid: {get_attribute: [VMI1, port_security_enabled ] }
- #volume_id: {get_attribute: [VMI1, address_mode ] }
- #volume_type: {get_attribute: [VMI1, mac ] }
- #delete_on_termination: {get_attribute: [VMI1, ip ] }
- #volume_size: {get_attribute: [VMI1, ip_prefix ] }
- #device_type: {get_attribute: [VMI1, ip_prefix_len ] }
- #disk_bus: {get_attribute: [VMI1, virtual_machine_interface_refs ] }
- #swap_size: {get_attribute: [VMI1, virtual_machine_interface_properties_service_interface_type ] }
- created_at: {get_attribute: [VMI1, fq_name ] }
- display_description: {get_attribute: [VMI1, show ] }
+ availability_zone: {get_attribute: [VMI_1, virtual_machine_interface_mac_addresses ] }
+ #backup_id: {get_attribute: [VMI_1, mac_address ] }
+ description: {get_attribute: [VMI_1, virtual_network_refs ] }
+ image: {get_attribute: [VMI_1, port_tuple_refs ] }
+ metadata: {get_attribute: [VMI_1, security_group_refs ] }
+ multiattach: {get_attribute: [VMI_1, virtual_machine_interface_properties ] }
+ name: {get_attribute: [VMI_1, name ] }
+ #read_only: {get_attribute: [VMI_1, service_interface_type ] }
+ #scheduler_hints: {get_attribute: [VMI_1, sub_interface_vlan_tag ] }
+ size: {get_attribute: [VMI_1, virtual_machine_interface_allowed_address_pairs ] }
+ #snapshot_id: {get_attribute: [VMI_1, allowed_address_pair ] }
+ #source_volid: {get_attribute: [VMI_1, port_security_enabled ] }
+ #volume_id: {get_attribute: [VMI_1, address_mode ] }
+ #volume_type: {get_attribute: [VMI_1, mac ] }
+ #delete_on_termination: {get_attribute: [VMI_1, ip ] }
+ #volume_size: {get_attribute: [VMI_1, ip_prefix ] }
+ #device_type: {get_attribute: [VMI_1, ip_prefix_len ] }
+ #disk_bus: {get_attribute: [VMI_1, virtual_machine_interface_refs ] }
+ #swap_size: {get_attribute: [VMI_1, virtual_machine_interface_properties_service_interface_type ] }
+ created_at: {get_attribute: [VMI_1, fq_name ] }
+ display_description: {get_attribute: [VMI_1, show ] }
groups:
ep-jsa_net_group:
@@ -169,9 +169,9 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: Paul Phillips, pp2854 PROD)
members:
- - VMI1
+ - VMI_1
- FSB1
- - FSB1_Port1
+ - FSB1_Port_1
- cmaui_volume_test_compute_properties
- cmaui_volume_test_neutron_port_properties
- cmaui_volume_test_contrailv2_VMI_properties
@@ -185,7 +185,7 @@ topology_template:
value: {get_attribute: [ FSB1, addresses, {get_attribute: [ FSB2_Internal2,tenant_id ] } ]}
complexOutput2:
description: cgi fw01 left interface Mac-Address
- value: { get_attribute: [FSB1_Port1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1,user_data_format ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ value: { get_attribute: [FSB1_Port_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1,user_data_format ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
complexOutput3:
description: cgi fw01 left interface Mac-Address
value: { get_input: [a, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB1,accessIPv6 ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] } \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml
index b3db1c2890..51410677fb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/inputoutputparamtype/out/MainServiceTemplate.yaml
@@ -321,7 +321,7 @@ topology_template:
description: cgi fw01 left interface Mac-Address
value:
get_attribute:
- - FSB1_Port1
+ - FSB1_Port_1
- device_owner
- get_input:
- CMAUI_volume_type
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/in/MainServiceTemplate.yaml
index a28c82c39b..e6047b0c75 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/in/MainServiceTemplate.yaml
@@ -97,7 +97,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -112,7 +112,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -127,7 +127,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -142,7 +142,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -169,7 +169,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -177,11 +177,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -249,10 +249,10 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB1_Internal1
- - FSB1_Internal2
- - FSB2_Internal1
- - FSB2_Internal2
+ - FSB1_Internal_1
+ - FSB1_Internal_2
+ - FSB2_Internal_1
+ - FSB2_Internal_2
- FSB1_template
- FSB2_template
- jsa_net
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml
index 623b14cc28..d4722c1b28 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/consolidation/out/MainServiceTemplate.yaml
@@ -98,7 +98,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -113,7 +113,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -128,7 +128,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -143,7 +143,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -307,10 +307,10 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB1_Internal1
- - FSB1_Internal2
- - FSB2_Internal1
- - FSB2_Internal2
+ - FSB1_Internal_1
+ - FSB1_Internal_2
+ - FSB2_Internal_1
+ - FSB2_Internal_2
- FSB1_template
- FSB2_template
- jsa_net
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/in/MainServiceTemplate.yaml
index c339837945..6d64d3729e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/in/MainServiceTemplate.yaml
@@ -49,7 +49,7 @@ topology_template:
description: port name
default: port_name
node_templates:
- port1:
+ port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
replacement_policy: AUTO
@@ -80,7 +80,7 @@ topology_template:
get_input: smp_name_1
scheduler_hints:
group: BE_Affinity_group
- port2:
+ port_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
replacement_policy: AUTO
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml
index fc33e05df0..12db507859 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updGroupsConnectivity/noConsolidation/out/MainServiceTemplate.yaml
@@ -51,7 +51,7 @@ topology_template:
description: port name
default: port_name
node_templates:
- port1:
+ port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
replacement_policy: AUTO
@@ -82,7 +82,7 @@ topology_template:
get_input: smp_name_1
scheduler_hints:
group: BE_Affinity_group
- port2:
+ port_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
replacement_policy: AUTO
@@ -106,15 +106,15 @@ topology_template:
- RAW
vm_image_name:
get_input: image_smp_name
- port_port2_replacement_policy:
+ port_port_2_replacement_policy:
- AUTO
compute_smp_name:
- get_input: smp_name_1
- port_port1_replacement_policy:
+ port_port_1_replacement_policy:
- AUTO
- port_port1_network:
+ port_port_1_network:
- get_input: port_name
- port_port2_network:
+ port_port_2_network:
- get_input: port_name
compute_smp_metadata:
- jx_vm_role: smp2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/in/MainServiceTemplate.yaml
index 9c67d10e97..4f01d254bd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/in/MainServiceTemplate.yaml
@@ -97,7 +97,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -112,7 +112,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -127,7 +127,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -142,7 +142,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -169,7 +169,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -177,11 +177,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -242,11 +242,11 @@ topology_template:
requirements:
- port:
capability: tosca.capabilities.Attachment
- node: FSB1_Internal1
+ node: FSB1_Internal_1
relationship: org.openecomp.relationships.AttachesTo
- port:
capability: tosca.capabilities.Attachment
- node: FSB1_Internal2
+ node: FSB1_Internal_2
relationship: org.openecomp.relationships.AttachesTo
groups:
ep-jsa_net_group:
@@ -256,10 +256,10 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB1_Internal1
- - FSB1_Internal2
- - FSB2_Internal1
- - FSB2_Internal2
+ - FSB1_Internal_1
+ - FSB1_Internal_2
+ - FSB2_Internal_1
+ - FSB2_Internal_2
- FSB1_template
- FSB2_template
- jsa_net
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml
index 5019e08333..df2509108f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedIn/consolidation/out/MainServiceTemplate.yaml
@@ -98,7 +98,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -113,7 +113,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -128,7 +128,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -143,7 +143,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -308,10 +308,10 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB1_Internal1
- - FSB1_Internal2
- - FSB2_Internal1
- - FSB2_Internal2
+ - FSB1_Internal_1
+ - FSB1_Internal_2
+ - FSB2_Internal_1
+ - FSB2_Internal_2
- FSB1_template
- FSB2_template
- jsa_net
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/in/MainServiceTemplate.yaml
index 61eb2b6e58..7c516d8e51 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/in/MainServiceTemplate.yaml
@@ -97,7 +97,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -112,7 +112,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -127,7 +127,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -142,7 +142,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -169,7 +169,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -177,11 +177,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -239,10 +239,10 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB1_Internal1
- - FSB1_Internal2
- - FSB2_Internal1
- - FSB2_Internal2
+ - FSB1_Internal_1
+ - FSB1_Internal_2
+ - FSB2_Internal_1
+ - FSB2_Internal_2
- FSB1_template
- FSB2_template
- jsa_net
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml
index fb0d179203..5071ce06a4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/consolidation/out/MainServiceTemplate.yaml
@@ -98,7 +98,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -113,7 +113,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -128,7 +128,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -143,7 +143,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -299,10 +299,10 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB1_Internal1
- - FSB1_Internal2
- - FSB2_Internal1
- - FSB2_Internal2
+ - FSB1_Internal_1
+ - FSB1_Internal_2
+ - FSB2_Internal_1
+ - FSB2_Internal_2
- FSB1_template
- FSB2_template
- jsa_net
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/in/MainServiceTemplate.yaml
index 3db2da25e3..122b625268 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/in/MainServiceTemplate.yaml
@@ -72,7 +72,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -83,7 +83,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -120,7 +120,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -128,11 +128,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -175,8 +175,8 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB1_Internal1
+ - FSB2_Internal_2
+ - FSB1_Internal_1
- FSB1_OAM
- FSB1_template
- packet_mirror_network_name \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml
index c6362e351f..a881a1e458 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesConnectedOut/noConsolidation/out/MainServiceTemplate.yaml
@@ -73,7 +73,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -84,7 +84,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -229,8 +229,8 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB1_Internal1
+ - FSB2_Internal_2
+ - FSB1_Internal_1
- FSB1_OAM
- FSB1_template
- packet_mirror_network_name
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/in/MainServiceTemplate.yaml
index ef381fe9c9..60f0fe8c71 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/in/MainServiceTemplate.yaml
@@ -106,7 +106,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -117,7 +117,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -128,7 +128,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB2_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -143,7 +143,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -164,7 +164,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -172,11 +172,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB1
@@ -295,8 +295,8 @@ topology_template:
cmaui_volume1:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
- volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,tenant_id ] } ]}
- size: { get_attribute: [FSB1_Internal1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_Internal2,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]}
+ size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_Internal_2,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
cmaui_volume2:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
@@ -306,8 +306,8 @@ topology_template:
cmaui_volume3:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
- volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal1,tenant_id ] } ]}
- size: { get_attribute: [FSB1_Internal2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,user_data_format ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ volume_type: {get_attribute: [ FSB2_template, addresses, {get_attribute: [ FSB2_Internal_1,tenant_id ] } ]}
+ size: { get_attribute: [FSB1_Internal_2, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB2_template,user_data_format ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
groups:
ep-jsa_net_group:
type: org.openecomp.groups.heat.HeatStack
@@ -316,9 +316,9 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB2_Internal1
- - FSB1_Internal1
- - FSB1_Internal2
+ - FSB2_Internal_2
+ - FSB2_Internal_1
+ - FSB1_Internal_1
+ - FSB1_Internal_2
- FSB1_template
- FSB2_template \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/out/MainServiceTemplate.yaml
index a6eb69ef4d..1d388a986d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/consolidation/out/MainServiceTemplate.yaml
@@ -106,7 +106,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -117,7 +117,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -128,7 +128,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB2_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -143,7 +143,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -358,9 +358,9 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB2_Internal1
- - FSB1_Internal1
- - FSB1_Internal2
+ - FSB2_Internal_2
+ - FSB2_Internal_1
+ - FSB1_Internal_1
+ - FSB1_Internal_2
- FSB1_template
- FSB2_template
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml
index 065584de49..c6508ed192 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml
@@ -106,7 +106,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -117,7 +117,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -154,7 +154,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -162,11 +162,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB1
@@ -174,11 +174,11 @@ topology_template:
flavor:
get_input: fsb1-flavor
availability_zone:
- get_attribute: [ FSB1_Internal1, myAttr, get_attribute: [FSB1_Internal1, index] ]
+ get_attribute: [ FSB1_Internal_1, myAttr, get_attribute: [FSB1_Internal_1, index] ]
metadata:
- get_attribute: [ FSB1_Internal1, myAttr, get_input: index ]
+ get_attribute: [ FSB1_Internal_1, myAttr, get_input: index ]
name:
- get_attribute: [ FSB1_Internal1, myAttr, get_attribute: [jsa_net1, index] ]
+ get_attribute: [ FSB1_Internal_1, myAttr, get_attribute: [jsa_net1, index] ]
artifacts:
nimbus-ethernet-gw:
type: tosca.artifacts.Deployment
@@ -198,8 +198,8 @@ topology_template:
cmaui_volume1:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
- volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,tenant_id ] } ]}
- size: { get_attribute: [FSB1_Internal1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ volume_type: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]}
+ size: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,status ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
cmaui_volume2:
type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
properties:
@@ -214,7 +214,7 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB1_Internal1
+ - FSB2_Internal_2
+ - FSB1_Internal_1
- FSB1_OAM
- FSB1_template
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml
index 1aab8cb5c2..787cd5ee2f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updNodesGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml
@@ -106,7 +106,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -117,7 +117,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -177,19 +177,19 @@ topology_template:
get_input: fsb1-flavor
availability_zone:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- myAttr
- get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- index
metadata:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- myAttr
- get_input: index
name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- myAttr
- get_attribute:
- jsa_net1
@@ -255,7 +255,7 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB1_Internal1
+ - FSB2_Internal_2
+ - FSB1_Internal_1
- FSB1_OAM
- FSB1_template
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/in/MainServiceTemplate.yaml
index b26f74ace5..8de7a78695 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/in/MainServiceTemplate.yaml
@@ -106,7 +106,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -117,7 +117,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -128,7 +128,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB2_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -143,7 +143,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -164,7 +164,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -172,11 +172,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB1
@@ -312,10 +312,10 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB2_Internal1
- - FSB1_Internal1
- - FSB1_Internal2
+ - FSB2_Internal_2
+ - FSB2_Internal_1
+ - FSB1_Internal_1
+ - FSB1_Internal_2
- FSB1_template
- FSB2_template
outputs:
@@ -324,10 +324,10 @@ topology_template:
simpleOutput2:
value: {get_attribute: [ FSB2_template, addresses, key1 ] }
complexOutput1:
- value: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,tenant_id ] } ]}
+ value: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]}
complexOutput2:
description: cgi fw01 left interface Mac-Address
- value: { get_attribute: [FSB1_Internal2, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB2_Internal1,user_data_format ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ value: { get_attribute: [FSB1_Internal_2, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB2_Internal_1,user_data_format ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
complexOutput3:
description: cgi fw01 left interface Mac-Address
- value: { get_input: [a, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB1_Internal1,admin_state_up ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ value: { get_input: [a, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB1_Internal_1,admin_state_up ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml
index a59e6a5572..73c7302fc1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/consolidation/out/MainServiceTemplate.yaml
@@ -106,7 +106,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -117,7 +117,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -128,7 +128,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB2_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -143,7 +143,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -164,7 +164,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -172,11 +172,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB1
@@ -312,10 +312,10 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB2_Internal1
- - FSB1_Internal1
- - FSB1_Internal2
+ - FSB2_Internal_2
+ - FSB2_Internal_1
+ - FSB1_Internal_1
+ - FSB1_Internal_2
- FSB1_template
- FSB2_template
outputs:
@@ -342,7 +342,7 @@ topology_template:
description: cgi fw01 left interface Mac-Address
value:
get_attribute:
- - FSB1_Internal2
+ - FSB1_Internal_2
- addresses
- get_input:
- CMAUI_volume_type
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml
index ad7f9440f5..a2ef5b3f80 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/in/MainServiceTemplate.yaml
@@ -106,7 +106,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -117,7 +117,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -154,7 +154,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -162,11 +162,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB1
@@ -245,8 +245,8 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB1_Internal1
+ - FSB2_Internal_2
+ - FSB1_Internal_1
- FSB1_OAM
- FSB1_template
outputs:
@@ -255,10 +255,10 @@ topology_template:
simpleOutput2:
value: {get_attribute: [ FSB1_template, addresses, key1 ] }
complexOutput1:
- value: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal2,tenant_id ] } ]}
+ value: {get_attribute: [ FSB1_template, addresses, {get_attribute: [ FSB2_Internal_2,tenant_id ] } ]}
complexOutput2:
description: cgi fw01 left interface Mac-Address
- value: { get_attribute: [FSB1_Internal1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,user_data_format ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
+ value: { get_attribute: [FSB1_Internal_1, device_owner, get_input: [CMAUI_volume_type,{get_attribute: [FSB1_OAM,user_data_format ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
complexOutput3:
description: cgi fw01 left interface Mac-Address
value: { get_input: [a, addresses, get_input: [CMAUI_volume_type, {get_attribute: [FSB1_template,accessIPv6 ] }], 0, "OS-EXT-IPS-MAC:mac_addr"] }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml
index 1036541b5f..a2128485e1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updOutputGetAttrIn/noConsolidation/out/MainServiceTemplate.yaml
@@ -106,7 +106,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -117,7 +117,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -154,7 +154,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -162,11 +162,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB1
@@ -245,8 +245,8 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB1_Internal1
+ - FSB2_Internal_2
+ - FSB1_Internal_1
- FSB1_OAM
- FSB1_template
outputs:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml
index a81055ee8b..386bbd0bdf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml
@@ -97,7 +97,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -112,7 +112,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -127,7 +127,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -142,7 +142,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -169,7 +169,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -177,11 +177,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -279,10 +279,10 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB1_Internal1
- - FSB1_Internal2
- - FSB2_Internal1
- - FSB2_Internal2
+ - FSB1_Internal_1
+ - FSB1_Internal_2
+ - FSB2_Internal_1
+ - FSB2_Internal_2
- FSB1_template
- FSB2_template
- jsa_net
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml
index cde2c25b76..6ae9f35a2a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/out/MainServiceTemplate.yaml
@@ -98,7 +98,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -113,7 +113,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB2_Internal1:
+ FSB2_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -128,7 +128,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal2:
+ FSB1_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -143,7 +143,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: jsa_net1
relationship: tosca.relationships.network.LinksTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -347,10 +347,10 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB1_Internal1
- - FSB1_Internal2
- - FSB2_Internal1
- - FSB2_Internal2
+ - FSB1_Internal_1
+ - FSB1_Internal_2
+ - FSB2_Internal_1
+ - FSB2_Internal_2
- FSB1_template
- FSB2_template
- jsa_net
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/in/MainServiceTemplate.yaml
index 3a9873c20e..ee6116b1f6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/in/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/in/MainServiceTemplate.yaml
@@ -72,7 +72,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -83,7 +83,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -120,7 +120,7 @@ topology_template:
shared: true
network_name:
get_attribute:
- - FSB1_Internal1
+ - FSB1_Internal_1
- network_id
dhcp_agent_ids:
get_attribute:
@@ -128,11 +128,11 @@ topology_template:
- addresses
tenant_id:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
qos_policy:
get_attribute:
- - FSB2_Internal2
+ - FSB2_Internal_2
- network_id
FSB1_template:
type: org.openecomp.resource.vfc.nodes.heat.FSB
@@ -195,8 +195,8 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB1_Internal1
+ - FSB2_Internal_2
+ - FSB1_Internal_1
- FSB1_OAM
- FSB1_template
- packet_mirror_network_name \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml
index 44523935d7..99365a8f15 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/noConsolidation/out/MainServiceTemplate.yaml
@@ -73,7 +73,7 @@ topology_template:
type: string
description: prop
node_templates:
- FSB2_Internal2:
+ FSB2_Internal_2:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -84,7 +84,7 @@ topology_template:
capability: tosca.capabilities.network.Bindable
node: FSB1_template
relationship: tosca.relationships.network.BindsTo
- FSB1_Internal1:
+ FSB1_Internal_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
properties:
mac_address:
@@ -257,8 +257,8 @@ topology_template:
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - FSB2_Internal2
- - FSB1_Internal1
+ - FSB2_Internal_2
+ - FSB1_Internal_1
- FSB1_OAM
- FSB1_template
- packet_mirror_network_name