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/pattern1a/twoPortOnlyOneConnectedWithSubInf/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/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml')
1 files changed, 30 insertions, 30 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml index 66cbff9d89..edb427c692 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1a/twoPortOnlyOneConnectedWithSubInf/out/MainServiceTemplate.yaml @@ -414,12 +414,22 @@ topology_template: directives: - substitutable properties: - port_vdbe_untr_port_mac_requirements: - mac_count_required: - is_required: false compute_vdbe_availability_zone: - get_input: availability_zone_1 - port_vdbe_untr_port_name: + vm_flavor_name: + get_input: vdbe_flavor_name + port_vdbe_untr_port_2_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_vdbe_untr_port_2_mac_requirements: + mac_count_required: + is_required: false + vm_image_name: + get_input: vdbe_image_name + port_vdbe_untr_port_2_name: - str_replace: template: VM_NAMEDBE001p1n004 params: @@ -427,10 +437,6 @@ topology_template: get_input: vdbe_device_name VM_NAME: get_input: vdbe_name_1 - vm_flavor_name: - get_input: vdbe_flavor_name - vm_image_name: - get_input: vdbe_image_name compute_vdbe_metadata: - vf_module_id: get_input: vf_module_id @@ -440,12 +446,6 @@ topology_template: get_input: vnf_name compute_vdbe_name: - get_input: vdbe_name_1 - port_vdbe_untr_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_vdbe_1ServiceTemplate.yaml count: 1 @@ -467,6 +467,14 @@ topology_template: - get_input: untrusted_vn_networks compute_vdbe_availability_zone: - get_input: availability_zone_1 + 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 vm_flavor_name: get_input: vdbe_flavor_name vm_image_name: @@ -500,17 +508,15 @@ topology_template: - get_input: vdbe_aap_untrusted_ip_prefix_len subinterface_nested1_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_vdbe_untr_port_1_mac_requirements: mac_count_required: is_required: false - 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_nested1_mac_address: - get_input: vdbe_hw_untr_mac_1 subinterface_nested1_aap_untrusted_ip_prefix: @@ -523,12 +529,6 @@ topology_template: - get_input: vdbe_name_1 subinterface_nested1_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - port_vdbe_untr_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 @@ -558,4 +558,4 @@ topology_template: get_input: untr_vfc_instance_group_function subinterface_role: untr members: - - abstract_vdbe + - abstract_vdbe
\ No newline at end of file |