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, 188 insertions, 188 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 391a1b781c..697e58424d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -1461,217 +1461,217 @@ node_types:
         description: no_compute_attr_1
         status: SUPPORTED
     requirements:
-    - dependency_cmaui_port_2:
+    - dependency_cmaui_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - binding_cmaui_port_2:
+    - binding_cmaui_port_01:
         capability: tosca.capabilities.network.Bindable
         relationship: tosca.relationships.network.BindsTo
         occurrences:
         - 1
         - 1
-    - dependency_packet_external_network:
+    - dependency_cmaui_port_02:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_packet_internal_network:
+    - binding_cmaui_port_02:
+        capability: tosca.capabilities.network.Bindable
+        relationship: tosca.relationships.network.BindsTo
+        occurrences:
+        - 1
+        - 1
+    - dependency_packet_internal_network_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_cmaui_port_1:
+    - dependency_packet_external_network_0:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - binding_cmaui_port_1:
-        capability: tosca.capabilities.network.Bindable
-        relationship: tosca.relationships.network.BindsTo
-        occurrences:
-        - 1
-        - 1
     capabilities:
-      network.incoming.packets_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_packet_internal_network_0:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_cmaui_port_1:
+      network.incoming.packets_cmaui_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_1:
+      network.incoming.bytes_cmaui_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_packet_external_network_0:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_1:
-        type: tosca.capabilities.Node
+      network.outgoing.packets.rate_cmaui_port_01:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_cmaui_port_2:
-        type: tosca.capabilities.Node
+      binding_cmaui_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      end_point_packet_internal_network:
-        type: tosca.capabilities.Endpoint
+      network.outgoing.packets.rate_cmaui_port_02:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      link_packet_internal_network:
-        type: tosca.capabilities.network.Linkable
+      binding_cmaui_port_02:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      feature_packet_internal_network:
-        type: tosca.capabilities.Node
+      attachment_cmaui_port_02:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      end_point_packet_external_network:
+      end_point_packet_external_network_0:
         type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_2:
+      attachment_cmaui_port_01:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_2:
+      network.incoming.packets.rate_cmaui_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_1:
+      link_packet_internal_network_0:
+        type: tosca.capabilities.network.Linkable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes_cmaui_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_cmaui_port_2:
+      network.incoming.packets_cmaui_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_cmaui_port_1:
+      network.incoming.packets.rate_cmaui_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_cmaui_port_1:
+      attachment_packet_internal_network_0:
         type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      binding_cmaui_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_cmaui_port_2:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_1:
+      network.outgoing.bytes.rate_cmaui_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_cmaui_port_2:
+      network.outgoing.bytes.rate_cmaui_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_packet_internal_network:
-        type: tosca.capabilities.Attachment
+      end_point_packet_internal_network_0:
+        type: tosca.capabilities.Endpoint
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_1:
+      network.outpoing.packets_cmaui_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_cmaui_port_2:
+      network.outpoing.packets_cmaui_port_01:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_2:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      link_packet_external_network_0:
+        type: tosca.capabilities.network.Linkable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_cmaui_port_1:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_cmaui_port_02:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      attachment_packet_external_network:
-        type: tosca.capabilities.Attachment
+      feature_cmaui_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_2:
+      network.outgoing.bytes_cmaui_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      link_packet_external_network:
-        type: tosca.capabilities.network.Linkable
+      network.incoming.bytes.rate_cmaui_port_01:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_packet_external_network:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_cmaui_port_01:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_cmaui_port_1:
+      network.incoming.bytes.rate_cmaui_port_02:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
+      feature_packet_external_network_0:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
   org.openecomp.resource.abstract.nodes.heat.nested1:
     derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute
     properties:
@@ -4671,4 +4671,4 @@ node_types:
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
-        - UNBOUNDED
+        - UNBOUNDED
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-no-computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-no-computeServiceTemplate.yaml
index 76061f4f9c..be3fbadb31 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-no-computeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-no-computeServiceTemplate.yaml
@@ -65,7 +65,7 @@ topology_template:
       immutable: false
       type: string
   node_templates:
