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>

3 files changed, 276 insertions, 276 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2eeae9ad81..cf58502a77 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -577,43 +577,41 @@ node_types:
   org.openecomp.resource.abstract.nodes.heat.oam_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_pcm_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_pcm_port_1_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
       availabilityzone_name:
         type: string
         description: availabilityzone name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_vlan_requirements:
+      port_pcm_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: org.openecomp.datatypes.network.IpRequirements
       oam_server_name:
         type: string
         description: oam server name
         required: true
         status: SUPPORTED
-      port_pcm_port_0_order:
-        type: integer
+      port_pcm_port_00_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_subnetpoolid:
-        type: string
+      port_pcm_port_01_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_pcm_port_1_subnetpoolid:
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pcm_port_01_network_role:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_network_role_tag:
+      port_pcm_port_01_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -627,24 +625,20 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pcm_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       oam_net_name:
         type: string
         description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_network_role:
+      port_pcm_port_01_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_0_ip_requirements:
+      port_pcm_port_00_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
@@ -670,31 +664,37 @@ node_types:
         description: CPS network ip
         required: true
         status: SUPPORTED
-      port_pcm_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
+      port_pcm_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
-        type: list
+      port_pcm_port_01_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_pcm_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_pcm_port_01_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       pcm_vol:
         type: string
         description: CPS Cluman Cinder Volume
         required: true
         status: SUPPORTED
-      port_pcm_port_1_ip_requirements:
+      port_pcm_port_00_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_pcm_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
+          type: org.openecomp.datatypes.network.VlanRequirements
       cps_net_name:
         type: string
         description: CPS network name
@@ -710,8 +710,8 @@ node_types:
         description: CPS network mask
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
-        type: integer
+      port_pcm_port_01_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
     attributes:
@@ -734,27 +734,27 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_pcm_port_1:
+    - dependency_pcm_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_1:
+    - link_pcm_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
-    - dependency_pcm_port_0:
+    - dependency_pcm_port_01:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_pcm_port_0:
+    - link_pcm_port_01:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -767,37 +767,35 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_pcm_port_1:
+      network.incoming.packets_pcm_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.outpoing.packets_pcm_port_1:
+      memory_server_oam:
         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
-      memory_server_oam:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_pcm_port_01:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_pcm_port_0:
+      disk.write.requests_server_oam:
         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
-      disk.write.requests_server_oam:
+      network.incoming.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -815,154 +813,136 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_server_oam:
+      network.outgoing.packets.rate_pcm_port_00:
         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
-      disk.allocation_server_oam:
+      network.incoming.bytes_pcm_port_00:
         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
-      disk.device.usage_server_oam:
+      disk.device.write.requests_server_oam:
         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
-      disk.usage_server_oam:
+      network.incoming.bytes_pcm_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
-      disk.device.write.bytes_server_oam:
+      disk.allocation_server_oam:
         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_pcm_port_0:
+      disk.device.usage_server_oam:
         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
-      disk.ephemeral.size_server_oam:
+      disk.usage_server_oam:
         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
-      disk.device.latency_server_oam:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.root.size_server_oam:
+      disk.device.write.bytes_server_oam:
         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
-      memory.usage_server_oam:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_pcm_port_01:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_pcm_port_1:
+      network.outgoing.bytes_pcm_port_00:
         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
-      binding_pcm_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      binding_pcm_port_1:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.read.bytes_server_oam:
+      disk.ephemeral.size_server_oam:
         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
-      os_server_oam:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.read.requests_server_oam:
+      disk.device.latency_server_oam:
         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
-      disk.capacity_server_oam:
+      disk.root.size_server_oam:
         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_pcm_port_0:
+      network.outgoing.packets.rate_pcm_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_pcm_port_1:
+      memory.usage_server_oam:
         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_pcm_port_1:
-        type: tosca.capabilities.Node
+      network.outgoing.bytes_pcm_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_pcm_port_0:
+      disk.read.bytes_server_oam:
         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_pcm_port_0:
-        type: tosca.capabilities.Node
+      os_server_oam:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_pcm_port_1:
+      disk.read.requests_server_oam:
         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_pcm_port_0:
-        type: tosca.capabilities.Attachment
+      disk.capacity_server_oam:
+        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_pcm_port_1:
-        type: tosca.capabilities.Attachment
+      disk.device.read.bytes_server_oam:
+        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
-      disk.device.read.bytes_server_oam:
+      network.incoming.bytes.rate_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -973,6 +953,12 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      network.incoming.bytes.rate_pcm_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
       disk.device.read.requests.rate_server_oam:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -1032,55 +1018,69 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_server_oam:
