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/vfcInstanceGroup/oneSubInterfaceNetworkRole/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/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml')
1 files changed, 17 insertions, 17 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml index 32ad867f3c..0944af6c71 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRole/out/MainServiceTemplate.yaml @@ -457,16 +457,11 @@ topology_template: - get_input: aap_address_mode subinterface_vdbe_untr_2_subports_vlan_tag_list: - get_input: untrusted_vlan_tags + port_vdbe_untr_port_1_mac_requirements: + mac_count_required: + is_required: false subinterface_vdbe_untr_1_subports_vn_network_list: - get_input: untrusted_vn_networks - port_vdbe_untr_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_vdbe_untr_2_subports_vn_network_list: - get_input: untrusted_vn_networks subinterface_vdbe_untr_1_subports_aap_untrusted_v6_ip_prefix: @@ -483,22 +478,27 @@ topology_template: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len subinterface_vdbe_untr_2_subports_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - port_vdbe_untr_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false subinterface_vdbe_untr_1_subports_vlan_tag_list: - get_input: untrusted_vlan_tags subinterface_vdbe_untr_2_subports_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix subinterface_vdbe_untr_1_subports_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix + port_vdbe_untr_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 subinterface_vdbe_untr_1_subports_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - port_vdbe_untr_port_mac_requirements: - mac_count_required: + port_vdbe_untr_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: is_required: false subinterface_vdbe_untr_1_subports_parent_interface: - vdbe_1_untr_port_1 @@ -552,4 +552,4 @@ topology_template: get_input: untr_vfc_instance_group_function subinterface_role: untr members: - - abstract_vdbe
\ No newline at end of file + - abstract_vdbe |