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>

1 files changed, 13 insertions, 13 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw3.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw3.yml
index 45563922d6..27bb720fa0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw3.yml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrail2serviceinstance/connectToNetworkMultiNested/inputfiles/OCS-fw3.yml
@@ -92,19 +92,19 @@ parameters:
 
 resources:
 
-  hsl_direct_net:
+  hsl_direct_net_3:
     type: OS::Contrail::VirtualNetwork
     properties:
       name: { get_param: HSL_direct_net_id }
 
-  hsl_ip_subnet:
+  hsl_ip_subnet_3:
     type: OS::Neutron::Subnet
     properties:
-      network_id: { get_resource: hsl_direct_net }
+      network_id: { get_resource: hsl_direct_net_3 }
       cidr: { get_param: HSL_direct_net_cidr }
       gateway_ip: { get_param: HSL_direct_net_gateway }
 
-  service_template:
+  service_template_3:
     type: OS::Contrail::ServiceTemplate
     properties:
       name: { get_param: st_name }
@@ -119,11 +119,11 @@ resources:
 
   service_instance4:
     type: OS::Contrail::ServiceInstance
-    depends_on: [ hsl_ip_subnet]
+    depends_on: [ hsl_ip_subnet_3]
     properties:
       name: { get_param: service_instance_name }
       availability_zone: { get_param: availability_zone_1 }
-      service_template: { get_resource: service_template }
+      service_template: { get_resource: service_template_3 }
       scale_out:
         max_instances: {get_param: max_num_fw_instances}
       interface_list: [
@@ -139,7 +139,7 @@ resources:
           ]
 
 
-  service_policy:
+  service_policy_3:
     type: OS::Contrail::NetworkPolicy
     depends_on: [ service_instance4 ]
     properties:
@@ -157,17 +157,17 @@ resources:
           },
           ]
 
-  service_policy_attach_direct_net:
+  service_policy_attach_direct_net_3:
     type: OS::Contrail::AttachPolicy
-    depends_on: [ service_policy ]
+    depends_on: [ service_policy_3 ]
     properties:
       network: { get_param: Cricket_OCS_direct_net_id }
-      policy: { get_attr: [service_policy, fq_name] }
+      policy: { get_attr: [service_policy_3, fq_name] }
 
-  service_policy_attach_protected_net:
+  service_policy_attach_protected_net_3:
     type: OS::Contrail::AttachPolicy
-    depends_on: [ service_policy ]
+    depends_on: [ service_policy_3 ]
     properties:
       network: { get_param: Cricket_OCS_protected_net_id }
-      policy: { get_attr: [service_policy, fq_name] }
+      policy: { get_attr: [service_policy_3, fq_name] }