From 777a3493a4dc4bfeb854b3b820dc5968124af87e Mon Sep 17 00:00:00 2001 From: talio Date: Sun, 5 Nov 2017 11:34:51 +0200 Subject: duplicate ids throw an exception when a zip with duplicate ids in different files is getting uploaded Issue - Id : SDC-554 Change-Id: I213233d8833b89788f980db859d9597d2c1cb950 Signed-off-by: talio --- .../in/nested_DPA3_New_VNF_TSBGv.yaml | 10 +++++----- .../out/MainServiceTemplate.yaml | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/in/nested_DPA3_New_VNF_TSBGv.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/in/nested_DPA3_New_VNF_TSBGv.yaml index e2e268ed6e..1758d499b1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/in/nested_DPA3_New_VNF_TSBGv.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/in/nested_DPA3_New_VNF_TSBGv.yaml @@ -179,7 +179,7 @@ parameters: description: string containint the trunk parrent port resources: - sbg_sc_internal_0_port_0: + sbg_sc_internal_0_port_01: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -192,7 +192,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_01: type: OS::Neutron::Port properties: replacement_policy: AUTO @@ -203,7 +203,7 @@ resources: - ip_address: { get_param: sbg_management_floating_ip } mac_address: { get_param: [sbg_management_mac_addresses ,0] } - sbg_sc_0: + sbg_sc_01: type: OS::Nova::Server properties: name: { get_param: [sbg_sc_names, 0]} @@ -213,7 +213,7 @@ resources: availability_zone: { get_param: availability_zone_0 } 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_01 } + - port: { get_resource: sbg_sc_management_1_port_01 } 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/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml index c72c019742..7ba8fcc315 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml @@ -356,36 +356,36 @@ topology_template: directives: - substitutable properties: - port_sbg_sc_management_1_port_0_mac_requirements: - mac_count_required: - is_required: true nested_avpn_net_id: get_input: avpn_net_id service_template_filter: substitute_service_template: nested_DPA3_New_VNF_TSBGvServiceTemplate.yaml - port_sbg_sc_internal_0_port_0_mac_requirements: + port_sbg_sc_management_1_port_01_mac_requirements: mac_count_required: is_required: true - port_sbg_sc_internal_0_port_0_network_role_tag: internal - nested_sbg_AVPN_vlan_tag_list: - get_input: sbg_AVPN_vlan_tag_list - port_sbg_sc_internal_0_port_0_ip_requirements: + port_sbg_sc_internal_0_port_01_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: true - port_sbg_sc_management_1_port_0_network_role_tag: management - port_sbg_sc_management_1_port_0_ip_requirements: + port_sbg_sc_management_1_port_01_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: true + nested_sbg_AVPN_vlan_tag_list: + get_input: sbg_AVPN_vlan_tag_list + port_sbg_sc_internal_0_port_01_mac_requirements: + mac_count_required: + is_required: true + port_sbg_sc_management_1_port_01_network_role_tag: management nested_sbg_avpn_ip_0: get_input: - sbg_avpn_ips - 0 + port_sbg_sc_internal_0_port_01_network_role_tag: internal nested_avpn_subnet_id: get_input: avpn_subnet_id nested_sbg_AVPN_counter: '%index%' -- cgit 1.2.3-korg