Port Mirroring: Incorrect Interfaces list(2)

Defect 427115 - Port Mirroring: Incorrect Interfaces list - not correct Port Type

Change-Id: I5a58f5a0acf9df455d294d2dbc0b84cb2c1e03e2
Issue-ID: SDC-1107
Signed-off-by: eleonorali <eleonoral@amdocs.com>

6 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/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5514ce8ca4..9c61fde7b6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,26 +8,12 @@ node_types:
   org.openecomp.resource.abstract.nodes.smp:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_port_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_port_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
       compute_smp_name:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_port_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -42,33 +28,43 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_port_vlan_requirements:
+      port_port1_replacement_policy:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_port_network_role_tag:
-        type: string
+          type: string
+      port_port1_network:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
+      port_port1_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_port1_order:
+        type: integer
+        required: true
+        status: SUPPORTED
       compute_smp_user_data_format:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_port_ip_requirements:
+      port_port1_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      port_port_network_role:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_port1_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
@@ -76,26 +72,30 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      compute_smp_metadata:
+      port_port1_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_port1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_port_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_port1_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_port_replacement_policy:
-        type: list
+      port_port1_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      port_port_order:
-        type: integer
+      compute_smp_metadata:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_smp_scheduler_hints:
         type: list
         required: true
@@ -103,14 +103,14 @@ node_types:
         entry_schema:
           type: json
     requirements:
-    - dependency_smp_port:
+    - dependency_smp_port1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_smp_port:
+    - link_smp_port1:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
@@ -131,6 +131,12 @@ node_types:
         - 0
         - UNBOUNDED
     capabilities:
+      network.outgoing.bytes_smp_port1:
+        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
       scalable_smp:
         type: tosca.capabilities.Scalable
         occurrences:
@@ -141,46 +147,42 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
+      binding_smp_port1:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
       memory.resident_smp:
         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_smp:
+      network.incoming.bytes_smp_port1:
         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_smp:
+      disk.usage_smp:
         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_smp_port:
+      disk.device.write.bytes_smp:
         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_smp_port:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
       os_smp:
         type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.bytes_smp_port:
-        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_smp:
         type: tosca.capabilities.network.Bindable
         occurrences:
@@ -192,14 +194,15 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      instance_smp:
+      network.incoming.packets_smp_port1:
         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
-      forwarder_smp_port:
-        type: org.openecomp.capabilities.Forwarder
+      instance_smp:
+        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
@@ -216,12 +219,6 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.packets.rate_smp_port:
-        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.read.bytes_smp:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
@@ -240,25 +237,35 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets_smp_port:
+      disk.device.write.bytes.rate_smp:
         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_smp:
+      disk.capacity_smp:
         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_smp:
+      feature_smp_port1:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.read.bytes.rate_smp:
         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.rate_smp:
+      attachment_smp_port1:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outgoing.bytes.rate_smp_port1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -276,18 +283,19 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      feature_smp_port:
-        type: tosca.capabilities.Node
+      disk.root.size_smp:
+        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.root.size_smp:
+      disk.write.requests_smp:
         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_smp:
+      network.outpoing.packets_smp_port1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -317,7 +325,7 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes_smp_port:
+      network.incoming.bytes.rate_smp_port1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -359,56 +367,48 @@ node_types:
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_smp_port:
+      disk.iops_smp:
         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_smp_port:
+      disk.read.bytes.rate_smp:
         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_smp_port:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      disk.iops_smp:
+      cpu_util_smp:
         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.read.bytes.rate_smp:
+      disk.write.bytes_smp:
         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_smp_port:
+      memory.usage_smp:
         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
-      cpu_util_smp:
+      network.incoming.packets.rate_smp_port1:
         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.bytes_smp:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      forwarder_smp_port1:
+        type: org.openecomp.capabilities.Forwarder
         occurrences:
         - 1
         - UNBOUNDED
-      memory.usage_smp:
+      network.outgoing.packets.rate_smp_port1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml
index 3ff238743d..c83b3f41fd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml
@@ -111,20 +111,21 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_port_mac_requirements:
-          mac_count_required:
-            is_required: false
-        port_port_network:
-        - get_input: port_name
         compute_smp_name:
         - get_input: smp_name_1
         compute_smp_availability_zone:
         - get_input: availability_zone_0
+        port_port1_replacement_policy:
+        - AUTO
+        port_port1_network:
+        - get_input: port_name
         vm_flavor_name:
           get_input: flavor_smp_name
         compute_smp_user_data_format:
         - RAW
-        port_port_ip_requirements:
+        vm_image_name:
+          get_input: image_smp_name
+        port_port1_ip_requirements:
         - ip_version: 4
           ip_count_required:
             is_required: false
