diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface')
195 files changed, 6721 insertions, 5718 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 43b1e55eff..95f99fc457 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,6 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -117,7 +123,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -345,6 +351,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 @@ -529,7 +536,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -603,6 +610,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -660,7 +673,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -955,6 +968,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 @@ -1015,4 +1029,4 @@ node_types: 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 + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml index 885ae52726..0ea4a68d1e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml @@ -738,6 +738,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -752,7 +754,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -775,6 +777,8 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - ps01_port_0 + port_ps01_port_subinterface_indicator: + - true vm_image_name: get_input: pd_image_name port_ps01_port_mac_requirements: @@ -805,7 +809,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -819,4 +823,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_ps_server
\ No newline at end of file + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml index 9bec8b6463..ae47cfa092 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_pd_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -139,6 +144,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -341,12 +350,12 @@ topology_template: dependency_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - dependency - link_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - link_template_Vlan_1 dependency_pd_server: - pd_server - dependency + subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: + - pd_server_pd01_port_nested + - subinterface_link_template_Vlan_1 dependency_template_Vlan_1_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - - dependency_template_Vlan_1
\ No newline at end of file + - dependency_template_Vlan_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml index d05d3f6aca..cbe6b147ec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/Nested_ps_serverServiceTemplate.yaml @@ -54,6 +54,11 @@ topology_template: required: true entry_schema: type: string + port_ps01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -139,6 +144,10 @@ topology_template: get_input: port_ps01_port_exCP_naming vlan_requirements: get_input: port_ps01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps01_port_ip_requirements network_role_tag: @@ -329,6 +338,9 @@ topology_template: - ps_server_ps01_port - network.outgoing.bytes requirements: + subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: + - ps_server_ps01_port_nested + - subinterface_link_template_Vlan_1 dependency_ps_server: - ps_server - dependency @@ -344,9 +356,6 @@ topology_template: dependency_template_Vlan_1_ps_server_ps01_port_nested: - ps_server_ps01_port_nested - dependency_template_Vlan_1 - link_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - link_template_Vlan_1 local_storage_ps_server: - ps_server - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/nestedServiceTemplate.yaml index a82a0563f8..7f0188fcfe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_1: - 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: p1 @@ -111,9 +111,9 @@ topology_template: dependency_template_Vlan_1: - template_Vlan_1 - dependency - link_template_Vlan_1: + subinterface_link_template_Vlan_1: - template_Vlan_1 - - link + - subinterface_link binding_template_Vlan_1: - template_Vlan_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml index a839d67cc1..d6fa3c4559 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -297,6 +303,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 @@ -488,6 +495,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -537,7 +550,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -765,6 +778,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 @@ -949,7 +963,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -967,4 +981,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/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml index 57be376a5d..3284aad2f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml @@ -734,6 +734,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -780,6 +782,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -794,7 +798,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -808,4 +812,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_pd_server_1
\ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml index 3d9ebd74ae..54070a9852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml index 537d0dbef7..0ca34a79a5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/Nested_pd_server_1ServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -139,6 +144,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -332,9 +341,6 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - link_template_Vlan_vmi_1 link_pd_server_pd01_port: - pd_server_pd01_port - link @@ -349,4 +355,7 @@ topology_template: - dependency dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1
\ No newline at end of file + - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - pd_server_pd01_port_nested + - subinterface_link_template_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/nestedServiceTemplate.yaml index bbc48d76ec..c5195c51e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - 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: p1 @@ -108,12 +108,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/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/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 43b1e55eff..95f99fc457 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/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/pattern1b/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,6 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -117,7 +123,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -345,6 +351,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 @@ -529,7 +536,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -603,6 +610,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -660,7 +673,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -955,6 +968,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 @@ -1015,4 +1029,4 @@ node_types: 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 + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/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/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml index 5f16f354ab..bb8c2a7214 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/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/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml @@ -736,6 +736,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -750,7 +752,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -771,6 +773,8 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - ps01_port_0 + port_ps01_port_subinterface_indicator: + - true vm_image_name: get_input: pd_image_name port_ps01_port_mac_requirements: @@ -801,7 +805,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_1_ps_server_ps01_port_nested: + - subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml index e54889ba0f..8a4a553505 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_pd_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -138,6 +143,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -340,12 +349,12 @@ topology_template: dependency_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - dependency - link_template_Vlan_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - link_template_Vlan_1 dependency_pd_server: - pd_server - dependency + subinterface_link_template_Vlan_1_pd_server_pd01_port_nested: + - pd_server_pd01_port_nested + - subinterface_link_template_Vlan_1 dependency_template_Vlan_1_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - - dependency_template_Vlan_1
\ No newline at end of file + - dependency_template_Vlan_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml index d90ee86983..dd03ca0248 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/Nested_ps_serverServiceTemplate.yaml @@ -54,6 +54,11 @@ topology_template: required: true entry_schema: type: string + port_ps01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -138,6 +143,10 @@ topology_template: get_input: port_ps01_port_exCP_naming vlan_requirements: get_input: port_ps01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps01_port_ip_requirements network_role_tag: @@ -328,6 +337,9 @@ topology_template: - ps_server_ps01_port - network.outgoing.bytes requirements: + subinterface_link_template_Vlan_1_ps_server_ps01_port_nested: + - ps_server_ps01_port_nested + - subinterface_link_template_Vlan_1 dependency_ps_server: - ps_server - dependency @@ -343,9 +355,6 @@ topology_template: dependency_template_Vlan_1_ps_server_ps01_port_nested: - ps_server_ps01_port_nested - dependency_template_Vlan_1 - link_template_Vlan_1_ps_server_ps01_port_nested: - - ps_server_ps01_port_nested - - link_template_Vlan_1 local_storage_ps_server: - ps_server - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/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/pattern1b/regularNestedSubInterface/out/nestedServiceTemplate.yaml index a82a0563f8..7f0188fcfe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/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/pattern1b/regularNestedSubInterface/out/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_1: - 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: p1 @@ -111,9 +111,9 @@ topology_template: dependency_template_Vlan_1: - template_Vlan_1 - dependency - link_template_Vlan_1: + subinterface_link_template_Vlan_1: - template_Vlan_1 - - link + - subinterface_link binding_template_Vlan_1: - template_Vlan_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 62d9868dd6..eb19ee1ea8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -54,6 +54,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -117,7 +123,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_ps01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -417,6 +423,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 @@ -536,6 +543,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -585,7 +598,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -813,6 +826,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 @@ -997,7 +1011,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1015,4 +1029,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/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml index d18b63d88b..4c70e386ce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml @@ -720,6 +720,8 @@ topology_template: get_input: pd_flavor_name subinterface_nested_p1: - ps01_port_0 + port_ps01_port_subinterface_indicator: + - true vm_image_name: get_input: pd_image_name port_ps01_port_mac_requirements: @@ -752,7 +754,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_vmi_1_pd_server_ps01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -791,6 +793,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -805,7 +809,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -819,4 +823,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_pd_server_1
\ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml index 6a798fde3e..66c054bc84 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_serverServiceTemplate.yaml @@ -49,6 +49,11 @@ topology_template: required: true entry_schema: type: string + port_ps01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps01_port_order: type: integer required: true @@ -120,6 +125,10 @@ topology_template: get_input: port_ps01_port_exCP_naming vlan_requirements: get_input: port_ps01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps01_port_ip_requirements network_role_tag: @@ -329,9 +338,6 @@ topology_template: - pd_server - disk.device.iops requirements: - link_template_Vlan_vmi_1_pd_server_ps01_port_nested: - - pd_server_ps01_port_nested - - link_template_Vlan_vmi_1 local_storage_pd_server: - pd_server - local_storage @@ -347,6 +353,9 @@ topology_template: dependency_pd_server: - pd_server - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_ps01_port_nested: + - pd_server_ps01_port_nested + - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_ps01_port_nested: - pd_server_ps01_port_nested - - 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/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml index 537d0dbef7..0ca34a79a5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/Nested_pd_server_1ServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -139,6 +144,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -332,9 +341,6 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - link_template_Vlan_vmi_1 link_pd_server_pd01_port: - pd_server_pd01_port - link @@ -349,4 +355,7 @@ topology_template: - dependency dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1
\ No newline at end of file + - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - pd_server_pd01_port_nested + - subinterface_link_template_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/nestedServiceTemplate.yaml index bbc48d76ec..c5195c51e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - 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: p1 @@ -108,12 +108,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml index a839d67cc1..d6fa3c4559 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -297,6 +303,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 @@ -488,6 +495,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -537,7 +550,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -765,6 +778,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 @@ -949,7 +963,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -967,4 +981,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/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml index 57be376a5d..3284aad2f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml @@ -734,6 +734,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -780,6 +782,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -794,7 +798,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -808,4 +812,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_pd_server_1
\ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml index 3d9ebd74ae..54070a9852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml index 537d0dbef7..0ca34a79a5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/Nested_pd_server_1ServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -139,6 +144,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -332,9 +341,6 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - link_template_Vlan_vmi_1 link_pd_server_pd01_port: - pd_server_pd01_port - link @@ -349,4 +355,7 @@ topology_template: - dependency dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1
\ No newline at end of file + - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - pd_server_pd01_port_nested + - subinterface_link_template_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/nestedServiceTemplate.yaml index bbc48d76ec..c5195c51e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - 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: p1 @@ -108,12 +108,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index de6dfcddfa..4840c96647 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -14,12 +14,6 @@ node_types: status: SUPPORTED entry_schema: type: string - subinterface_vlan1_ip_v6_address: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true @@ -32,12 +26,6 @@ node_types: status: SUPPORTED entry_schema: type: string - subinterface_vlan1_aap_untrusted_ip_prefix: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: type: list required: true @@ -52,38 +40,22 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_untr_2_port_virtual_network_refs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json subinterface_vlan1_counter: type: list required: true status: SUPPORTED entry_schema: type: float - subinterface_vlan1_subinterfaces_name_prefix: + port_vdbe_untr_2_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: string + type: boolean 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_2_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_vdbe_untr_2_port_network_role: type: string required: true @@ -100,12 +72,6 @@ node_types: status: SUPPORTED entry_schema: type: string - 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 @@ -122,130 +88,176 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - subinterface_vlan1_vn_network_list: + port_vdbe_untr_2_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_vdbe_untr_2_port_order: + port_vdbe_untr_1_port_order: type: integer required: true status: SUPPORTED - subinterface_vlan1_service_template_filter_count: + port_vdbe_untr_1_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_2_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + 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 + subinterface_vlan1_mac_address: type: list required: true status: SUPPORTED entry_schema: - type: float - port_vdbe_untr_2_port_ip_requirements: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + subinterface_vlan1_ip_address: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_order: - type: integer + entry_schema: + type: string + compute_vdbe_name: + type: list required: true status: SUPPORTED - subinterface_vlan1_parent_interface: + entry_schema: + type: string + port_vdbe_untr_1_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_1_port_subinterface_indicator: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vlan1_aap_address_mode: + type: boolean + subinterface_vlan1_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - 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 - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + subinterface_vlan1_aap_untrusted_ip_prefix: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: string + port_vdbe_untr_2_port_virtual_network_refs: + type: list required: true status: SUPPORTED - subinterface_vlan1_optional_property_1: + entry_schema: + type: json + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_name: + port_vdbe_untr_1_port_network_role: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_2_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_1_port_virtual_network_refs: + type: list required: true status: SUPPORTED - subinterface_vlan1_optional_property_2: + entry_schema: + type: json + subinterface_vlan1_vn_network_list: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + port_vdbe_untr_2_port_subnetpoolid: + type: string required: true status: SUPPORTED - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + port_vdbe_untr_2_port_order: + type: integer + required: true + status: SUPPORTED + subinterface_vlan1_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float + subinterface_vlan1_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_mac_address: + subinterface_vlan1_aap_address_mode: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_aap_untrusted_ip_prefix_len: + 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 + port_vdbe_untr_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + subinterface_vlan1_optional_property_1: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vlan1_ip_address: + port_vdbe_untr_1_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + subinterface_vlan1_optional_property_2: + type: list required: true status: SUPPORTED - compute_vdbe_name: + entry_schema: + type: string + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: - type: string + port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED port_vdbe_untr_1_port_vlan_requirements: @@ -312,7 +324,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -521,6 +533,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 @@ -670,6 +683,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 @@ -817,7 +831,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -835,4 +849,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/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml index 24ed331aca..30ee294d8f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/MainServiceTemplate.yaml @@ -476,49 +476,25 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix - get_input: vdbe_aap_untrusted_v6_ip_prefix - subinterface_vlan1_ip_v6_address: - - get_input: vdbe_untrusted_v6_ip_1 - - get_input: vdbe_untrusted_v6_ip_1 subinterface_vlan1_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - get_input: vdbe_aap_sec_untrusted_ip_prefix compute_vdbe_availability_zone: - get_input: availability_zone_1 - get_input: availability_zone_1 - subinterface_vlan1_aap_untrusted_ip_prefix: - - get_input: vdbe_aap_untrusted_ip_prefix - - get_input: vdbe_aap_untrusted_ip_prefix port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: - - get_input: vdbe_hw_untr_mac_1 - - get_input: vdbe_hw_untr_mac_1 vm_flavor_name: get_input: vdbe_flavor_name - port_vdbe_untr_2_port_virtual_network_refs: - - - fabric_int_net - - - fabric_int_net subinterface_vlan1_counter: - get_input: counter - get_input: counter - subinterface_vlan1_subinterfaces_name_prefix: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 + port_vdbe_untr_2_port_subinterface_indicator: + - true + - true vm_image_name: get_input: vdbe_image_name - port_vdbe_untr_2_port_name: - - Port_2 - - Port_4 compute_vdbe_metadata: - vf_module_id: get_input: vf_module_id @@ -535,6 +511,48 @@ topology_template: subinterface_vlan1_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + subinterface_vlan1_mac_address: + - get_input: vdbe_hw_untr_mac_1 + - get_input: vdbe_hw_untr_mac_1 + subinterface_vlan1_aap_untrusted_ip_prefix_len: + - get_input: vdbe_aap_untrusted_ip_prefix_len + - get_input: vdbe_aap_untrusted_ip_prefix_len + subinterface_vlan1_ip_address: + - get_input: vdbe_untrusted_ip_1 + - get_input: vdbe_untrusted_ip_1 + compute_vdbe_name: + - get_input: vdbe_name_1 + - get_input: vdbe_name_1 + port_vdbe_untr_1_port_subinterface_indicator: + - true + - true + subinterface_vlan1_ip_v6_address: + - get_input: vdbe_untrusted_v6_ip_1 + - get_input: vdbe_untrusted_v6_ip_1 + subinterface_vlan1_aap_untrusted_ip_prefix: + - get_input: vdbe_aap_untrusted_ip_prefix + - get_input: vdbe_aap_untrusted_ip_prefix + port_vdbe_untr_2_port_virtual_network_refs: + - - fabric_int_net + - - fabric_int_net + subinterface_vlan1_subinterfaces_name_prefix: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + port_vdbe_untr_2_port_name: + - Port_2 + - Port_4 port_vdbe_untr_1_port_virtual_network_refs: - - control_int_net - - control_int_net @@ -574,18 +592,6 @@ topology_template: subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - subinterface_vlan1_mac_address: - - get_input: vdbe_hw_untr_mac_1 - - get_input: vdbe_hw_untr_mac_1 - subinterface_vlan1_aap_untrusted_ip_prefix_len: - - get_input: vdbe_aap_untrusted_ip_prefix_len - - get_input: vdbe_aap_untrusted_ip_prefix_len - subinterface_vlan1_ip_address: - - get_input: vdbe_untrusted_ip_1 - - get_input: vdbe_untrusted_ip_1 - compute_vdbe_name: - - get_input: vdbe_name_1 - - get_input: vdbe_name_1 port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - get_input: vdbe_hw_untr_mac_1 - - get_input: vdbe_hw_untr_mac_1 @@ -609,7 +615,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -634,4 +640,4 @@ topology_template: value: get_attribute: - abstract_vdbe - - vdbe_vdbe_untr_1_port_vlan1_aap_address_mode
\ No newline at end of file + - vdbe_vdbe_untr_1_port_vlan1_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/pattern1c1/allConnectivities/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/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml index d751754ae5..eb21b34ada 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/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/pattern1c1/allConnectivities/out/Nested_vdbeServiceTemplate.yaml @@ -16,11 +16,6 @@ topology_template: required: true entry_schema: type: string - subinterface_vlan1_ip_v6_address: - type: list - required: true - entry_schema: - type: string subinterface_vlan1_aap_sec_untrusted_ip_prefix: type: list required: true @@ -31,11 +26,6 @@ topology_template: required: true entry_schema: type: string - subinterface_vlan1_aap_untrusted_ip_prefix: - type: list - required: true - entry_schema: - type: string port_vdbe_untr_2_port_virtual_machine_interface_mac_addresses: type: list required: true @@ -47,32 +37,19 @@ topology_template: vm_flavor_name: type: string required: true - port_vdbe_untr_2_port_virtual_network_refs: - type: list - required: true - entry_schema: - type: json subinterface_vlan1_counter: type: list required: true entry_schema: type: float - subinterface_vlan1_subinterfaces_name_prefix: + port_vdbe_untr_2_port_subinterface_indicator: type: list required: true entry_schema: - type: string + type: boolean vm_image_name: type: string required: true - port_vdbe_untr_1_port_network_role: - type: string - required: true - port_vdbe_untr_2_port_name: - type: list - required: true - entry_schema: - type: string port_vdbe_untr_2_port_network_role: type: string required: true @@ -86,11 +63,6 @@ topology_template: required: true entry_schema: type: string - 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 @@ -104,107 +76,145 @@ topology_template: port_vdbe_untr_2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true - subinterface_vlan1_vn_network_list: + port_vdbe_untr_2_port_ip_requirements: type: list required: true entry_schema: - type: string - port_vdbe_untr_2_port_subnetpoolid: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_vdbe_untr_2_port_order: + port_vdbe_untr_1_port_order: type: integer required: true - subinterface_vlan1_service_template_filter_count: + port_vdbe_untr_1_port_subnetpoolid: + type: string + required: true + port_vdbe_untr_2_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + 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 + subinterface_vlan1_mac_address: type: list required: true entry_schema: - type: float - port_vdbe_untr_2_port_ip_requirements: + type: string + subinterface_vlan1_aap_untrusted_ip_prefix_len: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_vdbe_untr_1_port_order: - type: integer + type: string + subinterface_vlan1_ip_address: + type: list required: true - subinterface_vlan1_parent_interface: + entry_schema: + type: string + compute_vdbe_name: type: list required: true entry_schema: type: string - subinterface_vlan1_aap_address_mode: + port_vdbe_untr_1_port_network_role_tag: + type: string + required: true + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean + subinterface_vlan1_ip_v6_address: type: list required: true entry_schema: type: string - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + subinterface_vlan1_aap_untrusted_ip_prefix: + type: list required: true - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: string + port_vdbe_untr_2_port_virtual_network_refs: + type: list required: true - subinterface_vlan1_optional_property_1: + entry_schema: + type: json + subinterface_vlan1_subinterfaces_name_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_name: + port_vdbe_untr_1_port_network_role: + type: string + required: true + port_vdbe_untr_2_port_name: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_1_port_virtual_network_refs: + type: list required: true - subinterface_vlan1_optional_property_2: + entry_schema: + type: json + subinterface_vlan1_vn_network_list: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + port_vdbe_untr_2_port_subnetpoolid: + type: string required: true - subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: + port_vdbe_untr_2_port_order: + type: integer + required: true + subinterface_vlan1_service_template_filter_count: + type: list + required: true + entry_schema: + type: float + subinterface_vlan1_parent_interface: type: list required: true entry_schema: type: string - subinterface_vlan1_mac_address: + subinterface_vlan1_aap_address_mode: type: list required: true entry_schema: type: string - subinterface_vlan1_aap_untrusted_ip_prefix_len: + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_vdbe_untr_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + subinterface_vlan1_optional_property_1: type: list required: true entry_schema: type: string - subinterface_vlan1_ip_address: + port_vdbe_untr_1_port_name: type: list required: true entry_schema: type: string - port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + subinterface_vlan1_optional_property_2: + type: list required: true - compute_vdbe_name: + entry_schema: + type: string + subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: - type: string + port_vdbe_untr_2_port_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true port_vdbe_untr_1_port_vlan_requirements: type: list @@ -256,6 +266,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 @@ -385,6 +399,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 @@ -637,9 +655,9 @@ topology_template: link_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - link - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - vdbe_vdbe_untr_1_port_vlan1 + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/vlan1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/vlan1ServiceTemplate.yaml index 559263b791..548592d05c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/vlan1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/allConnectivities/out/vlan1ServiceTemplate.yaml @@ -1,181 +1,181 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: vlan1
-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
- optional_property_1:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- optional_property_2:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- 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_vlan1-Network-Role_vmi_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:
- vlan1_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/vlan1.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1
- capabilities:
- feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - feature
- requirements:
- link_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - link
- binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - binding
- dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - dependency
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: vlan1 +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 + optional_property_1: + hidden: false + immutable: false + type: string + description: Optional property + optional_property_2: + hidden: false + immutable: false + type: string + description: Optional property + 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_vlan1-Network-Role_vmi_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: + vlan1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/vlan1.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1 + capabilities: + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - feature + requirements: + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - subinterface_link + binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - binding + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/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/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5f32192a6f..a2a3bc67dd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/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/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -210,6 +210,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_vmi_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true @@ -330,6 +336,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_oam_vmi_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_vdbe_untr_vmi_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -391,7 +403,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -437,7 +449,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: + - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -619,6 +631,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 @@ -692,6 +705,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 @@ -929,7 +943,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0: + - subinterface_link_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1041,7 +1055,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_1_subint_oam_vmi_1: + - subinterface_link_vdbe_1_subint_oam_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1059,4 +1073,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/pattern1c1/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/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml index c973648470..1e7c8c88c7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/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/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml @@ -581,6 +581,9 @@ topology_template: subinterface_vlan2_vmac_address: - get_input: vdbe_untrusted_vmac_address - get_input: vdbe_untrusted_vmac_address + port_vdbe_untr_vmi_subinterface_indicator: + - true + - true subinterface_vlan1_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix - get_input: vdbe_aap_untrusted_ip_prefix @@ -650,6 +653,9 @@ topology_template: subinterface_vlan2_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_oam_vmi_subinterface_indicator: + - true + - true subinterface_vlan2_service_template_filter_count: - 5 - 5 @@ -676,7 +682,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo - - link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: + - subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo @@ -712,4 +718,4 @@ topology_template: get_input: oam_vfc_instance_group_function subinterface_role: oam members: - - 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/pattern1c1/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/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml index e256c4fd7c..2bb75a89ee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/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/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml @@ -176,6 +176,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_vmi_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_vlan1_aap_untrusted_ip_prefix: type: list required: true @@ -275,6 +280,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_oam_vmi_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_vdbe_untr_vmi_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -417,6 +427,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 @@ -457,6 +471,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_oam_vmi_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_oam_vmi_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_oam_vmi_virtual_network_refs @@ -768,12 +786,18 @@ topology_template: - vdbe - disk.read.bytes requirements: + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: + - vdbe_vdbe_untr_vmi_vlan1 + - subinterface_link_vdbe_0_subint_untr_vmi_0 link_vdbe_vdbe_untr_vmi: - vdbe_vdbe_untr_vmi - link dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: - vdbe_vdbe_untr_vmi_vlan1 - dependency_vdbe_0_subint_untr_vmi_0 + subinterface_link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: + - vdbe_vdbe_oam_vmi_vlan2 + - subinterface_link_vdbe_1_subint_oam_vmi_1 dependency_vdbe_vdbe_oam_vmi: - vdbe_vdbe_oam_vmi - dependency @@ -786,9 +810,6 @@ topology_template: local_storage_vdbe: - vdbe - local_storage - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_vmi_vlan1: - - vdbe_vdbe_untr_vmi_vlan1 - - link_vdbe_0_subint_untr_vmi_0 dependency_vdbe_vdbe_untr_vmi: - vdbe_vdbe_untr_vmi - dependency @@ -801,6 +822,3 @@ topology_template: dependency_vdbe: - vdbe - dependency - link_vdbe_1_subint_oam_vmi_1_vdbe_vdbe_oam_vmi_vlan2: - - vdbe_vdbe_oam_vmi_vlan2 - - link_vdbe_1_subint_oam_vmi_1
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/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/pattern1c1/multiplePortsMultipleVlans/out/vlan1ServiceTemplate.yaml index ef5f4913e8..a8b78bf267 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/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/pattern1c1/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_0_subint_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 @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0: + - vdbe_0_subint_untr_vmi_0 + - subinterface_link binding_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - binding - link_vdbe_0_subint_untr_vmi_0: - - vdbe_0_subint_untr_vmi_0 - - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/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/pattern1c1/multiplePortsMultipleVlans/out/vlan2ServiceTemplate.yaml index 2fcab81b61..4cc2faab29 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/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/pattern1c1/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_1_subint_oam_vmi_1: - 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_1_subint_oam_vmi_1 - feature requirements: - link_vdbe_1_subint_oam_vmi_1: - - vdbe_1_subint_oam_vmi_1 - - link dependency_vdbe_1_subint_oam_vmi_1: - vdbe_1_subint_oam_vmi_1 - dependency + subinterface_link_vdbe_1_subint_oam_vmi_1: + - vdbe_1_subint_oam_vmi_1 + - subinterface_link binding_vdbe_1_subint_oam_vmi_1: - vdbe_1_subint_oam_vmi_1 - - binding
\ No newline at end of file + - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0cd031a3f6..bebd463f09 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -138,6 +138,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -244,7 +250,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: + - subinterface_link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -405,6 +411,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_int_vmi_subport: + - subinterface_link_vdbe_untr_x_int_vmi_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -679,4 +686,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/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml index e8d9805915..1d4530863a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml @@ -545,6 +545,9 @@ topology_template: subinterface_nested_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 + port_vdbe_untr_port_subinterface_indicator: + - true + - true subinterface_nested_vmac_address: - get_input: vdbe_untrusted_vmac_address - get_input: vdbe_untrusted_vmac_address @@ -606,4 +609,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/pattern1c1/onePortVlanSameType/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/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml index e3c02e0545..2f44c0c8a8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/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/pattern1c1/onePortVlanSameType/out/Nested_vdbeServiceTemplate.yaml @@ -117,6 +117,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -205,6 +210,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_port_virtual_network_refs @@ -489,12 +498,12 @@ topology_template: local_storage_vdbe: - vdbe - local_storage - link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: + subinterface_link_vdbe_untr_x_int_vmi_subport_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - - link_vdbe_untr_x_int_vmi_subport + - subinterface_link_vdbe_untr_x_int_vmi_subport dependency_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - dependency dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/nestedServiceTemplate.yaml index b5d5fad9f2..6a0c7f642e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/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_int_vmi_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_int_vmi_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_int_vmi_subport:
- - vdbe_untr_x_int_vmi_subport
- - feature
- requirements:
- binding_vdbe_untr_x_int_vmi_subport:
- - vdbe_untr_x_int_vmi_subport
- - binding
- dependency_vdbe_untr_x_int_vmi_subport:
- - vdbe_untr_x_int_vmi_subport
- - dependency
- link_vdbe_untr_x_int_vmi_subport:
- - vdbe_untr_x_int_vmi_subport
- - link
\ 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_int_vmi_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_int_vmi_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_int_vmi_subport: + - vdbe_untr_x_int_vmi_subport + - feature + requirements: + subinterface_link_vdbe_untr_x_int_vmi_subport: + - vdbe_untr_x_int_vmi_subport + - subinterface_link + binding_vdbe_untr_x_int_vmi_subport: + - vdbe_untr_x_int_vmi_subport + - binding + dependency_vdbe_untr_x_int_vmi_subport: + - vdbe_untr_x_int_vmi_subport + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index b4f43f271c..36046c5423 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/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 vm_image_name: type: string required: true @@ -142,6 +148,12 @@ node_types: type: string required: true status: SUPPORTED + 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 @@ -314,7 +326,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -523,6 +535,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 @@ -672,6 +685,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 @@ -819,7 +833,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -837,4 +851,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/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml index 649026024e..ef8138edae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/MainServiceTemplate.yaml @@ -488,6 +488,9 @@ topology_template: subinterface_vlan1_counter: - get_input: counter - get_input: counter + port_vdbe_untr_2_port_subinterface_indicator: + - true + - true vm_image_name: get_input: vdbe_image_name compute_vdbe_metadata: @@ -518,6 +521,9 @@ topology_template: compute_vdbe_name: - get_input: vdbe_name_1 - get_input: vdbe_name_1 + port_vdbe_untr_1_port_subinterface_indicator: + - true + - true subinterface_vlan1_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 @@ -617,4 +623,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/pattern1c1/optionalPropertiesConsolidation/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/pattern1c1/optionalPropertiesConsolidation/out/Nested_vdbeServiceTemplate.yaml index 407cd60118..e2bf61738b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/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/pattern1c1/optionalPropertiesConsolidation/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 vm_image_name: type: string required: true @@ -119,6 +124,11 @@ topology_template: port_vdbe_untr_1_port_network_role_tag: type: string required: true + port_vdbe_untr_1_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_vlan1_ip_v6_address: type: list required: true @@ -261,6 +271,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 @@ -390,6 +404,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 @@ -635,9 +653,9 @@ topology_template: link_vdbe_vdbe_untr_1_port: - vdbe_vdbe_untr_1_port - link - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: - - vdbe_vdbe_untr_1_port_vlan1 - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_1_port_vlan1: + - vdbe_vdbe_untr_1_port_vlan1 + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/vlan1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/vlan1ServiceTemplate.yaml index 559263b791..548592d05c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/vlan1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/optionalPropertiesConsolidation/out/vlan1ServiceTemplate.yaml @@ -1,181 +1,181 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0
-metadata:
- template_name: vlan1
-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
- optional_property_1:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- optional_property_2:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- 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_vlan1-Network-Role_vmi_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:
- vlan1_group:
- type: org.openecomp.groups.heat.HeatStack
- properties:
- heat_file: ../Artifacts/vlan1.yml
- description: cmaui server template for vMMSC
- members:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1
- capabilities:
- feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - feature
- requirements:
- link_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - link
- binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - binding
- dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - dependency
\ No newline at end of file +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: vlan1 +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 + optional_property_1: + hidden: false + immutable: false + type: string + description: Optional property + optional_property_2: + hidden: false + immutable: false + type: string + description: Optional property + 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_vlan1-Network-Role_vmi_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: + vlan1_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/vlan1.yml + description: cmaui server template for vMMSC + members: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.vlan1 + capabilities: + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - feature + requirements: + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - subinterface_link + binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - binding + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/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/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6d9770bd53..25b57c6b4e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/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/pattern1c1/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -138,6 +138,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -256,7 +262,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -417,6 +423,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 @@ -683,7 +690,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -701,4 +708,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/pattern1c1/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/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml index 6fd7b7bc24..bb61d9e082 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/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/pattern1c1/regularNestedSubInterface/out/MainServiceTemplate.yaml @@ -1,609 +1,612 @@ -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:
- 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_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_name_1
- type: string
- description: Unique name for this VF instance
- vnf_name_2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_name_2
- type: string
- description: Unique name for this VF instance
- 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
- vnf_id_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_id_1
- type: string
- description: Unique ID for this VF inst
- vnf_id_2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vnf_id_2
- type: string
- description: Unique ID for this VF inst
- 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
- 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.
- availability_zone_2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: availability_zone_2
- type: string
- description: The availability zone of secondary node2 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_name_2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vdbe_name_2
- type: string
- description: VM Name for this vdbe node 2
- 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
- counter:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: counter
- type: float
- description: Counter.
- vf_module_id_2:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vf_module_id_2
- type: string
- description: Unique ID for this VF module inst
- vf_module_id_1:
- hidden: false
- immutable: false
- annotations:
- source:
- type: org.openecomp.annotations.Source
- properties:
- vf_module_label:
- - main
- source_type: HEAT
- param_name: vf_module_id_1
- type: string
- description: Unique ID for this VF module inst
- 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_port_1
- - vdbe_untr_port_2
- subinterface_nested_aap_address_mode:
- - get_input: aap_address_mode
- - get_input: aap_address_mode
- subinterface_nested_vlan_tag_list:
- - get_input: untrusted_vlan_tags
- - get_input: untrusted_vlan_tags
- compute_vdbe_availability_zone:
- - get_input: availability_zone_1
- - get_input: availability_zone_2
- subinterface_nested_aap_untrusted_v6_ip_prefix_len:
- - get_input: vdbe_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
- - 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
- - get_input: vdbe_aap_sec_untrusted_ip_prefix_len
- subinterface_nested_aap_sec_untrusted_ip_prefix:
- - get_input: vdbe_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
- - get_input: vdbe_aap_untrusted_v6_ip_prefix
- compute_vdbe_metadata:
- - vf_module_id:
- get_input: vf_module_id_1
- vnf_id:
- get_input: vnf_id_1
- vnf_name:
- get_input: vnf_name_1
- - vf_module_id:
- get_input: vf_module_id_2
- vnf_id:
- get_input: vnf_id_2
- vnf_name:
- get_input: vnf_name_2
- subinterface_nested_mac_address:
- - get_input: vdbe_hw_untr_mac_1
- - get_input: vdbe_hw_untr_mac_1
- subinterface_nested_ip_address:
- - get_input: vdbe_untrusted_ip_1
- - get_input: vdbe_untrusted_ip_1
- port_vdbe_untr_port_virtual_network_refs:
- - - control_int_net
- - - control_int_net
- subinterface_nested_ip_v6_address:
- - get_input: vdbe_untrusted_v6_ip_1
- - get_input: vdbe_untrusted_v6_ip_1
- subinterface_nested_vmac_address:
- - get_input: vdbe_untrusted_vmac_address
- - get_input: vdbe_untrusted_vmac_address
- subinterface_nested_vn_network_list:
- - get_input: untrusted_vn_networks
- - get_input: untrusted_vn_networks
- port_vdbe_untr_port_name:
- - Untr_Port_1
- - Untr_Port_2
- port_vdbe_untr_port_virtual_machine_interface_mac_addresses:
- - - get_input: vdbe_hw_untr_mac_1
- - - get_input: vdbe_hw_untr_mac_1
- subinterface_nested_aap_untrusted_ip_prefix_len:
- - get_input: vdbe_aap_untrusted_ip_prefix_len
- - get_input: vdbe_aap_untrusted_ip_prefix_len
- subinterface_nested_counter:
- - 5
- - get_input: counter
- subinterface_nested_subinterfaces_name_prefix:
- - str_replace:
- template: VM_NAMEDBE001p1n004
- params:
- DBE:
- get_input: vdbe_device_name
- VM_NAME:
- get_input: vdbe_name_1
- - 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
- - get_input: vdbe_name_2
- subinterface_nested_optional_property_1:
- - OPTIONAL_VALUE_SUBPORT_1
- - null
- subinterface_nested_optional_property_2:
- - null
- - OPTIONAL_VALUE_SUBPORT_2
- service_template_filter:
- substitute_service_template: Nested_vdbeServiceTemplate.yaml
- count: 2
- index_value:
- get_property:
- - SELF
- - service_template_filter
- - index_value
- requirements:
- - link_vdbe_vdbe_untr_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: + 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_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_name_1 + type: string + description: Unique name for this VF instance + vnf_name_2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_name_2 + type: string + description: Unique name for this VF instance + 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 + vnf_id_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_id_1 + type: string + description: Unique ID for this VF inst + vnf_id_2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vnf_id_2 + type: string + description: Unique ID for this VF inst + 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 + 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. + availability_zone_2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: availability_zone_2 + type: string + description: The availability zone of secondary node2 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_name_2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vdbe_name_2 + type: string + description: VM Name for this vdbe node 2 + 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 + counter: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: counter + type: float + description: Counter. + vf_module_id_2: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vf_module_id_2 + type: string + description: Unique ID for this VF module inst + vf_module_id_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: vf_module_id_1 + type: string + description: Unique ID for this VF module inst + 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_port_1 + - vdbe_untr_port_2 + subinterface_nested_aap_address_mode: + - get_input: aap_address_mode + - get_input: aap_address_mode + subinterface_nested_vlan_tag_list: + - get_input: untrusted_vlan_tags + - get_input: untrusted_vlan_tags + compute_vdbe_availability_zone: + - get_input: availability_zone_1 + - get_input: availability_zone_2 + subinterface_nested_aap_untrusted_v6_ip_prefix_len: + - get_input: vdbe_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 + - 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 + - get_input: vdbe_aap_sec_untrusted_ip_prefix_len + subinterface_nested_aap_sec_untrusted_ip_prefix: + - get_input: vdbe_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 + - get_input: vdbe_aap_untrusted_v6_ip_prefix + compute_vdbe_metadata: + - vf_module_id: + get_input: vf_module_id_1 + vnf_id: + get_input: vnf_id_1 + vnf_name: + get_input: vnf_name_1 + - vf_module_id: + get_input: vf_module_id_2 + vnf_id: + get_input: vnf_id_2 + vnf_name: + get_input: vnf_name_2 + subinterface_nested_mac_address: + - get_input: vdbe_hw_untr_mac_1 + - get_input: vdbe_hw_untr_mac_1 + subinterface_nested_ip_address: + - get_input: vdbe_untrusted_ip_1 + - get_input: vdbe_untrusted_ip_1 + port_vdbe_untr_port_virtual_network_refs: + - - control_int_net + - - control_int_net + subinterface_nested_ip_v6_address: + - get_input: vdbe_untrusted_v6_ip_1 + - get_input: vdbe_untrusted_v6_ip_1 + port_vdbe_untr_port_subinterface_indicator: + - true + - true + subinterface_nested_vmac_address: + - get_input: vdbe_untrusted_vmac_address + - get_input: vdbe_untrusted_vmac_address + subinterface_nested_vn_network_list: + - get_input: untrusted_vn_networks + - get_input: untrusted_vn_networks + port_vdbe_untr_port_name: + - Untr_Port_1 + - Untr_Port_2 + port_vdbe_untr_port_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 + subinterface_nested_aap_untrusted_ip_prefix_len: + - get_input: vdbe_aap_untrusted_ip_prefix_len + - get_input: vdbe_aap_untrusted_ip_prefix_len + subinterface_nested_counter: + - 5 + - get_input: counter + subinterface_nested_subinterfaces_name_prefix: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + - 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 + - get_input: vdbe_name_2 + subinterface_nested_optional_property_1: + - OPTIONAL_VALUE_SUBPORT_1 + - null + subinterface_nested_optional_property_2: + - null + - OPTIONAL_VALUE_SUBPORT_2 + service_template_filter: + substitute_service_template: Nested_vdbeServiceTemplate.yaml + count: 2 + index_value: + get_property: + - SELF + - service_template_filter + - index_value + requirements: + - link_vdbe_vdbe_untr_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/pattern1c1/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/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml index fccec4c2d6..aa3c3edb2c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/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/pattern1c1/regularNestedSubInterface/out/Nested_vdbeServiceTemplate.yaml @@ -117,6 +117,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -215,6 +220,10 @@ topology_template: - index_value vlan_requirements: get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value virtual_network_refs: get_input: - port_vdbe_untr_port_virtual_network_refs @@ -497,15 +506,15 @@ topology_template: dependency_vdbe_vdbe_untr_port: - vdbe_vdbe_untr_port - dependency - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - - vdbe_vdbe_untr_port_nested - - link_vdbe_untr_x_vlan1-Network-Role_vmi_subport link_vdbe_vdbe_untr_port: - vdbe_vdbe_untr_port - link local_storage_vdbe: - vdbe - local_storage + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: + - vdbe_vdbe_untr_port_nested + - subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport dependency_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - dependency @@ -514,4 +523,4 @@ topology_template: - dependency dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport
\ No newline at end of file + - dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/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/pattern1c1/regularNestedSubInterface/out/nestedServiceTemplate.yaml index 893a3affe9..b3ed933cb2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/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/pattern1c1/regularNestedSubInterface/out/nestedServiceTemplate.yaml @@ -1,181 +1,181 @@ -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
- optional_property_1:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- optional_property_2:
- hidden: false
- immutable: false
- type: string
- description: Optional property
- 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_vlan1-Network-Role_vmi_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_vlan1-Network-Role_vmi_subport
- substitution_mappings:
- node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested
- capabilities:
- feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - feature
- requirements:
- link_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - link
- binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - binding
- dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport:
- - vdbe_untr_x_vlan1-Network-Role_vmi_subport
- - dependency
\ 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 + optional_property_1: + hidden: false + immutable: false + type: string + description: Optional property + optional_property_2: + hidden: false + immutable: false + type: string + description: Optional property + 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_vlan1-Network-Role_vmi_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_vlan1-Network-Role_vmi_subport + substitution_mappings: + node_type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + capabilities: + feature_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - feature + requirements: + subinterface_link_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - subinterface_link + binding_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - binding + dependency_vdbe_untr_x_vlan1-Network-Role_vmi_subport: + - vdbe_untr_x_vlan1-Network-Role_vmi_subport + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml index 79521b41ef..b0e8e5605b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,6 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -117,7 +123,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -345,6 +351,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 @@ -529,7 +536,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -547,4 +554,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/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml index 42bef9d1e1..17c0960ed1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml @@ -738,6 +738,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net2 port_pd01_port_network_role_tag: oam @@ -752,7 +754,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo @@ -791,6 +793,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -805,7 +809,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -819,4 +823,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server_0 - - abstract_pd_server_1
\ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml index f0bd1b0f9f..25932a5bf6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -139,6 +144,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -332,9 +341,6 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - link_template_Vlan_vmi_1 link_pd_server_pd01_port: - pd_server_pd01_port - link @@ -349,4 +355,7 @@ topology_template: - dependency dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1
\ No newline at end of file + - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - pd_server_pd01_port_nested + - subinterface_link_template_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/nestedServiceTemplate.yaml index bbc48d76ec..c5195c51e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - 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: p1 @@ -108,12 +108,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 79521b41ef..b0e8e5605b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -68,6 +68,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -117,7 +123,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -345,6 +351,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 @@ -529,7 +536,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -547,4 +554,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/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml index 1333f6d508..10e3bf99af 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml @@ -738,6 +738,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -752,7 +754,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -791,6 +793,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true subinterface_nested_net1: - test_net1 port_pd01_port_network_role_tag: oam @@ -809,7 +813,7 @@ topology_template: capability: tosca.capabilities.Node node: test_net2 relationship: tosca.relationships.DependsOn - - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -823,4 +827,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server_0 - - abstract_pd_server_1
\ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index f0bd1b0f9f..25932a5bf6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -60,6 +60,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -139,6 +144,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -332,9 +341,6 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - link_template_Vlan_vmi_1 link_pd_server_pd01_port: - pd_server_pd01_port - link @@ -349,4 +355,7 @@ topology_template: - dependency dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1
\ No newline at end of file + - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - pd_server_pd01_port_nested + - subinterface_link_template_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/nestedServiceTemplate.yaml index bbc48d76ec..c5195c51e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - 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: p1 @@ -108,12 +108,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml index b4b3551fe6..9bf67731bd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/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: @@ -679,4 +686,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/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml index 4ef81bd2ab..e13c18f644 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml @@ -399,6 +399,8 @@ topology_template: directives: - substitutable properties: + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_nested_parent_interface: - vdbe_untr_1_port_1 subinterface_nested_aap_address_mode: @@ -496,6 +498,8 @@ topology_template: directives: - substitutable properties: + port_vdbe_untr_1_port_subinterface_indicator: + - true subinterface_nested_parent_interface: - vdbe_untr_1_port_2 subinterface_nested_aap_address_mode: @@ -586,4 +590,4 @@ topology_template: members: - control_int_net - abstract_vdbe_0 - - abstract_vdbe_1
\ No newline at end of file + - abstract_vdbe_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/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/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml index ab5c047d48..bd02fe09f5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/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/pattern1c2/differentResourceGroupCount/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 @@ -497,4 +506,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/pattern1c2/differentResourceGroupCount/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/nestedServiceTemplate.yaml index adfc50fa23..58980ac9d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/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_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
\ No newline at end of file + - 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/pattern4/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/pattern4/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9519211757..6d4ef6aded 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/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/pattern4/computePortNetworkSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -233,7 +233,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -387,6 +387,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 @@ -677,7 +678,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/pattern4/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/pattern4/computePortNetworkSubInterface/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/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/pattern4/computePortNetworkSubInterface/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml index b00d4ff9b0..33f746f7f8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_pattern4ServiceTemplate.yaml @@ -537,9 +537,6 @@ topology_template: dependency_vdbe_untr_x_subport_vdbe_untr_1_subports: - vdbe_untr_1_subports - dependency_vdbe_untr_x_subport - link_vdbe_untr_x_subport_vdbe_untr_1_subports: - - vdbe_untr_1_subports - - link_vdbe_untr_x_subport dependency_vdbe_node_1: - vdbe_node_1 - dependency @@ -552,6 +549,9 @@ topology_template: dependency_control_int_net: - control_int_net - dependency + subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - vdbe_untr_1_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_untr_1_subports: - 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/pattern4/computePortNetworkSubInterface/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_vlanServiceTemplate.yaml index e1270d1e64..6d765c33da 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/computePortNetworkSubInterface/out/nested_vlanServiceTemplate.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/pattern4/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/pattern4/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml index b09b4912db..85193db9a0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/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/pattern4/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -98,7 +98,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: @@ -426,7 +426,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -637,6 +637,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 @@ -870,6 +871,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 @@ -972,7 +974,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/pattern4/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/pattern4/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/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/pattern4/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml index 5e7c106f67..7b355eacb2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multiplePortsMultipleVlans/out/nested_pattern4ServiceTemplate.yaml @@ -291,7 +291,7 @@ topology_template: aap_untrusted_ip_prefix_len: get_input: vdbe_aap_untrusted_ip_prefix_len requirements: - - link_vdbe_untr_x_subport_another: + - subinterface_link_vdbe_untr_x_subport_another: capability: tosca.capabilities.network.Linkable node: fabric_int_net relationship: tosca.relationships.network.LinksTo @@ -773,9 +773,6 @@ topology_template: dependency_vdbe_untr_x_subport_vdbe_untr_1_subports: - vdbe_untr_1_subports - dependency_vdbe_untr_x_subport - link_vdbe_untr_x_subport_vdbe_untr_1_subports: - - vdbe_untr_1_subports - - link_vdbe_untr_x_subport dependency_vdbe_untr_2_port: - vdbe_untr_2_port - dependency @@ -797,6 +794,9 @@ topology_template: dependency_vdbe_untr_x_subport_another_vdbe_untr_2_subports: - vdbe_untr_2_subports - dependency_vdbe_untr_x_subport_another + subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - vdbe_untr_1_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_untr_1_subports: - 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/pattern4/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/pattern4/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/pattern4/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/pattern4/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/pattern4/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/pattern4/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/pattern4/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/pattern4/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/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6fb9d6fcdc..8c18eb81b7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -98,7 +98,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: @@ -329,7 +329,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_another_vdbe_untr_2_subports: + - subinterface_link_vdbe_untr_x_subport_another_vdbe_untr_2_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -370,7 +370,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -534,6 +534,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 @@ -824,7 +825,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/pattern4/multipleVlanDiffFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml index 6fb26941d5..72af3e6093 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/out/nested_pattern4ServiceTemplate.yaml @@ -600,15 +600,12 @@ topology_template: dependency_vdbe_untr_x_subport_vdbe_untr_1_subports: - vdbe_untr_1_subports - dependency_vdbe_untr_x_subport - link_vdbe_untr_x_subport_vdbe_untr_1_subports: - - vdbe_untr_1_subports - - link_vdbe_untr_x_subport - link_vdbe_untr_x_subport_another_vdbe_untr_2_subports: - - vdbe_untr_2_subports - - link_vdbe_untr_x_subport_another dependency_vdbe_node_1: - vdbe_node_1 - dependency + subinterface_link_vdbe_untr_x_subport_another_vdbe_untr_2_subports: + - vdbe_untr_2_subports + - subinterface_link_vdbe_untr_x_subport_another local_storage_vdbe_node_1: - vdbe_node_1 - local_storage @@ -621,6 +618,9 @@ topology_template: dependency_vdbe_untr_x_subport_another_vdbe_untr_2_subports: - vdbe_untr_2_subports - dependency_vdbe_untr_x_subport_another + subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - vdbe_untr_1_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_untr_1_subports: - 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/pattern4/multipleVlanDiffFile/out/vlan1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/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/pattern4/multipleVlanDiffFile/out/vlan1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/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/pattern4/multipleVlanDiffFile/out/vlan2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/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/pattern4/multipleVlanDiffFile/out/vlan2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanDiffFile/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/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9940fbc87c..2e140acb39 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -217,7 +217,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_untr_2_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_untr_2_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -258,7 +258,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -417,6 +417,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 @@ -712,7 +713,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/pattern4/multipleVlanSameFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml index cda86a3cb1..7bda071fa2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_pattern4ServiceTemplate.yaml @@ -603,15 +603,9 @@ topology_template: dependency_vdbe_untr_x_subport_vdbe_untr_1_subports: - vdbe_untr_1_subports - dependency_vdbe_untr_x_subport - link_vdbe_untr_x_subport_vdbe_untr_1_subports: - - vdbe_untr_1_subports - - link_vdbe_untr_x_subport dependency_vdbe_node_1: - vdbe_node_1 - dependency - link_vdbe_untr_x_subport_vdbe_untr_2_subports: - - vdbe_untr_2_subports - - link_vdbe_untr_x_subport local_storage_vdbe_node_1: - vdbe_node_1 - local_storage @@ -624,6 +618,12 @@ topology_template: dependency_vdbe_untr_x_subport_vdbe_untr_2_subports: - vdbe_untr_2_subports - dependency_vdbe_untr_x_subport + subinterface_link_vdbe_untr_x_subport_vdbe_untr_2_subports: + - vdbe_untr_2_subports + - subinterface_link_vdbe_untr_x_subport + subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - vdbe_untr_1_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_untr_1_subports: - 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/pattern4/multipleVlanSameFile/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_vlanServiceTemplate.yaml index e1270d1e64..6d765c33da 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/multipleVlanSameFile/out/nested_vlanServiceTemplate.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/pattern4/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/pattern4/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml index 06202fdceb..cc7798570c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/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/pattern4/regularNestedSubInterface/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -233,7 +233,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -387,6 +387,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 @@ -677,7 +678,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/pattern4/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/pattern4/regularNestedSubInterface/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/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/pattern4/regularNestedSubInterface/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml index c8d738c951..d3bf9d737e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_pattern4ServiceTemplate.yaml @@ -530,9 +530,6 @@ topology_template: dependency_vdbe_untr_x_subport_vdbe_untr_1_subports: - vdbe_untr_1_subports - dependency_vdbe_untr_x_subport - link_vdbe_untr_x_subport_vdbe_untr_1_subports: - - vdbe_untr_1_subports - - link_vdbe_untr_x_subport dependency_vdbe_node_1: - vdbe_node_1 - dependency @@ -545,6 +542,9 @@ topology_template: dependency_control_int_net: - control_int_net - dependency + subinterface_link_vdbe_untr_x_subport_vdbe_untr_1_subports: + - vdbe_untr_1_subports + - subinterface_link_vdbe_untr_x_subport dependency_vdbe_untr_1_subports: - 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/pattern4/regularNestedSubInterface/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_vlanServiceTemplate.yaml index e1270d1e64..6d765c33da 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/regularNestedSubInterface/out/nested_vlanServiceTemplate.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/pattern4/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/pattern4/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 03719b01a0..60cbbcf06c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/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/pattern4/subInterfaceGetAttrInOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -427,6 +427,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 @@ -727,7 +728,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/pattern4/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/pattern4/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/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/pattern4/subInterfaceGetAttrInOut/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml index cf14a263ce..0f42e66438 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_pattern4ServiceTemplate.yaml @@ -365,7 +365,7 @@ topology_template: aap_untrusted_ip_prefix_len: get_input: vdbe_aap_untrusted_ip_prefix_len requirements: - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_vlanServiceTemplate.yaml index 3b80cf4a73..81a004fcb3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceGetAttrInOut/out/nested_vlanServiceTemplate.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/pattern4/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/pattern4/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 6cdd023b1c..15e649a2cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/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/pattern4/subInterfaceNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -422,6 +422,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 @@ -722,7 +723,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/pattern4/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/pattern4/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/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/pattern4/subInterfaceNodesConnectedIn/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml index 61dc383ac9..d92dab440e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_pattern4ServiceTemplate.yaml @@ -365,7 +365,7 @@ topology_template: aap_untrusted_ip_prefix_len: get_input: vdbe_aap_untrusted_ip_prefix_len requirements: - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_vlanServiceTemplate.yaml index 3b80cf4a73..81a004fcb3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedIn/out/nested_vlanServiceTemplate.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/pattern4/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/pattern4/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0e0805f1d6..5d10b6a6ea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/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/pattern4/subInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -381,6 +381,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 @@ -671,7 +672,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/pattern4/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/pattern4/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml index ee86bcfe71..d7eadbf032 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/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/pattern4/subInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml @@ -90,4 +90,4 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml index 256a363dc8..66689e8228 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml @@ -330,7 +330,7 @@ topology_template: aap_untrusted_ip_prefix_len: get_input: vdbe_aap_untrusted_ip_prefix_len requirements: - - link_vdbe_untr_x_subport: + - subinterface_link_vdbe_untr_x_subport: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.yaml index 3b80cf4a73..81a004fcb3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern4/subInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.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/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 14560c5b1a..11ab827c9b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -236,6 +236,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 @@ -773,6 +774,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 @@ -820,6 +822,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 @@ -863,6 +866,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 @@ -1109,6 +1113,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -1129,6 +1139,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_pd_server_2b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_2b_port_network_role: type: string required: true @@ -1189,7 +1205,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1308,6 +1324,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 @@ -1402,6 +1419,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 @@ -1662,6 +1680,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_2b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_2b_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -1688,6 +1712,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2058,6 +2088,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 @@ -2175,6 +2206,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 @@ -2226,7 +2258,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2244,4 +2276,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/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml index c993f98370..21bc68dae8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -94,6 +94,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -110,6 +115,11 @@ topology_template: port_pd_server_1b_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_pd_server_2b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_2b_port_network_role: type: string required: true @@ -139,30 +149,34 @@ topology_template: pd_server_1b_pd_server_2b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_2b_port_exCP_naming replacement_policy: get_input: - port_pd_server_2b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_2b_port_mac_requirements + order: + get_input: port_pd_server_2b_port_order + exCP_naming: + get_input: port_pd_server_2b_port_exCP_naming vlan_requirements: get_input: port_pd_server_2b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_2b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_2b_port_ip_requirements network_role_tag: get_input: port_pd_server_2b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_2b_port_mac_requirements - order: - get_input: port_pd_server_2b_port_order network_role: get_input: port_pd_server_2b_port_network_role - subnetpoolid: - get_input: port_pd_server_2b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_2b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_2b_port_subnetpoolid network: get_input: - port_pd_server_2b_port_network @@ -215,30 +229,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -453,9 +471,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -474,9 +489,12 @@ topology_template: dependency_pd_server_1b_pd_server_2b_port: - pd_server_1b_pd_server_2b_port - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 link_pd_server_1b_pd_server_2b_port: - pd_server_1b_pd_server_2b_port - link dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 5e299594b7..1ed349aea4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -46,6 +46,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_2b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_2b_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -67,6 +72,11 @@ topology_template: port_ps_server_1b_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -139,30 +149,34 @@ topology_template: ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network @@ -175,30 +189,34 @@ topology_template: ps_server_1b_ps_server_2b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_2b_port_exCP_naming replacement_policy: get_input: - port_ps_server_2b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_2b_port_mac_requirements + order: + get_input: port_ps_server_2b_port_order + exCP_naming: + get_input: port_ps_server_2b_port_exCP_naming vlan_requirements: get_input: port_ps_server_2b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_2b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_2b_port_ip_requirements network_role_tag: get_input: port_ps_server_2b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_2b_port_mac_requirements - order: - get_input: port_ps_server_2b_port_order network_role: get_input: port_ps_server_2b_port_network_role - subnetpoolid: - get_input: port_ps_server_2b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_2b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_2b_port_subnetpoolid network: get_input: - port_ps_server_2b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml index 280080ab55..469540fa5a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_pattern5ServiceTemplate.yaml @@ -162,11 +162,15 @@ topology_template: is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 + port_pd_server_1b_port_subinterface_indicator: + - true port_pd_server_1b_port_replacement_policy: - AUTO port_pd_server_1b_port_mac_requirements: mac_count_required: is_required: false + port_pd_server_2b_port_subinterface_indicator: + - true port_pd_server_1b_port_network: - packet_internal_network port_pd_server_2b_port_replacement_policy: @@ -184,7 +188,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -223,6 +227,8 @@ topology_template: get_input: - ps_server_2b_ips - 0 + port_ps_server_2b_port_subinterface_indicator: + - true compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 compute_ps_server_1b_name: @@ -232,6 +238,8 @@ topology_template: port_ps_server_1b_port_mac_requirements: mac_count_required: is_required: false + port_ps_server_1b_port_subinterface_indicator: + - true port_ps_server_1b_port_network: - packet_internal_network port_ps_server_1b_port_ip_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..9a7f270928 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - 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 @@ -100,12 +100,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 03622d2261..5833433c36 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -699,6 +699,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 @@ -794,6 +795,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 @@ -928,6 +930,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -1019,7 +1027,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1127,6 +1135,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 @@ -1573,6 +1582,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 @@ -1932,7 +1942,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1950,4 +1960,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/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 057aac895e..e37886cc8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -136,30 +141,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -338,9 +347,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -356,6 +362,9 @@ topology_template: dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml index a5d84b3e51..a55e067b96 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml @@ -111,6 +111,8 @@ topology_template: - 9 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true subinterface_nested_vlan_net1: - packet_external_network vm_image_name: @@ -155,7 +157,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index a3c9870391..85b75c7544 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -123,7 +123,7 @@ topology_template: parent_interface: ps_server_1b_port_1 net1: packet_ext_network requirements: - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -401,4 +401,4 @@ topology_template: - dependency_template_Vlan_vmi_1 dependency_server_1b_ps_1: - server_1b_ps_1 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..9a7f270928 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - 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 @@ -100,12 +100,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8d11461838..d7ea458bf6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -938,6 +938,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 @@ -969,6 +970,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 @@ -1081,6 +1083,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 @@ -1285,6 +1288,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -1376,7 +1385,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1484,6 +1493,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 @@ -1882,6 +1892,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 @@ -1931,6 +1942,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 @@ -2581,6 +2593,12 @@ node_types: status: SUPPORTED entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -2694,7 +2712,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3028,6 +3046,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 @@ -3084,7 +3103,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3102,4 +3121,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/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 057aac895e..e37886cc8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -136,30 +141,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -338,9 +347,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -356,6 +362,9 @@ topology_template: dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 855e842bf5..f518d262b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -24,6 +24,11 @@ topology_template: required: true entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -136,30 +141,34 @@ topology_template: ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network @@ -341,6 +350,9 @@ topology_template: dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - ps_server_1b_ps_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - ps_server_1b_ps_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 local_storage_ps_server_1b: - ps_server_1b - local_storage @@ -353,9 +365,6 @@ topology_template: link_ps_server_1b_ps_server_1b_port: - ps_server_1b_ps_server_1b_port - link - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_ps_server_1b: - ps_server_1b - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml index 9b9b379f8d..cac0be9063 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml @@ -97,6 +97,8 @@ topology_template: - 9 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true subinterface_nested_vlan_net1: - packet_external_network vm_image_name: @@ -141,7 +143,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index d02dbd04aa..3d8089b03b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -88,6 +88,9 @@ topology_template: subinterface_nested_vlan_service_template_filter_count: - 9 - 9 + port_ps_server_1b_port_subinterface_indicator: + - true + - true port_ps_server_1b_port_fixed_ips: - - ip_address: get_input: @@ -157,7 +160,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..9a7f270928 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - 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 @@ -100,12 +100,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7a7adb6d58..0f730fd451 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -122,7 +122,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_test_resourceGroup_0: + - subinterface_link_template_Vlan_vmi_1_test_resourceGroup_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -149,7 +149,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: + - subinterface_link_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -286,6 +286,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 @@ -695,6 +696,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 @@ -859,6 +861,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -950,7 +958,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1058,6 +1066,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 @@ -1432,7 +1441,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_test_resourceGroup_1: + - subinterface_link_template_Vlan_vmi_1_test_resourceGroup_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1680,6 +1689,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 @@ -1836,7 +1846,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1854,4 +1864,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/pattern5/complexVFCMultiLevelNestedScenario/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/MainServiceTemplate.yaml index 1c675f2a9a..94cd51451e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/MainServiceTemplate.yaml @@ -75,11 +75,11 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_test_resourceGroup_0: + - subinterface_link_template_Vlan_vmi_1_test_resourceGroup_0: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: + - subinterface_link_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 057aac895e..e37886cc8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -136,30 +141,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -338,9 +347,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -356,6 +362,9 @@ topology_template: dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml index 9a647881e5..4c68f250a4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml @@ -120,6 +120,8 @@ topology_template: - 9 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true subinterface_nested_vlan_net1: - get_input: sub_inf_net vm_image_name: @@ -505,21 +507,18 @@ topology_template: - test_nested_level2 - disk.write.requests_server_1b_pd_1 requirements: - link_template_Vlan_vmi_1_test_resourceGroup_0: - - test_resourceGroup_0 - - link_template_Vlan_vmi_1 dependency_pd_server_1b_port_0: - abstract_pd_server_1b - dependency_pd_server_1b_pd_server_1b_port - link_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: - - test_nested_level2 - - link_template_Vlan_vmi_1_test_resourceGroup_1 dependency_server_1b_pd_1_test_nested_level2: - test_nested_level2 - dependency_server_1b_pd_1 link_pd_server_1b_port_0: - abstract_pd_server_1b - link_pd_server_1b_pd_server_1b_port + subinterface_link_template_Vlan_vmi_1_test_resourceGroup_0: + - test_resourceGroup_0 + - subinterface_link_template_Vlan_vmi_1 dependency_template_Vlan_vmi_1_test_resourceGroup_0: - test_resourceGroup_0 - dependency_template_Vlan_vmi_1 @@ -544,6 +543,9 @@ topology_template: dependency_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: - test_nested_level2 - dependency_template_Vlan_vmi_1_test_resourceGroup_1 + subinterface_link_template_Vlan_vmi_1_test_resourceGroup_1_test_nested_level2: + - test_nested_level2 + - subinterface_link_template_Vlan_vmi_1_test_resourceGroup_1 dependency_test_nested_level2: - test_nested_level2 - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 29959579c9..019e6cf76e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -357,15 +357,15 @@ topology_template: dependency_test_resourceGroup_1: - test_resourceGroup_1 - dependency - link_template_Vlan_vmi_1_test_resourceGroup_1: - - test_resourceGroup_1 - - link_template_Vlan_vmi_1 dependency_template_Vlan_vmi_1_test_resourceGroup_1: - test_resourceGroup_1 - dependency_template_Vlan_vmi_1 local_storage_server_1b_pd_1: - server_1b_pd_1 - local_storage + subinterface_link_template_Vlan_vmi_1_test_resourceGroup_1: + - test_resourceGroup_1 + - subinterface_link_template_Vlan_vmi_1 link_pd_server_1b_port_1: - pd_server_1b_port_1 - link @@ -374,4 +374,4 @@ topology_template: - dependency dependency_pd_server_1b_port_1: - pd_server_1b_port_1 - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..9a7f270928 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - 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 @@ -100,12 +100,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 418a181568..f671973941 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -32,6 +32,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -123,7 +129,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -231,6 +237,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 @@ -692,6 +699,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 @@ -699,6 +707,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 @@ -1187,6 +1196,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 @@ -1215,6 +1225,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 @@ -2017,6 +2028,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -2184,6 +2201,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 @@ -2441,6 +2459,12 @@ node_types: status: SUPPORTED entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -2554,7 +2578,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2888,6 +2912,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 @@ -2944,7 +2969,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2962,4 +2987,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/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml index a5bb292d55..b788e6b5d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml @@ -139,6 +139,11 @@ topology_template: - 9 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true + - true + - true + - true subinterface_nested_vlan_net1: - packet_externalmain_network - packet_externalmain_network @@ -240,7 +245,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internalmain_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_externalmain_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 53bc450834..71c4d654a2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -26,6 +26,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -96,30 +101,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml index d0798c5e1f..f3ebc433f9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -136,30 +141,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -338,9 +347,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -356,6 +362,9 @@ topology_template: dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 855e842bf5..f518d262b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -24,6 +24,11 @@ topology_template: required: true entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -136,30 +141,34 @@ topology_template: ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network @@ -341,6 +350,9 @@ topology_template: dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - ps_server_1b_ps_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - ps_server_1b_ps_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 local_storage_ps_server_1b: - ps_server_1b - local_storage @@ -353,9 +365,6 @@ topology_template: link_ps_server_1b_ps_server_1b_port: - ps_server_1b_ps_server_1b_port - link - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_ps_server_1b: - ps_server_1b - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml index e6bbdf5a12..f5055f4147 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml @@ -102,6 +102,9 @@ topology_template: - 0 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true + - true vm_image_name: get_input: pd_server_1b_image port_pd_server_1b_port_replacement_policy: @@ -180,6 +183,9 @@ topology_template: subinterface_nested_vlan_service_template_filter_count: - 9 - 9 + port_ps_server_1b_port_subinterface_indicator: + - true + - true port_ps_server_1b_port_fixed_ips: - - ip_address: get_input: @@ -249,7 +255,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..9a7f270928 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - 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 @@ -100,12 +100,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index f0406ad372..974e584ce7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -706,6 +706,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 @@ -719,6 +720,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 @@ -889,6 +891,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -980,7 +988,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1088,6 +1096,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 @@ -1384,7 +1393,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1402,4 +1411,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/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 057aac895e..e37886cc8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -136,30 +141,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -338,9 +347,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -356,6 +362,9 @@ topology_template: dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml index 5ad77ff461..a8f96e268e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml @@ -121,6 +121,9 @@ topology_template: - 9 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true + - true subinterface_nested_vlan_net1: - packet_external_network - packet_external_network @@ -184,7 +187,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..9a7f270928 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - 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 @@ -100,12 +100,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index b1b333cfe3..1387e5c045 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -919,6 +919,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 @@ -950,6 +951,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 @@ -1062,6 +1064,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 @@ -1261,6 +1264,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -1352,7 +1361,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1460,6 +1469,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 @@ -1844,6 +1854,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 @@ -1893,6 +1904,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 @@ -2527,6 +2539,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -2937,6 +2955,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 @@ -2959,6 +2978,12 @@ node_types: status: SUPPORTED entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -3072,7 +3097,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3406,6 +3431,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 @@ -3462,7 +3488,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_vmi_1: + - subinterface_link_template_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3480,4 +3506,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/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 057aac895e..e37886cc8b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -136,30 +141,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -338,9 +347,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -356,6 +362,9 @@ topology_template: dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 855e842bf5..f518d262b3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -24,6 +24,11 @@ topology_template: required: true entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -136,30 +141,34 @@ topology_template: ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network @@ -341,6 +350,9 @@ topology_template: dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - ps_server_1b_ps_server_1b_port_nested_vlan - dependency_template_Vlan_vmi_1 + subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - ps_server_1b_ps_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 local_storage_ps_server_1b: - ps_server_1b - local_storage @@ -353,9 +365,6 @@ topology_template: link_ps_server_1b_ps_server_1b_port: - ps_server_1b_ps_server_1b_port - link - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_ps_server_1b: - ps_server_1b - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml index 6c67ea7a33..fa14eab377 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml @@ -19,6 +19,11 @@ topology_template: port_ps_server_1b_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -96,30 +101,34 @@ topology_template: ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network @@ -303,4 +312,4 @@ topology_template: - link dependency_ps_server_1b: - ps_server_1b - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml index 61161a6def..93a58633fc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml @@ -97,6 +97,8 @@ topology_template: - 9 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true subinterface_nested_vlan_net1: - packet_external_network vm_image_name: @@ -141,7 +143,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 4b1d400f33..11197a9d69 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -85,6 +85,8 @@ topology_template: port_ps_server_1b_port_mac_requirements: mac_count_required: is_required: false + port_ps_server_1b_port_subinterface_indicator: + - true port_ps_server_1b_port_fixed_ips: - ip_address: get_input: @@ -138,6 +140,8 @@ topology_template: is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 + port_ps_server_1b_port_subinterface_indicator: + - true port_ps_server_1b_port_fixed_ips: - ip_address: get_input: @@ -185,7 +189,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_vlanServiceTemplate.yaml index ed59356950..9a7f270928 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_Vlan_vmi_1: - 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 @@ -100,12 +100,12 @@ topology_template: - template_Vlan_vmi_1 - feature requirements: - link_template_Vlan_vmi_1: - - template_Vlan_vmi_1 - - link dependency_template_Vlan_vmi_1: - template_Vlan_vmi_1 - dependency + subinterface_link_template_Vlan_vmi_1: + - template_Vlan_vmi_1 + - subinterface_link binding_template_Vlan_vmi_1: - template_Vlan_vmi_1 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8333788d1d..1e5a598b9e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -938,6 +938,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 @@ -969,6 +970,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 @@ -1081,6 +1083,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 @@ -1285,6 +1288,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -1376,7 +1385,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1484,6 +1493,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 @@ -1882,6 +1892,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 @@ -1931,6 +1942,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 @@ -2581,6 +2593,12 @@ node_types: status: SUPPORTED entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -2694,7 +2712,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3033,6 +3051,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 @@ -3084,7 +3103,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_subint_Vlan_vmi_1: + - subinterface_link_template_subint_Vlan_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3102,4 +3121,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/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 7187e41f74..a429c0a6ea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -136,30 +141,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -350,12 +359,12 @@ topology_template: dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - dependency - link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_subint_Vlan_vmi_1 + - subinterface_link_template_subint_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - dependency dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - pd_server_1b_pd_server_1b_port_nested_vlan - - dependency_template_subint_Vlan_vmi_1
\ No newline at end of file + - dependency_template_subint_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml index c76668e78a..bda2ced2cf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -24,6 +24,11 @@ topology_template: required: true entry_schema: type: float + port_ps_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_ps_server_1b_port_network_role_tag: type: string required: true @@ -136,30 +141,34 @@ topology_template: ps_server_1b_ps_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming replacement_policy: get_input: - port_ps_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_ps_server_1b_port_mac_requirements + order: + get_input: port_ps_server_1b_port_order + exCP_naming: + get_input: port_ps_server_1b_port_exCP_naming vlan_requirements: get_input: port_ps_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_ps_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_ps_server_1b_port_ip_requirements network_role_tag: get_input: port_ps_server_1b_port_network_role_tag - mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements - order: - get_input: port_ps_server_1b_port_order network_role: get_input: port_ps_server_1b_port_network_role - subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid fixed_ips: get_input: - port_ps_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_ps_server_1b_port_subnetpoolid network: get_input: - port_ps_server_1b_port_network @@ -353,9 +362,9 @@ topology_template: dependency_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - ps_server_1b_ps_server_1b_port_nested_vlan - dependency_template_subint_Vlan_vmi_1 + subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - ps_server_1b_ps_server_1b_port_nested_vlan + - subinterface_link_template_subint_Vlan_vmi_1 dependency_ps_server_1b: - ps_server_1b - dependency - link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - link_template_subint_Vlan_vmi_1
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml index e87ea3632f..16338954ee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml @@ -103,6 +103,8 @@ topology_template: - 9 vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_subinterface_indicator: + - true subinterface_nested_vlan_net1: - packet_external_network vm_image_name: @@ -147,7 +149,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -782,4 +784,4 @@ topology_template: - dependency dependency_packet_external_network: - packet_external_network - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 794867eb95..cb809d0edf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -83,6 +83,8 @@ topology_template: is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 + port_ps_server_1b_port_subinterface_indicator: + - true port_ps_server_1b_port_fixed_ips: - ip_address: get_input: @@ -130,7 +132,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -154,6 +156,8 @@ topology_template: is_required: false subinterface_nested_vlan_service_template_filter_count: - 19 + port_ps_server_1b_port_subinterface_indicator: + - true port_ps_server_1b_port_fixed_ips: - ip_address: get_input: @@ -201,7 +205,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -621,4 +625,4 @@ topology_template: - dependency_ps_server_1b dependency_template_subint_Vlan_vmi_1_test_resourceGroup_1: - test_resourceGroup_1 - - dependency_template_subint_Vlan_vmi_1
\ No newline at end of file + - dependency_template_subint_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml index bbb740fc75..e15370ab96 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/out/nested_vlanServiceTemplate.yaml @@ -47,7 +47,7 @@ topology_template: type: float node_templates: template_subint_Vlan_vmi_1: - 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 @@ -103,9 +103,9 @@ topology_template: binding_template_subint_Vlan_vmi_1: - template_subint_Vlan_vmi_1 - binding + subinterface_link_template_subint_Vlan_vmi_1: + - template_subint_Vlan_vmi_1 + - subinterface_link dependency_template_subint_Vlan_vmi_1: - template_subint_Vlan_vmi_1 - dependency - link_template_subint_Vlan_vmi_1: - - template_subint_Vlan_vmi_1 - - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml index 97718e0f5a..bd4018ecbe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -18,22 +18,6 @@ node_types: status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_port_subnetpoolid: - type: string - required: true - status: SUPPORTED subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix: type: list required: true @@ -78,12 +62,6 @@ node_types: status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_1_subports_ip_v6_address: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string subinterface_vdbe_untr_1_subports_subinterfaces_name_prefix: type: list required: true @@ -134,154 +112,182 @@ node_types: status: SUPPORTED entry_schema: type: json - port_vdbe_untr_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_port_subinterface_indicator: + type: list 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 - subinterface_vdbe_untr_1_subports_parent_interface: + entry_schema: + type: boolean + subinterface_vdbe_untr_1_subports_vn_network_list: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_service_template_filter_count: + port_vdbe_untr_port_name: type: list required: true status: SUPPORTED entry_schema: - type: float - subinterface_vdbe_untr_1_subports_service_template_filter_count: + type: string + port_vdbe_untr_port_network_role: + type: string + required: true + status: SUPPORTED + subinterface_vdbe_untr_2_subports_vn_network_list: type: list required: true status: SUPPORTED entry_schema: - type: float - subinterface_vdbe_untr_1_subports_vn_network_list: + type: string + subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_name: + subinterface_vdbe_untr_2_subports_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_vlan_requirements: + subinterface_vdbe_untr_2_subports_mac_address: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - subinterface_vdbe_untr_2_subports_ip_address: + type: string + subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string + compute_vdbe_name: + type: list required: true status: SUPPORTED - subinterface_vdbe_untr_1_subports_vmac_address: + entry_schema: + type: string + subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix: + subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_vn_network_list: + port_vdbe_untr_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix: + type: org.openecomp.datatypes.network.IpRequirements + subinterface_vdbe_untr_1_subports_vlan_tag_list: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix: + type: json + subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_ip_v6_address: + subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_mac_address: + port_vdbe_untr_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + subinterface_vdbe_untr_1_subports_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len: + port_vdbe_untr_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + 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 + subinterface_vdbe_untr_1_subports_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len: + subinterface_vdbe_untr_2_subports_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: - type: string - subinterface_vdbe_untr_2_subports_parent_interface: + type: float + subinterface_vdbe_untr_1_subports_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float + port_vdbe_untr_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vdbe_untr_2_subports_ip_address: type: list required: true status: SUPPORTED entry_schema: type: string - compute_vdbe_name: + subinterface_vdbe_untr_1_subports_vmac_address: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len: + subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len: + subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_ip_requirements: + subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - subinterface_vdbe_untr_1_subports_vlan_tag_list: + type: string + subinterface_vdbe_untr_2_subports_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: json + type: string requirements: - dependency_vdbe_vdbe_untr_port_vdbe_untr_1_subports: capability: tosca.capabilities.Node @@ -297,7 +303,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -317,7 +323,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -515,6 +521,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 @@ -776,7 +783,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0: + - subinterface_link_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -794,4 +801,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/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml index e7c838afe1..225bfdf8c4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml @@ -416,10 +416,6 @@ topology_template: properties: subinterface_vdbe_untr_1_subports_ip_address: - get_input: vdbe_untrusted_ip_1 - 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: - - get_input: vdbe_aap_untrusted_ip_prefix subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix: @@ -434,8 +430,6 @@ topology_template: - get_input: vdbe_aap_untrusted_ip_prefix_len subinterface_vdbe_untr_1_subports_mac_address: - get_input: vdbe_hw_untr_mac_1 - subinterface_vdbe_untr_1_subports_ip_v6_address: - - get_input: vdbe_untrusted_v6_ip_1 subinterface_vdbe_untr_1_subports_subinterfaces_name_prefix: - str_replace: template: VM_NAMEDBE001p1n004 @@ -463,15 +457,8 @@ topology_template: - get_input: aap_address_mode subinterface_vdbe_untr_2_subports_vlan_tag_list: - get_input: untrusted_vlan_tags - port_vdbe_untr_port_mac_requirements: - mac_count_required: - is_required: false - subinterface_vdbe_untr_1_subports_parent_interface: - - vdbe_1_untr_port_1 - subinterface_vdbe_untr_2_subports_service_template_filter_count: - - 5 - subinterface_vdbe_untr_1_subports_service_template_filter_count: - - get_input: untrusted_num_vn + port_vdbe_untr_port_subinterface_indicator: + - true subinterface_vdbe_untr_1_subports_vn_network_list: - get_input: untrusted_vn_networks port_vdbe_untr_port_name: @@ -482,34 +469,16 @@ topology_template: get_input: vdbe_device_name VM_NAME: get_input: vdbe_name_1 - subinterface_vdbe_untr_2_subports_ip_address: - - get_input: vdbe_untrusted_ip_1 - subinterface_vdbe_untr_1_subports_vmac_address: - - get_input: vdbe_untrusted_vmac_address - subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_vdbe_untr_2_subports_vn_network_list: - get_input: untrusted_vn_networks subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix - subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix: - - get_input: vdbe_aap_sec_untrusted_ip_prefix subinterface_vdbe_untr_2_subports_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 subinterface_vdbe_untr_2_subports_mac_address: - get_input: vdbe_hw_untr_mac_1 subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len: - - get_input: vdbe_aap_untrusted_ip_prefix_len - subinterface_vdbe_untr_2_subports_parent_interface: - - vdbe_1_untr_port_1 compute_vdbe_name: - get_input: vdbe_name_1 subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len: @@ -529,6 +498,39 @@ topology_template: is_required: false subinterface_vdbe_untr_1_subports_vlan_tag_list: - get_input: untrusted_vlan_tags + 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: + - get_input: vdbe_aap_untrusted_ip_prefix + subinterface_vdbe_untr_1_subports_ip_v6_address: + - get_input: vdbe_untrusted_v6_ip_1 + port_vdbe_untr_port_mac_requirements: + mac_count_required: + is_required: false + subinterface_vdbe_untr_1_subports_parent_interface: + - vdbe_1_untr_port_1 + subinterface_vdbe_untr_2_subports_service_template_filter_count: + - 5 + subinterface_vdbe_untr_1_subports_service_template_filter_count: + - get_input: untrusted_num_vn + subinterface_vdbe_untr_2_subports_ip_address: + - get_input: vdbe_untrusted_ip_1 + subinterface_vdbe_untr_1_subports_vmac_address: + - get_input: vdbe_untrusted_vmac_address + subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 + subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix: + - get_input: vdbe_aap_sec_untrusted_ip_prefix + subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len: + - get_input: vdbe_aap_untrusted_ip_prefix_len + subinterface_vdbe_untr_2_subports_parent_interface: + - vdbe_1_untr_port_1 service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 @@ -557,4 +559,4 @@ topology_template: get_input: untr_vfc_instance_group_function subinterface_role: untr members: - - 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/vfcInstanceGroup/oneSubInterfaceNetworkRole/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/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml index c5e13a106c..8ca8da6bcd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/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/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/Nested_vdbeServiceTemplate.yaml @@ -19,19 +19,6 @@ topology_template: required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: - type: list - required: true - entry_schema: - type: string - subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: - type: list - required: true - entry_schema: - type: string - port_vdbe_untr_port_subnetpoolid: - type: string - required: true subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix: type: list required: true @@ -68,11 +55,6 @@ topology_template: required: true entry_schema: type: string - subinterface_vdbe_untr_1_subports_ip_v6_address: - type: list - required: true - entry_schema: - type: string subinterface_vdbe_untr_1_subports_subinterfaces_name_prefix: type: list required: true @@ -114,129 +96,152 @@ topology_template: required: true entry_schema: type: json - port_vdbe_untr_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_vdbe_untr_port_subinterface_indicator: + type: list 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 - subinterface_vdbe_untr_1_subports_parent_interface: + entry_schema: + type: boolean + subinterface_vdbe_untr_1_subports_vn_network_list: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_service_template_filter_count: + port_vdbe_untr_port_name: type: list required: true entry_schema: - type: float - subinterface_vdbe_untr_1_subports_service_template_filter_count: + type: string + port_vdbe_untr_port_network_role: + type: string + required: true + subinterface_vdbe_untr_2_subports_vn_network_list: type: list required: true entry_schema: - type: float - subinterface_vdbe_untr_1_subports_vn_network_list: + type: string + subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_port_name: + subinterface_vdbe_untr_2_subports_ip_v6_address: type: list required: true entry_schema: type: string - port_vdbe_untr_port_vlan_requirements: + subinterface_vdbe_untr_2_subports_mac_address: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - subinterface_vdbe_untr_2_subports_ip_address: + type: string + subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len: type: list required: true entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string - required: true - subinterface_vdbe_untr_1_subports_vmac_address: + compute_vdbe_name: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix: + subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_vn_network_list: + subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix: + port_vdbe_untr_port_ip_requirements: type: list required: true entry_schema: - type: string - subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix: + type: org.openecomp.datatypes.network.IpRequirements + subinterface_vdbe_untr_1_subports_vlan_tag_list: type: list required: true entry_schema: - type: string - subinterface_vdbe_untr_2_subports_ip_v6_address: + type: json + subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_mac_address: + subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_aap_untrusted_v6_ip_prefix_len: + port_vdbe_untr_port_subnetpoolid: + type: string + required: true + subinterface_vdbe_untr_1_subports_ip_v6_address: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len: + port_vdbe_untr_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + 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 + subinterface_vdbe_untr_1_subports_parent_interface: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_parent_interface: + subinterface_vdbe_untr_2_subports_service_template_filter_count: + type: list + required: true + entry_schema: + type: float + subinterface_vdbe_untr_1_subports_service_template_filter_count: + type: list + required: true + entry_schema: + type: float + port_vdbe_untr_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + subinterface_vdbe_untr_2_subports_ip_address: type: list required: true entry_schema: type: string - compute_vdbe_name: + subinterface_vdbe_untr_1_subports_vmac_address: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_1_subports_aap_sec_untrusted_ip_prefix_len: + subinterface_vdbe_untr_2_subports_subinterfaces_name_prefix: type: list required: true entry_schema: type: string - subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len: + subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_port_ip_requirements: + subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix_len: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - subinterface_vdbe_untr_1_subports_vlan_tag_list: + type: string + subinterface_vdbe_untr_2_subports_parent_interface: type: list required: true entry_schema: - type: json + type: string node_templates: vdbe_vdbe_untr_port_vdbe_untr_1_subports: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested @@ -427,6 +432,10 @@ topology_template: get_input: port_vdbe_untr_port_exCP_naming vlan_requirements: get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value ip_requirements: get_input: port_vdbe_untr_port_ip_requirements network_role_tag: @@ -623,9 +632,6 @@ topology_template: - vdbe_vdbe_untr_port - network.incoming.packets.rate requirements: - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - - vdbe_vdbe_untr_port_vdbe_untr_2_subports - - link_vdbe_0_subint_untr_vmi_0 dependency_vdbe_vdbe_untr_port: - vdbe_vdbe_untr_port - dependency @@ -635,21 +641,24 @@ topology_template: dependency_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - vdbe_vdbe_untr_port_vdbe_untr_1_subports - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: + - vdbe_vdbe_untr_port_vdbe_untr_1_subports + - subinterface_link_vdbe_0_subint_untr_vmi_0 dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - vdbe_vdbe_untr_port_vdbe_untr_2_subports - dependency_vdbe_0_subint_untr_vmi_0 local_storage_vdbe: - vdbe - local_storage - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - - vdbe_vdbe_untr_port_vdbe_untr_1_subports - - link_vdbe_0_subint_untr_vmi_0 dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_1_subports: - vdbe_vdbe_untr_port_vdbe_untr_1_subports - dependency_vdbe_0_subint_untr_vmi_0 dependency_vdbe_vdbe_untr_port_vdbe_untr_2_subports: - vdbe_vdbe_untr_port_vdbe_untr_2_subports - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_vdbe_untr_2_subports: + - vdbe_vdbe_untr_port_vdbe_untr_2_subports + - subinterface_link_vdbe_0_subint_untr_vmi_0 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/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/nestedServiceTemplate.yaml index 172b9c8d2c..a5bdcb8491 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/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_subint_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 @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0: + - vdbe_0_subint_untr_vmi_0 + - subinterface_link binding_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - binding - link_vdbe_0_subint_untr_vmi_0: - - vdbe_0_subint_untr_vmi_0 - - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8088898fbb..7294ba02a2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -128,6 +128,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -228,7 +234,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -394,6 +400,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 @@ -650,7 +657,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0: + - subinterface_link_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -668,4 +675,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/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml index 69c79c3e42..592b1b6f85 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml @@ -445,6 +445,8 @@ topology_template: port_vdbe_untr_port_mac_requirements: mac_count_required: is_required: false + port_vdbe_untr_port_subinterface_indicator: + - true subinterface_nested_vmac_address: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: @@ -547,6 +549,8 @@ topology_template: port_vdbe_untr_port_mac_requirements: mac_count_required: is_required: false + port_vdbe_untr_port_subinterface_indicator: + - true subinterface_nested_vmac_address: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: @@ -614,4 +618,4 @@ topology_template: subinterface_role: untr members: - abstract_vdbe_0 - - abstract_vdbe_1
\ No newline at end of file + - abstract_vdbe_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/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/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml index 16381420bd..71097c0ac2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/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/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml @@ -109,6 +109,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean subinterface_nested_vmac_address: type: list required: true @@ -184,6 +189,10 @@ topology_template: get_input: port_vdbe_untr_port_exCP_naming vlan_requirements: get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value ip_requirements: get_input: port_vdbe_untr_port_ip_requirements network_role_tag: @@ -467,12 +476,12 @@ topology_template: dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - dependency_vdbe_0_subint_untr_vmi_0 - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - - link_vdbe_0_subint_untr_vmi_0 + - subinterface_link_vdbe_0_subint_untr_vmi_0 dependency_vdbe_vdbe_untr_port_nested: - vdbe_vdbe_untr_port_nested - dependency dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nestedServiceTemplate.yaml index 172b9c8d2c..a5bdcb8491 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/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_subint_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 @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0: + - vdbe_0_subint_untr_vmi_0 + - subinterface_link binding_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - binding - link_vdbe_0_subint_untr_vmi_0: - - vdbe_0_subint_untr_vmi_0 - - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index e937a9e6bd..3a33693986 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -280,6 +280,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 @@ -671,7 +672,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_1: + - subinterface_link_vdbe_0_subint_untr_vmi_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -689,4 +690,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/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml index 94f7b2fa25..5475604538 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/MainServiceTemplate.yaml @@ -107,4 +107,4 @@ topology_template: get_input: untr_vfc_instance_group_function subinterface_role: untr members: - - tdcore_zone_0_RRG
\ No newline at end of file + - tdcore_zone_0_RRG diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml index 2ba36df895..19a79dc96d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_pattern4ServiceTemplate.yaml @@ -330,7 +330,7 @@ topology_template: aap_untrusted_ip_prefix_len: get_input: vdbe_aap_untrusted_ip_prefix_len requirements: - - link_vdbe_0_subint_untr_vmi_1: + - subinterface_link_vdbe_0_subint_untr_vmi_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -558,4 +558,4 @@ topology_template: - dependency dependency_vdbe_untr_1_subports: - vdbe_untr_1_subports - - 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/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.yaml index 94e55fe70a..623f1a4db8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/pattern4SubInterfaceNodesConnectedOut/out/nested_vlanServiceTemplate.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_subint_untr_vmi_1: - 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_subint_untr_vmi_1 - feature requirements: + subinterface_link_vdbe_0_subint_untr_vmi_1: + - vdbe_0_subint_untr_vmi_1 + - subinterface_link dependency_vdbe_0_subint_untr_vmi_1: - vdbe_0_subint_untr_vmi_1 - dependency binding_vdbe_0_subint_untr_vmi_1: - vdbe_0_subint_untr_vmi_1 - binding - link_vdbe_0_subint_untr_vmi_1: - - vdbe_0_subint_untr_vmi_1 - - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7485e0dd99..134a235a05 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -98,7 +98,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_oam_vmi_0: + - subinterface_link_vdbe_0_subint_oam_vmi_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -234,6 +234,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_vdbe_untr_port_name: type: list required: true @@ -307,7 +313,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -500,6 +506,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 @@ -756,7 +763,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_untr_vmi_0: + - subinterface_link_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -874,6 +881,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_vdbe_untr_port_name: type: list required: true @@ -971,7 +984,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: + - subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1159,6 +1172,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 @@ -1326,4 +1340,4 @@ node_types: 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 + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml index 0e805a44b4..f96351357a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml @@ -458,6 +458,8 @@ topology_template: is_required: false subinterface_nested2_ip_address: - get_input: vdbe_untrusted_ip_1 + port_vdbe_untr_port_subinterface_indicator: + - true port_vdbe_untr_port_name: - str_replace: template: VM_NAMEDBE001p1n004 @@ -554,6 +556,8 @@ topology_template: port_vdbe_untr_port_mac_requirements: mac_count_required: is_required: false + port_vdbe_untr_port_subinterface_indicator: + - true port_vdbe_untr_port_name: - str_replace: template: VM_NAMEDBE001p1n004 @@ -625,4 +629,4 @@ topology_template: get_input: oam_vfc_instance_group_function subinterface_role: oam members: - - abstract_vdbe_1
\ No newline at end of file + - abstract_vdbe_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/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/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml index 4b5ef9d76d..c74aa04dcd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/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/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml @@ -104,6 +104,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_vdbe_untr_port_name: type: list required: true @@ -261,6 +266,10 @@ topology_template: get_input: port_vdbe_untr_port_exCP_naming vlan_requirements: get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value ip_requirements: get_input: port_vdbe_untr_port_ip_requirements network_role_tag: @@ -451,12 +460,12 @@ topology_template: - vdbe_vdbe_untr_port - network.incoming.packets.rate requirements: + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: + - vdbe_vdbe_untr_port_nested1 + - subinterface_link_vdbe_0_subint_untr_vmi_0 dependency_vdbe_vdbe_untr_port: - vdbe_vdbe_untr_port - dependency - link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: - - vdbe_vdbe_untr_port_nested1 - - link_vdbe_0_subint_untr_vmi_0 dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: - vdbe_vdbe_untr_port_nested1 - dependency_vdbe_0_subint_untr_vmi_0 @@ -471,4 +480,4 @@ topology_template: - dependency dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml index be49ab843c..d75abde655 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml @@ -89,6 +89,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_vdbe_untr_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_vdbe_untr_port_name: type: list required: true @@ -265,6 +270,10 @@ topology_template: get_input: port_vdbe_untr_port_exCP_naming vlan_requirements: get_input: port_vdbe_untr_port_vlan_requirements + subinterface_indicator: + get_input: + - port_vdbe_untr_port_subinterface_indicator + - index_value ip_requirements: get_input: port_vdbe_untr_port_ip_requirements network_role_tag: @@ -461,12 +470,12 @@ topology_template: dependency_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: - vdbe_vdbe_untr_port_nested2 - dependency_vdbe_0_subint_oam_vmi_0 + subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: + - vdbe_vdbe_untr_port_nested2 + - subinterface_link_vdbe_0_subint_oam_vmi_0 link_vdbe_vdbe_untr_port: - vdbe_vdbe_untr_port - link - link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: - - vdbe_vdbe_untr_port_nested2 - - link_vdbe_0_subint_oam_vmi_0 local_storage_vdbe: - vdbe - local_storage @@ -475,4 +484,4 @@ topology_template: - dependency dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested1ServiceTemplate.yaml index a76b5cd74f..83279c502b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested1ServiceTemplate.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_subint_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 @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - dependency + subinterface_link_vdbe_0_subint_untr_vmi_0: + - vdbe_0_subint_untr_vmi_0 + - subinterface_link binding_vdbe_0_subint_untr_vmi_0: - vdbe_0_subint_untr_vmi_0 - binding - link_vdbe_0_subint_untr_vmi_0: - - vdbe_0_subint_untr_vmi_0 - - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested2ServiceTemplate.yaml index 96062a3999..82957d9e8a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/nested2ServiceTemplate.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_subint_oam_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 @@ -163,9 +163,9 @@ topology_template: dependency_vdbe_0_subint_oam_vmi_0: - vdbe_0_subint_oam_vmi_0 - dependency - link_vdbe_0_subint_oam_vmi_0: + subinterface_link_vdbe_0_subint_oam_vmi_0: - vdbe_0_subint_oam_vmi_0 - - link + - subinterface_link binding_vdbe_0_subint_oam_vmi_0: - vdbe_0_subint_oam_vmi_0 - binding |