+      network.outgoing.bytes.rate_pcm_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
-      host_server_oam:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      network.incoming.packets.rate_pcm_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
-      disk.device.write.bytes.rate_server_oam:
+      network.incoming.packets.rate_pcm_port_00:
         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_pcm_port_1:
+      binding_pcm_port_01:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      cpu.delta_server_oam:
         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_pcm_port_0:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_server_oam:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      binding_server_oam:
+      binding_pcm_port_00:
         type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      network.outgoing.bytes.rate_pcm_port_0:
+      disk.device.write.bytes.rate_server_oam:
         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
-      disk.device.capacity_server_oam:
+      network.outgoing.bytes.rate_pcm_port_00:
         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_pcm_port_1:
+      binding_server_oam:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.capacity_server_oam:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1115,7 +1115,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_0:
+      network.outpoing.packets_pcm_port_00:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1127,7 +1127,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_pcm_port_1:
+      network.outpoing.packets_pcm_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:
@@ -1994,4 +1994,4 @@ node_types:
         type: tosca.capabilities.network.Bindable
         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/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
index e49afcd726..e33c8f7742 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -186,17 +186,19 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_pcm_port_1_network_role_tag: oam
-        availabilityzone_name:
-          get_input: availabilityzone_name
-        port_pcm_port_0_ip_requirements:
+        port_pcm_port_00_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: true
           floating_ip_count_required:
             is_required: false
+        availabilityzone_name:
+          get_input: availabilityzone_name
         oam_net_gw:
           get_input: oam_net_gw
+        port_pcm_port_00_mac_requirements:
+          mac_count_required:
+            is_required: false
         oam_flavor_name:
           get_input: oam_flavor_name
         security_group_name:
@@ -205,29 +207,26 @@ topology_template:
           get_input:
           - cps_net_ips
           - 0
+        port_pcm_port_01_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         oam_server_name:
           get_input:
           - oam_server_names
           - 0
-        port_pcm_port_1_mac_requirements:
-          mac_count_required:
-            is_required: false
+        port_pcm_port_00_network_role_tag: cps
         service_template_filter:
           substitute_service_template: nested-oam_v0.1ServiceTemplate.yaml
+        port_pcm_port_01_mac_requirements:
+          mac_count_required:
+            is_required: false
         pcm_vol:
           get_input:
           - pcm_volumes
           - 0
-        port_pcm_port_1_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
-        port_pcm_port_0_network_role_tag: cps
-        port_pcm_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         oam_image_name:
           get_input: oam_image_name
         cps_net_name:
@@ -242,6 +241,7 @@ topology_template:
           get_input: oam_net_mask
         oam_net_name:
           get_input: oam_net_name
+        port_pcm_port_01_network_role_tag: oam
     server_pcm_001:
       type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
@@ -408,4 +408,4 @@ topology_template:
       value:
         get_attribute:
         - server_pcm_002
-        - server_pcm_id
+        - server_pcm_id
\ 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/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
index 815fc7c18d..5abcd8ca3b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -11,39 +11,38 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_pcm_port_0_network_role:
-      type: string
-      required: true
-    port_pcm_port_1_network_role_tag:
-      type: string
-      required: true
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
       immutable: false
       type: string
       description: availabilityzone name
-    port_pcm_port_0_vlan_requirements:
+    port_pcm_port_00_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_pcm_port_01_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: org.openecomp.datatypes.network.IpRequirements
     oam_server_name:
       label: oam server name
       hidden: false
       immutable: false
       type: string
       description: oam server name
-    port_pcm_port_0_order:
-      type: integer
-      required: true
-    port_pcm_port_0_subnetpoolid:
+    port_pcm_port_00_subnetpoolid:
       type: string
       required: true
-    port_pcm_port_1_subnetpoolid:
+    port_pcm_port_01_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pcm_port_01_network_role:
       type: string
       required: true
-    port_pcm_port_0_network_role_tag:
+    port_pcm_port_01_subnetpoolid:
       type: string
       required: true
     oam_image_name:
@@ -58,22 +57,19 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pcm_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     oam_net_name:
       label: OAM network name
       hidden: false
       immutable: false
       type: string
       description: OAM network name
-    port_pcm_port_1_network_role:
+    port_pcm_port_01_network_role_tag:
       type: string
       required: true
-    port_pcm_port_0_ip_requirements:
+    port_pcm_port_00_network_role:
+      type: string
+      required: true
+    port_pcm_port_00_ip_requirements:
       type: list
       required: true
       entry_schema:
@@ -102,28 +98,32 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
-    port_pcm_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_pcm_port_00_network_role_tag:
+      type: string
       required: true
