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/computePortNetworkSubInterface')
4 files changed, 27 insertions, 9 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 |