-    cmaui_port_2:
+    cmaui_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -83,23 +83,13 @@ topology_template:
         mac_requirements:
           mac_count_required:
             is_required: false
-        network: packet_external_network
+        network: packet_internal_network_0
       requirements:
       - link:
           capability: tosca.capabilities.network.Linkable
-          node: packet_external_network
+          node: packet_internal_network_0
           relationship: tosca.relationships.network.LinksTo
-    packet_external_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-      properties:
-        network_name:
-          get_input: packet_external_network_name
-    packet_internal_network:
-      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
-      properties:
-        network_name:
-          get_input: packet_internal_network_name
-    cmaui_port_1:
+    cmaui_port_02:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         replacement_policy: AUTO
@@ -117,12 +107,22 @@ topology_template:
         mac_requirements:
           mac_count_required:
             is_required: false
-        network: packet_internal_network
+        network: packet_external_network_0
       requirements:
       - link:
           capability: tosca.capabilities.network.Linkable
-          node: packet_internal_network
+          node: packet_external_network_0
           relationship: tosca.relationships.network.LinksTo
+    packet_internal_network_0:
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        network_name:
+          get_input: packet_internal_network_name
+    packet_external_network_0:
+      type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
+      properties:
+        network_name:
+          get_input: packet_external_network_name
   groups:
     nested-no-compute_group:
       type: org.openecomp.groups.heat.HeatStack
@@ -130,123 +130,123 @@ topology_template:
         heat_file: ../Artifacts/nested-no-compute.yml
         description: nested1
       members:
-      - cmaui_port_2
-      - packet_external_network
-      - packet_internal_network
-      - cmaui_port_1
+      - cmaui_port_01
+      - cmaui_port_02
+      - packet_internal_network_0
+      - packet_external_network_0
   outputs:
     no_compute_attr_1:
       description: no_compute_attr_1
-      value: packet_external_network
+      value: packet_external_network_0
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.nested-no-compute
     capabilities:
-      network.incoming.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets
-      network.incoming.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets
-      network.incoming.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.packets.rate
-      network.incoming.packets.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.packets.rate
-      feature_cmaui_port_1:
-      - cmaui_port_1
-      - feature
-      feature_cmaui_port_2:
-      - cmaui_port_2
+      feature_packet_internal_network_0:
+      - packet_internal_network_0
       - feature
-      end_point_packet_internal_network:
-      - packet_internal_network
-      - end_point
-      link_packet_internal_network:
-      - packet_internal_network
-      - link
-      feature_packet_internal_network:
-      - packet_internal_network
-      - feature
-      end_point_packet_external_network:
-      - packet_external_network
-      - end_point
-      attachment_cmaui_port_2:
-      - cmaui_port_2
+      network.incoming.packets_cmaui_port_02:
+      - cmaui_port_02
+      - network.incoming.packets
+      network.incoming.bytes_cmaui_port_02:
+      - cmaui_port_02
+      - network.incoming.bytes
+      attachment_packet_external_network_0:
+      - packet_external_network_0
       - attachment
-      network.outgoing.bytes_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes
-      network.outgoing.packets.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_cmaui_port_2:
-      - cmaui_port_2
+      network.outgoing.packets.rate_cmaui_port_01:
+      - cmaui_port_01
       - network.outgoing.packets.rate
-      network.outgoing.bytes_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes
-      attachment_cmaui_port_1:
-      - cmaui_port_1
-      - attachment
-      binding_cmaui_port_1:
-      - cmaui_port_1
+      binding_cmaui_port_01:
+      - cmaui_port_01
       - binding
-      binding_cmaui_port_2:
-      - cmaui_port_2
+      network.outgoing.packets.rate_cmaui_port_02:
+      - cmaui_port_02
+      - network.outgoing.packets.rate
+      binding_cmaui_port_02:
+      - cmaui_port_02
       - binding
-      network.incoming.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.bytes.rate
-      network.incoming.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.incoming.bytes.rate
-      attachment_packet_internal_network:
-      - packet_internal_network
+      attachment_cmaui_port_02:
+      - cmaui_port_02
       - attachment
