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/dynamicPorts | |
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/dynamicPorts')
5 files changed, 17 insertions, 17 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/in/DPA3_New_VNF_TSBGv_base.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/in/DPA3_New_VNF_TSBGv_base.yaml index 28a9051a7b..7a6dcc3517 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/in/DPA3_New_VNF_TSBGv_base.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/in/DPA3_New_VNF_TSBGv_base.yaml @@ -161,7 +161,7 @@ parameters: description: A valid OpenStack UUID must be provided resources: - sbg_sc_internal_0_port_0: + sbg_sc_internal_0_port: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -218,6 +218,6 @@ resources: delete_on_termination : "false" flavor: { get_param: sbg_sc_flavor_name } networks: - - port: { get_resource: sbg_sc_internal_0_port_0 } + - port: { get_resource: sbg_sc_internal_0_port } config_drive: "true" user_data_format: RAW diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/in/DPA3_New_VNF_TSBGv_base.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/in/DPA3_New_VNF_TSBGv_base.yaml index b3d1dda896..90a7ed940d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/in/DPA3_New_VNF_TSBGv_base.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/in/DPA3_New_VNF_TSBGv_base.yaml @@ -80,7 +80,7 @@ parameters: description: A valid OpenStack UUID must be provided resources: - sbg_sc_internal_0_port_0: + sbg_sc_internal_0_port: type: OS::Neutron::Port depends_on: [ sbg_pl_trunk_subport_avpn_group_0 ] properties: @@ -124,6 +124,6 @@ resources: delete_on_termination : "false" flavor: { get_param: sbg_sc_flavor_name } networks: - - port: { get_resource: sbg_sc_internal_0_port_0 } + - port: { get_resource: sbg_sc_internal_0_port } config_drive: "true" user_data_format: RAW diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/in/DPA3_New_VNF_TSBGv_base.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/in/DPA3_New_VNF_TSBGv_base.yaml index ee25b400dd..f998664769 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/in/DPA3_New_VNF_TSBGv_base.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/in/DPA3_New_VNF_TSBGv_base.yaml @@ -161,7 +161,7 @@ parameters: description: A valid OpenStack UUID must be provided resources: - sbg_sc_internal_0_port_0: + sbg_sc_internal_0_port: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -174,7 +174,7 @@ resources: - ip_address: { get_param: sbg_boot_floating_ip } mac_address: { get_param: [sbg_internal_mac_addresses ,0] } - sbg_sc_management_1_port_0: + sbg_sc_management_1_port: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -216,7 +216,7 @@ resources: delete_on_termination : "false" flavor: { get_param: sbg_sc_flavor_name } networks: - - port: { get_resource: sbg_sc_internal_0_port_0 } - - port: { get_resource: sbg_sc_management_1_port_0 } + - port: { get_resource: sbg_sc_internal_0_port } + - port: { get_resource: sbg_sc_management_1_port } config_drive: "true" user_data_format: RAW diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/in/DPA3_New_VNF_TSBGv_base.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/in/DPA3_New_VNF_TSBGv_base.yaml index d4c517fd04..3c1cc8f2b9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/in/DPA3_New_VNF_TSBGv_base.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/in/DPA3_New_VNF_TSBGv_base.yaml @@ -161,7 +161,7 @@ parameters: description: A valid OpenStack UUID must be provided resources: - sbg_sc_internal_0_port_0: + sbg_sc_internal_0_port: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -174,7 +174,7 @@ resources: - ip_address: { get_param: sbg_boot_floating_ip } mac_address: { get_param: [sbg_internal_mac_addresses ,0] } - sbg_sc_management_1_port_0: + sbg_sc_management_1_port: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -225,7 +225,7 @@ resources: delete_on_termination : "false" flavor: { get_param: sbg_sc_flavor_name } networks: - - port: { get_resource: sbg_sc_internal_0_port_0 } - - port: { get_resource: sbg_sc_management_1_port_0 } + - port: { get_resource: sbg_sc_internal_0_port } + - port: { get_resource: sbg_sc_management_1_port } config_drive: "true" user_data_format: RAW diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/in/DPA3_New_VNF_TSBGv_base.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/in/DPA3_New_VNF_TSBGv_base.yaml index 7a06f07481..5535e6b1d4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/in/DPA3_New_VNF_TSBGv_base.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/in/DPA3_New_VNF_TSBGv_base.yaml @@ -293,7 +293,7 @@ parameters: description: A valid OpenStack UUID must be provided resources: - sbg_sc_internal_0_port_0: + sbg_sc_internal_0_port: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -306,7 +306,7 @@ resources: - ip_address: { get_param: sbg_boot_floating_ip } mac_address: { get_param: [sbg_internal_mac_addresses ,0] } - sbg_sc_management_1_port_0: + sbg_sc_management_1_port: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -351,7 +351,7 @@ resources: sbg_sc_0: type: OS::Nova::Server - depends_on: [ sbg_sc_internal_0_port_0, sbg_sc_management_1_port_0 ] + depends_on: [ sbg_sc_internal_0_port, sbg_sc_management_1_port ] properties: name: { get_param: [sbg_sc_names, 0]} metadata: @@ -367,7 +367,7 @@ resources: delete_on_termination : "false" flavor: { get_param: sbg_sc_flavor_name } networks: - - port: { get_resource: sbg_sc_internal_0_port_0 } - - port: { get_resource: sbg_sc_management_1_port_0 } + - port: { get_resource: sbg_sc_internal_0_port } + - port: { get_resource: sbg_sc_management_1_port } config_drive: "true" user_data_format: RAW |