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/multiplePortsMultipleVlans/in/main.yml | |
| 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/multiplePortsMultipleVlans/in/main.yml')
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/multiplePortsMultipleVlans/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/in/main.yml index 42b84b7734..59afff7776 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/in/main.yml @@ -139,7 +139,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_1_untr_vmi_1 + get_resource: vdbe_untr_vmi_1 subinterfaces_name_prefix: str_replace: params: @@ -173,8 +173,8 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_1_untr_vmi_1} - - port: {get_resource: vdbe_1_oam_vmi_1} + - port: {get_resource: vdbe_untr_vmi_1} + - port: {get_resource: vdbe_oam_vmi_1} vdbe_node_2: type: OS::Nova::Server properties: @@ -194,9 +194,9 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_1_untr_vmi_2} - - port: {get_resource: vdbe_2_oam_vmi_2} - vdbe_1_untr_vmi_1: + - port: {get_resource: vdbe_1_untr_vmi_1} + - port: {get_resource: vdbe_1_oam_vmi_1} + vdbe_untr_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -246,7 +246,7 @@ resources: virtual_network_refs: - get_resource: control_int_net - vdbe_1_oam_vmi_1: + vdbe_oam_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: Port_2 @@ -292,7 +292,7 @@ resources: - vdbe_1_untr_vmi_2: + vdbe_1_untr_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -342,7 +342,7 @@ resources: virtual_network_refs: - get_resource: control_int_net - vdbe_2_oam_vmi_2: + vdbe_1_oam_vmi_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: Port_4 @@ -415,7 +415,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_1_oam_vmi_1 + get_resource: vdbe_oam_vmi_1 subinterfaces_name_prefix: str_replace: params: @@ -462,7 +462,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_1_untr_vmi_2 + get_resource: vdbe_1_untr_vmi_1 subinterfaces_name_prefix: str_replace: params: @@ -508,7 +508,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_2_oam_vmi_2 + get_resource: vdbe_1_oam_vmi_1 subinterfaces_name_prefix: str_replace: params: |