diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels')
6 files changed, 95 insertions, 95 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index d0270968e9..8b05a3876a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -65,7 +65,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_2: + - subinterface_link_template_Vlan_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -85,7 +85,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_1: + - subinterface_link_template_Vlan_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -126,7 +126,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: + - subinterface_link_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -146,7 +146,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: + - subinterface_link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -166,7 +166,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_6_test_nested3Level_test_nested2Level: + - subinterface_link_template_Vlan_6_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -186,7 +186,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_5_test_nested3Level_test_nested2Level: + - subinterface_link_template_Vlan_5_test_nested3Level_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -206,7 +206,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_4_test_nested2Level: + - subinterface_link_template_Vlan_4_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -226,7 +226,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3_test_nested2Level: + - subinterface_link_template_Vlan_3_test_nested2Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -414,7 +414,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_8_test_nested4Level_test_nested3Level: + - subinterface_link_template_Vlan_8_test_nested4Level_test_nested3Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -434,7 +434,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_7_test_nested4Level_test_nested3Level: + - subinterface_link_template_Vlan_7_test_nested4Level_test_nested3Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -454,7 +454,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_6_test_nested3Level: + - subinterface_link_template_Vlan_6_test_nested3Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -474,7 +474,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_5_test_nested3Level: + - subinterface_link_template_Vlan_5_test_nested3Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -494,7 +494,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_4: + - subinterface_link_template_Vlan_4: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -514,7 +514,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3: + - subinterface_link_template_Vlan_3: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -680,7 +680,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_8_test_nested4Level: + - subinterface_link_template_Vlan_8_test_nested4Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -700,7 +700,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_7_test_nested4Level: + - subinterface_link_template_Vlan_7_test_nested4Level: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -720,7 +720,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_6: + - subinterface_link_template_Vlan_6: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -740,7 +740,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_5: + - subinterface_link_template_Vlan_5: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -884,7 +884,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_8: + - subinterface_link_template_Vlan_8: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -904,7 +904,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_7: + - subinterface_link_template_Vlan_7: 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/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml index 652a5464a7..e8f7c17fbb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml @@ -218,35 +218,35 @@ topology_template: port1: template_VMInt_OAM_lb_1
port2: cmaui_port_2
requirements:
- - link_template_Vlan_2:
+ - subinterface_link_template_Vlan_2:
capability: tosca.capabilities.network.Linkable
node: test_contrailV2_net2
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_1:
+ - subinterface_link_template_Vlan_1:
capability: tosca.capabilities.network.Linkable
node: test_net1
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level:
+ - subinterface_link_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level:
capability: tosca.capabilities.network.Linkable
node: test_net1
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level:
+ - subinterface_link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level:
capability: tosca.capabilities.network.Linkable
node: test_net1
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_6_test_nested3Level_test_nested2Level:
+ - subinterface_link_template_Vlan_6_test_nested3Level_test_nested2Level:
capability: tosca.capabilities.network.Linkable
node: test_net1
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_5_test_nested3Level_test_nested2Level:
+ - subinterface_link_template_Vlan_5_test_nested3Level_test_nested2Level:
capability: tosca.capabilities.network.Linkable
node: test_net1
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_4_test_nested2Level:
+ - subinterface_link_template_Vlan_4_test_nested2Level:
capability: tosca.capabilities.network.Linkable
node: test_contrailV2_net2
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_3_test_nested2Level:
+ - subinterface_link_template_Vlan_3_test_nested2Level:
capability: tosca.capabilities.network.Linkable
node: test_contrailV2_net2
relationship: tosca.relationships.network.LinksTo
@@ -330,11 +330,11 @@ topology_template: - index_value
port1: cmaui_port_2
requirements:
- - link_template_Vlan_7_test_nested4Level:
+ - subinterface_link_template_Vlan_7_test_nested4Level:
capability: tosca.capabilities.network.Linkable
node: test_contrailV2_net2
relationship: tosca.relationships.network.LinksTo
- - link_template_Vlan_6:
+ - subinterface_link_template_Vlan_6:
capability: tosca.capabilities.network.Linkable
node: test_contrailV2_net2
relationship: tosca.relationships.network.LinksTo
@@ -390,4 +390,4 @@ topology_template: - test_resourceGroup
- test_net1
- test_nestedInvalidConnection
- - server_cmaui_nova
+ - server_cmaui_nova
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml index 92647bb2f8..1dd275150e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -59,7 +59,7 @@ topology_template: type: string node_templates: template_Vlan_2: - 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: port2 @@ -98,7 +98,7 @@ topology_template: mac_address: - get_input: mac_address template_Vlan_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: port1 @@ -198,6 +198,12 @@ topology_template: - test_nested2Level - feature_template_Vlan_6_test_nested3Level requirements: + subinterface_link_template_Vlan_2: + - template_Vlan_2 + - subinterface_link + subinterface_link_template_Vlan_4_test_nested2Level: + - test_nested2Level + - subinterface_link_template_Vlan_4 dependency_template_Vlan_5_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_template_Vlan_5_test_nested3Level @@ -207,24 +213,27 @@ topology_template: dependency_template_Vlan_4_test_nested2Level: - test_nested2Level - dependency_template_Vlan_4 + subinterface_link_template_Vlan_1: + - template_Vlan_1 + - subinterface_link dependency_test_nested2Level: - test_nested2Level - dependency - link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: + subinterface_link_template_Vlan_6_test_nested3Level_test_nested2Level: - test_nested2Level - - link_template_Vlan_7_test_nested4Level_test_nested3Level + - subinterface_link_template_Vlan_6_test_nested3Level dependency_template_Vlan_2: - template_Vlan_2 - dependency binding_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - binding_template_Vlan_7_test_nested4Level_test_nested3Level - link_template_Vlan_4_test_nested2Level: - - test_nested2Level - - link_template_Vlan_4 dependency_template_Vlan_1: - template_Vlan_1 - dependency + subinterface_link_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - subinterface_link_template_Vlan_7_test_nested4Level_test_nested3Level binding_template_Vlan_2: - template_Vlan_2 - binding @@ -234,9 +243,6 @@ topology_template: dependency_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_template_Vlan_8_test_nested4Level_test_nested3Level - link_template_Vlan_6_test_nested3Level_test_nested2Level: - - test_nested2Level - - link_template_Vlan_6_test_nested3Level dependency_template_Vlan_6_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_template_Vlan_6_test_nested3Level @@ -249,33 +255,27 @@ topology_template: binding_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - binding_template_Vlan_8_test_nested4Level_test_nested3Level + subinterface_link_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: + - test_nested2Level + - subinterface_link_template_Vlan_8_test_nested4Level_test_nested3Level binding_template_Vlan_6_test_nested3Level_test_nested2Level: - test_nested2Level - binding_template_Vlan_6_test_nested3Level dependency_template_Vlan_7_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_template_Vlan_7_test_nested4Level_test_nested3Level - link_template_Vlan_1: - - template_Vlan_1 - - link - link_template_Vlan_2: - - template_Vlan_2 - - link + subinterface_link_template_Vlan_3_test_nested2Level: + - test_nested2Level + - subinterface_link_template_Vlan_3 dependency_test_nested4Level_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_test_nested4Level_test_nested3Level - link_template_Vlan_5_test_nested3Level_test_nested2Level: + subinterface_link_template_Vlan_5_test_nested3Level_test_nested2Level: - test_nested2Level - - link_template_Vlan_5_test_nested3Level + - subinterface_link_template_Vlan_5_test_nested3Level dependency_test_nested3Level_test_nested2Level: - test_nested2Level - dependency_test_nested3Level - link_template_Vlan_3_test_nested2Level: - - test_nested2Level - - link_template_Vlan_3 binding_template_Vlan_4_test_nested2Level: - test_nested2Level - - binding_template_Vlan_4 - link_template_Vlan_8_test_nested4Level_test_nested3Level_test_nested2Level: - - test_nested2Level - - link_template_Vlan_8_test_nested4Level_test_nested3Level
\ No newline at end of file + - binding_template_Vlan_4
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml index e42ee48133..a18c661c7b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -127,7 +127,7 @@ topology_template: port2: get_input: port1 template_Vlan_4: - 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: port1 @@ -166,7 +166,7 @@ topology_template: mac_address: - get_input: mac_address template_Vlan_3: - 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: port1 @@ -244,15 +244,18 @@ topology_template: - test_nested3Level - feature_template_Vlan_5 requirements: - link_template_Vlan_7_test_nested4Level_test_nested3Level: - - test_nested3Level - - link_template_Vlan_7_test_nested4Level + subinterface_link_template_Vlan_3: + - template_Vlan_3 + - subinterface_link + subinterface_link_template_Vlan_4: + - template_Vlan_4 + - subinterface_link dependency_template_Vlan_5_test_nested3Level: - test_nested3Level - dependency_template_Vlan_5 - link_template_Vlan_8_test_nested4Level_test_nested3Level: + subinterface_link_template_Vlan_5_test_nested3Level: - test_nested3Level - - link_template_Vlan_8_test_nested4Level + - subinterface_link_template_Vlan_5 binding_template_Vlan_6_test_nested3Level: - test_nested3Level - binding_template_Vlan_6 @@ -262,6 +265,12 @@ topology_template: dependency_test_nested4Level_test_nested3Level: - test_nested3Level - dependency_test_nested4Level + subinterface_link_template_Vlan_6_test_nested3Level: + - test_nested3Level + - subinterface_link_template_Vlan_6 + subinterface_link_template_Vlan_8_test_nested4Level_test_nested3Level: + - test_nested3Level + - subinterface_link_template_Vlan_8_test_nested4Level dependency_template_Vlan_7_test_nested4Level_test_nested3Level: - test_nested3Level - dependency_template_Vlan_7_test_nested4Level @@ -271,21 +280,12 @@ topology_template: binding_template_Vlan_8_test_nested4Level_test_nested3Level: - test_nested3Level - binding_template_Vlan_8_test_nested4Level - link_template_Vlan_5_test_nested3Level: - - test_nested3Level - - link_template_Vlan_5 - link_template_Vlan_6_test_nested3Level: + subinterface_link_template_Vlan_7_test_nested4Level_test_nested3Level: - test_nested3Level - - link_template_Vlan_6 - link_template_Vlan_3: - - template_Vlan_3 - - link + - subinterface_link_template_Vlan_7_test_nested4Level dependency_template_Vlan_8_test_nested4Level_test_nested3Level: - test_nested3Level - dependency_template_Vlan_8_test_nested4Level - link_template_Vlan_4: - - template_Vlan_4 - - link binding_template_Vlan_4: - template_Vlan_4 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml index 00a2260614..7b582584e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml @@ -120,7 +120,7 @@ topology_template: port2: get_input: port2 template_Vlan_6: - 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: port1 @@ -159,7 +159,7 @@ topology_template: mac_address: - get_input: mac_address template_Vlan_5: - 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: port2 @@ -226,36 +226,36 @@ topology_template: - test_nested4Level - feature_template_Vlan_7 requirements: - link_template_Vlan_8_test_nested4Level: - - test_nested4Level - - link_template_Vlan_8 + subinterface_link_template_Vlan_5: + - template_Vlan_5 + - subinterface_link binding_template_Vlan_8_test_nested4Level: - test_nested4Level - binding_template_Vlan_8 binding_template_Vlan_7_test_nested4Level: - test_nested4Level - binding_template_Vlan_7 + subinterface_link_template_Vlan_7_test_nested4Level: + - test_nested4Level + - subinterface_link_template_Vlan_7 dependency_template_Vlan_7_test_nested4Level: - test_nested4Level - dependency_template_Vlan_7 dependency_test_nested4Level: - test_nested4Level - dependency - link_template_Vlan_7_test_nested4Level: + subinterface_link_template_Vlan_8_test_nested4Level: - test_nested4Level - - link_template_Vlan_7 - link_template_Vlan_5: - - template_Vlan_5 - - link + - subinterface_link_template_Vlan_8 dependency_template_Vlan_8_test_nested4Level: - test_nested4Level - dependency_template_Vlan_8 - link_template_Vlan_6: - - template_Vlan_6 - - link binding_template_Vlan_6: - template_Vlan_6 - binding + subinterface_link_template_Vlan_6: + - template_Vlan_6 + - subinterface_link binding_template_Vlan_5: - template_Vlan_5 - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml index bd6e1a1f24..6ec72d7302 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml @@ -105,7 +105,7 @@ topology_template: type: string node_templates: template_Vlan_8: - 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: port2 @@ -144,7 +144,7 @@ topology_template: mac_address: - get_input: mac_address template_Vlan_7: - 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: port1 @@ -207,15 +207,15 @@ topology_template: dependency_template_Vlan_7: - template_Vlan_7 - dependency - link_template_Vlan_7: + subinterface_link_template_Vlan_7: - template_Vlan_7 - - link - link_template_Vlan_8: - - template_Vlan_8 - - link + - subinterface_link binding_template_Vlan_8: - template_Vlan_8 - binding + subinterface_link_template_Vlan_8: + - template_Vlan_8 + - subinterface_link binding_template_Vlan_7: - template_Vlan_7 - - binding + - binding
\ No newline at end of file |