@@ -135,16 +136,15 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        vm_image_name:
-          get_input: image_smp_name
+        port_port1_mac_requirements:
+          mac_count_required:
+            is_required: false
         compute_smp_metadata:
         - jx_vm_role: smp2
           vnf_id:
             get_input: vnf_id
           jx_lab_name:
             get_input: lab_name
-        port_port_replacement_policy:
-        - AUTO
         compute_smp_scheduler_hints:
         - group: BE_Affinity_group
         service_template_filter:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
index 643df5c578..6fe26aad39 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
@@ -11,22 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_port_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     compute_smp_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_port_subnetpoolid:
-      type: string
-      required: true
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -39,81 +28,92 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_port_vlan_requirements:
+    port_port1_replacement_policy:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_port_network_role_tag:
-      type: string
+        type: string
+    port_port1_network:
+      type: list
       required: true
+      entry_schema:
+        type: string
     vm_flavor_name:
       type: string
       required: true
+    port_port1_network_role:
+      type: string
+      required: true
+    port_port1_order:
+      type: integer
+      required: true
     compute_smp_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    port_port_ip_requirements:
+    port_port1_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_port_network_role:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_port1_network_role_tag:
       type: string
       required: true
     vm_image_name:
       type: string
       required: true
-    compute_smp_metadata:
+    port_port1_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_port1_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_port1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_port_replacement_policy:
+    port_port1_subnetpoolid:
+      type: string
+      required: true
+    compute_smp_metadata:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_port_order:
-      type: integer
-      required: true
+        type: json
     compute_smp_scheduler_hints:
       type: list
       required: true
       entry_schema:
         type: json
   node_templates:
-    smp_port:
+    smp_port1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_port_exCP_naming
+          get_input: port_port1_exCP_naming
         replacement_policy:
           get_input:
-          - port_port_replacement_policy
+          - port_port1_replacement_policy
           - index_value
         vlan_requirements:
-          get_input: port_port_vlan_requirements
+          get_input: port_port1_vlan_requirements
         ip_requirements:
-          get_input: port_port_ip_requirements
+          get_input: port_port1_ip_requirements
         network_role_tag:
-          get_input: port_port_network_role_tag
+          get_input: port_port1_network_role_tag
         mac_requirements:
-          get_input: port_port_mac_requirements
+          get_input: port_port1_mac_requirements
         order:
-          get_input: port_port_order
+          get_input: port_port1_order
         network_role:
-          get_input: port_port_network_role
+          get_input: port_port1_network_role
         subnetpoolid:
-          get_input: port_port_subnetpoolid
+          get_input: port_port1_subnetpoolid
         network:
           get_input:
-          - port_port_network
+          - port_port1_network
           - index_value
       requirements:
       - binding:
@@ -150,54 +150,51 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.smp
     capabilities:
+      network.outgoing.bytes_smp_port1:
+      - smp_port1
+      - network.outgoing.bytes
       scalable_smp:
       - smp
       - scalable
       feature_smp:
       - smp
       - feature
+      binding_smp_port1:
+      - smp_port1
+      - binding
       memory.resident_smp:
       - smp
       - memory.resident
+      network.incoming.bytes_smp_port1:
+      - smp_port1
+      - network.incoming.bytes
       disk.usage_smp:
       - smp
       - disk.usage
       disk.device.write.bytes_smp:
       - smp
       - disk.device.write.bytes
-      network.outpoing.packets_smp_port:
-      - smp_port
-      - network.outpoing.packets
-      attachment_smp_port:
-      - smp_port
-      - attachment
       os_smp:
       - smp
       - os
-      network.incoming.bytes_smp_port:
-      - smp_port
-      - network.incoming.bytes
       binding_smp:
       - smp
       - binding
       disk.allocation_smp:
       - smp
       - disk.allocation
+      network.incoming.packets_smp_port1:
+      - smp_port1
+      - network.incoming.packets
       instance_smp:
       - smp
       - instance
-      forwarder_smp_port:
-      - smp_port
-      - forwarder
       host_smp:
       - smp
       - host
       disk.device.usage_smp:
       - smp
       - disk.device.usage
-      network.outgoing.packets.rate_smp_port:
-      - smp_port
-      - network.outgoing.packets.rate
       disk.read.bytes_smp:
       - smp
       - disk.read.bytes
@@ -207,33 +204,39 @@ topology_template:
       disk.write.bytes.rate_smp:
       - smp
       - disk.write.bytes.rate
-      network.incoming.packets_smp_port:
-      - smp_port
-      - network.incoming.packets
       disk.device.write.bytes.rate_smp:
       - smp
       - disk.device.write.bytes.rate
       disk.capacity_smp:
       - smp
       - disk.capacity