-    port_pcm_port_1_vlan_requirements:
-      type: list
+    port_pcm_port_01_order:
+      type: integer
+      required: true
+    port_pcm_port_00_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pcm_port_00_order:
+      type: integer
+      required: true
+    port_pcm_port_01_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    port_pcm_port_1_ip_requirements:
+    port_pcm_port_00_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_pcm_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
+        type: org.openecomp.datatypes.network.VlanRequirements
     cps_net_name:
       label: CPS network name
       hidden: false
@@ -142,8 +142,8 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_order:
-      type: integer
+    port_pcm_port_01_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
   node_templates:
     server_oam:
@@ -158,63 +158,63 @@ topology_template:
         config_drive: true
         name:
           get_input: oam_server_name
-    pcm_port_1:
+    pcm_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_1_ip_requirements
+          get_input: port_pcm_port_00_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_1_network_role
+          get_input: port_pcm_port_00_network_role
         fixed_ips:
         - ip_address:
-            get_input: oam_net_ip
+            get_input: cps_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_1_subnetpoolid
+          get_input: port_pcm_port_00_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_1_mac_requirements
+          get_input: port_pcm_port_00_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_1_exCP_naming
+          get_input: port_pcm_port_00_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_1_vlan_requirements
+          get_input: port_pcm_port_00_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_1_network_role_tag
+          get_input: port_pcm_port_00_network_role_tag
         network:
-          get_input: oam_net_name
+          get_input: cps_net_name
         order:
-          get_input: port_pcm_port_1_order
+          get_input: port_pcm_port_00_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: server_oam
           relationship: tosca.relationships.network.BindsTo
-    pcm_port_0:
+    pcm_port_01:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_pcm_port_0_ip_requirements
+          get_input: port_pcm_port_01_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input: port_pcm_port_0_network_role
+          get_input: port_pcm_port_01_network_role
         fixed_ips:
         - ip_address:
-            get_input: cps_net_ip
+            get_input: oam_net_ip
         subnetpoolid:
-          get_input: port_pcm_port_0_subnetpoolid
+          get_input: port_pcm_port_01_subnetpoolid
         mac_requirements:
-          get_input: port_pcm_port_0_mac_requirements
+          get_input: port_pcm_port_01_mac_requirements
         exCP_naming:
-          get_input: port_pcm_port_0_exCP_naming
+          get_input: port_pcm_port_01_exCP_naming
         vlan_requirements:
-          get_input: port_pcm_port_0_vlan_requirements
+          get_input: port_pcm_port_01_vlan_requirements
         network_role_tag:
-          get_input: port_pcm_port_0_network_role_tag
+          get_input: port_pcm_port_01_network_role_tag
         network:
-          get_input: cps_net_name
+          get_input: oam_net_name
         order:
-          get_input: port_pcm_port_0_order
+          get_input: port_pcm_port_01_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -228,8 +228,8 @@ topology_template:
         description: heat template that creates PCRF Cluman stack
       members:
       - server_oam
-      - pcm_port_1
-      - pcm_port_0
+      - pcm_port_00
+      - pcm_port_01
   outputs:
     server_oam_id:
       description: the oam nova service id
@@ -240,33 +240,42 @@ topology_template:
       cpu_server_oam:
       - server_oam
       - cpu
-      network.incoming.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets.rate
-      network.incoming.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets.rate
-      network.outpoing.packets_pcm_port_1:
-      - pcm_port_1
-      - network.outpoing.packets
+      feature_pcm_port_00:
+      - pcm_port_00
+      - feature
+      network.incoming.packets_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets
       memory_server_oam:
       - server_oam
       - memory
-      network.outpoing.packets_pcm_port_0:
-      - pcm_port_0
-      - network.outpoing.packets
+      feature_pcm_port_01:
+      - pcm_port_01
+      - feature
       disk.write.requests_server_oam:
       - server_oam
       - disk.write.requests
+      network.incoming.packets_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets
       memory.resident_server_oam:
       - server_oam
       - memory.resident
       disk.device.iops_server_oam:
       - server_oam
       - disk.device.iops
+      network.outgoing.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.packets.rate
+      network.incoming.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes
       disk.device.write.requests_server_oam:
       - server_oam
       - disk.device.write.requests
+      network.incoming.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes
       disk.allocation_server_oam:
       - server_oam
       - disk.allocation
@@ -276,12 +285,18 @@ topology_template:
       disk.usage_server_oam:
       - server_oam
       - disk.usage
+      attachment_pcm_port_00:
+      - pcm_port_00
+      - attachment
       disk.device.write.bytes_server_oam:
       - server_oam
       - disk.device.write.bytes
