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/vdbeav/in | |
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/vdbeav/in')
1 files changed, 8 insertions, 8 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/vdbeav/in/vdbeav_base_heat_template.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/in/vdbeav_base_heat_template.yaml index ba730546ea..be85be4308 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/in/vdbeav_base_heat_template.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/vdbeav/in/vdbeav_base_heat_template.yaml @@ -252,7 +252,7 @@ resources: network: get_resource: fabric_int_net type: "OS::Neutron::Subnet" - vdbe_0_untr_vmi_0: + vdbe_0_untr_vmi_1: properties: name: str_replace: @@ -502,7 +502,7 @@ resources: get_resource: vdbe_fabr_0_port - port: - get_resource: vdbe_0_untr_vmi_0 + get_resource: vdbe_0_untr_vmi_1 - port: get_resource: vdbe_trst_0_port @@ -772,7 +772,7 @@ resources: get_param: trusted_net_name type: "OS::ContrailV2::InstanceIp" vdbe_untr_0_subports: - depends_on: vdbe_0_untr_vmi_0 + depends_on: vdbe_0_untr_vmi_1 properties: count: get_param: untrusted_num_vn @@ -800,7 +800,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_0 parent_interface: - get_resource: vdbe_0_untr_vmi_0 + get_resource: vdbe_0_untr_vmi_1 subinterfaces_name_prefix: str_replace: params: @@ -865,13 +865,13 @@ resources: type: "OS::Heat::ResourceGroup" vdbe_untrusted_Iip_0: depends_on: - - vdbe_0_untr_vmi_0 + - vdbe_0_untr_vmi_1 properties: instance_ip_address: get_param: vdbe_untrusted_ip_0 virtual_machine_interface_refs: - - get_resource: vdbe_0_untr_vmi_0 + get_resource: vdbe_0_untr_vmi_1 virtual_network_refs: - get_param: untrusted_net_name @@ -891,14 +891,14 @@ resources: type: "OS::ContrailV2::InstanceIp" vdbe_untrusted_v6_Iip_0: depends_on: - - vdbe_0_untr_vmi_0 + - vdbe_0_untr_vmi_1 properties: instance_ip_address: get_param: vdbe_untrusted_v6_ip_0 instance_ip_family: v6 virtual_machine_interface_refs: - - get_resource: vdbe_0_untr_vmi_0 + get_resource: vdbe_0_untr_vmi_1 virtual_network_refs: - get_param: untrusted_net_name |