diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/multiplePortsMultipleVlans')
5 files changed, 55 insertions, 19 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/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 |