summaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib
diff options
context:
space:
mode:
authorsiddharth0905 <siddharth.singh4@amdocs.com>2018-03-27 19:56:54 +0530
committerOren Kleks <orenkle@amdocs.com>2018-03-28 05:32:09 +0000
commitadca5281550b50d93c7f4259c2f84e21d5681c07 (patch)
treebbef53ec13afefcb0aef882cdc2ab92447a58095 /openecomp-be/lib
parent7363f3d875e08d5195cb5e8b7e4f9ac86ec99ef5 (diff)
Code change to evaluate Network role
Code change to evaluate Network Role of Sub interface resource Change-Id: I0e29c0a1512b76b6db569aaf534f5e59868ae715 Issue-ID: SDC-1072 Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
Diffstat (limited to 'openecomp-be/lib')
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java61
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnectionTest.java6
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml17
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/nestedServiceTemplate.yaml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml56
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml55
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml65
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml20
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml17
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml55
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml65
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_vlan.yml2
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml98
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml38
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml30
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml24
23 files changed, 262 insertions, 446 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java
index f965352da4..016b4b2873 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/HeatToToscaUtil.java
@@ -1514,7 +1514,7 @@ public class HeatToToscaUtil {
.findFirst();
if (vlanSubInterfaceResource.isPresent()) {
Map.Entry<String, Resource> vlanSubInterfaceResourceEntry = vlanSubInterfaceResource.get();
- networkRole = evaluateNetworkRoleFromResourceId(vlanSubInterfaceResourceEntry.getKey(),
+ networkRole = extractNetworkRoleFromSubInterfaceId(vlanSubInterfaceResourceEntry.getKey(),
vlanSubInterfaceResourceEntry.getValue().getType());
}
}
@@ -1523,43 +1523,46 @@ public class HeatToToscaUtil {
public static Optional<String> evaluateNetworkRoleFromResourceId(String resourceId,
String resourceType) {
- if (resourceType.equals(
- HeatResourcesTypes.CONTRAIL_V2_VIRTUAL_MACHINE_INTERFACE_RESOURCE_TYPE.getHeatResource())) {
- return Optional.ofNullable(extractNetworkRoleFromResourceId(resourceId, PortType.VMI));
- }
+ Optional<PortType> portType = getPortType(resourceType);
+ if (portType.isPresent()) {
+ String portResourceIdRegex =
+ PORT_RESOURCE_ID_REGEX_PREFIX + UNDERSCORE + WORDS_REGEX + UNDERSCORE
+ + portType.get().getPortTypeName() + PORT_RESOURCE_ID_REGEX_SUFFIX;
+ String portIntResourceIdRegex =
+ PORT_INT_RESOURCE_ID_REGEX_PREFIX + portType.get().getPortTypeName()
+ + PORT_RESOURCE_ID_REGEX_SUFFIX;
+
+ String portNetworkRole = getNetworkRole(resourceId, portResourceIdRegex);
+ String portIntNetworkRole = getNetworkRole(resourceId, portIntResourceIdRegex);
- if (resourceType.equals(HeatResourcesTypes.NEUTRON_PORT_RESOURCE_TYPE.getHeatResource())) {
- return Optional.ofNullable(extractNetworkRoleFromResourceId(resourceId, PortType.PORT));
+ return Optional.ofNullable(Objects.nonNull(portNetworkRole)
+ ? portNetworkRole : portIntNetworkRole);
}
return Optional.empty();
}
- private static String extractNetworkRoleFromResourceId(String portResourceId, PortType portType) {
-
- if (portResourceId.matches(SUB_INTERFACE_REGEX)) {
- return extractNetworkRoleFromSubInterfaceId(portResourceId, portType);
+ private static Optional<PortType> getPortType(String resourceType) {
+ if (resourceType.equals(
+ HeatResourcesTypes.CONTRAIL_V2_VIRTUAL_MACHINE_INTERFACE_RESOURCE_TYPE.getHeatResource())) {
+ return Optional.of(PortType.VMI);
+ } else if (resourceType.equals(
+ HeatResourcesTypes.NEUTRON_PORT_RESOURCE_TYPE.getHeatResource())) {
+ return Optional.of(PortType.PORT);
}
-
- String portResourceIdRegex =
- PORT_RESOURCE_ID_REGEX_PREFIX + UNDERSCORE + WORDS_REGEX + UNDERSCORE + portType.getPortTypeName()
- + PORT_RESOURCE_ID_REGEX_SUFFIX;
- String portIntResourceIdRegex =
- PORT_INT_RESOURCE_ID_REGEX_PREFIX + portType.getPortTypeName()
- + PORT_RESOURCE_ID_REGEX_SUFFIX;
-
- String portNetworkRole = getNetworkRole(portResourceId, portResourceIdRegex);
- String portIntNetworkRole = getNetworkRole(portResourceId, portIntResourceIdRegex);
-
- return Objects.nonNull(portNetworkRole) ? portNetworkRole : portIntNetworkRole;
+ return Optional.empty();
}
- private static String extractNetworkRoleFromSubInterfaceId(String resourceId,
- PortType portType) {
- String subInterfaceResourceIdRegex =
- SUB_INTERFACE_INT_RESOURCE_ID_REGEX_PREFIX + portType.getPortTypeName()
- + PORT_RESOURCE_ID_REGEX_SUFFIX;
+ public static Optional<String> extractNetworkRoleFromSubInterfaceId(String resourceId,
+ String resourceType) {
+ Optional<PortType> portType = getPortType(resourceType);
+ if (portType.isPresent()) {
+ String subInterfaceResourceIdRegex =
+ SUB_INTERFACE_INT_RESOURCE_ID_REGEX_PREFIX + portType.get().getPortTypeName()
+ + PORT_RESOURCE_ID_REGEX_SUFFIX;
- return getNetworkRole(resourceId, subInterfaceResourceIdRegex);
+ return Optional.ofNullable(getNetworkRole(resourceId, subInterfaceResourceIdRegex));
+ }
+ return Optional.empty();
}
private enum PortType {
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnectionTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnectionTest.java
index 7815824208..564cddb73c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnectionTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ContrailV2VlanToInterfaceResourceConnectionTest.java
@@ -139,7 +139,8 @@ public class ContrailV2VlanToInterfaceResourceConnectionTest extends BaseResourc
"vm_type_subint_networkrole_vmi");
subInterfaceResourceIds.forEach(resourceId -> {
- Optional<String> networkRole=HeatToToscaUtil.evaluateNetworkRoleFromResourceId(resourceId,
+ Optional<String> networkRole = HeatToToscaUtil.extractNetworkRoleFromSubInterfaceId(
+ resourceId,
HeatResourcesTypes.CONTRAIL_V2_VIRTUAL_MACHINE_INTERFACE_RESOURCE_TYPE.getHeatResource());
Assert.assertTrue(networkRole.isPresent()
&& "networkrole".equals(networkRole.get()));
@@ -153,7 +154,8 @@ public class ContrailV2VlanToInterfaceResourceConnectionTest extends BaseResourc
"vm_type_11_subint_11_vmi_11");
subInterfaceResourceIds.forEach(resourceId -> {
- Optional<String> networkRole=HeatToToscaUtil.evaluateNetworkRoleFromResourceId(resourceId,
+ Optional<String> networkRole = HeatToToscaUtil.extractNetworkRoleFromSubInterfaceId(
+ resourceId,
HeatResourcesTypes.CONTRAIL_V2_VIRTUAL_MACHINE_INTERFACE_RESOURCE_TYPE.getHeatResource());
Assert.assertFalse(networkRole.isPresent());
}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b0d27fdb25..0741e1096d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -676,4 +676,4 @@ node_types:
type: tosca.capabilities.Node
occurrences:
- 1
- - UNBOUNDED \ No newline at end of file
+ - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml
index 6d4cbf9dd9..8e88cf25d4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/MainServiceTemplate.yaml
@@ -298,12 +298,6 @@ topology_template:
description: List of subinterface vlan tags
entry_schema:
type: string
- untr_network_collection_function:
- type: string
- required: true
- untr_vfc_instance_group_function:
- type: string
- required: true
vdbe_flavor_name:
hidden: false
immutable: false
@@ -470,14 +464,3 @@ topology_template:
members:
- control_int_net
- abstract_vdbe
- untr_group:
- type: org.openecomp.groups.VfcInstanceGroup
- properties:
- vfc_parent_port_role: untr
- network_collection_function:
- get_input: untr_network_collection_function
- vfc_instance_group_function:
- get_input: untr_vfc_instance_group_function
- subinterface_role: untr
- members:
- - abstract_vdbe \ 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/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml
index bb13382d3c..42f3daa53f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/Nested_vdbeServiceTemplate.yaml
@@ -495,4 +495,4 @@ topology_template:
- dependency
dependency_vdbe:
- vdbe
- - dependency \ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/nestedServiceTemplate.yaml
index b83a138554..c45c4d6dcc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/nestedServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/computePortNetworkSubInterface/out/nestedServiceTemplate.yaml
@@ -168,4 +168,4 @@ topology_template:
- dependency
binding_vdbe_0_untr_vmi_0:
- vdbe_0_untr_vmi_0
- - binding \ No newline at end of file
+ - binding
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml
index db8bd34347..f550cb2546 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -18,9 +18,6 @@ topology_template:
immutable: false
type: string
description: UID of OAM network
- Vlan_network_collection_function:
- type: string
- required: true
ps_server_1b_ips:
hidden: false
immutable: false
@@ -63,9 +60,6 @@ topology_template:
hidden: false
immutable: false
type: string
- Vlan_vfc_instance_group_function:
- type: string
- required: true
packet_external_network_name:
hidden: false
immutable: false
@@ -277,17 +271,6 @@ topology_template:
- packet_internal_network
- abstract_ps_server_1b
- abstract_pd_server_1b
- Vlan_group:
- type: org.openecomp.groups.VfcInstanceGroup
- properties:
- vfc_parent_port_role: 1b
- network_collection_function:
- get_input: Vlan_network_collection_function
- vfc_instance_group_function:
- get_input: Vlan_vfc_instance_group_function
- subinterface_role: Vlan
- members:
- - abstract_pd_server_1b
substitution_mappings:
node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5
capabilities:
@@ -753,4 +736,4 @@ topology_template:
- link_pd_server_1b_pd_server_2b_port
dependency_packet_external_network:
- packet_external_network
- - dependency \ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml
index 3add46dce6..2a33ee306c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -8,9 +8,25 @@ imports:
file: GlobalSubstitutionTypesServiceTemplate.yaml
topology_template:
inputs:
- Vlan_network_collection_function:
+ port_net:
+ hidden: false
+ immutable: false
+ type: string
+ description: port network
+ pd_server_1b_flavor:
+ hidden: false
+ immutable: false
+ type: string
+ description: Flavor for PD server
+ pd_server_1b_ips:
+ hidden: false
+ immutable: false
+ type: string
+ packet_external_network_name:
+ hidden: false
+ immutable: false
type: string
- required: true
+ description: network name
packet_internal_network_name:
hidden: false
immutable: false
@@ -30,28 +46,6 @@ topology_template:
description: CMAUI1, CMAUI2 server names
entry_schema:
type: string
- port_net:
- hidden: false
- immutable: false
- type: string
- description: port network
- pd_server_1b_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for PD server
- pd_server_1b_ips:
- hidden: false
- immutable: false
- type: string
- Vlan_vfc_instance_group_function:
- type: string
- required: true
- packet_external_network_name:
- hidden: false
- immutable: false
- type: string
- description: network name
availability_zone_0:
label: availabilityzone name
hidden: false
@@ -174,18 +168,6 @@ topology_template:
- packet_internal_network
- test_nested_level2
- abstract_pd_server_1b
- Vlan_group:
- type: org.openecomp.groups.VfcInstanceGroup
- properties:
- vfc_parent_port_role: 1b
- network_collection_function:
- get_input: Vlan_network_collection_function
- vfc_instance_group_function:
- get_input: Vlan_vfc_instance_group_function
- subinterface_role: Vlan
- members:
- - test_nested_level2
- - abstract_pd_server_1b
substitution_mappings:
node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5
capabilities:
@@ -615,4 +597,4 @@ topology_template:
- dependency
dependency_packet_external_network:
- packet_external_network
- - dependency \ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml
index 51fd65c2fb..8ae882e8bf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -8,9 +8,25 @@ imports:
file: GlobalSubstitutionTypesServiceTemplate.yaml
topology_template:
inputs:
- Vlan_network_collection_function:
+ port_net:
+ hidden: false
+ immutable: false
type: string
- required: true
+ description: port network
+ pd_server_1b_flavor:
+ hidden: false
+ immutable: false
+ type: string
+ description: Flavor for PD server
+ pd_server_1b_ips:
+ hidden: false
+ immutable: false
+ type: string
+ packet_external_network_name:
+ hidden: false
+ immutable: false
+ type: string
+ description: network name
packet_internal_network_name:
hidden: false
immutable: false
@@ -30,28 +46,6 @@ topology_template:
description: CMAUI1, CMAUI2 server names
entry_schema:
type: string
- port_net:
- hidden: false
- immutable: false
- type: string
- description: port network
- pd_server_1b_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for PD server
- pd_server_1b_ips:
- hidden: false
- immutable: false
- type: string
- Vlan_vfc_instance_group_function:
- type: string
- required: true
- packet_external_network_name:
- hidden: false
- immutable: false
- type: string
- description: network name
availability_zone_0:
label: availabilityzone name
hidden: false
@@ -160,17 +154,6 @@ topology_template:
- packet_internal_network
- test_nested_level2
- abstract_pd_server_1b
- Vlan_group:
- type: org.openecomp.groups.VfcInstanceGroup
- properties:
- vfc_parent_port_role: 1b
- network_collection_function:
- get_input: Vlan_network_collection_function
- vfc_instance_group_function:
- get_input: Vlan_vfc_instance_group_function
- subinterface_role: Vlan
- members:
- - abstract_pd_server_1b
substitution_mappings:
node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5
capabilities:
@@ -780,4 +763,4 @@ topology_template:
- dependency
dependency_packet_external_network:
- packet_external_network
- - dependency \ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index 8543cab7e5..91bd0bca8e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -8,32 +8,6 @@ imports:
file: GlobalSubstitutionTypesServiceTemplate.yaml
topology_template:
inputs:
- Vlan_network_collection_function:
- type: string
- required: true
- ps_server_1b_ips:
- hidden: false
- immutable: false
- type: string
- security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- ps_server_1b_names:
- hidden: false
- immutable: false
- type: list
- description: Ps server names
- entry_schema:
- type: string
- packet_ext_network_name:
- hidden: false
- immutable: false
- type: string
- description: network name
port_net:
hidden: false
immutable: false
@@ -43,14 +17,22 @@ topology_template:
hidden: false
immutable: false
type: string
+ ps_server_1b_ips:
+ hidden: false
+ immutable: false
+ type: string
packet_int_network_name:
hidden: false
immutable: false
type: string
description: network name
- Vlan_vfc_instance_group_function:
- type: string
- required: true
+ security_group_name:
+ hidden: false
+ immutable: false
+ type: list
+ description: CMAUI1, CMAUI2 server names
+ entry_schema:
+ type: string
availability_zone_0:
label: availabilityzone name
hidden: false
@@ -72,6 +54,18 @@ topology_template:
immutable: false
type: string
description: sub interface network
+ ps_server_1b_names:
+ hidden: false
+ immutable: false
+ type: list
+ description: Ps server names
+ entry_schema:
+ type: string
+ packet_ext_network_name:
+ hidden: false
+ immutable: false
+ type: string
+ description: network name
node_templates:
packet_ext_network:
type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
@@ -165,17 +159,6 @@ topology_template:
node: packet_ext_network
relationship: tosca.relationships.network.LinksTo
groups:
- Vlan_group:
- type: org.openecomp.groups.VfcInstanceGroup
- properties:
- vfc_parent_port_role: 1b
- network_collection_function:
- get_input: Vlan_network_collection_function
- vfc_instance_group_function:
- get_input: Vlan_vfc_instance_group_function
- subinterface_role: Vlan
- members:
- - abstract_ps_server_1b
nested_pattern5_levelTwo_group:
type: org.openecomp.groups.heat.HeatStack
properties:
@@ -578,4 +561,4 @@ topology_template:
- dependency_ps_server_1b
dependency_server_1b_ps_2:
- abstract_ps_server_1b
- - dependency_ps_server_1b \ No newline at end of file
+ - dependency_ps_server_1b
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml
index e0ee6fe9fe..6b4786665d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -8,9 +8,6 @@ imports:
file: GlobalSubstitutionTypesServiceTemplate.yaml
topology_template:
inputs:
- Vlan_network_collection_function:
- type: string
- required: true
ps_server_1b_ips:
hidden: false
immutable: false
@@ -54,9 +51,6 @@ topology_template:
hidden: false
immutable: false
type: string
- Vlan_vfc_instance_group_function:
- type: string
- required: true
availability_zone_0:
label: availabilityzone name
hidden: false
@@ -172,18 +166,6 @@ topology_template:
members:
- test_nested_level2
- abstract_pd_server_1b
- Vlan_group:
- type: org.openecomp.groups.VfcInstanceGroup
- properties:
- vfc_parent_port_role: 1b
- network_collection_function:
- get_input: Vlan_network_collection_function
- vfc_instance_group_function:
- get_input: Vlan_vfc_instance_group_function
- subinterface_role: Vlan
- members:
- - test_nested_level2
- - abstract_pd_server_1b
substitution_mappings:
node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5
capabilities:
@@ -565,4 +547,4 @@ topology_template:
- dependency
local_storage_server_1b_pd_1_test_nested_level2:
- test_nested_level2
- - local_storage_server_1b_pd_1 \ No newline at end of file
+ - local_storage_server_1b_pd_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml
index 18e3aa6ca5..6f4882f241 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml
@@ -46,12 +46,6 @@ topology_template:
source_type: HEAT
param_name: pd_server_1b_ips
type: string
- Vlan_network_collection_function:
- type: string
- required: true
- Vlan_vfc_instance_group_function:
- type: string
- required: true
pd_server_1b_names:
hidden: false
immutable: false
@@ -274,14 +268,3 @@ topology_template:
- test_nested_level1
- packet_externalmain_network
- abstract_pd_server_1b_1
- Vlan_group:
- type: org.openecomp.groups.VfcInstanceGroup
- properties:
- vfc_parent_port_role: 1b
- network_collection_function:
- get_input: Vlan_network_collection_function
- vfc_instance_group_function:
- get_input: Vlan_vfc_instance_group_function
- subinterface_role: Vlan
- members:
- - abstract_pd_server_1b_1 \ 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/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml
index bedb402ef6..2372290217 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -8,9 +8,6 @@ imports:
file: GlobalSubstitutionTypesServiceTemplate.yaml
topology_template:
inputs:
- Vlan_network_collection_function:
- type: string
- required: true
ps_server_1b_ips:
hidden: false
immutable: false
@@ -64,9 +61,6 @@ topology_template:
immutable: false
type: string
description: network name
- Vlan_vfc_instance_group_function:
- type: string
- required: true
availability_zone_0:
label: availabilityzone name
hidden: false
@@ -267,17 +261,6 @@ topology_template:
- packet_int_network
- abstract_ps_server_1b
- abstract_pd_server_1b
- Vlan_group:
- type: org.openecomp.groups.VfcInstanceGroup
- properties:
- vfc_parent_port_role: 1b
- network_collection_function:
- get_input: Vlan_network_collection_function
- vfc_instance_group_function:
- get_input: Vlan_vfc_instance_group_function
- subinterface_role: Vlan
- members:
- - abstract_ps_server_1b
substitution_mappings:
node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5
capabilities:
@@ -1007,4 +990,4 @@ topology_template:
- dependency_pd_server_1b
dependency_server_1b_pd_3:
- abstract_pd_server_1b
- - dependency_pd_server_1b \ No newline at end of file
+ - dependency_pd_server_1b
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml
index b80060507d..d9c83039df 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -18,9 +18,6 @@ topology_template:
immutable: false
type: string
description: UID of OAM network
- Vlan_network_collection_function:
- type: string
- required: true
ps_server_1b_ips:
hidden: false
immutable: false
@@ -63,9 +60,6 @@ topology_template:
hidden: false
immutable: false
type: string
- Vlan_vfc_instance_group_function:
- type: string
- required: true
packet_external_network_name:
hidden: false
immutable: false
@@ -201,17 +195,6 @@ topology_template:
- packet_external_network
- packet_internal_network
- abstract_pd_server_1b
- Vlan_group:
- type: org.openecomp.groups.VfcInstanceGroup
- properties:
- vfc_parent_port_role: 1b
- network_collection_function:
- get_input: Vlan_network_collection_function
- vfc_instance_group_function:
- get_input: Vlan_vfc_instance_group_function
- subinterface_role: Vlan
- members:
- - abstract_pd_server_1b
substitution_mappings:
node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5
capabilities:
@@ -605,4 +588,4 @@ topology_template:
- dependency_pd_server_1b_pd_server_1b_port
dependency_packet_external_network:
- packet_external_network
- - dependency \ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml
index a85192e7db..9e29f61b8e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -8,9 +8,25 @@ imports:
file: GlobalSubstitutionTypesServiceTemplate.yaml
topology_template:
inputs:
- Vlan_network_collection_function:
+ port_net:
+ hidden: false
+ immutable: false
type: string
- required: true
+ description: port network
+ pd_server_1b_flavor:
+ hidden: false
+ immutable: false
+ type: string
+ description: Flavor for PD server
+ pd_server_1b_ips:
+ hidden: false
+ immutable: false
+ type: string
+ packet_external_network_name:
+ hidden: false
+ immutable: false
+ type: string
+ description: network name
packet_internal_network_name:
hidden: false
immutable: false
@@ -30,28 +46,6 @@ topology_template:
description: CMAUI1, CMAUI2 server names
entry_schema:
type: string
- port_net:
- hidden: false
- immutable: false
- type: string
- description: port network
- pd_server_1b_flavor:
- hidden: false
- immutable: false
- type: string
- description: Flavor for PD server
- pd_server_1b_ips:
- hidden: false
- immutable: false
- type: string
- Vlan_vfc_instance_group_function:
- type: string
- required: true
- packet_external_network_name:
- hidden: false
- immutable: false
- type: string
- description: network name
availability_zone_0:
label: availabilityzone name
hidden: false
@@ -160,17 +154,6 @@ topology_template:
- packet_internal_network
- test_nested_level2
- abstract_pd_server_1b
- Vlan_group:
- type: org.openecomp.groups.VfcInstanceGroup
- properties:
- vfc_parent_port_role: 1b
- network_collection_function:
- get_input: Vlan_network_collection_function
- vfc_instance_group_function:
- get_input: Vlan_vfc_instance_group_function
- subinterface_role: Vlan
- members:
- - abstract_pd_server_1b
substitution_mappings:
node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5
capabilities:
@@ -768,4 +751,4 @@ topology_template:
- dependency
dependency_packet_external_network:
- packet_external_network
- - dependency \ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index 46c1b013e2..8cf3f5d99b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -8,32 +8,6 @@ imports:
file: GlobalSubstitutionTypesServiceTemplate.yaml
topology_template:
inputs:
- Vlan_network_collection_function:
- type: string
- required: true
- ps_server_1b_ips:
- hidden: false
- immutable: false
- type: string
- security_group_name:
- hidden: false
- immutable: false
- type: list
- description: CMAUI1, CMAUI2 server names
- entry_schema:
- type: string
- ps_server_1b_names:
- hidden: false
- immutable: false
- type: list
- description: Ps server names
- entry_schema:
- type: string
- packet_ext_network_name:
- hidden: false
- immutable: false
- type: string
- description: network name
port_net:
hidden: false
immutable: false
@@ -43,14 +17,22 @@ topology_template:
hidden: false
immutable: false
type: string
+ ps_server_1b_ips:
+ hidden: false
+ immutable: false
+ type: string
packet_int_network_name:
hidden: false
immutable: false
type: string
description: network name
- Vlan_vfc_instance_group_function:
- type: string
- required: true
+ security_group_name:
+ hidden: false
+ immutable: false
+ type: list
+ description: CMAUI1, CMAUI2 server names
+ entry_schema:
+ type: string
availability_zone_0:
label: availabilityzone name
hidden: false
@@ -72,6 +54,18 @@ topology_template:
immutable: false
type: string
description: sub interface network
+ ps_server_1b_names:
+ hidden: false
+ immutable: false
+ type: list
+ description: Ps server names
+ entry_schema:
+ type: string
+ packet_ext_network_name:
+ hidden: false
+ immutable: false
+ type: string
+ description: network name
node_templates:
packet_ext_network:
type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
@@ -194,17 +188,6 @@ topology_template:
node: packet_ext_network
relationship: tosca.relationships.network.LinksTo
groups:
- Vlan_group:
- type: org.openecomp.groups.VfcInstanceGroup
- properties:
- vfc_parent_port_role: 1b
- network_collection_function:
- get_input: Vlan_network_collection_function
- vfc_instance_group_function:
- get_input: Vlan_vfc_instance_group_function
- subinterface_role: Vlan
- members:
- - abstract_ps_server_1b
nested_pattern5_levelTwo_group:
type: org.openecomp.groups.heat.HeatStack
properties:
@@ -596,4 +579,4 @@ topology_template:
- dependency_ps_server_1b
dependency_server_1b_ps_2:
- abstract_ps_server_1b_1
- - dependency_ps_server_1b \ No newline at end of file
+ - dependency_ps_server_1b
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_vlan.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_vlan.yml
index cc50a66d6e..1aa418cd5a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_vlan.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_vlan.yml
@@ -24,7 +24,7 @@ parameters:
type: number
resources:
- template_Vlan_vmi_1:
+ template_subint_Vlan_vmi_1:
type: OS::ContrailV2::VirtualMachineInterface
properties:
name:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 4b63486703..f955a57828 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -101,7 +101,7 @@ node_types:
occurrences:
- 0
- UNBOUNDED
- - dependency_template_Vlan_vmi_1_test_resourceGroup_0:
+ - dependency_template_subint_Vlan_vmi_1_test_resourceGroup_0:
capability: tosca.capabilities.Node
node: tosca.nodes.Root
relationship: tosca.relationships.DependsOn
@@ -143,7 +143,7 @@ node_types:
occurrences:
- 0
- UNBOUNDED
- - dependency_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2:
+ - dependency_template_subint_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2:
capability: tosca.capabilities.Node
node: tosca.nodes.Root
relationship: tosca.relationships.DependsOn
@@ -157,7 +157,7 @@ node_types:
occurrences:
- 0
- UNBOUNDED
- - dependency_template_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2:
+ - dependency_template_subint_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2:
capability: tosca.capabilities.Node
node: tosca.nodes.Root
relationship: tosca.relationships.DependsOn
@@ -399,6 +399,11 @@ node_types:
occurrences:
- 1
- UNBOUNDED
+ feature_template_subint_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2:
+ type: tosca.capabilities.Node
+ occurrences:
+ - 1
+ - UNBOUNDED
disk.device.read.bytes.rate_server_1b_pd_0:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -590,11 +595,6 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- feature_template_Vlan_vmi_1_test_resourceGroup_0:
- type: tosca.capabilities.Node
- occurrences:
- - 1
- - UNBOUNDED
end_point_packet_external_network:
type: tosca.capabilities.Endpoint
occurrences:
@@ -652,16 +652,6 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- feature_template_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2:
- type: tosca.capabilities.Node
- occurrences:
- - 1
- - UNBOUNDED
- feature_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2:
- type: tosca.capabilities.Node
- occurrences:
- - 1
- - UNBOUNDED
network.outgoing.bytes_pd_server_1b_port_0:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -853,6 +843,11 @@ node_types:
occurrences:
- 1
- UNBOUNDED
+ feature_template_subint_Vlan_vmi_1_test_resourceGroup_0:
+ type: tosca.capabilities.Node
+ occurrences:
+ - 1
+ - UNBOUNDED
disk.device.read.requests_server_1b_ps_1_test_nested_level2:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -934,6 +929,11 @@ node_types:
occurrences:
- 1
- UNBOUNDED
+ feature_template_subint_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2:
+ type: tosca.capabilities.Node
+ occurrences:
+ - 1
+ - UNBOUNDED
binding_ps_server_1b_port_1_test_nested_level2:
type: tosca.capabilities.network.Bindable
valid_source_types:
@@ -1363,14 +1363,14 @@ node_types:
occurrences:
- 0
- UNBOUNDED
- - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
+ - dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
capability: tosca.capabilities.Node
node: tosca.nodes.Root
relationship: tosca.relationships.DependsOn
occurrences:
- 0
- UNBOUNDED
- - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
+ - link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
capability: tosca.capabilities.network.Linkable
relationship: tosca.relationships.network.LinksTo
occurrences:
@@ -1592,11 +1592,6 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
- type: tosca.capabilities.Node
- occurrences:
- - 1
- - UNBOUNDED
disk.device.write.bytes.rate_pd_server_1b:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1655,6 +1650,11 @@ node_types:
occurrences:
- 1
- UNBOUNDED
+ feature_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
+ type: tosca.capabilities.Node
+ occurrences:
+ - 1
+ - UNBOUNDED
cpu_util_pd_server_1b:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1808,7 +1808,7 @@ node_types:
occurrences:
- 0
- UNBOUNDED
- - dependency_template_Vlan_vmi_1_test_resourceGroup_1:
+ - dependency_template_subint_Vlan_vmi_1_test_resourceGroup_1:
capability: tosca.capabilities.Node
node: tosca.nodes.Root
relationship: tosca.relationships.DependsOn
@@ -1822,7 +1822,7 @@ node_types:
occurrences:
- 0
- UNBOUNDED
- - dependency_template_Vlan_vmi_1_test_resourceGroup_2:
+ - dependency_template_subint_Vlan_vmi_1_test_resourceGroup_2:
capability: tosca.capabilities.Node
node: tosca.nodes.Root
relationship: tosca.relationships.DependsOn
@@ -2127,16 +2127,6 @@ node_types:
occurrences:
- 1
- UNBOUNDED
- feature_template_Vlan_vmi_1_test_resourceGroup_1:
- type: tosca.capabilities.Node
- occurrences:
- - 1
- - UNBOUNDED
- feature_template_Vlan_vmi_1_test_resourceGroup_2:
- type: tosca.capabilities.Node
- occurrences:
- - 1
- - UNBOUNDED
disk.device.capacity_server_1b_ps_1:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2335,6 +2325,16 @@ node_types:
occurrences:
- 1
- UNBOUNDED
+ feature_template_subint_Vlan_vmi_1_test_resourceGroup_2:
+ type: tosca.capabilities.Node
+ occurrences:
+ - 1
+ - UNBOUNDED
+ feature_template_subint_Vlan_vmi_1_test_resourceGroup_1:
+ type: tosca.capabilities.Node
+ occurrences:
+ - 1
+ - UNBOUNDED
disk.read.bytes.rate_server_1b_ps_2:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -2675,14 +2675,14 @@ node_types:
occurrences:
- 0
- UNBOUNDED
- - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
+ - dependency_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
capability: tosca.capabilities.Node
node: tosca.nodes.Root
relationship: tosca.relationships.DependsOn
occurrences:
- 0
- UNBOUNDED
- - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
+ - link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
capability: tosca.capabilities.network.Linkable
relationship: tosca.relationships.network.LinksTo
occurrences:
@@ -2873,6 +2873,11 @@ node_types:
occurrences:
- 1
- UNBOUNDED
+ feature_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
+ type: tosca.capabilities.Node
+ occurrences:
+ - 1
+ - UNBOUNDED
binding_ps_server_1b:
type: tosca.capabilities.network.Bindable
occurrences:
@@ -3019,11 +3024,6 @@ node_types:
occurrences:
- 0
- UNBOUNDED
- feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
- type: tosca.capabilities.Node
- occurrences:
- - 1
- - UNBOUNDED
org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan:
derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
properties:
@@ -3065,20 +3065,20 @@ node_types:
required: true
status: SUPPORTED
requirements:
- - dependency_template_Vlan_vmi_1:
+ - dependency_template_subint_Vlan_vmi_1:
capability: tosca.capabilities.Node
node: tosca.nodes.Root
relationship: tosca.relationships.DependsOn
occurrences:
- 0
- UNBOUNDED
- - link_template_Vlan_vmi_1:
+ - link_template_subint_Vlan_vmi_1:
capability: tosca.capabilities.network.Linkable
relationship: tosca.relationships.network.LinksTo
occurrences:
- 1
- 1
- - binding_template_Vlan_vmi_1:
+ - binding_template_subint_Vlan_vmi_1:
capability: tosca.capabilities.network.Bindable
node: org.openecomp.resource.cp.nodes.network.Port
relationship: tosca.relationships.network.BindsTo
@@ -3086,8 +3086,8 @@ node_types:
- 1
- 1
capabilities:
- feature_template_Vlan_vmi_1:
+ feature_template_subint_Vlan_vmi_1:
type: tosca.capabilities.Node
occurrences:
- 1
- - UNBOUNDED
+ - UNBOUNDED \ 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/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml
index 9bea96b063..629fdb2fb6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml
@@ -106,7 +106,7 @@ topology_template:
- subinterface_nested_vlan_net1
- index_value
requirements:
- - binding_template_Vlan_vmi_1:
+ - binding_template_subint_Vlan_vmi_1:
capability: tosca.capabilities.network.Bindable
node: pd_server_1b_pd_server_1b_port
relationship: tosca.relationships.network.BindsTo
@@ -260,9 +260,6 @@ topology_template:
disk.write.requests_pd_server_1b:
- pd_server_1b
- disk.write.requests
- feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
- - pd_server_1b_pd_server_1b_port_nested_vlan
- - feature_template_Vlan_vmi_1
disk.device.write.bytes.rate_pd_server_1b:
- pd_server_1b
- disk.device.write.bytes.rate
@@ -293,6 +290,9 @@ topology_template:
binding_pd_server_1b:
- pd_server_1b
- binding
+ feature_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
+ - pd_server_1b_pd_server_1b_port_nested_vlan
+ - feature_template_subint_Vlan_vmi_1
cpu_util_pd_server_1b:
- pd_server_1b
- cpu_util
@@ -330,9 +330,6 @@ topology_template:
- pd_server_1b
- disk.write.requests.rate
requirements:
- link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
- - pd_server_1b_pd_server_1b_port_nested_vlan
- - link_template_Vlan_vmi_1
dependency_pd_server_1b:
- pd_server_1b
- dependency
@@ -345,9 +342,12 @@ topology_template:
dependency_pd_server_1b_pd_server_1b_port_nested_vlan:
- pd_server_1b_pd_server_1b_port_nested_vlan
- dependency
- dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
+ link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
- pd_server_1b_pd_server_1b_port_nested_vlan
- - dependency_template_Vlan_vmi_1
+ - link_template_subint_Vlan_vmi_1
dependency_pd_server_1b_pd_server_1b_port:
- pd_server_1b_pd_server_1b_port
- dependency
+ dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
+ - pd_server_1b_pd_server_1b_port_nested_vlan
+ - dependency_template_subint_Vlan_vmi_1 \ 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/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml
index 9b0f4d9573..3b19af8867 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml
@@ -121,7 +121,7 @@ topology_template:
- subinterface_nested_vlan_net1
- index_value
requirements:
- - binding_template_Vlan_vmi_1:
+ - binding_template_subint_Vlan_vmi_1:
capability: tosca.capabilities.network.Bindable
node: ps_server_1b_ps_server_1b_port
relationship: tosca.relationships.network.BindsTo
@@ -251,6 +251,9 @@ topology_template:
disk.root.size_ps_server_1b:
- ps_server_1b
- disk.root.size
+ feature_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
+ - ps_server_1b_ps_server_1b_port_nested_vlan
+ - feature_template_subint_Vlan_vmi_1
binding_ps_server_1b:
- ps_server_1b
- binding
@@ -326,13 +329,7 @@ topology_template:
binding_ps_server_1b_ps_server_1b_port:
- ps_server_1b_ps_server_1b_port
- binding
- feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
- - ps_server_1b_ps_server_1b_port_nested_vlan
- - feature_template_Vlan_vmi_1
requirements:
- dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
- - ps_server_1b_ps_server_1b_port_nested_vlan
- - dependency_template_Vlan_vmi_1
local_storage_ps_server_1b:
- ps_server_1b
- local_storage
@@ -345,9 +342,12 @@ topology_template:
link_ps_server_1b_ps_server_1b_port:
- ps_server_1b_ps_server_1b_port
- link
- link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
+ dependency_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
- ps_server_1b_ps_server_1b_port_nested_vlan
- - link_template_Vlan_vmi_1
+ - dependency_template_subint_Vlan_vmi_1
dependency_ps_server_1b:
- ps_server_1b
- dependency
+ link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
+ - ps_server_1b_ps_server_1b_port_nested_vlan
+ - link_template_subint_Vlan_vmi_1 \ 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/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml
index 51fd65c2fb..de25a40e58 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml
@@ -145,7 +145,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: packet_internal_network
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
+ - link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan:
capability: tosca.capabilities.network.Linkable
node: packet_external_network
relationship: tosca.relationships.network.LinksTo
@@ -276,6 +276,9 @@ topology_template:
disk.latency_server_1b_ps_1_test_nested_level2:
- test_nested_level2
- disk.latency_server_1b_ps_1
+ feature_template_subint_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2:
+ - test_nested_level2
+ - feature_template_subint_Vlan_vmi_1_test_resourceGroup_1
disk.device.read.bytes.rate_server_1b_pd_0:
- abstract_pd_server_1b
- disk.device.read.bytes.rate_pd_server_1b
@@ -375,9 +378,6 @@ topology_template:
disk.iops_server_1b_pd_0:
- abstract_pd_server_1b
- disk.iops_pd_server_1b
- feature_template_Vlan_vmi_1_test_resourceGroup_0:
- - test_resourceGroup_0
- - feature_template_Vlan_vmi_1
end_point_packet_external_network:
- packet_external_network
- end_point
@@ -408,12 +408,6 @@ topology_template:
disk.device.iops_server_1b_ps_2_test_nested_level2:
- test_nested_level2
- disk.device.iops_server_1b_ps_2
- feature_template_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2:
- - test_nested_level2
- - feature_template_Vlan_vmi_1_test_resourceGroup_2
- feature_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2:
- - test_nested_level2
- - feature_template_Vlan_vmi_1_test_resourceGroup_1
network.outgoing.bytes_pd_server_1b_port_0:
- abstract_pd_server_1b
- network.outgoing.bytes_pd_server_1b_pd_server_1b_port
@@ -513,6 +507,9 @@ topology_template:
network.incoming.packets.rate_ps_server_1b_port_1_test_nested_level2:
- test_nested_level2
- network.incoming.packets.rate_ps_server_1b_port_1
+ feature_template_subint_Vlan_vmi_1_test_resourceGroup_0:
+ - test_resourceGroup_0
+ - feature_template_subint_Vlan_vmi_1
disk.device.read.requests_server_1b_ps_1_test_nested_level2:
- test_nested_level2
- disk.device.read.requests_server_1b_ps_1
@@ -555,6 +552,9 @@ topology_template:
network.incoming.bytes.rate_ps_server_1b_port_1_test_nested_level2:
- test_nested_level2
- network.incoming.bytes.rate_ps_server_1b_port_1
+ feature_template_subint_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2:
+ - test_nested_level2
+ - feature_template_subint_Vlan_vmi_1_test_resourceGroup_2
binding_ps_server_1b_port_1_test_nested_level2:
- test_nested_level2
- binding_ps_server_1b_port_1
@@ -727,24 +727,24 @@ topology_template:
dependency_server_1b_ps_1_test_nested_level2:
- test_nested_level2
- dependency_server_1b_ps_1
+ dependency_template_subint_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2:
+ - test_nested_level2
+ - dependency_template_subint_Vlan_vmi_1_test_resourceGroup_1
+ dependency_template_subint_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2:
+ - test_nested_level2
+ - dependency_template_subint_Vlan_vmi_1_test_resourceGroup_2
dependency_ps_server_1b_port_1_test_nested_level2:
- test_nested_level2
- dependency_ps_server_1b_port_1
dependency_pd_server_1b_port_0:
- abstract_pd_server_1b
- dependency_pd_server_1b_pd_server_1b_port
- dependency_template_Vlan_vmi_1_test_resourceGroup_0:
- - test_resourceGroup_0
- - dependency_template_Vlan_vmi_1
dependency_ps_server_1b_port_2_test_nested_level2:
- test_nested_level2
- dependency_ps_server_1b_port_2
dependency_test_resourceGroup_2_test_nested_level2:
- test_nested_level2
- dependency_test_resourceGroup_2
- dependency_template_Vlan_vmi_1_test_resourceGroup_2_test_nested_level2:
- - test_nested_level2
- - dependency_template_Vlan_vmi_1_test_resourceGroup_2
dependency_test_resourceGroup_0:
- test_resourceGroup_0
- dependency
@@ -769,12 +769,12 @@ topology_template:
dependency_server_1b_pd_0:
- abstract_pd_server_1b
- dependency_pd_server_1b
- dependency_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2:
- - test_nested_level2
- - dependency_template_Vlan_vmi_1_test_resourceGroup_1
dependency_packet_ext_network_test_nested_level2:
- test_nested_level2
- dependency_packet_ext_network
+ dependency_template_subint_Vlan_vmi_1_test_resourceGroup_0:
+ - test_resourceGroup_0
+ - dependency_template_subint_Vlan_vmi_1
dependency_test_nested_level2:
- test_nested_level2
- dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
index 5d7b81aaa3..616e93e46d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml
@@ -128,7 +128,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: packet_int_network
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
+ - link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
capability: tosca.capabilities.network.Linkable
node: packet_ext_network
relationship: tosca.relationships.network.LinksTo
@@ -197,7 +197,7 @@ topology_template:
capability: tosca.capabilities.network.Linkable
node: packet_int_network
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
+ - link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan:
capability: tosca.capabilities.network.Linkable
node: packet_ext_network
relationship: tosca.relationships.network.LinksTo
@@ -356,12 +356,6 @@ topology_template:
instance_server_1b_ps_2:
- abstract_ps_server_1b_1
- instance_ps_server_1b
- feature_template_Vlan_vmi_1_test_resourceGroup_1:
- - test_resourceGroup_1
- - feature_template_Vlan_vmi_1
- feature_template_Vlan_vmi_1_test_resourceGroup_2:
- - test_resourceGroup_2
- - feature_template_Vlan_vmi_1
disk.device.capacity_server_1b_ps_1:
- abstract_ps_server_1b_0
- disk.device.capacity_ps_server_1b
@@ -464,6 +458,12 @@ topology_template:
vcpus_server_1b_ps_2:
- abstract_ps_server_1b_1
- vcpus_ps_server_1b
+ feature_template_subint_Vlan_vmi_1_test_resourceGroup_2:
+ - test_resourceGroup_2
+ - feature_template_subint_Vlan_vmi_1
+ feature_template_subint_Vlan_vmi_1_test_resourceGroup_1:
+ - test_resourceGroup_1
+ - feature_template_subint_Vlan_vmi_1
disk.read.bytes.rate_server_1b_ps_2:
- abstract_ps_server_1b_1
- disk.read.bytes.rate_ps_server_1b
@@ -603,18 +603,18 @@ topology_template:
dependency_packet_ext_network:
- packet_ext_network
- dependency
- dependency_template_Vlan_vmi_1_test_resourceGroup_2:
- - test_resourceGroup_2
- - dependency_template_Vlan_vmi_1
- dependency_template_Vlan_vmi_1_test_resourceGroup_1:
- - test_resourceGroup_1
- - dependency_template_Vlan_vmi_1
local_storage_server_1b_ps_2:
- abstract_ps_server_1b_1
- local_storage_ps_server_1b
dependency_server_1b_ps_1:
- abstract_ps_server_1b_0
- dependency_ps_server_1b
+ dependency_template_subint_Vlan_vmi_1_test_resourceGroup_2:
+ - test_resourceGroup_2
+ - dependency_template_subint_Vlan_vmi_1
dependency_server_1b_ps_2:
- abstract_ps_server_1b_1
- - dependency_ps_server_1b \ No newline at end of file
+ - dependency_ps_server_1b
+ dependency_template_subint_Vlan_vmi_1_test_resourceGroup_1:
+ - test_resourceGroup_1
+ - dependency_template_subint_Vlan_vmi_1 \ 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/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml
index ed59356950..bbb740fc75 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml
@@ -46,7 +46,7 @@ topology_template:
immutable: false
type: float
node_templates:
- template_Vlan_vmi_1:
+ template_subint_Vlan_vmi_1:
type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
properties:
virtual_machine_interface_refs:
@@ -92,20 +92,20 @@ topology_template:
heat_file: ../Artifacts/nested_vlan.yml
description: cmaui server template for vMMSC
members:
- - template_Vlan_vmi_1
+ - template_subint_Vlan_vmi_1
substitution_mappings:
node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan
capabilities:
- feature_template_Vlan_vmi_1:
- - template_Vlan_vmi_1
+ feature_template_subint_Vlan_vmi_1:
+ - template_subint_Vlan_vmi_1
- feature
requirements:
- link_template_Vlan_vmi_1:
- - template_Vlan_vmi_1
- - link
- dependency_template_Vlan_vmi_1:
- - template_Vlan_vmi_1
- - dependency
- binding_template_Vlan_vmi_1:
- - template_Vlan_vmi_1
+ binding_template_subint_Vlan_vmi_1:
+ - template_subint_Vlan_vmi_1
- binding
+ dependency_template_subint_Vlan_vmi_1:
+ - template_subint_Vlan_vmi_1
+ - dependency
+ link_template_subint_Vlan_vmi_1:
+ - template_subint_Vlan_vmi_1
+ - link \ No newline at end of file