+      feature_smp_port1:
+      - smp_port1
+      - feature
       disk.device.read.bytes.rate_smp:
       - smp
       - disk.device.read.bytes.rate
+      attachment_smp_port1:
+      - smp_port1
+      - attachment
+      network.outgoing.bytes.rate_smp_port1:
+      - smp_port1
+      - network.outgoing.bytes.rate
       disk.device.latency_smp:
       - smp
       - disk.device.latency
       disk.device.write.requests.rate_smp:
       - smp
       - disk.device.write.requests.rate
-      feature_smp_port:
-      - smp_port
-      - feature
       disk.root.size_smp:
       - smp
       - disk.root.size
       disk.write.requests_smp:
       - smp
       - disk.write.requests
+      network.outpoing.packets_smp_port1:
+      - smp_port1
+      - network.outpoing.packets
       cpu.delta_smp:
       - smp
       - cpu.delta
@@ -246,9 +249,9 @@ topology_template:
       disk.device.iops_smp:
       - smp
       - disk.device.iops
-      network.outgoing.bytes_smp_port:
-      - smp_port
-      - network.outgoing.bytes
+      network.incoming.bytes.rate_smp_port1:
+      - smp_port1
+      - network.incoming.bytes.rate
       disk.device.allocation_smp:
       - smp
       - disk.device.allocation
@@ -267,24 +270,12 @@ topology_template:
       disk.latency_smp:
       - smp
       - disk.latency
-      network.incoming.packets.rate_smp_port:
-      - smp_port
-      - network.incoming.packets.rate
-      network.incoming.bytes.rate_smp_port:
-      - smp_port
-      - network.incoming.bytes.rate
-      binding_smp_port:
-      - smp_port
-      - binding
       disk.iops_smp:
       - smp
       - disk.iops
       disk.read.bytes.rate_smp:
       - smp
       - disk.read.bytes.rate
-      network.outgoing.bytes.rate_smp_port:
-      - smp_port
-      - network.outgoing.bytes.rate
       cpu_util_smp:
       - smp
       - cpu_util
@@ -294,6 +285,15 @@ topology_template:
       memory.usage_smp:
       - smp
       - memory.usage
+      network.incoming.packets.rate_smp_port1:
+      - smp_port1
+      - network.incoming.packets.rate
+      forwarder_smp_port1:
+      - smp_port1
+      - forwarder
+      network.outgoing.packets.rate_smp_port1:
+      - smp_port1
+      - network.outgoing.packets.rate
       disk.read.requests_smp:
       - smp
       - disk.read.requests
@@ -310,15 +310,15 @@ topology_template:
       - smp
       - disk.device.read.requests
     requirements:
-      link_smp_port:
-      - smp_port
-      - link
+      dependency_smp_port1:
+      - smp_port1
+      - dependency
       dependency_smp:
       - smp
       - dependency
-      dependency_smp_port:
-      - smp_port
-      - dependency
+      link_smp_port1:
+      - smp_port1
+      - link
       local_storage_smp:
       - smp
       - local_storage
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 76856f62be..17285f8444 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -22,16 +22,16 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
       port_pd01_port2_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port1_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       port_pd01_port2_ip_requirements:
         type: list
         required: true
@@ -80,14 +80,14 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_pd01_port1_order:
-        type: integer
-        required: true
-        status: SUPPORTED
       port_pd01_port2_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
+      port_pd01_port1_order:
+        type: integer
+        required: true
+        status: SUPPORTED
       port_pd01_port1_network_role:
         type: string
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml
index bcd3451776..993c99c66f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml
@@ -835,11 +835,11 @@ topology_template:
         port_pd01_port1_network:
         - get_input: oam_net_name
         port_pd01_port1_network_role_tag: oam
+        port_pd01_port2_network:
+        - get_input: oam_net_name
         port_pd01_port1_mac_requirements:
           mac_count_required:
             is_required: false
-        port_pd01_port2_network:
-        - get_input: oam_net_name
         port_pd01_port2_ip_requirements:
         - ip_version: 4
           ip_count_required:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml
index 322991e37b..20ce78d7f1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/Nested_pd_serverServiceTemplate.yaml
@@ -22,14 +22,14 @@ topology_template:
     port_pd01_port1_network_role_tag:
       type: string
       required: true
-    port_pd01_port1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
     port_pd01_port2_network:
       type: list
       required: true
       entry_schema:
         type: string
+    port_pd01_port1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     port_pd01_port2_ip_requirements:
       type: list
       required: true
@@ -69,12 +69,12 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_pd01_port1_order:
-      type: integer
-      required: true
     port_pd01_port2_network_role_tag:
       type: string
       required: true
+    port_pd01_port1_order:
+      type: integer
+      required: true
     port_pd01_port1_network_role:
       type: string
       required: true