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/unifiedComposition/updVolumes/consolidation/in/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/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml')
1 files changed, 11 insertions, 11 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml index 386bbd0bdf..810968f5ec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/updVolumes/consolidation/in/MainServiceTemplate.yaml @@ -97,7 +97,7 @@ topology_template: type: string description: prop node_templates: - FSB2_Internal_2: + FSB_2_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -112,7 +112,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB2_Internal_1: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -127,7 +127,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net relationship: tosca.relationships.network.LinksTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -142,7 +142,7 @@ topology_template: capability: tosca.capabilities.network.Linkable node: jsa_net1 relationship: tosca.relationships.network.LinksTo - FSB1_Internal_1: + FSB_1_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -169,7 +169,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB_1_Internal_port_1 - network_id dhcp_agent_ids: get_attribute: @@ -177,11 +177,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB_2_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB @@ -279,10 +279,10 @@ topology_template: description: | Version 2.0 02-09-2016 (Authors: John Doe, user PROD) members: - - FSB1_Internal_1 - - FSB1_Internal_2 - - FSB2_Internal_1 - - FSB2_Internal_2 + - FSB_1_Internal_port_1 + - FSB_2_Internal_port_1 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_0 - FSB1_template - FSB2_template - jsa_net |