aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml
diff options
context:
space:
mode:
authorojasdubey <ojas.dubey@amdocs.com>2018-11-29 20:46:49 +0530
committerAvi Gaffa <avi.gaffa@amdocs.com>2018-12-02 09:47:45 +0000
commit6ce1094d509195fe484761467a67a6b3757593b0 (patch)
tree4c3b0df6711f80c0f20c20ccf013727ff90428d5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml
parentc2a1b7c2eea934f309838f0082b2b851012be9a1 (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/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml')
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml6
1 files changed, 3 insertions, 3 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/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml
index 923c53d41f..5a35661871 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml
@@ -136,7 +136,7 @@ resources:
name:
get_param: vdbe_name_1
networks:
- - port: {get_resource: vdbe_2_untr_port_2}
+ - port: {get_resource: vdbe_2_untr_port_1}
vdbe_1_untr_port_1:
type: OS::Neutron::Port
properties:
@@ -149,7 +149,7 @@ resources:
get_param: vdbe_name_1
template: VM_NAMEDBE001p1n004
- vdbe_2_untr_port_2:
+ vdbe_2_untr_port_1:
type: OS::Neutron::Port
properties:
name:
@@ -236,7 +236,7 @@ resources:
mac_address:
get_param: vdbe_hw_untr_mac_1
parent_interface:
- get_resource: vdbe_2_untr_port_2
+ get_resource: vdbe_2_untr_port_1
subinterfaces_name_prefix:
str_replace:
params: