From d6982006c27288936d8b0d9eee18068854036f45 Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Tue, 3 Apr 2018 20:24:59 +0530 Subject: Added new nodes type Added new nodes type and new property in Port. All test data need to be updated, so file count is much more. Change-Id: Ic21befe8d7feee912fbed1d3eb676488db1fb68c Issue-ID: SDC-1183 Signed-off-by: siddharth0905 --- .../out/GlobalSubstitutionTypesServiceTemplate.yaml | 13 ++++++++++--- .../differentNetwork/out/MainServiceTemplate.yaml | 10 +++++++--- .../out/Nested_pd_serverServiceTemplate.yaml | 17 +++++++++++++---- .../differentNetwork/out/nestedServiceTemplate.yaml | 8 ++++---- .../out/GlobalSubstitutionTypesServiceTemplate.yaml | 13 ++++++++++--- .../out/MainServiceTemplate.yaml | 10 +++++++--- .../out/Nested_pd_serverServiceTemplate.yaml | 17 +++++++++++++---- .../out/nestedServiceTemplate.yaml | 8 ++++---- .../out/GlobalSubstitutionTypesServiceTemplate.yaml | 13 ++++++++++--- .../out/MainServiceTemplate.yaml | 6 +++++- .../out/Nested_vdbeServiceTemplate.yaml | 15 ++++++++++++--- .../out/nestedServiceTemplate.yaml | 10 +++++----- 12 files changed, 100 insertions(+), 40 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2') 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 -- cgit 1.2.3-korg