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/pattern4/multipleVlanSameFile')
4 files changed, 15 insertions, 14 deletions
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 |