From 6ce1094d509195fe484761467a67a6b3757593b0 Mon Sep 17 00:00:00 2001 From: ojasdubey Date: Thu, 29 Nov 2018 20:46:49 +0530 Subject: 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 --- .../out/MainServiceTemplate.yaml | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml index ca75560607..dc3eca36bd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/createAbstractSubstitute/twoComputesMultiplePorts/out/MainServiceTemplate.yaml @@ -88,7 +88,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: @@ -99,7 +99,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB2_template relationship: tosca.relationships.network.BindsTo - FSB2_Internal_1: + FSB_1_Internal_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -110,7 +110,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: FSB1_template relationship: tosca.relationships.network.BindsTo - FSB1_Internal_2: + FSB_2_Internal_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: mac_address: @@ -125,7 +125,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: @@ -146,7 +146,7 @@ topology_template: shared: true network_name: get_attribute: - - FSB1_Internal_1 + - FSB1_0_Internal_port_0 - network_id dhcp_agent_ids: get_attribute: @@ -154,11 +154,11 @@ topology_template: - addresses tenant_id: get_attribute: - - FSB2_Internal_2 + - FSB2_1_Internal_port_0 - network_id qos_policy: get_attribute: - - FSB2_Internal_2 + - FSB2_1_Internal_port_0 - network_id FSB1_template: type: org.openecomp.resource.vfc.nodes.heat.FSB @@ -240,26 +240,23 @@ topology_template: directives: - substitutable properties: - port_FSB1_Internal_mac_address: - get_input: fsb1-Internal1-mac + port_FSB_Internal_port_0_network: + - Internal2-net-fsb2-Internal1 + - Internal2-net-fsb2-Internal2 compute_FSB_user_data: - OPTIONAL-DATA-FSB1 - null + port_FSB_Internal_port_0_mac_address: + get_input: fsb2-Internal1-mac vm_flavor_name: get_input: fsb-flavor + port_FSB_Internal_port_1_mac_address: + get_input: fsb1-Internal1-mac vm_image_name: get_input: fsb-image compute_FSB_admin_pass: - STATIC-DATA-FSB1 - STATIC-DATA-FSB2 - port_FSB1_Internal_network: - - Internal1-net-fsb1-Internal1 - - Internal1-net-fsb1-Internal2 - port_FSB2_Internal_mac_address: - get_input: fsb2-Internal1-mac - port_FSB2_Internal_network: - - Internal2-net-fsb2-Internal1 - - Internal2-net-fsb2-Internal2 compute_FSB_metadata: - write_files: - path: /path1/etc/sysconfig/network-scripts/ifcfg-eth0 @@ -273,6 +270,9 @@ topology_template: compute_FSB_name: - get_input: fsb1-name - get_input: fsb2-name + port_FSB_Internal_port_1_network: + - Internal1-net-fsb1-Internal1 + - Internal1-net-fsb1-Internal2 service_template_filter: substitute_service_template: Nested_FSBServiceTemplate.yaml count: 2 @@ -289,9 +289,9 @@ 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_2_Internal_port_0 + - FSB_1_Internal_port_0 + - FSB_2_Internal_port_1 + - FSB_1_Internal_port_1 - FSB1_template - FSB2_template -- cgit 1.2.3-korg