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/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes')
4 files changed, 31 insertions, 11 deletions
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 |