-      network.incoming.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes
+      attachment_pcm_port_01:
+      - pcm_port_01
+      - attachment
+      network.outgoing.bytes_pcm_port_00:
+      - pcm_port_00
+      - network.outgoing.bytes
       disk.ephemeral.size_server_oam:
       - server_oam
       - disk.ephemeral.size
@@ -291,18 +306,15 @@ topology_template:
       disk.root.size_server_oam:
       - server_oam
       - disk.root.size
+      network.outgoing.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.packets.rate
       memory.usage_server_oam:
       - server_oam
       - memory.usage
-      network.incoming.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes
-      binding_pcm_port_0:
-      - pcm_port_0
-      - binding
-      binding_pcm_port_1:
-      - pcm_port_1
-      - binding
+      network.outgoing.bytes_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes
       disk.read.bytes_server_oam:
       - server_oam
       - disk.read.bytes
@@ -315,36 +327,18 @@ topology_template:
       disk.capacity_server_oam:
       - server_oam
       - disk.capacity
-      network.outgoing.packets.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.packets.rate
-      network.outgoing.packets.rate_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.packets.rate
-      feature_pcm_port_1:
-      - pcm_port_1
-      - feature
-      network.outgoing.bytes_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes
-      feature_pcm_port_0:
-      - pcm_port_0
-      - feature
-      network.outgoing.bytes_pcm_port_1:
-      - pcm_port_1
-      - network.outgoing.bytes
-      attachment_pcm_port_0:
-      - pcm_port_0
-      - attachment
-      attachment_pcm_port_1:
-      - pcm_port_1
-      - attachment
       disk.device.read.bytes_server_oam:
       - server_oam
       - disk.device.read.bytes
+      network.incoming.bytes.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.bytes.rate
       endpoint_server_oam:
       - server_oam
       - endpoint
+      network.incoming.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.bytes.rate
       disk.device.read.requests.rate_server_oam:
       - server_oam
       - disk.device.read.requests.rate
@@ -375,33 +369,39 @@ topology_template:
       cpu_util_server_oam:
       - server_oam
       - cpu_util
+      network.outgoing.bytes.rate_pcm_port_01:
+      - pcm_port_01
+      - network.outgoing.bytes.rate
+      network.incoming.packets.rate_pcm_port_01:
+      - pcm_port_01
+      - network.incoming.packets.rate
+      network.incoming.packets.rate_pcm_port_00:
+      - pcm_port_00
+      - network.incoming.packets.rate
+      binding_pcm_port_01:
+      - pcm_port_01
+      - binding
       cpu.delta_server_oam:
       - server_oam
       - cpu.delta
       host_server_oam:
       - server_oam
       - host
+      binding_pcm_port_00:
+      - pcm_port_00
+      - binding
       disk.device.write.bytes.rate_server_oam:
       - server_oam
       - disk.device.write.bytes.rate
-      network.outgoing.bytes.rate_pcm_port_1:
-      - pcm_port_1
+      network.outgoing.bytes.rate_pcm_port_00:
+      - pcm_port_00
       - network.outgoing.bytes.rate
-      network.incoming.packets_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.packets
       binding_server_oam:
       - server_oam
       - binding
-      network.outgoing.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.outgoing.bytes.rate
       disk.device.capacity_server_oam:
       - server_oam
       - disk.device.capacity
-      network.incoming.packets_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.packets
       disk.latency_server_oam:
       - server_oam
       - disk.latency
@@ -417,31 +417,31 @@ topology_template:
       feature_server_oam:
       - server_oam
       - feature
-      network.incoming.bytes.rate_pcm_port_0:
-      - pcm_port_0
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_00:
+      - pcm_port_00
+      - network.outpoing.packets
       disk.write.bytes.rate_server_oam:
       - server_oam
       - disk.write.bytes.rate
-      network.incoming.bytes.rate_pcm_port_1:
-      - pcm_port_1
-      - network.incoming.bytes.rate
+      network.outpoing.packets_pcm_port_01:
+      - pcm_port_01
+      - network.outpoing.packets
     requirements:
-      link_pcm_port_0:
-      - pcm_port_0
-      - link
-      link_pcm_port_1:
-      - pcm_port_1
-      - link
+      dependency_pcm_port_00:
+      - pcm_port_00
+      - dependency
       local_storage_server_oam:
       - server_oam
       - local_storage
-      dependency_pcm_port_0:
-      - pcm_port_0
+      dependency_pcm_port_01:
+      - pcm_port_01
       - dependency
+      link_pcm_port_01:
+      - pcm_port_01
+      - link
+      link_pcm_port_00:
+      - pcm_port_00
+      - link
       dependency_server_oam:
       - server_oam
-      - dependency
-      dependency_pcm_port_1:
-      - pcm_port_1
-      - dependency
+      - dependency
\ No newline at end of file