diff options
author | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-03 20:24:59 +0530 |
---|---|---|
committer | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-04 13:54:59 +0530 |
commit | d6982006c27288936d8b0d9eee18068854036f45 (patch) | |
tree | 7b71be074b5303d442971d0bd59b2accd7940604 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested | |
parent | 4b6709601c47050c853e6eaa5525259f066d5277 (diff) |
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 <siddharth.singh4@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested')
3 files changed, 20 insertions, 20 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml index cd3f9701c5..b821e47358 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/GlobalSubstitutionTypesServiceTemplate.yaml @@ -61,7 +61,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - link_template_Vlan_3_arrayParameter: + - subinterface_link_template_Vlan_3_arrayParameter: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -81,7 +81,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: @@ -101,7 +101,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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml index 8a91a43dca..c27d7a8829 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml @@ -294,11 +294,11 @@ topology_template: net2: test_net2
net1: test_net1
requirements:
- - link_template_Vlan_2:
+ - subinterface_link_template_Vlan_2:
capability: tosca.capabilities.network.Linkable
node: test_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
@@ -400,11 +400,11 @@ topology_template: net2: test_net2
net1: test_net1
requirements:
- - link_template_Vlan_2:
+ - subinterface_link_template_Vlan_2:
capability: tosca.capabilities.network.Linkable
node: test_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
@@ -433,4 +433,4 @@ topology_template: - test_Vlan2
- test_Vlan1
- server_cmaui_nova
- - test_nested
+ - test_nested
\ 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/nested/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml index 949d55d270..ed9c4c5acd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml @@ -55,7 +55,7 @@ topology_template: type: float node_templates: template_Vlan_3_arrayParameter: - 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: @@ -98,7 +98,7 @@ topology_template: mac_address: - get_input: mac_address 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: p2 @@ -139,7 +139,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: p1 @@ -200,24 +200,24 @@ topology_template: - template_Vlan_3_arrayParameter - feature requirements: + subinterface_link_template_Vlan_3_arrayParameter: + - template_Vlan_3_arrayParameter + - subinterface_link + subinterface_link_template_Vlan_2: + - template_Vlan_2 + - subinterface_link dependency_template_Vlan_2: - template_Vlan_2 - dependency dependency_template_Vlan_1: - template_Vlan_1 - dependency - link_template_Vlan_1: - - template_Vlan_1 - - link dependency_template_Vlan_3_arrayParameter: - template_Vlan_3_arrayParameter - dependency - link_template_Vlan_3_arrayParameter: - - template_Vlan_3_arrayParameter - - link - link_template_Vlan_2: - - template_Vlan_2 - - link + subinterface_link_template_Vlan_1: + - template_Vlan_1 + - subinterface_link binding_template_Vlan_2: - template_Vlan_2 - binding |