-      network.outpoing.packets_cmaui_port_1:
-      - cmaui_port_1
-      - network.outpoing.packets
-      network.outpoing.packets_cmaui_port_2:
-      - cmaui_port_2
-      - network.outpoing.packets
-      network.outgoing.bytes.rate_cmaui_port_2:
-      - cmaui_port_2
-      - network.outgoing.bytes.rate
-      network.outgoing.bytes.rate_cmaui_port_1:
-      - cmaui_port_1
-      - network.outgoing.bytes.rate
-      attachment_packet_external_network:
-      - packet_external_network
+      end_point_packet_external_network_0:
+      - packet_external_network_0
+      - end_point
+      attachment_cmaui_port_01:
+      - cmaui_port_01
       - attachment
-      network.incoming.bytes_cmaui_port_2:
-      - cmaui_port_2
+      network.incoming.packets.rate_cmaui_port_01:
+      - cmaui_port_01
+      - network.incoming.packets.rate
+      link_packet_internal_network_0:
+      - packet_internal_network_0
+      - link
+      network.incoming.bytes_cmaui_port_01:
+      - cmaui_port_01
       - network.incoming.bytes
-      link_packet_external_network:
-      - packet_external_network
+      network.incoming.packets_cmaui_port_01:
+      - cmaui_port_01
+      - network.incoming.packets
+      network.incoming.packets.rate_cmaui_port_02:
+      - cmaui_port_02
+      - network.incoming.packets.rate
+      attachment_packet_internal_network_0:
+      - packet_internal_network_0
+      - attachment
+      network.outgoing.bytes.rate_cmaui_port_02:
+      - cmaui_port_02
+      - network.outgoing.bytes.rate
+      network.outgoing.bytes.rate_cmaui_port_01:
+      - cmaui_port_01
+      - network.outgoing.bytes.rate
+      end_point_packet_internal_network_0:
+      - packet_internal_network_0
+      - end_point
+      network.outpoing.packets_cmaui_port_02:
+      - cmaui_port_02
+      - network.outpoing.packets
+      network.outpoing.packets_cmaui_port_01:
+      - cmaui_port_01
+      - network.outpoing.packets
+      link_packet_external_network_0:
+      - packet_external_network_0
       - link
-      feature_packet_external_network:
-      - packet_external_network
+      feature_cmaui_port_02:
+      - cmaui_port_02
+      - feature
+      feature_cmaui_port_01:
+      - cmaui_port_01
+      - feature
+      network.outgoing.bytes_cmaui_port_02:
+      - cmaui_port_02
+      - network.outgoing.bytes
+      network.incoming.bytes.rate_cmaui_port_01:
+      - cmaui_port_01
+      - network.incoming.bytes.rate
+      network.outgoing.bytes_cmaui_port_01:
+      - cmaui_port_01
+      - network.outgoing.bytes
+      network.incoming.bytes.rate_cmaui_port_02:
+      - cmaui_port_02
+      - network.incoming.bytes.rate
+      feature_packet_external_network_0:
+      - packet_external_network_0
       - feature
-      network.incoming.bytes_cmaui_port_1:
-      - cmaui_port_1
-      - network.incoming.bytes
     requirements:
-      binding_cmaui_port_1:
-      - cmaui_port_1
-      - binding
-      binding_cmaui_port_2:
-      - cmaui_port_2
-      - binding
-      dependency_packet_internal_network:
-      - packet_internal_network
+      dependency_packet_external_network_0:
+      - packet_external_network_0
       - dependency
-      dependency_cmaui_port_1:
-      - cmaui_port_1
+      dependency_packet_internal_network_0:
+      - packet_internal_network_0
       - dependency
-      dependency_cmaui_port_2:
-      - cmaui_port_2
+      dependency_cmaui_port_01:
+      - cmaui_port_01
       - dependency
-      dependency_packet_external_network:
-      - packet_external_network
+      binding_cmaui_port_01:
+      - cmaui_port_01
+      - binding
+      dependency_cmaui_port_02:
+      - cmaui_port_02
       - dependency
+      binding_cmaui_port_02:
+      - cmaui_port_02
+      - binding
\ No newline at end of file