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 <tali.orenbach@amdocs.com>

2 files changed, 8 insertions, 22 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1.yaml
index 109bf86d24..476953750e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1.yaml
@@ -68,7 +68,7 @@ resources:
       - config: { get_resource: network}
       - config: { get_resource: script_init}
 
-  server_pcm:
+  server_pcm_1:
     type: OS::Nova::Server
     properties:
       config_drive: "True"
@@ -77,8 +77,8 @@ resources:
       flavor: { get_param: pcm_flavor_name }
       availability_zone: { get_param: availabilityzone_name }
       networks:
-        - port: { get_resource: pcm_port_0}
-        - port: { get_resource: pcm_port_1}
+        - port: { get_resource: pcm_port_00}
+        - port: { get_resource: pcm_port_01}
       block_device_mapping:
         - device_name: vdb
           volume_id: { get_param: pcm_vol}
@@ -86,7 +86,7 @@ resources:
       user_data:
         get_resource: server_init
 
-  pcm_port_0:
+  pcm_port_00:
     type: OS::Neutron::Port
     properties:
       network: { get_param: cps_net_name }
@@ -94,21 +94,14 @@ resources:
         - ip_address: { get_param: cps_net_ip }
       security_groups: [{ get_param: security_group_name }]
 
-  pcm_port_1:
+  pcm_port_01:
     type: OS::Neutron::Port
     properties:
       network: { get_param: oam_net_name }
       fixed_ips:
         - ip_address: { get_param: oam_net_ip }
       security_groups: [{ get_param: security_group_name }]
-
-  #pcm_vol_attachment:
-  #  type: OS:: Cinder::VolumeAttachment
-  #  properties:
-  #    volume_id: { get_param: pcm_vol }
-  #    mountpoint: /dev/vdb
-  #    instance_uuid: { get_resource: server_pcm }
 outputs:
   server_pcm_id:
     description: the pcm nova service id
-    value: { get_resource: server_pcm }
\ No newline at end of file
+    value: { get_resource: server_pcm_1 }
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1_2.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1_2.yaml
index 3f117a8410..fe545e9f1e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1_2.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/inputs/nested-pcm_v0.1_2.yaml
@@ -74,7 +74,7 @@ resources:
       - config: { get_resource: network}
       - config: { get_resource: script_init}
 
-  server_pcm:
+  server_pcm_2:
     type: OS::Nova::Server
     properties:
       config_drive: "True"
@@ -107,14 +107,7 @@ resources:
       fixed_ips:
         - ip_address: { get_param: oam_net_ip }
       security_groups: [{ get_param: security_group_name }]
-
-  #pcm_vol_attachment:
-  #  type: OS:: Cinder::VolumeAttachment
-  #  properties:
-  #    volume_id: { get_param: pcm_vol }
-  #    mountpoint: /dev/vdb
-  #    instance_uuid: { get_resource: server_pcm }
 outputs:
   server_pcm_id:
     description: the pcm nova service id
-    value: { get_resource: server_pcm }
\ No newline at end of file
+    value: { get_resource: server_pcm_2 }
\ No newline at end of file