diff options
author | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-03 20:24:59 +0530 |
---|---|---|
committer | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-04 13:54:59 +0530 |
commit | d6982006c27288936d8b0d9eee18068854036f45 (patch) | |
tree | 7b71be074b5303d442971d0bd59b2accd7940604 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a | |
parent | 4b6709601c47050c853e6eaa5525259f066d5277 (diff) |
Added new nodes type
Added new nodes type and new property in Port.
All test data need to be updated, so file count is much more.
Change-Id: Ic21befe8d7feee912fbed1d3eb676488db1fb68c
Issue-ID: SDC-1183
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a')
39 files changed, 3636 insertions, 3455 deletions
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 461b81cd2f..c30564adad 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 @@ -34,6 +34,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_vdbe_untr_vmi_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_vdbe_availability_zone: type: list required: true @@ -238,7 +244,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: + - subinterface_link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -436,6 +442,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -655,7 +662,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_untr_vmi_0: + - subinterface_link_vdbe_0_untr_vmi_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: 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 46d5688f80..447f628beb 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 @@ -401,6 +401,8 @@ topology_template: - get_input: aap_address_mode subinterface_nested_vlan_tag_list: - get_input: untrusted_vlan_tags + port_vdbe_untr_vmi_subinterface_indicator: + - true compute_vdbe_availability_zone: - get_input: availability_zone_1 subinterface_nested_service_template_filter_count: 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 cc98b59c72..024ca9a725 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 @@ -32,6 +32,11 @@ topology_template: required: true entry_schema: type: json + port_vdbe_untr_vmi_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_vdbe_availability_zone: type: list required: true @@ -200,6 +205,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_vmi_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_vmi_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_vmi_virtual_network_refs @@ -476,9 +485,6 @@ topology_template: link_vdbe_vdbe_untr_vmi: - vdbe_vdbe_untr_vmi - link - link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: - - vdbe_vdbe_untr_vmi_nested - - link_vdbe_0_untr_vmi_0 dependency_vdbe_vdbe_untr_vmi_nested: - vdbe_vdbe_untr_vmi_nested - dependency @@ -494,3 +500,6 @@ topology_template: dependency_vdbe: - vdbe - dependency + subinterface_link_vdbe_0_untr_vmi_0_vdbe_vdbe_untr_vmi_nested: + - vdbe_vdbe_untr_vmi_nested + - subinterface_link_vdbe_0_untr_vmi_0 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 c45c4d6dcc..2817c54a6e 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 @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_0_untr_vmi_0: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_0_untr_vmi_0 - feature requirements: - link_vdbe_0_untr_vmi_0: - - vdbe_0_untr_vmi_0 - - link dependency_vdbe_0_untr_vmi_0: - vdbe_0_untr_vmi_0 - dependency binding_vdbe_0_untr_vmi_0: - vdbe_0_untr_vmi_0 - binding + subinterface_link_vdbe_0_untr_vmi_0: + - vdbe_0_untr_vmi_0 + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/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/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8a03266a7b..2b6e88dd48 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/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/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -52,6 +52,12 @@ node_types: status: SUPPORTED entry_schema: type: float + port_vdbe_untr_2_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_vlan2_aap_untrusted_v6_ip_prefix: type: list required: true @@ -190,6 +196,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_vlan1_ip_v6_address: type: list required: true @@ -410,7 +422,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_2_port_vlan2: + - subinterface_link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_2_port_vlan2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -430,7 +442,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -644,6 +656,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -798,6 +811,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -934,7 +948,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1046,7 +1060,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_another: + - subinterface_link_vdbe_untr_x_subport_another: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/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/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml index 2f990e6fce..6608ddb811 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/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/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml @@ -485,6 +485,8 @@ topology_template: get_input: vdbe_flavor_name subinterface_vlan1_counter: - get_input: counter + port_vdbe_untr_2_port_subinterface_indicator: + - true subinterface_vlan2_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix vm_image_name: @@ -520,6 +522,8 @@ topology_template: - get_input: vdbe_name_1 subinterface_vlan2_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_vlan1_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 subinterface_vlan2_vmac_address: @@ -603,7 +607,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_2_port_vlan2: + - subinterface_link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_2_port_vlan2: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo @@ -617,4 +621,4 @@ topology_template: members: - fabric_int_net - control_int_net - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/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/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml index aa35c77223..4ef1ae6e3d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/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/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml @@ -47,6 +47,11 @@ topology_template: required: true entry_schema: type: float + port_vdbe_untr_2_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_vlan2_aap_untrusted_v6_ip_prefix: type: list required: true @@ -159,6 +164,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_vlan1_ip_v6_address: type: list required: true @@ -336,6 +346,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_2_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_2_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_2_port_virtual_network_refs @@ -538,6 +552,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -780,12 +798,18 @@ topology_template: dependency_vdbe_untr_x_subport_another_vdbe_vdbe_untr_2_port_vlan2: - vdbe_vdbe_untr_2_port_vlan2 - dependency_vdbe_untr_x_subport_another + subinterface_link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_2_port_vlan2: + - vdbe_vdbe_untr_2_port_vlan2 + - subinterface_link_vdbe_untr_x_subport_another dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - dependency link_vdbe_vdbe_untr_2_port: - vdbe_vdbe_untr_2_port - link + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: + - vdbe_vdbe_untr_1_port_vlan1 + - subinterface_link_vdbe_untr_x_subport local_storage_vdbe: - vdbe - local_storage @@ -798,15 +822,9 @@ topology_template: dependency_vdbe_vdbe_untr_1_port_vlan1: - vdbe_vdbe_untr_1_port_vlan1 - dependency - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - link_vdbe_untr_x_subport link_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - link - link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_2_port_vlan2: - - vdbe_vdbe_untr_2_port_vlan2 - - link_vdbe_untr_x_subport_another dependency_vdbe: - vdbe - 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/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml index 928c0d3afd..225bb66f98 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_untr_x_subport - feature requirements: - link_vdbe_untr_x_subport: - - vdbe_untr_x_subport - - link dependency_vdbe_untr_x_subport: - vdbe_untr_x_subport - dependency binding_vdbe_untr_x_subport: - vdbe_untr_x_subport - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml index beb9c2c790..208636f807 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport_another: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - dependency - link_vdbe_untr_x_subport_another: + subinterface_link_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - - link + - subinterface_link binding_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/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/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 33dbb49298..28d80b519e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/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/multipleVlanDiffType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -156,6 +156,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_vlan1_ip_v6_address: type: list required: true @@ -333,7 +339,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -366,7 +372,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_1_port_vlan2: + - subinterface_link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_1_port_vlan2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -543,6 +549,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -793,7 +800,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -905,7 +912,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_another: + - subinterface_link_vdbe_untr_x_subport_another: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/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/multipleVlanDiffType/out/MainServiceTemplate.yaml index 5b18cab1e9..3ecb94b2fe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/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/multipleVlanDiffType/out/MainServiceTemplate.yaml @@ -455,6 +455,8 @@ topology_template: - get_input: vdbe_name_1 subinterface_vlan2_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_vlan1_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 subinterface_vlan2_vmac_address: @@ -537,4 +539,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - control_int_net - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/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/multipleVlanDiffType/out/Nested_vdbeServiceTemplate.yaml index 6e81017375..3babb153db 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/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/multipleVlanDiffType/out/Nested_vdbeServiceTemplate.yaml @@ -132,6 +132,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_vlan1_ip_v6_address: type: list required: true @@ -371,6 +376,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -649,21 +658,21 @@ topology_template: - vdbe - disk.read.bytes requirements: - link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_1_port_vlan2: + subinterface_link_vdbe_untr_x_subport_another_vdbe_vdbe_untr_1_port_vlan2: - vdbe_vdbe_untr_1_port_vlan2 - - link_vdbe_untr_x_subport_another + - subinterface_link_vdbe_untr_x_subport_another dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - dependency + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: + - vdbe_vdbe_untr_1_port_vlan1 + - subinterface_link_vdbe_untr_x_subport local_storage_vdbe: - vdbe - local_storage dependency_vdbe_vdbe_untr_1_port_vlan1: - vdbe_vdbe_untr_1_port_vlan1 - dependency - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port_vlan2: - vdbe_vdbe_untr_1_port_vlan2 - 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/multipleVlanDiffType/out/vlan1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/vlan1ServiceTemplate.yaml index 928c0d3afd..225bb66f98 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/vlan1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/vlan1ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -160,12 +160,12 @@ topology_template: - vdbe_untr_x_subport - feature requirements: - link_vdbe_untr_x_subport: - - vdbe_untr_x_subport - - link dependency_vdbe_untr_x_subport: - vdbe_untr_x_subport - dependency binding_vdbe_untr_x_subport: - vdbe_untr_x_subport - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/vlan2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/vlan2ServiceTemplate.yaml index beb9c2c790..208636f807 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/vlan2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanDiffType/out/vlan2ServiceTemplate.yaml @@ -92,7 +92,7 @@ topology_template: description: ip prefix length for the primary vDBE VM on the VAN untrusted network node_templates: vdbe_untr_x_subport_another: - type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface properties: virtual_machine_interface_refs: - get_input: parent_interface @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - dependency - link_vdbe_untr_x_subport_another: + subinterface_link_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - - link + - subinterface_link binding_vdbe_untr_x_subport_another: - vdbe_untr_x_subport_another - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/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/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 36c1a97f94..bd94f25284 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/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/multipleVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -186,6 +186,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: type: list required: true @@ -313,7 +319,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -360,7 +366,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_2_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_2_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -532,6 +538,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -787,7 +794,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/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/multipleVlanSameType/out/MainServiceTemplate.yaml index 6f735b3c54..0516898e7e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/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/multipleVlanSameType/out/MainServiceTemplate.yaml @@ -471,6 +471,8 @@ topology_template: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len subinterface_vdbe_untr_1_subports_vlan_tag_list: - get_input: untrusted_vlan_tags + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: @@ -535,4 +537,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - control_int_net - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/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/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml index 86ece84fdf..721af0f45b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/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/multipleVlanSameType/out/Nested_vdbeServiceTemplate.yaml @@ -157,6 +157,11 @@ topology_template: required: true entry_schema: type: json + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: type: list required: true @@ -367,6 +372,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -645,24 +654,24 @@ topology_template: - vdbe - disk.read.bytes requirements: + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: + - vdbe_vdbe_untr_1_port_vdbe_untr_1_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - dependency dependency_vdbe_vdbe_untr_1_port_vdbe_untr_2_subports: - vdbe_vdbe_untr_1_port_vdbe_untr_2_subports - dependency - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: - - vdbe_vdbe_untr_1_port_vdbe_untr_1_subports - - link_vdbe_untr_x_subport + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_2_subports: + - vdbe_vdbe_untr_1_port_vdbe_untr_2_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: - vdbe_vdbe_untr_1_port_vdbe_untr_1_subports - dependency_vdbe_untr_x_subport local_storage_vdbe: - vdbe - local_storage - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_vdbe_untr_2_subports: - - vdbe_vdbe_untr_1_port_vdbe_untr_2_subports - - link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port_vdbe_untr_1_subports: - vdbe_vdbe_untr_1_port_vdbe_untr_1_subports - 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/multipleVlanSameType/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/multipleVlanSameType/out/nestedServiceTemplate.yaml index d70a184404..58980ac9d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multipleVlanSameType/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/multipleVlanSameType/out/nestedServiceTemplate.yaml @@ -1,171 +1,171 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - feature
- requirements:
- link_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - link
- dependency_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - dependency
- binding_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - binding
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - feature + requirements: + dependency_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - dependency + binding_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/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/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9c474dc6bc..9b8810f3f3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/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/notBoundToParentPort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -1,806 +1,814 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: GlobalSubstitutionTypes
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-node_types:
- org.openecomp.resource.abstract.nodes.vdbe:
- derived_from: org.openecomp.resource.abstract.nodes.VFC
- properties:
- port_vdbe_untr_1_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- status: SUPPORTED
- port_vdbe_untr_1_port_order:
- type: integer
- required: true
- status: SUPPORTED
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- status: SUPPORTED
- constraints:
- - greater_or_equal: 0
- compute_vdbe_availability_zone:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- port_vdbe_untr_1_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- status: SUPPORTED
- vm_flavor_name:
- type: string
- required: true
- status: SUPPORTED
- port_vdbe_untr_1_port_subnetpoolid:
- type: string
- required: true
- status: SUPPORTED
- port_vdbe_untr_1_port_name:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- vm_image_name:
- type: string
- required: true
- status: SUPPORTED
- port_vdbe_untr_1_port_network_role:
- type: string
- required: true
- status: SUPPORTED
- port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
- type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
- required: true
- status: SUPPORTED
- compute_vdbe_metadata:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: json
- port_vdbe_untr_1_port_virtual_network_refs:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: json
- port_vdbe_untr_1_port_ip_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- compute_vdbe_name:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- port_vdbe_untr_1_port_network_role_tag:
- type: string
- required: true
- status: SUPPORTED
- port_vdbe_untr_1_port_vlan_requirements:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
- type: list
- required: true
- status: SUPPORTED
- entry_schema:
- type: json
- requirements:
- - dependency_vdbe:
- capability: tosca.capabilities.Node
- node: tosca.nodes.Root
- relationship: tosca.relationships.DependsOn
- occurrences:
- - 0
- - UNBOUNDED
- - local_storage_vdbe:
- capability: tosca.capabilities.Attachment
- node: tosca.nodes.BlockStorage
- relationship: tosca.relationships.AttachesTo
- occurrences:
- - 0
- - UNBOUNDED
- - dependency_vdbe_vdbe_untr_1_port:
- capability: tosca.capabilities.Node
- node: tosca.nodes.Root
- relationship: tosca.relationships.DependsOn
- occurrences:
- - 0
- - UNBOUNDED
- - link_vdbe_vdbe_untr_1_port:
- capability: tosca.capabilities.network.Linkable
- relationship: tosca.relationships.network.LinksTo
- occurrences:
- - 1
- - 1
- capabilities:
- feature_vdbe:
- type: tosca.capabilities.Node
- occurrences:
- - 1
- - UNBOUNDED
- disk.device.iops_vdbe:
- 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
- endpoint_vdbe:
- type: tosca.capabilities.Endpoint.Admin
- occurrences:
- - 1
- - UNBOUNDED
- disk.ephemeral.size_vdbe:
- 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_vdbe:
- 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
- vcpus_vdbe:
- 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_vdbe:
- 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.latency_vdbe:
- 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.requests.rate_vdbe:
- 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_vdbe_vdbe_untr_1_port:
- type: tosca.capabilities.Node
- occurrences:
- - 1
- - UNBOUNDED
- disk.write.bytes.rate_vdbe:
- 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_vdbe_vdbe_untr_1_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
- network.incoming.packets.rate_vdbe_vdbe_untr_1_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
- scalable_vdbe:
- type: tosca.capabilities.Scalable
- occurrences:
- - 1
- - UNBOUNDED
- disk.iops_vdbe:
- 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.requests_vdbe:
- 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.capacity_vdbe:
- 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_vdbe_vdbe_untr_1_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.device.allocation_vdbe:
- 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_vdbe:
- 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_vdbe:
- 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_vdbe:
- 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_vdbe_vdbe_untr_1_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
- instance_vdbe:
- 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.delta_vdbe:
- 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_vdbe_vdbe_untr_1_port:
- type: tosca.capabilities.network.Bindable
- valid_source_types:
- - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- occurrences:
- - 0
- - UNBOUNDED
- disk.device.read.bytes.rate_vdbe:
- 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_vdbe:
- 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.resident_vdbe:
- 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_vdbe_vdbe_untr_1_port:
- type: org.openecomp.capabilities.Forwarder
- occurrences:
- - 1
- - UNBOUNDED
- disk.write.requests.rate_vdbe:
- 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_vdbe:
- 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_vdbe:
- 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.usage_vdbe:
- 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_vdbe:
- 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.latency_vdbe:
- 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_vdbe_vdbe_untr_1_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.capacity_vdbe:
- 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_vdbe:
- type: tosca.capabilities.Container
- valid_source_types:
- - tosca.nodes.SoftwareComponent
- occurrences:
- - 1
- - UNBOUNDED
- disk.allocation_vdbe:
- 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_vdbe_vdbe_untr_1_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
- network.incoming.packets_vdbe_vdbe_untr_1_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.rate_vdbe:
- 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
- os_vdbe:
- type: tosca.capabilities.OperatingSystem
- occurrences:
- - 1
- - UNBOUNDED
- disk.device.read.requests_vdbe:
- 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_vdbe:
- 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_vdbe:
- 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_vdbe:
- type: tosca.capabilities.network.Bindable
- occurrences:
- - 1
- - UNBOUNDED
- disk.device.write.bytes_vdbe:
- 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_vdbe_vdbe_untr_1_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.device.read.requests.rate_vdbe:
- 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_vdbe:
- 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
- org.openecomp.resource.abstract.nodes.heat.nested:
- derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
- properties:
- aap_untrusted_ip_prefix:
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- aap_sec_untrusted_ip_prefix:
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- required: true
- status: SUPPORTED
- ip_v6_address:
- type: string
- description: IPv6 address associated with subinterfaces
- required: true
- status: SUPPORTED
- counter:
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- required: true
- status: SUPPORTED
- subinterfaces_name_prefix:
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- required: true
- status: SUPPORTED
- ip_address:
- type: string
- description: IPv4 address associated with subinterfaces
- required: true
- status: SUPPORTED
- aap_address_mode:
- type: string
- description: Address mode for the vDBE cluster IP
- required: true
- status: SUPPORTED
- aap_untrusted_v6_ip_prefix:
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- parent_interface:
- type: string
- description: Parent Contrail interface
- required: true
- status: SUPPORTED
- vn_network_list:
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- required: true
- status: SUPPORTED
- mac_address:
- type: string
- description: HW MAC address to use for subinterface
- required: true
- status: SUPPORTED
- vlan_tag_list:
- type: list
- description: List of VLAN IDs to use for subinterfaces
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- required: true
- status: SUPPORTED
- vmac_address:
- type: string
- description: virtual MAC address to use for subinterface
- required: true
- status: SUPPORTED
- aap_untrusted_v6_ip_prefix_len:
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- aap_untrusted_ip_prefix_len:
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- requirements:
- - dependency_vdbe_untr_x_subport:
- capability: tosca.capabilities.Node
- node: tosca.nodes.Root
- relationship: tosca.relationships.DependsOn
- occurrences:
- - 0
- - UNBOUNDED
- - link_vdbe_untr_x_subport:
- capability: tosca.capabilities.network.Linkable
- relationship: tosca.relationships.network.LinksTo
- occurrences:
- - 1
- - 1
- - binding_vdbe_untr_x_subport:
- capability: tosca.capabilities.network.Bindable
- node: org.openecomp.resource.cp.nodes.network.Port
- relationship: tosca.relationships.network.BindsTo
- occurrences:
- - 1
- - 1
- capabilities:
- feature_vdbe_untr_x_subport:
- type: tosca.capabilities.Node
- occurrences:
- - 1
- - UNBOUNDED
- org.openecomp.resource.abstract.nodes.heat.nested2:
- derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
- properties:
- aap_untrusted_ip_prefix:
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- aap_sec_untrusted_ip_prefix:
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- required: true
- status: SUPPORTED
- ip_v6_address:
- type: string
- description: IPv6 address associated with subinterfaces
- required: true
- status: SUPPORTED
- counter:
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- required: true
- status: SUPPORTED
- subinterfaces_name_prefix:
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- required: true
- status: SUPPORTED
- ip_address:
- type: string
- description: IPv4 address associated with subinterfaces
- required: true
- status: SUPPORTED
- aap_address_mode:
- type: string
- description: Address mode for the vDBE cluster IP
- required: true
- status: SUPPORTED
- aap_untrusted_v6_ip_prefix:
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- parent_interface:
- type: string
- description: Parent Contrail interface
- required: true
- status: SUPPORTED
- vn_network_list:
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- required: true
- status: SUPPORTED
- mac_address:
- type: string
- description: HW MAC address to use for subinterface
- required: true
- status: SUPPORTED
- vlan_tag_list:
- type: list
- description: List of VLAN IDs to use for subinterfaces
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- required: true
- status: SUPPORTED
- vmac_address:
- type: string
- description: virtual MAC address to use for subinterface
- required: true
- status: SUPPORTED
- aap_untrusted_v6_ip_prefix_len:
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- aap_untrusted_ip_prefix_len:
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- org.openecomp.resource.abstract.nodes.heat.nested3:
- derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
- properties:
- aap_untrusted_ip_prefix:
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- aap_sec_untrusted_ip_prefix:
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- required: true
- status: SUPPORTED
- ip_v6_address:
- type: string
- description: IPv6 address associated with subinterfaces
- required: true
- status: SUPPORTED
- counter:
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- required: true
- status: SUPPORTED
- subinterfaces_name_prefix:
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- required: true
- status: SUPPORTED
- ip_address:
- type: string
- description: IPv4 address associated with subinterfaces
- required: true
- status: SUPPORTED
- aap_address_mode:
- type: string
- description: Address mode for the vDBE cluster IP
- required: true
- status: SUPPORTED
- aap_untrusted_v6_ip_prefix:
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- parent_interface:
- type: string
- description: Parent Contrail interface
- required: true
- status: SUPPORTED
- vn_network_list:
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- required: true
- status: SUPPORTED
- mac_address:
- type: string
- description: HW MAC address to use for subinterface
- required: true
- status: SUPPORTED
- vlan_tag_list:
- type: list
- description: List of VLAN IDs to use for subinterfaces
- required: true
- status: SUPPORTED
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- required: true
- status: SUPPORTED
- vmac_address:
- type: string
- description: virtual MAC address to use for subinterface
- required: true
- status: SUPPORTED
- aap_untrusted_v6_ip_prefix_len:
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- aap_untrusted_ip_prefix_len:
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- required: true
- status: SUPPORTED
- requirements:
- - dependency_vdbe_untr_x_subport_missing_vlan_tag:
- capability: tosca.capabilities.Node
- node: tosca.nodes.Root
- relationship: tosca.relationships.DependsOn
- occurrences:
- - 0
- - UNBOUNDED
- - link_vdbe_untr_x_subport_missing_vlan_tag:
- capability: tosca.capabilities.network.Linkable
- relationship: tosca.relationships.network.LinksTo
- occurrences:
- - 1
- - 1
- - binding_vdbe_untr_x_subport_missing_vlan_tag:
- capability: tosca.capabilities.network.Bindable
- relationship: tosca.relationships.network.BindsTo
- occurrences:
- - 1
- - 1
- capabilities:
- forwarder_vdbe_untr_x_subport_missing_vlan_tag:
- type: org.openecomp.capabilities.Forwarder
- occurrences:
- - 1
- - UNBOUNDED
- network.outgoing.bytes.rate_vdbe_untr_x_subport_missing_vlan_tag:
- 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.rate_vdbe_untr_x_subport_missing_vlan_tag:
- 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_vdbe_untr_x_subport_missing_vlan_tag:
- type: tosca.capabilities.Node
- occurrences:
- - 1
- - UNBOUNDED
- network.outpoing.packets_vdbe_untr_x_subport_missing_vlan_tag:
- 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_vdbe_untr_x_subport_missing_vlan_tag:
- 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_vdbe_untr_x_subport_missing_vlan_tag:
- type: tosca.capabilities.network.Bindable
- valid_source_types:
- - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- occurrences:
- - 0
- - UNBOUNDED
- network.outgoing.bytes_vdbe_untr_x_subport_missing_vlan_tag:
- 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_vdbe_untr_x_subport_missing_vlan_tag:
- 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_vdbe_untr_x_subport_missing_vlan_tag:
- 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_vdbe_untr_x_subport_missing_vlan_tag:
- 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
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: GlobalSubstitutionTypes +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +node_types: + org.openecomp.resource.abstract.nodes.vdbe: + derived_from: org.openecomp.resource.abstract.nodes.VFC + properties: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_vdbe_untr_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_vdbe_untr_1_port_order: + type: integer + required: true + status: SUPPORTED + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + compute_vdbe_availability_zone: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + vm_image_name: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_network_role: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + status: SUPPORTED + compute_vdbe_metadata: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_vdbe_untr_1_port_virtual_network_refs: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_vdbe_untr_1_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + compute_vdbe_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_1_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + requirements: + - dependency_vdbe: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_1_port: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_vdbe_vdbe_untr_1_port: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + capabilities: + feature_vdbe: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.iops_vdbe: + 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 + endpoint_vdbe: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + disk.ephemeral.size_vdbe: + 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_vdbe: + 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 + vcpus_vdbe: + 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_vdbe: + 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.latency_vdbe: + 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.requests.rate_vdbe: + 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_vdbe_vdbe_untr_1_port: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.write.bytes.rate_vdbe: + 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_vdbe_vdbe_untr_1_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 + network.incoming.packets.rate_vdbe_vdbe_untr_1_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 + scalable_vdbe: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.iops_vdbe: + 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.requests_vdbe: + 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.capacity_vdbe: + 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_vdbe_vdbe_untr_1_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.device.allocation_vdbe: + 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_vdbe: + 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_vdbe: + 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_vdbe: + 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_vdbe_vdbe_untr_1_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 + instance_vdbe: + 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.delta_vdbe: + 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_vdbe_vdbe_untr_1_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + disk.device.read.bytes.rate_vdbe: + 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_vdbe: + 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.resident_vdbe: + 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_vdbe_vdbe_untr_1_port: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.rate_vdbe: + 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_vdbe: + 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_vdbe: + 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.usage_vdbe: + 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_vdbe: + 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.latency_vdbe: + 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_vdbe_vdbe_untr_1_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.capacity_vdbe: + 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_vdbe: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent + occurrences: + - 1 + - UNBOUNDED + disk.allocation_vdbe: + 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_vdbe_vdbe_untr_1_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 + network.incoming.packets_vdbe_vdbe_untr_1_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.rate_vdbe: + 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 + os_vdbe: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + disk.device.read.requests_vdbe: + 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_vdbe: + 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_vdbe: + 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_vdbe: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_vdbe: + 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_vdbe_vdbe_untr_1_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.device.read.requests.rate_vdbe: + 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_vdbe: + 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 + org.openecomp.resource.abstract.nodes.heat.nested: + derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute + properties: + aap_untrusted_ip_prefix: + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_sec_untrusted_ip_prefix: + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + ip_v6_address: + type: string + description: IPv6 address associated with subinterfaces + required: true + status: SUPPORTED + counter: + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + required: true + status: SUPPORTED + subinterfaces_name_prefix: + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + required: true + status: SUPPORTED + ip_address: + type: string + description: IPv4 address associated with subinterfaces + required: true + status: SUPPORTED + aap_address_mode: + type: string + description: Address mode for the vDBE cluster IP + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix: + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + parent_interface: + type: string + description: Parent Contrail interface + required: true + status: SUPPORTED + vn_network_list: + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + required: true + status: SUPPORTED + mac_address: + type: string + description: HW MAC address to use for subinterface + required: true + status: SUPPORTED + vlan_tag_list: + type: list + description: List of VLAN IDs to use for subinterfaces + required: true + status: SUPPORTED + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + vmac_address: + type: string + description: virtual MAC address to use for subinterface + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix_len: + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + requirements: + - dependency_vdbe_untr_x_subport: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - subinterface_link_vdbe_untr_x_subport: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - binding_vdbe_untr_x_subport: + capability: tosca.capabilities.network.Bindable + node: org.openecomp.resource.cp.nodes.network.Port + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + capabilities: + feature_vdbe_untr_x_subport: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + org.openecomp.resource.abstract.nodes.heat.nested2: + derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute + properties: + aap_untrusted_ip_prefix: + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_sec_untrusted_ip_prefix: + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + ip_v6_address: + type: string + description: IPv6 address associated with subinterfaces + required: true + status: SUPPORTED + counter: + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + required: true + status: SUPPORTED + subinterfaces_name_prefix: + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + required: true + status: SUPPORTED + ip_address: + type: string + description: IPv4 address associated with subinterfaces + required: true + status: SUPPORTED + aap_address_mode: + type: string + description: Address mode for the vDBE cluster IP + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix: + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + parent_interface: + type: string + description: Parent Contrail interface + required: true + status: SUPPORTED + vn_network_list: + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + required: true + status: SUPPORTED + mac_address: + type: string + description: HW MAC address to use for subinterface + required: true + status: SUPPORTED + vlan_tag_list: + type: list + description: List of VLAN IDs to use for subinterfaces + required: true + status: SUPPORTED + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + vmac_address: + type: string + description: virtual MAC address to use for subinterface + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix_len: + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + org.openecomp.resource.abstract.nodes.heat.nested3: + derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute + properties: + aap_untrusted_ip_prefix: + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_sec_untrusted_ip_prefix: + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + ip_v6_address: + type: string + description: IPv6 address associated with subinterfaces + required: true + status: SUPPORTED + counter: + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + required: true + status: SUPPORTED + subinterfaces_name_prefix: + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + required: true + status: SUPPORTED + ip_address: + type: string + description: IPv4 address associated with subinterfaces + required: true + status: SUPPORTED + aap_address_mode: + type: string + description: Address mode for the vDBE cluster IP + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix: + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + parent_interface: + type: string + description: Parent Contrail interface + required: true + status: SUPPORTED + vn_network_list: + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + required: true + status: SUPPORTED + mac_address: + type: string + description: HW MAC address to use for subinterface + required: true + status: SUPPORTED + vlan_tag_list: + type: list + description: List of VLAN IDs to use for subinterfaces + required: true + status: SUPPORTED + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + required: true + status: SUPPORTED + vmac_address: + type: string + description: virtual MAC address to use for subinterface + required: true + status: SUPPORTED + aap_untrusted_v6_ip_prefix_len: + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + aap_untrusted_ip_prefix_len: + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + required: true + status: SUPPORTED + requirements: + - dependency_vdbe_untr_x_subport_missing_vlan_tag: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - link_vdbe_untr_x_subport_missing_vlan_tag: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - binding_vdbe_untr_x_subport_missing_vlan_tag: + capability: tosca.capabilities.network.Bindable + relationship: tosca.relationships.network.BindsTo + occurrences: + - 1 + - 1 + capabilities: + forwarder_vdbe_untr_x_subport_missing_vlan_tag: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_vdbe_untr_x_subport_missing_vlan_tag: + 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.rate_vdbe_untr_x_subport_missing_vlan_tag: + 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_vdbe_untr_x_subport_missing_vlan_tag: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outpoing.packets_vdbe_untr_x_subport_missing_vlan_tag: + 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_vdbe_untr_x_subport_missing_vlan_tag: + 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_vdbe_untr_x_subport_missing_vlan_tag: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outgoing.bytes_vdbe_untr_x_subport_missing_vlan_tag: + 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_vdbe_untr_x_subport_missing_vlan_tag: + 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_vdbe_untr_x_subport_missing_vlan_tag: + 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_vdbe_untr_x_subport_missing_vlan_tag: + 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/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/notBoundToParentPort/out/MainServiceTemplate.yaml index 78ed2205d4..cb896d4449 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/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/notBoundToParentPort/out/MainServiceTemplate.yaml @@ -1,542 +1,544 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- vf_module_id:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vf_module_id
- type: string
- description: Unique ID for this VF module inst
- control_int_net_rpf:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_rpf
- type: string
- description: Reverse Path Filtering enable or disable for the control virtual network
- control_int_net_forwarding_mode:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_forwarding_mode
- type: string
- description: forwarding mode of the control virtual network
- vnf_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_name
- type: string
- description: Unique name for this VF instance
- vdbe_untrusted_ip_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_untrusted_ip_1
- type: string
- description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
- vdbe_aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_ip_prefix_len
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- untrusted_num_vn:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_num_vn
- type: float
- description: Number of vDBE subinterface virtual Networks
- constraints:
- - in_range:
- - 1
- - 77
- aap_address_mode:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: aap_address_mode
- type: string
- description: Address mode for the vDBE cluster IP
- control_int_net_shared:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_shared
- type: boolean
- description: control virtual network shared
- vdbe_untrusted_v6_ip_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_untrusted_v6_ip_1
- type: string
- description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
- vdbe_untrusted_vmac_address:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_untrusted_vmac_address
- type: string
- description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
- control_int_net_flood_unknown_unicast:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_flood_unknown_unicast
- type: boolean
- description: forwarding mode of the control virtual network
- vdbe_aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_sec_untrusted_ip_prefix
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- vnf_id:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_id
- type: string
- description: Unique ID for this VF inst
- vdbe_name_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_name_1
- type: string
- description: VM Name for this vdbe node 1
- availability_zone_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: availability_zone_1
- type: string
- description: The availability zone of secondary node1 vDBE vm in the local HA pair.
- untrusted_vn_networks:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_vn_networks
- type: list
- description: List of subinterface virtual networks
- entry_schema:
- type: string
- vdbe_image_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_image_name
- type: string
- description: Image to use for vDBE
- oam_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: oam_net_name
- type: string
- description: Name of NSDNet network from which the management IP addresses will be allocated
- vdbe_aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_sec_untrusted_ip_prefix_len
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vdbe_aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_v6_ip_prefix
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- vdbe_aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_v6_ip_prefix_len
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- untrusted_vlan_tags:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_vlan_tags
- type: list
- description: List of subinterface vlan tags
- entry_schema:
- type: string
- vdbe_flavor_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_flavor_name
- type: string
- description: Flavor to use for vDBE
- vdbe_hw_untr_mac_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_hw_untr_mac_1
- type: string
- description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
- untrusted_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_net_name
- type: string
- description: Name of public untrusted network into which this vDBE HA cluster is deployed
- vdbe_device_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_device_name
- type: string
- description: VDBE device Name for this vdbe VNF
- vdbe_aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_ip_prefix
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- node_templates:
- suport_missing_vlan_tag_property:
- type: org.openecomp.resource.abstract.nodes.heat.nested3
- directives:
- - substitutable
- properties:
- aap_untrusted_ip_prefix:
- get_input: vdbe_aap_untrusted_ip_prefix
- aap_sec_untrusted_ip_prefix:
- get_input: vdbe_aap_sec_untrusted_ip_prefix
- ip_v6_address:
- get_input: vdbe_untrusted_v6_ip_1
- counter: 5
- ip_address:
- get_input: vdbe_untrusted_ip_1
- subinterfaces_name_prefix:
- str_replace:
- template: VM_NAMEDBE001p1n004
- params:
- DBE:
- get_input: vdbe_device_name
- VM_NAME:
- get_input: vdbe_name_1
- aap_address_mode:
- get_input: aap_address_mode
- service_template_filter:
- substitute_service_template: nested3ServiceTemplate.yaml
- count:
- get_input: untrusted_num_vn
- mandatory: false
- aap_untrusted_v6_ip_prefix:
- get_input: vdbe_aap_untrusted_v6_ip_prefix
- parent_interface: vdbe_untr_1_port
- vn_network_list:
- get_input: untrusted_vn_networks
- mac_address:
- get_input: vdbe_hw_untr_mac_1
- vlan_tag_list:
- get_input: untrusted_vlan_tags
- aap_sec_untrusted_ip_prefix_len:
- get_input: vdbe_aap_sec_untrusted_ip_prefix_len
- vmac_address:
- get_input: vdbe_untrusted_vmac_address
- aap_untrusted_v6_ip_prefix_len:
- get_input: vdbe_aap_untrusted_v6_ip_prefix_len
- aap_untrusted_ip_prefix_len:
- get_input: vdbe_aap_untrusted_ip_prefix_len
- control_int_net:
- type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
- properties:
- network_name:
- str_replace:
- template: VNF_NAME_control_net
- params:
- VNF_NAME:
- get_input: vnf_name
- subport_get_param_parent:
- type: org.openecomp.resource.abstract.nodes.heat.nested
- directives:
- - substitutable
- properties:
- aap_untrusted_ip_prefix:
- get_input: vdbe_aap_untrusted_ip_prefix
- aap_sec_untrusted_ip_prefix:
- get_input: vdbe_aap_sec_untrusted_ip_prefix
- ip_v6_address:
- get_input: vdbe_untrusted_v6_ip_1
- counter: 5
- ip_address:
- get_input: vdbe_untrusted_ip_1
- subinterfaces_name_prefix:
- str_replace:
- template: VM_NAMEDBE001p1n004
- params:
- DBE:
- get_input: vdbe_device_name
- VM_NAME:
- get_input: vdbe_name_1
- aap_address_mode:
- get_input: aap_address_mode
- service_template_filter:
- substitute_service_template: nestedServiceTemplate.yaml
- count:
- get_input: untrusted_num_vn
- mandatory: false
- aap_untrusted_v6_ip_prefix:
- get_input: vdbe_aap_untrusted_v6_ip_prefix
- parent_interface:
- get_input: vdbe_hw_untr_mac_1
- vn_network_list:
- get_input: untrusted_vn_networks
- mac_address:
- get_input: vdbe_hw_untr_mac_1
- vlan_tag_list:
- get_input: untrusted_vlan_tags
- aap_sec_untrusted_ip_prefix_len:
- get_input: vdbe_aap_sec_untrusted_ip_prefix_len
- vmac_address:
- get_input: vdbe_untrusted_vmac_address
- aap_untrusted_v6_ip_prefix_len:
- get_input: vdbe_aap_untrusted_v6_ip_prefix_len
- aap_untrusted_ip_prefix_len:
- get_input: vdbe_aap_untrusted_ip_prefix_len
- abstract_vdbe:
- type: org.openecomp.resource.abstract.nodes.vdbe
- directives:
- - substitutable
- properties:
- compute_vdbe_availability_zone:
- - get_input: availability_zone_1
- vm_flavor_name:
- get_input: vdbe_flavor_name
- port_vdbe_untr_1_port_name:
- - str_replace:
- template: VM_NAMEDBE001p1n004
- params:
- DBE:
- get_input: vdbe_device_name
- VM_NAME:
- get_input: vdbe_name_1
- vm_image_name:
- get_input: vdbe_image_name
- compute_vdbe_metadata:
- - vf_module_id:
- get_input: vf_module_id
- vnf_id:
- get_input: vnf_id
- vnf_name:
- get_input: vnf_name
- port_vdbe_untr_1_port_virtual_network_refs:
- - - control_int_net
- compute_vdbe_name:
- - get_input: vdbe_name_1
- port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
- - - get_input: vdbe_hw_untr_mac_1
- service_template_filter:
- substitute_service_template: Nested_vdbeServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_vdbe_vdbe_untr_1_port:
- capability: tosca.capabilities.network.Linkable
- node: control_int_net
- relationship: tosca.relationships.network.LinksTo
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - suport_missing_vlan_tag_property
- - control_int_net
- - subport_get_param_parent
- - abstract_vdbe
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + vf_module_id: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vf_module_id + type: string + description: Unique ID for this VF module inst + control_int_net_rpf: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_rpf + type: string + description: Reverse Path Filtering enable or disable for the control virtual network + control_int_net_forwarding_mode: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_forwarding_mode + type: string + description: forwarding mode of the control virtual network + vnf_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_name + type: string + description: Unique name for this VF instance + vdbe_untrusted_ip_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_ip_1 + type: string + description: IPV4 address of the secondary vDBE VM on the VAN untrusted network + vdbe_aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_ip_prefix_len + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_num_vn: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_num_vn + type: float + description: Number of vDBE subinterface virtual Networks + constraints: + - in_range: + - 1 + - 77 + aap_address_mode: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: aap_address_mode + type: string + description: Address mode for the vDBE cluster IP + control_int_net_shared: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_shared + type: boolean + description: control virtual network shared + vdbe_untrusted_v6_ip_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_v6_ip_1 + type: string + description: IPV6 address of the secondary vDBE VM on the VAN untrusted network + vdbe_untrusted_vmac_address: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_vmac_address + type: string + description: Virtual MAC of the primary vDBE VM on the VAN untrusted network + control_int_net_flood_unknown_unicast: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_flood_unknown_unicast + type: boolean + description: forwarding mode of the control virtual network + vdbe_aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_sec_untrusted_ip_prefix + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + vnf_id: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_id + type: string + description: Unique ID for this VF inst + vdbe_name_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_name_1 + type: string + description: VM Name for this vdbe node 1 + availability_zone_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availability_zone_1 + type: string + description: The availability zone of secondary node1 vDBE vm in the local HA pair. + untrusted_vn_networks: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_vn_networks + type: list + description: List of subinterface virtual networks + entry_schema: + type: string + vdbe_image_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_image_name + type: string + description: Image to use for vDBE + oam_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: oam_net_name + type: string + description: Name of NSDNet network from which the management IP addresses will be allocated + vdbe_aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_sec_untrusted_ip_prefix_len + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vdbe_aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_v6_ip_prefix + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + vdbe_aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_v6_ip_prefix_len + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_vlan_tags: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_vlan_tags + type: list + description: List of subinterface vlan tags + entry_schema: + type: string + vdbe_flavor_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_flavor_name + type: string + description: Flavor to use for vDBE + vdbe_hw_untr_mac_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_hw_untr_mac_1 + type: string + description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network + untrusted_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_net_name + type: string + description: Name of public untrusted network into which this vDBE HA cluster is deployed + vdbe_device_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_device_name + type: string + description: VDBE device Name for this vdbe VNF + vdbe_aap_untrusted_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_ip_prefix + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + node_templates: + suport_missing_vlan_tag_property: + type: org.openecomp.resource.abstract.nodes.heat.nested3 + directives: + - substitutable + properties: + aap_untrusted_ip_prefix: + get_input: vdbe_aap_untrusted_ip_prefix + aap_sec_untrusted_ip_prefix: + get_input: vdbe_aap_sec_untrusted_ip_prefix + ip_v6_address: + get_input: vdbe_untrusted_v6_ip_1 + counter: 5 + ip_address: + get_input: vdbe_untrusted_ip_1 + subinterfaces_name_prefix: + str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + aap_address_mode: + get_input: aap_address_mode + service_template_filter: + substitute_service_template: nested3ServiceTemplate.yaml + count: + get_input: untrusted_num_vn + mandatory: false + aap_untrusted_v6_ip_prefix: + get_input: vdbe_aap_untrusted_v6_ip_prefix + parent_interface: vdbe_untr_1_port + vn_network_list: + get_input: untrusted_vn_networks + mac_address: + get_input: vdbe_hw_untr_mac_1 + vlan_tag_list: + get_input: untrusted_vlan_tags + aap_sec_untrusted_ip_prefix_len: + get_input: vdbe_aap_sec_untrusted_ip_prefix_len + vmac_address: + get_input: vdbe_untrusted_vmac_address + aap_untrusted_v6_ip_prefix_len: + get_input: vdbe_aap_untrusted_v6_ip_prefix_len + aap_untrusted_ip_prefix_len: + get_input: vdbe_aap_untrusted_ip_prefix_len + control_int_net: + type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork + properties: + network_name: + str_replace: + template: VNF_NAME_control_net + params: + VNF_NAME: + get_input: vnf_name + subport_get_param_parent: + type: org.openecomp.resource.abstract.nodes.heat.nested + directives: + - substitutable + properties: + aap_untrusted_ip_prefix: + get_input: vdbe_aap_untrusted_ip_prefix + aap_sec_untrusted_ip_prefix: + get_input: vdbe_aap_sec_untrusted_ip_prefix + ip_v6_address: + get_input: vdbe_untrusted_v6_ip_1 + counter: 5 + ip_address: + get_input: vdbe_untrusted_ip_1 + subinterfaces_name_prefix: + str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + aap_address_mode: + get_input: aap_address_mode + service_template_filter: + substitute_service_template: nestedServiceTemplate.yaml + count: + get_input: untrusted_num_vn + mandatory: false + aap_untrusted_v6_ip_prefix: + get_input: vdbe_aap_untrusted_v6_ip_prefix + parent_interface: + get_input: vdbe_hw_untr_mac_1 + vn_network_list: + get_input: untrusted_vn_networks + mac_address: + get_input: vdbe_hw_untr_mac_1 + vlan_tag_list: + get_input: untrusted_vlan_tags + aap_sec_untrusted_ip_prefix_len: + get_input: vdbe_aap_sec_untrusted_ip_prefix_len + vmac_address: + get_input: vdbe_untrusted_vmac_address + aap_untrusted_v6_ip_prefix_len: + get_input: vdbe_aap_untrusted_v6_ip_prefix_len + aap_untrusted_ip_prefix_len: + get_input: vdbe_aap_untrusted_ip_prefix_len + abstract_vdbe: + type: org.openecomp.resource.abstract.nodes.vdbe + directives: + - substitutable + properties: + port_vdbe_untr_1_port_subinterface_indicator: + - true + compute_vdbe_availability_zone: + - get_input: availability_zone_1 + vm_flavor_name: + get_input: vdbe_flavor_name + port_vdbe_untr_1_port_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + vm_image_name: + get_input: vdbe_image_name + compute_vdbe_metadata: + - vf_module_id: + get_input: vf_module_id + vnf_id: + get_input: vnf_id + vnf_name: + get_input: vnf_name + port_vdbe_untr_1_port_virtual_network_refs: + - - control_int_net + compute_vdbe_name: + - get_input: vdbe_name_1 + port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + service_template_filter: + substitute_service_template: Nested_vdbeServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_vdbe_vdbe_untr_1_port: + capability: tosca.capabilities.network.Linkable + node: control_int_net + relationship: tosca.relationships.network.LinksTo + groups: + main_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/main.yml + description: | + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + members: + - suport_missing_vlan_tag_property + - control_int_net + - subport_get_param_parent + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/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/notBoundToParentPort/out/Nested_vdbeServiceTemplate.yaml index 0b11d60e73..aca6038cfe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/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/notBoundToParentPort/out/Nested_vdbeServiceTemplate.yaml @@ -1,319 +1,328 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Nested_vdbe
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-node_types:
- org.openecomp.resource.vfc.compute.nodes.heat.vdbe:
- derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
-topology_template:
- inputs:
- port_vdbe_untr_1_port_mac_requirements:
- type: org.openecomp.datatypes.network.MacRequirements
- required: true
- port_vdbe_untr_1_port_order:
- type: integer
- required: true
- index_value:
- type: integer
- description: Index value of this substitution service template runtime instance
- required: false
- default: 0
- constraints:
- - greater_or_equal: 0
- compute_vdbe_availability_zone:
- type: list
- required: true
- entry_schema:
- type: string
- port_vdbe_untr_1_port_exCP_naming:
- type: org.openecomp.datatypes.Naming
- required: true
- vm_flavor_name:
- type: string
- required: true
- port_vdbe_untr_1_port_subnetpoolid:
- type: string
- required: true
- port_vdbe_untr_1_port_name:
- type: list
- required: true
- entry_schema:
- type: string
- vm_image_name:
- type: string
- required: true
- port_vdbe_untr_1_port_network_role:
- type: string
- required: true
- port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs:
- type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
- required: true
- compute_vdbe_metadata:
- type: list
- required: true
- entry_schema:
- type: json
- port_vdbe_untr_1_port_virtual_network_refs:
- type: list
- required: true
- entry_schema:
- type: json
- port_vdbe_untr_1_port_ip_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.IpRequirements
- compute_vdbe_name:
- type: list
- required: true
- entry_schema:
- type: string
- port_vdbe_untr_1_port_network_role_tag:
- type: string
- required: true
- port_vdbe_untr_1_port_vlan_requirements:
- type: list
- required: true
- entry_schema:
- type: org.openecomp.datatypes.network.VlanRequirements
- port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
- type: list
- required: true
- entry_schema:
- type: json
- node_templates:
- vdbe:
- type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe
- properties:
- availability_zone:
- get_input:
- - compute_vdbe_availability_zone
- - index_value
- flavor:
- get_input: vm_flavor_name
- metadata:
- get_input:
- - compute_vdbe_metadata
- - index_value
- image:
- get_input: vm_image_name
- name:
- get_input:
- - compute_vdbe_name
- - index_value
- vdbe_vdbe_untr_1_port:
- type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
- properties:
- mac_requirements:
- get_input: port_vdbe_untr_1_port_mac_requirements
- order:
- get_input: port_vdbe_untr_1_port_order
- exCP_naming:
- get_input: port_vdbe_untr_1_port_exCP_naming
- virtual_machine_interface_allowed_address_pairs:
- get_input:
- - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs
- - index_value
- vlan_requirements:
- get_input: port_vdbe_untr_1_port_vlan_requirements
- virtual_network_refs:
- get_input:
- - port_vdbe_untr_1_port_virtual_network_refs
- - index_value
- ip_requirements:
- get_input: port_vdbe_untr_1_port_ip_requirements
- network_role_tag:
- get_input: port_vdbe_untr_1_port_network_role_tag
- virtual_machine_interface_mac_addresses:
- get_input:
- - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses
- - index_value
- network_role:
- get_input: port_vdbe_untr_1_port_network_role
- subnetpoolid:
- get_input: port_vdbe_untr_1_port_subnetpoolid
- name:
- get_input:
- - port_vdbe_untr_1_port_name
- - index_value
- requirements:
- - binding:
- capability: tosca.capabilities.network.Bindable
- node: vdbe
- relationship: tosca.relationships.network.BindsTo
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.vdbe
- capabilities:
- feature_vdbe:
- - vdbe
- - feature
- disk.device.iops_vdbe:
- - vdbe
- - disk.device.iops
- endpoint_vdbe:
- - vdbe
- - endpoint
- disk.ephemeral.size_vdbe:
- - vdbe
- - disk.ephemeral.size
- cpu_util_vdbe:
- - vdbe
- - cpu_util
- vcpus_vdbe:
- - vdbe
- - vcpus
- disk.write.requests_vdbe:
- - vdbe
- - disk.write.requests
- disk.device.latency_vdbe:
- - vdbe
- - disk.device.latency
- disk.device.write.requests.rate_vdbe:
- - vdbe
- - disk.device.write.requests.rate
- feature_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - feature
- disk.write.bytes.rate_vdbe:
- - vdbe
- - disk.write.bytes.rate
- network.incoming.bytes.rate_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.incoming.bytes.rate
- network.incoming.packets.rate_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.incoming.packets.rate
- scalable_vdbe:
- - vdbe
- - scalable
- disk.iops_vdbe:
- - vdbe
- - disk.iops
- disk.device.write.requests_vdbe:
- - vdbe
- - disk.device.write.requests
- disk.device.capacity_vdbe:
- - vdbe
- - disk.device.capacity
- network.outgoing.bytes_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.outgoing.bytes
- disk.device.allocation_vdbe:
- - vdbe
- - disk.device.allocation
- disk.usage_vdbe:
- - vdbe
- - disk.usage
- memory.usage_vdbe:
- - vdbe
- - memory.usage
- disk.read.requests_vdbe:
- - vdbe
- - disk.read.requests
- network.incoming.bytes_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.incoming.bytes
- instance_vdbe:
- - vdbe
- - instance
- cpu.delta_vdbe:
- - vdbe
- - cpu.delta
- binding_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - binding
- disk.device.read.bytes.rate_vdbe:
- - vdbe
- - disk.device.read.bytes.rate
- disk.device.write.bytes.rate_vdbe:
- - vdbe
- - disk.device.write.bytes.rate
- memory.resident_vdbe:
- - vdbe
- - memory.resident
- forwarder_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - forwarder
- disk.write.requests.rate_vdbe:
- - vdbe
- - disk.write.requests.rate
- cpu_vdbe:
- - vdbe
- - cpu
- disk.write.bytes_vdbe:
- - vdbe
- - disk.write.bytes
- disk.device.usage_vdbe:
- - vdbe
- - disk.device.usage
- disk.device.read.bytes_vdbe:
- - vdbe
- - disk.device.read.bytes
- disk.latency_vdbe:
- - vdbe
- - disk.latency
- network.outgoing.packets.rate_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.outgoing.packets.rate
- disk.capacity_vdbe:
- - vdbe
- - disk.capacity
- host_vdbe:
- - vdbe
- - host
- disk.allocation_vdbe:
- - vdbe
- - disk.allocation
- network.outpoing.packets_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.outpoing.packets
- network.incoming.packets_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.incoming.packets
- disk.read.bytes.rate_vdbe:
- - vdbe
- - disk.read.bytes.rate
- os_vdbe:
- - vdbe
- - os
- disk.device.read.requests_vdbe:
- - vdbe
- - disk.device.read.requests
- disk.root.size_vdbe:
- - vdbe
- - disk.root.size
- memory_vdbe:
- - vdbe
- - memory
- binding_vdbe:
- - vdbe
- - binding
- disk.device.write.bytes_vdbe:
- - vdbe
- - disk.device.write.bytes
- network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - network.outgoing.bytes.rate
- disk.device.read.requests.rate_vdbe:
- - vdbe
- - disk.device.read.requests.rate
- disk.read.bytes_vdbe:
- - vdbe
- - disk.read.bytes
- requirements:
- dependency_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - dependency
- local_storage_vdbe:
- - vdbe
- - local_storage
- link_vdbe_vdbe_untr_1_port:
- - vdbe_vdbe_untr_1_port
- - link
- dependency_vdbe:
- - vdbe
- - dependency
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Nested_vdbe +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +node_types: + org.openecomp.resource.vfc.compute.nodes.heat.vdbe: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + port_vdbe_untr_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_vdbe_untr_1_port_order: + type: integer + required: true + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + compute_vdbe_availability_zone: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + vm_flavor_name: + type: string + required: true + port_vdbe_untr_1_port_subnetpoolid: + type: string + required: true + port_vdbe_untr_1_port_name: + type: list + required: true + entry_schema: + type: string + vm_image_name: + type: string + required: true + port_vdbe_untr_1_port_network_role: + type: string + required: true + port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + compute_vdbe_metadata: + type: list + required: true + entry_schema: + type: json + port_vdbe_untr_1_port_virtual_network_refs: + type: list + required: true + entry_schema: + type: json + port_vdbe_untr_1_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + compute_vdbe_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_1_port_network_role_tag: + type: string + required: true + port_vdbe_untr_1_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json + node_templates: + vdbe: + type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe + properties: + availability_zone: + get_input: + - compute_vdbe_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + metadata: + get_input: + - compute_vdbe_metadata + - index_value + image: + get_input: vm_image_name + name: + get_input: + - compute_vdbe_name + - index_value + vdbe_vdbe_untr_1_port: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_1_port_mac_requirements + order: + get_input: port_vdbe_untr_1_port_order + exCP_naming: + get_input: port_vdbe_untr_1_port_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value + virtual_network_refs: + get_input: + - port_vdbe_untr_1_port_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_1_port_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_1_port_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_1_port_network_role + subnetpoolid: + get_input: port_vdbe_untr_1_port_subnetpoolid + name: + get_input: + - port_vdbe_untr_1_port_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.vdbe + capabilities: + feature_vdbe: + - vdbe + - feature + disk.device.iops_vdbe: + - vdbe + - disk.device.iops + endpoint_vdbe: + - vdbe + - endpoint + disk.ephemeral.size_vdbe: + - vdbe + - disk.ephemeral.size + cpu_util_vdbe: + - vdbe + - cpu_util + vcpus_vdbe: + - vdbe + - vcpus + disk.write.requests_vdbe: + - vdbe + - disk.write.requests + disk.device.latency_vdbe: + - vdbe + - disk.device.latency + disk.device.write.requests.rate_vdbe: + - vdbe + - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - feature + disk.write.bytes.rate_vdbe: + - vdbe + - disk.write.bytes.rate + network.incoming.bytes.rate_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.incoming.packets.rate + scalable_vdbe: + - vdbe + - scalable + disk.iops_vdbe: + - vdbe + - disk.iops + disk.device.write.requests_vdbe: + - vdbe + - disk.device.write.requests + disk.device.capacity_vdbe: + - vdbe + - disk.device.capacity + network.outgoing.bytes_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.outgoing.bytes + disk.device.allocation_vdbe: + - vdbe + - disk.device.allocation + disk.usage_vdbe: + - vdbe + - disk.usage + memory.usage_vdbe: + - vdbe + - memory.usage + disk.read.requests_vdbe: + - vdbe + - disk.read.requests + network.incoming.bytes_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.incoming.bytes + instance_vdbe: + - vdbe + - instance + cpu.delta_vdbe: + - vdbe + - cpu.delta + binding_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - binding + disk.device.read.bytes.rate_vdbe: + - vdbe + - disk.device.read.bytes.rate + disk.device.write.bytes.rate_vdbe: + - vdbe + - disk.device.write.bytes.rate + memory.resident_vdbe: + - vdbe + - memory.resident + forwarder_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - forwarder + disk.write.requests.rate_vdbe: + - vdbe + - disk.write.requests.rate + cpu_vdbe: + - vdbe + - cpu + disk.write.bytes_vdbe: + - vdbe + - disk.write.bytes + disk.device.usage_vdbe: + - vdbe + - disk.device.usage + disk.device.read.bytes_vdbe: + - vdbe + - disk.device.read.bytes + disk.latency_vdbe: + - vdbe + - disk.latency + network.outgoing.packets.rate_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.outgoing.packets.rate + disk.capacity_vdbe: + - vdbe + - disk.capacity + host_vdbe: + - vdbe + - host + disk.allocation_vdbe: + - vdbe + - disk.allocation + network.outpoing.packets_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.outpoing.packets + network.incoming.packets_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.incoming.packets + disk.read.bytes.rate_vdbe: + - vdbe + - disk.read.bytes.rate + os_vdbe: + - vdbe + - os + disk.device.read.requests_vdbe: + - vdbe + - disk.device.read.requests + disk.root.size_vdbe: + - vdbe + - disk.root.size + memory_vdbe: + - vdbe + - memory + binding_vdbe: + - vdbe + - binding + disk.device.write.bytes_vdbe: + - vdbe + - disk.device.write.bytes + network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - network.outgoing.bytes.rate + disk.device.read.requests.rate_vdbe: + - vdbe + - disk.device.read.requests.rate + disk.read.bytes_vdbe: + - vdbe + - disk.read.bytes + requirements: + dependency_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - dependency + local_storage_vdbe: + - vdbe + - local_storage + link_vdbe_vdbe_untr_1_port: + - vdbe_vdbe_untr_1_port + - link + dependency_vdbe: + - vdbe + - 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/notBoundToParentPort/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/nested3ServiceTemplate.yaml index 55f11b0c86..7dc9c41d48 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/out/nested3ServiceTemplate.yaml @@ -1,198 +1,198 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested3
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_subport_missing_vlan_tag:
- type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface
- properties:
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- virtual_machine_interface_properties_sub_interface_vlan_tag_INVALID:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- - get_input: mac_address
- groups:
- nested3_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested3.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_subport_missing_vlan_tag
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.nested3
- capabilities:
- forwarder_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - forwarder
- network.outgoing.bytes.rate_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.outgoing.bytes.rate
- network.incoming.packets.rate_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.incoming.packets.rate
- feature_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - feature
- network.outpoing.packets_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.outpoing.packets
- network.outgoing.packets.rate_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.outgoing.packets.rate
- binding_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - binding
- network.outgoing.bytes_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.outgoing.bytes
- network.incoming.bytes.rate_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.incoming.bytes.rate
- network.incoming.packets_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.incoming.packets
- network.incoming.bytes_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - network.incoming.bytes
- requirements:
- dependency_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - dependency
- binding_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - binding
- link_vdbe_untr_x_subport_missing_vlan_tag:
- - vdbe_untr_x_subport_missing_vlan_tag
- - link
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested3 +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_subport_missing_vlan_tag: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + virtual_machine_interface_properties_sub_interface_vlan_tag_INVALID: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + - get_input: mac_address + groups: + nested3_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested3.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_subport_missing_vlan_tag + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.nested3 + capabilities: + forwarder_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - forwarder + network.outgoing.bytes.rate_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.outgoing.bytes.rate + network.incoming.packets.rate_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.incoming.packets.rate + feature_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - feature + network.outpoing.packets_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.outpoing.packets + network.outgoing.packets.rate_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.outgoing.packets.rate + binding_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - binding + network.outgoing.bytes_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.outgoing.bytes + network.incoming.bytes.rate_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.incoming.bytes.rate + network.incoming.packets_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.incoming.packets + network.incoming.bytes_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - network.incoming.bytes + requirements: + dependency_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - dependency + binding_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - binding + link_vdbe_untr_x_subport_missing_vlan_tag: + - vdbe_untr_x_subport_missing_vlan_tag + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/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/notBoundToParentPort/out/nestedServiceTemplate.yaml index 933718ff73..6a94e0dd58 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/notBoundToParentPort/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/notBoundToParentPort/out/nestedServiceTemplate.yaml @@ -1,171 +1,171 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.nested
- capabilities:
- feature_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - feature
- requirements:
- link_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - link
- dependency_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - dependency
- binding_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - binding
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.nested + capabilities: + feature_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - feature + requirements: + dependency_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - dependency + binding_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/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/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2fafd8e615..9bf67731bd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/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/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -217,7 +223,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -406,6 +412,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -661,7 +668,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/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/regularNestedSubInterface/out/MainServiceTemplate.yaml index d1dcbbf7a5..7eb63dbfcc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/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/regularNestedSubInterface/out/MainServiceTemplate.yaml @@ -1,485 +1,487 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: Main
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- vf_module_id:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vf_module_id
- type: string
- description: Unique ID for this VF module inst
- control_int_net_rpf:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_rpf
- type: string
- description: Reverse Path Filtering enable or disable for the control virtual network
- control_int_net_forwarding_mode:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_forwarding_mode
- type: string
- description: forwarding mode of the control virtual network
- vnf_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_name
- type: string
- description: Unique name for this VF instance
- vdbe_untrusted_ip_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_untrusted_ip_1
- type: string
- description: IPV4 address of the secondary vDBE VM on the VAN untrusted network
- vdbe_aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_ip_prefix_len
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- untrusted_num_vn:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_num_vn
- type: float
- description: Number of vDBE subinterface virtual Networks
- constraints:
- - in_range:
- - 1
- - 77
- aap_address_mode:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: aap_address_mode
- type: string
- description: Address mode for the vDBE cluster IP
- control_int_net_shared:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_shared
- type: boolean
- description: control virtual network shared
- vdbe_untrusted_v6_ip_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_untrusted_v6_ip_1
- type: string
- description: IPV6 address of the secondary vDBE VM on the VAN untrusted network
- vdbe_untrusted_vmac_address:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_untrusted_vmac_address
- type: string
- description: Virtual MAC of the primary vDBE VM on the VAN untrusted network
- control_int_net_flood_unknown_unicast:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: control_int_net_flood_unknown_unicast
- type: boolean
- description: forwarding mode of the control virtual network
- vdbe_aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_sec_untrusted_ip_prefix
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- vnf_id:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_id
- type: string
- description: Unique ID for this VF inst
- vdbe_name_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_name_1
- type: string
- description: VM Name for this vdbe node 1
- availability_zone_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: availability_zone_1
- type: string
- description: The availability zone of secondary node1 vDBE vm in the local HA pair.
- untrusted_vn_networks:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_vn_networks
- type: list
- description: List of subinterface virtual networks
- entry_schema:
- type: string
- vdbe_image_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_image_name
- type: string
- description: Image to use for vDBE
- oam_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: oam_net_name
- type: string
- description: Name of NSDNet network from which the management IP addresses will be allocated
- vdbe_aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_sec_untrusted_ip_prefix_len
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vdbe_aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_v6_ip_prefix
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- vdbe_aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_v6_ip_prefix_len
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- untrusted_vlan_tags:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_vlan_tags
- type: list
- description: List of subinterface vlan tags
- entry_schema:
- type: string
- vdbe_flavor_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_flavor_name
- type: string
- description: Flavor to use for vDBE
- vdbe_hw_untr_mac_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_hw_untr_mac_1
- type: string
- description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network
- untrusted_net_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: untrusted_net_name
- type: string
- description: Name of public untrusted network into which this vDBE HA cluster is deployed
- vdbe_device_name:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_device_name
- type: string
- description: VDBE device Name for this vdbe VNF
- vdbe_aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_aap_untrusted_ip_prefix
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- node_templates:
- control_int_net:
- type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork
- properties:
- network_name:
- str_replace:
- template: VNF_NAME_control_net
- params:
- VNF_NAME:
- get_input: vnf_name
- abstract_vdbe:
- type: org.openecomp.resource.abstract.nodes.vdbe
- directives:
- - substitutable
- properties:
- subinterface_nested_parent_interface:
- - vdbe_untr_1_port
- subinterface_nested_aap_address_mode:
- - get_input: aap_address_mode
- subinterface_nested_vlan_tag_list:
- - get_input: untrusted_vlan_tags
- compute_vdbe_availability_zone:
- - get_input: availability_zone_1
- subinterface_nested_aap_untrusted_v6_ip_prefix_len:
- - get_input: vdbe_aap_untrusted_v6_ip_prefix_len
- vm_flavor_name:
- get_input: vdbe_flavor_name
- subinterface_nested_aap_untrusted_ip_prefix:
- - get_input: vdbe_aap_untrusted_ip_prefix
- vm_image_name:
- get_input: vdbe_image_name
- subinterface_nested_aap_sec_untrusted_ip_prefix_len:
- - get_input: vdbe_aap_sec_untrusted_ip_prefix_len
- subinterface_nested_aap_sec_untrusted_ip_prefix:
- - get_input: vdbe_aap_sec_untrusted_ip_prefix
- subinterface_nested_aap_untrusted_v6_ip_prefix:
- - get_input: vdbe_aap_untrusted_v6_ip_prefix
- compute_vdbe_metadata:
- - vf_module_id:
- get_input: vf_module_id
- vnf_id:
- get_input: vnf_id
- vnf_name:
- get_input: vnf_name
- subinterface_nested_mac_address:
- - get_input: vdbe_hw_untr_mac_1
- port_vdbe_untr_1_port_virtual_network_refs:
- - - control_int_net
- subinterface_nested_ip_address:
- - get_input: vdbe_untrusted_ip_1
- subinterface_nested_ip_v6_address:
- - get_input: vdbe_untrusted_v6_ip_1
- subinterface_nested_vmac_address:
- - get_input: vdbe_untrusted_vmac_address
- subinterface_nested_vn_network_list:
- - get_input: untrusted_vn_networks
- port_vdbe_untr_1_port_name:
- - str_replace:
- template: VM_NAMEDBE001p1n004
- params:
- DBE:
- get_input: vdbe_device_name
- VM_NAME:
- get_input: vdbe_name_1
- subinterface_nested_aap_untrusted_ip_prefix_len:
- - get_input: vdbe_aap_untrusted_ip_prefix_len
- subinterface_nested_counter:
- - 5
- subinterface_nested_subinterfaces_name_prefix:
- - str_replace:
- template: VM_NAMEDBE001p1n004
- params:
- DBE:
- get_input: vdbe_device_name
- VM_NAME:
- get_input: vdbe_name_1
- compute_vdbe_name:
- - get_input: vdbe_name_1
- port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses:
- - - get_input: vdbe_hw_untr_mac_1
- service_template_filter:
- substitute_service_template: Nested_vdbeServiceTemplate.yaml
- count: 1
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_vdbe_vdbe_untr_1_port:
- capability: tosca.capabilities.network.Linkable
- node: control_int_net
- relationship: tosca.relationships.network.LinksTo
- groups:
- main_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/main.yml
- description: |
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
- members:
- - control_int_net
- - abstract_vdbe
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + vf_module_id: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vf_module_id + type: string + description: Unique ID for this VF module inst + control_int_net_rpf: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_rpf + type: string + description: Reverse Path Filtering enable or disable for the control virtual network + control_int_net_forwarding_mode: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_forwarding_mode + type: string + description: forwarding mode of the control virtual network + vnf_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_name + type: string + description: Unique name for this VF instance + vdbe_untrusted_ip_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_ip_1 + type: string + description: IPV4 address of the secondary vDBE VM on the VAN untrusted network + vdbe_aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_ip_prefix_len + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_num_vn: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_num_vn + type: float + description: Number of vDBE subinterface virtual Networks + constraints: + - in_range: + - 1 + - 77 + aap_address_mode: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: aap_address_mode + type: string + description: Address mode for the vDBE cluster IP + control_int_net_shared: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_shared + type: boolean + description: control virtual network shared + vdbe_untrusted_v6_ip_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_v6_ip_1 + type: string + description: IPV6 address of the secondary vDBE VM on the VAN untrusted network + vdbe_untrusted_vmac_address: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_untrusted_vmac_address + type: string + description: Virtual MAC of the primary vDBE VM on the VAN untrusted network + control_int_net_flood_unknown_unicast: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: control_int_net_flood_unknown_unicast + type: boolean + description: forwarding mode of the control virtual network + vdbe_aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_sec_untrusted_ip_prefix + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + vnf_id: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_id + type: string + description: Unique ID for this VF inst + vdbe_name_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_name_1 + type: string + description: VM Name for this vdbe node 1 + availability_zone_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availability_zone_1 + type: string + description: The availability zone of secondary node1 vDBE vm in the local HA pair. + untrusted_vn_networks: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_vn_networks + type: list + description: List of subinterface virtual networks + entry_schema: + type: string + vdbe_image_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_image_name + type: string + description: Image to use for vDBE + oam_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: oam_net_name + type: string + description: Name of NSDNet network from which the management IP addresses will be allocated + vdbe_aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_sec_untrusted_ip_prefix_len + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vdbe_aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_v6_ip_prefix + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + vdbe_aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_v6_ip_prefix_len + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_vlan_tags: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_vlan_tags + type: list + description: List of subinterface vlan tags + entry_schema: + type: string + vdbe_flavor_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_flavor_name + type: string + description: Flavor to use for vDBE + vdbe_hw_untr_mac_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_hw_untr_mac_1 + type: string + description: Secondary MAC address of the secondary vDBE VM on the VAN untrusted network + untrusted_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_net_name + type: string + description: Name of public untrusted network into which this vDBE HA cluster is deployed + vdbe_device_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_device_name + type: string + description: VDBE device Name for this vdbe VNF + vdbe_aap_untrusted_ip_prefix: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_aap_untrusted_ip_prefix + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + node_templates: + control_int_net: + type: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork + properties: + network_name: + str_replace: + template: VNF_NAME_control_net + params: + VNF_NAME: + get_input: vnf_name + abstract_vdbe: + type: org.openecomp.resource.abstract.nodes.vdbe + directives: + - substitutable + properties: + port_vdbe_untr_1_port_subinterface_indicator: + - true + subinterface_nested_parent_interface: + - vdbe_untr_1_port + subinterface_nested_aap_address_mode: + - get_input: aap_address_mode + subinterface_nested_vlan_tag_list: + - get_input: untrusted_vlan_tags + compute_vdbe_availability_zone: + - get_input: availability_zone_1 + subinterface_nested_aap_untrusted_v6_ip_prefix_len: + - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + vm_flavor_name: + get_input: vdbe_flavor_name + subinterface_nested_aap_untrusted_ip_prefix: + - get_input: vdbe_aap_untrusted_ip_prefix + vm_image_name: + get_input: vdbe_image_name + subinterface_nested_aap_sec_untrusted_ip_prefix_len: + - get_input: vdbe_aap_sec_untrusted_ip_prefix_len + subinterface_nested_aap_sec_untrusted_ip_prefix: + - get_input: vdbe_aap_sec_untrusted_ip_prefix + subinterface_nested_aap_untrusted_v6_ip_prefix: + - get_input: vdbe_aap_untrusted_v6_ip_prefix + compute_vdbe_metadata: + - vf_module_id: + get_input: vf_module_id + vnf_id: + get_input: vnf_id + vnf_name: + get_input: vnf_name + subinterface_nested_mac_address: + - get_input: vdbe_hw_untr_mac_1 + port_vdbe_untr_1_port_virtual_network_refs: + - - control_int_net + subinterface_nested_ip_address: + - get_input: vdbe_untrusted_ip_1 + subinterface_nested_ip_v6_address: + - get_input: vdbe_untrusted_v6_ip_1 + subinterface_nested_vmac_address: + - get_input: vdbe_untrusted_vmac_address + subinterface_nested_vn_network_list: + - get_input: untrusted_vn_networks + port_vdbe_untr_1_port_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + subinterface_nested_aap_untrusted_ip_prefix_len: + - get_input: vdbe_aap_untrusted_ip_prefix_len + subinterface_nested_counter: + - 5 + subinterface_nested_subinterfaces_name_prefix: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + compute_vdbe_name: + - get_input: vdbe_name_1 + port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + service_template_filter: + substitute_service_template: Nested_vdbeServiceTemplate.yaml + count: 1 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_vdbe_vdbe_untr_1_port: + capability: tosca.capabilities.network.Linkable + node: control_int_net + relationship: tosca.relationships.network.LinksTo + groups: + main_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/main.yml + description: | + Version 2.0 02-09-2016 (Authors: John Doe, user PROD) + members: + - control_int_net + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/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/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml index 827c922afb..41bb064ee0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/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/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -285,6 +290,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -476,9 +485,9 @@ topology_template: - vdbe - disk.read.bytes requirements: - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - vdbe_vdbe_untr_1_port_nested - - link_vdbe_untr_x_subport + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - 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/regularNestedSubInterface/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/regularNestedSubInterface/out/nestedServiceTemplate.yaml index d70a184404..58980ac9d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/regularNestedSubInterface/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/regularNestedSubInterface/out/nestedServiceTemplate.yaml @@ -1,171 +1,171 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- vn_network_list:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vn_network_list
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - feature
- requirements:
- link_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - link
- dependency_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - dependency
- binding_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - binding
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + vn_network_list: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vn_network_list + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - feature + requirements: + dependency_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - dependency + binding_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/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/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5d85386b2e..ecc78109cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/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/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -220,7 +226,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -409,6 +415,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -663,7 +670,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -681,4 +688,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/subInterfaceGetAttrInOut/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/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml index 8d011527ba..5ffc4e1449 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/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/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml @@ -471,6 +471,8 @@ topology_template: directives: - substitutable properties: + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_nested_parent_interface: - vdbe_untr_1_port subinterface_nested_aap_address_mode: @@ -551,7 +553,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -572,4 +574,4 @@ topology_template: value: get_attribute: - abstract_vdbe - - vdbe_vdbe_untr_1_port_nested_aap_address_mode
\ No newline at end of file + - vdbe_vdbe_untr_1_port_nested_aap_address_mode diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/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/subInterfaceGetAttrInOut/out/Nested_vdbeServiceTemplate.yaml index 940545c2ff..70e19420b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/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/subInterfaceGetAttrInOut/out/Nested_vdbeServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -281,6 +286,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -487,9 +496,9 @@ topology_template: - vdbe - disk.read.bytes requirements: - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - vdbe_vdbe_untr_1_port_nested - - link_vdbe_untr_x_subport + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - dependency @@ -507,4 +516,4 @@ topology_template: - link 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/subInterfaceGetAttrInOut/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/subInterfaceGetAttrInOut/out/nestedServiceTemplate.yaml index ae6961c098..a78c165ac4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceGetAttrInOut/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/subInterfaceGetAttrInOut/out/nestedServiceTemplate.yaml @@ -1,171 +1,171 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- vdbe_subport_network:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vdbe_subport_network
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - feature
- requirements:
- link_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - link
- dependency_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - dependency
- binding_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - binding
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + vdbe_subport_network: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vdbe_subport_network + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - feature + requirements: + dependency_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - dependency + binding_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/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/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index de27b5c0ad..30a4aec6a2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/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/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -217,7 +223,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -406,6 +412,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -661,7 +668,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/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/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml index 4f37a1b570..3232218d9e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/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/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml @@ -473,6 +473,8 @@ topology_template: directives: - substitutable properties: + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_nested_parent_interface: - vdbe_untr_1_port subinterface_nested_aap_address_mode: @@ -553,7 +555,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -567,4 +569,4 @@ topology_template: members: - fabric_int_net - control_int_net - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/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/subInterfaceNodesConnectedIn/out/Nested_vdbeServiceTemplate.yaml index 9951fc5f56..ae5bb90ea4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/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/subInterfaceNodesConnectedIn/out/Nested_vdbeServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -286,6 +291,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -477,9 +486,9 @@ topology_template: - vdbe - disk.read.bytes requirements: - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - vdbe_vdbe_untr_1_port_nested - - link_vdbe_untr_x_subport + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - 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/subInterfaceNodesConnectedIn/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/subInterfaceNodesConnectedIn/out/nestedServiceTemplate.yaml index ae6961c098..a78c165ac4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedIn/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/subInterfaceNodesConnectedIn/out/nestedServiceTemplate.yaml @@ -1,171 +1,171 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- vdbe_subport_network:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vdbe_subport_network
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - feature
- requirements:
- link_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - link
- dependency_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - dependency
- binding_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - binding
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + vdbe_subport_network: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vdbe_subport_network + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - feature + requirements: + dependency_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - dependency + binding_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/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/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 94a9c4a79c..0f685b46e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/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/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -211,7 +217,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -400,6 +406,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -655,7 +662,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/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/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml index a53ca751c4..199571e7df 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/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/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml @@ -395,6 +395,8 @@ topology_template: directives: - substitutable properties: + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_nested_parent_interface: - vdbe_untr_1_port subinterface_nested_aap_address_mode: @@ -473,7 +475,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -490,4 +492,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - control_int_net - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/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/subInterfaceNodesConnectedOut/out/Nested_vdbeServiceTemplate.yaml index dffc2344bd..5edce41701 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/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/subInterfaceNodesConnectedOut/out/Nested_vdbeServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_parent_interface: type: list required: true @@ -282,6 +287,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_1_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_1_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_1_port_virtual_network_refs @@ -473,9 +482,9 @@ topology_template: - vdbe - disk.read.bytes requirements: - link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - vdbe_vdbe_untr_1_port_nested - - link_vdbe_untr_x_subport + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - 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/subInterfaceNodesConnectedOut/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/subInterfaceNodesConnectedOut/out/nestedServiceTemplate.yaml index ae6961c098..a78c165ac4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/subInterfaceNodesConnectedOut/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/subInterfaceNodesConnectedOut/out/nestedServiceTemplate.yaml @@ -1,171 +1,171 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: nested
-imports:
-- openecomp_heat_index:
- file: openecomp-heat/_index.yml
-- GlobalSubstitutionTypes:
- file: GlobalSubstitutionTypesServiceTemplate.yaml
-topology_template:
- inputs:
- aap_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for primary vDBE VM on the VAN untrusted network
- aap_sec_untrusted_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ip prefix for secondary vDBE VM aap on the VAN untrusted network
- vdbe_subport_network:
- hidden: false
- immutable: false
- type: string
- description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list
- ip_v6_address:
- hidden: false
- immutable: false
- type: string
- description: IPv6 address associated with subinterfaces
- counter:
- hidden: false
- immutable: false
- type: float
- description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances.
- subinterfaces_name_prefix:
- hidden: false
- immutable: false
- type: string
- description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource
- ip_address:
- hidden: false
- immutable: false
- type: string
- description: IPv4 address associated with subinterfaces
- aap_address_mode:
- hidden: false
- immutable: false
- type: string
- description: Address mode for the vDBE cluster IP
- aap_untrusted_v6_ip_prefix:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network
- parent_interface:
- hidden: false
- immutable: false
- type: string
- description: Parent Contrail interface
- mac_address:
- hidden: false
- immutable: false
- type: string
- description: HW MAC address to use for subinterface
- vlan_tag_list:
- hidden: false
- immutable: false
- type: list
- description: List of VLAN IDs to use for subinterfaces
- entry_schema:
- type: string
- aap_sec_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network
- vmac_address:
- hidden: false
- immutable: false
- type: string
- description: virtual MAC address to use for subinterface
- aap_untrusted_v6_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network
- aap_untrusted_ip_prefix_len:
- hidden: false
- immutable: false
- type: string
- description: ip prefix length for the primary vDBE VM on the VAN untrusted network
- node_templates:
- vdbe_untr_x_subport:
- type: org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
- properties:
- virtual_machine_interface_refs:
- - get_input: parent_interface
- name:
- str_replace:
- template: $NAME_$INDEX
- params:
- $NAME:
- get_input: subinterfaces_name_prefix
- $INDEX:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_network_refs:
- - get_input: vdbe_subport_network
- virtual_machine_interface_properties:
- sub_interface_vlan_tag:
- get_input:
- - vlan_tag_list
- - get_input: counter
- virtual_machine_interface_allowed_address_pairs:
- allowed_address_pair:
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_ip_prefix_len
- mac:
- get_input: vmac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_sec_untrusted_ip_prefix
- ip_prefix_len:
- get_input: aap_sec_untrusted_ip_prefix_len
- mac:
- get_input: mac_address
- - address_mode:
- get_input: aap_address_mode
- ip:
- ip_prefix:
- get_input: aap_untrusted_v6_ip_prefix
- ip_prefix_len:
- get_input: aap_untrusted_v6_ip_prefix_len
- mac:
- get_input: vmac_address
- virtual_machine_interface_mac_addresses:
- mac_address:
- - get_input: mac_address
- groups:
- nested_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/nested.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - feature
- requirements:
- link_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - link
- dependency_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - dependency
- binding_vdbe_untr_x_subport:
- - vdbe_untr_x_subport
- - binding
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: nested +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +- GlobalSubstitutionTypes: + file: GlobalSubstitutionTypesServiceTemplate.yaml +topology_template: + inputs: + aap_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for primary vDBE VM on the VAN untrusted network + aap_sec_untrusted_ip_prefix: + hidden: false + immutable: false + type: string + description: ip prefix for secondary vDBE VM aap on the VAN untrusted network + vdbe_subport_network: + hidden: false + immutable: false + type: string + description: List of Contrail VLAN networks to use for the subinterfaces. The order and number of these must match the VLAN ID list + ip_v6_address: + hidden: false + immutable: false + type: string + description: IPv6 address associated with subinterfaces + counter: + hidden: false + immutable: false + type: float + description: Index of instance among multiple instances. Use to retrieve correct parameter for this instance when passed all parameters for all instances. + subinterfaces_name_prefix: + hidden: false + immutable: false + type: string + description: Combined with subinterface_instance_index, this is used as the name of the subinterface resource + ip_address: + hidden: false + immutable: false + type: string + description: IPv4 address associated with subinterfaces + aap_address_mode: + hidden: false + immutable: false + type: string + description: Address mode for the vDBE cluster IP + aap_untrusted_v6_ip_prefix: + hidden: false + immutable: false + type: string + description: ipv6 prefix for the primary vDBE VM on the VAN untrusted network + parent_interface: + hidden: false + immutable: false + type: string + description: Parent Contrail interface + mac_address: + hidden: false + immutable: false + type: string + description: HW MAC address to use for subinterface + vlan_tag_list: + hidden: false + immutable: false + type: list + description: List of VLAN IDs to use for subinterfaces + entry_schema: + type: string + aap_sec_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the secondary DBE VM aap on the VAN untrusted network + vmac_address: + hidden: false + immutable: false + type: string + description: virtual MAC address to use for subinterface + aap_untrusted_v6_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ipv6 prefix length for the primary vDBE VM on the VAN untrusted network + aap_untrusted_ip_prefix_len: + hidden: false + immutable: false + type: string + description: ip prefix length for the primary vDBE VM on the VAN untrusted network + node_templates: + vdbe_untr_x_subport: + type: org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + properties: + virtual_machine_interface_refs: + - get_input: parent_interface + name: + str_replace: + template: $NAME_$INDEX + params: + $NAME: + get_input: subinterfaces_name_prefix + $INDEX: + get_input: + - vlan_tag_list + - get_input: counter + virtual_network_refs: + - get_input: vdbe_subport_network + virtual_machine_interface_properties: + sub_interface_vlan_tag: + get_input: + - vlan_tag_list + - get_input: counter + virtual_machine_interface_allowed_address_pairs: + allowed_address_pair: + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_ip_prefix_len + mac: + get_input: vmac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_sec_untrusted_ip_prefix + ip_prefix_len: + get_input: aap_sec_untrusted_ip_prefix_len + mac: + get_input: mac_address + - address_mode: + get_input: aap_address_mode + ip: + ip_prefix: + get_input: aap_untrusted_v6_ip_prefix + ip_prefix_len: + get_input: aap_untrusted_v6_ip_prefix_len + mac: + get_input: vmac_address + virtual_machine_interface_mac_addresses: + mac_address: + - get_input: mac_address + groups: + nested_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/nested.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - feature + requirements: + dependency_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - dependency + binding_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - binding + subinterface_link_vdbe_untr_x_subport: + - vdbe_untr_x_subport + - subinterface_link |