diff options
| author |   ojasdubey <ojas.dubey@amdocs.com> | 2018-11-29 20:46:49 +0530 |
|---|---|---|
| committer |   Avi Gaffa <avi.gaffa@amdocs.com> | 2018-12-02 09:47:45 +0000 |
| commit | 6ce1094d509195fe484761467a67a6b3757593b0 (patch) | |
| tree | 4c3b0df6711f80c0f20c20ccf013727ff90428d5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml | |
| parent | c2a1b7c2eea934f309838f0082b2b851012be9a1 (diff) | |
Fix - Port type and vmtype underscore issue
1. Fix for consolidation of VMs for cases when:
a. VM type contains an underscore
b. Multiple ports per network role
2. Updated the unit test cases and test data
Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71
Issue-ID: SDC-1966
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml')
1 files changed, 12 insertions, 12 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml index dda3d09c8d..562d5fc9a2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/onePortVlanSameType/out/MainServiceTemplate.yaml @@ -488,7 +488,7 @@ topology_template: properties: subinterface_nested_parent_interface: - vdbe_untr_port_1 - - vdbe_untr_port_2 + - vdbe_1_untr_port_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode - get_input: aap_address_mode @@ -504,8 +504,14 @@ topology_template: subinterface_nested_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + port_vdbe_untr_port_1_name: + - Untr_Port_1 + - Untr_Port_2 vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix - get_input: vdbe_aap_untrusted_ip_prefix @@ -539,9 +545,6 @@ topology_template: subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 - get_input: vdbe_untrusted_ip_1 - port_vdbe_untr_port_virtual_network_refs: - - - control_int_net - - - control_int_net subinterface_nested_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - get_input: vdbe_untrusted_v6_ip_1 @@ -551,12 +554,6 @@ topology_template: subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - get_input: untrusted_vn_networks - port_vdbe_untr_port_name: - - Untr_Port_1 - - Untr_Port_2 - port_vdbe_untr_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 - - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len - get_input: vdbe_aap_untrusted_ip_prefix_len @@ -584,6 +581,9 @@ topology_template: compute_vdbe_name: - get_input: vdbe_name_1 - get_input: vdbe_name_2 + port_vdbe_untr_port_1_virtual_network_refs: + - - control_int_net + - - control_int_net service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 2 @@ -593,7 +593,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_port: + - link_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -606,4 +606,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - control_int_net - - abstract_vdbe + - abstract_vdbe
\ No newline at end of file |