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/pattern1c2/differentResourceGroupCount/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/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml')
1 files changed, 27 insertions, 27 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml index 8a3bf941d1..e5c29a52c6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml @@ -401,6 +401,8 @@ topology_template: properties: subinterface_nested_parent_interface: - vdbe_untr_1_port_1 + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode subinterface_nested_vlan_tag_list: @@ -413,6 +415,14 @@ topology_template: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_1_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 subinterface_nested_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix vm_image_name: @@ -432,8 +442,6 @@ topology_template: get_input: vnf_name subinterface_nested_mac_address: - get_input: vdbe_hw_untr_mac_1 - port_vdbe_untr_1_port_virtual_network_refs: - - - control_int_net subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 subinterface_nested_ip_v6_address: @@ -442,16 +450,10 @@ topology_template: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - port_vdbe_untr_1_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len + port_vdbe_untr_1_port_1_virtual_network_refs: + - - control_int_net subinterface_nested_counter: - get_property: - SELF @@ -467,8 +469,6 @@ topology_template: get_input: vdbe_name_1 compute_vdbe_name: - get_input: vdbe_name_1 - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 @@ -478,7 +478,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -497,7 +497,9 @@ topology_template: - substitutable properties: subinterface_nested_parent_interface: - - vdbe_untr_1_port_2 + - vdbe_1_untr_1_port_1 + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode subinterface_nested_vlan_tag_list: @@ -510,6 +512,14 @@ topology_template: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_1_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 subinterface_nested_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix vm_image_name: @@ -529,8 +539,6 @@ topology_template: get_input: vnf_name subinterface_nested_mac_address: - get_input: vdbe_hw_untr_mac_1 - port_vdbe_untr_1_port_virtual_network_refs: - - - control_int_net subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 subinterface_nested_ip_v6_address: @@ -539,16 +547,10 @@ topology_template: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - port_vdbe_untr_1_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len + port_vdbe_untr_1_port_1_virtual_network_refs: + - - control_int_net subinterface_nested_counter: - get_input: counter subinterface_nested_subinterfaces_name_prefix: @@ -561,8 +563,6 @@ topology_template: get_input: vdbe_name_1 compute_vdbe_name: - get_input: vdbe_name_1 - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 @@ -572,7 +572,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo |