diff options
author | 2018-11-29 20:46:49 +0530 | |
---|---|---|
committer | 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/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/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/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in')
3 files changed, 20 insertions, 20 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-pattern-4.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-pattern-4.yml index bbaa6a2636..6266dff927 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-pattern-4.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested-pattern-4.yml @@ -34,14 +34,14 @@ parameters: type: string resources: - pd_server_port_1: + pd_server_1_port: type: OS::Neutron::Port properties: network: { get_param: net } fixed_ips: [{"ip_address": {get_param: [pd_server_ips, 0]}}] replacement_policy: AUTO - pd_server_port_2: + pd_server_2_port: type: OS::Neutron::Port properties: network: { get_param: net } @@ -56,8 +56,8 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_flavor } networks: - - port: { get_resource: pd_server_port_1 } - - port: { get_resource: pd_server_port_2 } + - port: { get_resource: pd_server_1_port } + - port: { get_resource: pd_server_2_port } outputs: pattern4_attr_1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml index 65ef047317..8b93801e10 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested1.yml @@ -100,14 +100,14 @@ resources: networks: - port: { get_resource: ps_server_1b_port_1 } - cmaui_port_1: + cmaui_1c1_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network_1} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 0]}}] replacement_policy: AUTO - cmaui_port_2: + cmaui_1c1_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network_1} @@ -122,7 +122,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_flavor } networks: - - port: { get_resource: cmaui_port_1 } + - port: { get_resource: cmaui_1c1_1_mgmt_port_0 } server_1c1_cmaui_2: type: OS::Nova::Server @@ -132,16 +132,16 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: cmaui_1c1_flavor } networks: - - port: { get_resource: cmaui_port_2 } + - port: { get_resource: cmaui_1c1_2_mgmt_port_0 } - oam_port_1: + oam_server_1c2_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network_1} fixed_ips: [{"ip_address": {get_param: [cmaui_oam_ips, 1]}}] replacement_policy: AUTO - oam_port_2: + oam_server_1c2_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network_1} @@ -156,7 +156,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: oam_server_1c2_flavor } networks: - - port: { get_resource: oam_port_1 } + - port: { get_resource: oam_server_1c2_1_mgmt_port_0 } server_1c2_oam_2: type: OS::Nova::Server @@ -166,7 +166,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: oam_server_1c2_flavor } networks: - - port: { get_resource: oam_port_2 } + - port: { get_resource: oam_server_1c2_2_mgmt_port_0 } metadata: { connectivity_to_pd_server_1b: {get_attr: [server_1b_pd_1, accessIPv4]}, connectivity_to_server_1c1_cmaui_1: {get_attr: [server_1c1_cmaui_1, accessIPv4]}, diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml index 33a64f5cc1..63a0573263 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/in/nested2.yml @@ -100,14 +100,14 @@ resources: networks: - port: { get_resource: ps_server_1b_port } - BE_port_1: + BE_1c1_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network_2} fixed_ips: [{"ip_address": {get_param: [BE_osm_ips, 0]}}] replacement_policy: AUTO - BE_port_2: + BE_1c1_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network_2} @@ -122,7 +122,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: BE_1c1_flavor } networks: - - port: { get_resource: BE_port_1 } + - port: { get_resource: BE_1c1_1_mgmt_port_0 } server_1c1_BE_2: type: OS::Nova::Server @@ -132,16 +132,16 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: BE_1c1_flavor } networks: - - port: { get_resource: BE_port_2 } + - port: { get_resource: BE_1c1_2_mgmt_port_0 } - osm_port_1: + osm_server_1c2_1_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network_2} fixed_ips: [{"ip_address": {get_param: [BE_osm_ips, 1]}}] replacement_policy: AUTO - osm_port_2: + osm_server_1c2_2_mgmt_port_0: type: OS::Neutron::Port properties: network: {get_resource: packet_external_network_2} @@ -156,7 +156,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: osm_server_1c2_flavor } networks: - - port: { get_resource: osm_port_1 } + - port: { get_resource: osm_server_1c2_1_mgmt_port_0 } server_1c2_osm_2: type: OS::Nova::Server @@ -166,7 +166,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: osm_server_1c2_flavor } networks: - - port: { get_resource: osm_port_2 } + - port: { get_resource: osm_server_1c2_2_mgmt_port_0 } metadata: { connectivity_to_rd_server_1b: {get_attr: [server_1b_rd_1, accessIPv4]}, connectivity_to_server_1c1_BE_1: {get_attr: [server_1c1_BE_1, accessIPv4]}, |