Port scaling not working properly

Made changes in evaluating port naming pattern.

Change-Id: If9a3fc9c3d50fa5c4da319d2ff7d5f8ce6ca8ffe
Issue-ID: SDC-573
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>

1 files changed, 83 insertions, 83 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
index 10f6fd221e..372637f9e9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
@@ -14,9 +14,6 @@ topology_template:
     port_FSB1_Internal_mac_address:
       type: string
       required: true
-    port_FSB_OAM_network_role_tag:
-      type: string
-      required: true
     port_FSB1_Internal_ip_requirements:
       type: list
       required: true
@@ -25,6 +22,9 @@ topology_template:
     port_FSB1_Internal_subnetpoolid:
       type: string
       required: true
+    port_FSB1_OAM_subnetpoolid:
+      type: string
+      required: true
     compute_FSB1_metadata:
       type: list
       required: true
@@ -38,6 +38,14 @@ topology_template:
     port_FSB2_Internal_order:
       type: integer
       required: true
+    port_FSB1_OAM_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_FSB1_OAM_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
     port_FSB2_Internal_ip_requirements:
       type: list
       required: true
@@ -46,22 +54,17 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_FSB_OAM_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     port_FSB2_Internal_network_role:
       type: string
       required: true
-    port_FSB_OAM_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     port_FSB1_Internal_network_role_tag:
       type: string
       required: true
+    port_FSB1_OAM_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     port_FSB1_Internal_vlan_requirements:
       type: list
       required: true
@@ -73,21 +76,10 @@ topology_template:
     port_FSB1_Internal_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
-    port_FSB_OAM_network_role:
-      type: string
-      required: true
-    port_FSB_OAM_network:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     port_FSB1_Internal_network_role:
       type: string
       required: true
-    port_FSB_OAM_subnetpoolid:
-      type: string
-      required: true
-    port_FSB_OAM_mac_requirements:
+    port_FSB1_OAM_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
     compute_FSB1_availability_zone:
@@ -107,7 +99,7 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_FSB_OAM_order:
+    port_FSB1_OAM_order:
       type: integer
       required: true
     port_FSB2_Internal_mac_requirements:
@@ -116,33 +108,41 @@ topology_template:
     port_FSB2_Internal_mac_address:
       type: string
       required: true
+    port_FSB1_OAM_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_FSB2_Internal_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
     port_FSB1_Internal_order:
       type: integer
       required: true
-    port_FSB_OAM_fixed_ips:
-      type: list
+    port_FSB1_OAM_network_role:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     port_FSB2_Internal_network:
       type: list
       required: true
       entry_schema:
         type: string
+    port_FSB1_OAM_network_role_tag:
+      type: string
+      required: true
     port_FSB1_Internal_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_FSB_OAM_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     compute_FSB1_name:
       type: list
       required: true
       entry_schema:
         type: string
+    port_FSB1_OAM_fixed_ips:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     port_FSB2_Internal_network_role_tag:
       type: string
       required: true
@@ -207,30 +207,30 @@ topology_template:
           capability: tosca.capabilities.network.Bindable
           node: FSB1
           relationship: tosca.relationships.network.BindsTo
-    FSB1_FSB_OAM:
+    FSB1_FSB1_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_FSB_OAM_exCP_naming
+          get_input: port_FSB1_OAM_exCP_naming
         vlan_requirements:
-          get_input: port_FSB_OAM_vlan_requirements
+          get_input: port_FSB1_OAM_vlan_requirements
         ip_requirements:
-          get_input: port_FSB_OAM_ip_requirements
+          get_input: port_FSB1_OAM_ip_requirements
         network_role_tag:
-          get_input: port_FSB_OAM_network_role_tag
+          get_input: port_FSB1_OAM_network_role_tag
         mac_requirements:
-          get_input: port_FSB_OAM_mac_requirements
+          get_input: port_FSB1_OAM_mac_requirements
         order:
-          get_input: port_FSB_OAM_order
+          get_input: port_FSB1_OAM_order
         network_role:
-          get_input: port_FSB_OAM_network_role
+          get_input: port_FSB1_OAM_network_role
         subnetpoolid:
-          get_input: port_FSB_OAM_subnetpoolid
+          get_input: port_FSB1_OAM_subnetpoolid
         fixed_ips:
-          get_input: port_FSB_OAM_fixed_ips
+          get_input: port_FSB1_OAM_fixed_ips
         network:
           get_input:
-          - port_FSB_OAM_network
+          - port_FSB1_OAM_network
           - index_value
       requirements:
       - binding:
@@ -264,15 +264,12 @@ topology_template:
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.FSB1
     capabilities:
-      network.outgoing.packets.rate_FSB1_FSB_OAM:
-      - FSB1_FSB_OAM
-      - network.outgoing.packets.rate
-      attachment_FSB1_FSB_OAM:
-      - FSB1_FSB_OAM
-      - attachment
-      binding_FSB1_FSB_OAM:
-      - FSB1_FSB_OAM
-      - binding
+      network.incoming.bytes.rate_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - network.incoming.bytes.rate
+      network.outgoing.bytes_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - network.outgoing.bytes
       binding_FSB1_FSB2_Internal:
       - FSB1_FSB2_Internal
       - binding
@@ -300,12 +297,12 @@ topology_template:
       disk.device.write.requests.rate_FSB1:
       - FSB1
       - disk.device.write.requests.rate
+      network.outgoing.bytes.rate_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - network.outgoing.bytes.rate
       disk.root.size_FSB1:
       - FSB1
       - disk.root.size
-      network.outgoing.bytes.rate_FSB1_FSB_OAM:
-      - FSB1_FSB_OAM
-      - network.outgoing.bytes.rate
       feature_FSB1:
       - FSB1
       - feature
@@ -324,12 +321,12 @@ topology_template:
       network.incoming.packets_FSB1_FSB2_Internal:
       - FSB1_FSB2_Internal
       - network.incoming.packets
-      feature_FSB1_FSB_OAM:
-      - FSB1_FSB_OAM
-      - feature
       memory.resident_FSB1:
       - FSB1
       - memory.resident
+      network.incoming.packets.rate_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - network.incoming.packets.rate
       network.incoming.packets.rate_FSB1_FSB2_Internal:
       - FSB1_FSB2_Internal
       - network.incoming.packets.rate
@@ -339,12 +336,12 @@ topology_template:
       disk.write.requests.rate_FSB1:
       - FSB1
       - disk.write.requests.rate
+      feature_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - feature
       instance_FSB1:
       - FSB1
       - instance
-      network.incoming.bytes_FSB1_FSB_OAM:
-      - FSB1_FSB_OAM
-      - network.incoming.bytes
       disk.device.read.bytes.rate_FSB1:
       - FSB1
       - disk.device.read.bytes.rate
@@ -375,30 +372,36 @@ topology_template:
       disk.device.write.bytes_FSB1:
       - FSB1
       - disk.device.write.bytes
-      network.outpoing.packets_FSB1_FSB_OAM:
-      - FSB1_FSB_OAM
-      - network.outpoing.packets
+      network.outgoing.packets.rate_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - network.outgoing.packets.rate
+      binding_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - binding
+      attachment_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - attachment
       network.incoming.packets_FSB1_FSB1_Internal:
       - FSB1_FSB1_Internal
       - network.incoming.packets
       attachment_FSB1_FSB1_Internal:
       - FSB1_FSB1_Internal
       - attachment
+      network.incoming.bytes_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - network.incoming.bytes
       memory_FSB1:
       - FSB1
       - memory
-      network.incoming.bytes.rate_FSB1_FSB_OAM:
-      - FSB1_FSB_OAM
-      - network.incoming.bytes.rate
+      network.incoming.packets_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - network.incoming.packets
       network.outpoing.packets_FSB1_FSB1_Internal:
       - FSB1_FSB1_Internal
       - network.outpoing.packets
       network.outgoing.bytes.rate_FSB1_FSB2_Internal:
       - FSB1_FSB2_Internal
       - network.outgoing.bytes.rate
-      network.outgoing.bytes_FSB1_FSB_OAM:
-      - FSB1_FSB_OAM
-      - network.outgoing.bytes
       disk.device.read.bytes_FSB1:
       - FSB1
       - disk.device.read.bytes
@@ -414,6 +417,9 @@ topology_template:
       disk.usage_FSB1:
       - FSB1
       - disk.usage
+      network.outpoing.packets_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - network.outpoing.packets
       host_FSB1:
       - FSB1
       - host
@@ -429,9 +435,6 @@ topology_template:
       disk.write.requests_FSB1:
       - FSB1
       - disk.write.requests
-      network.incoming.packets.rate_FSB1_FSB_OAM:
-      - FSB1_FSB_OAM
-      - network.incoming.packets.rate
       network.outgoing.bytes_FSB1_FSB2_Internal:
       - FSB1_FSB2_Internal
       - network.outgoing.bytes
@@ -465,9 +468,6 @@ topology_template:
       disk.read.requests_FSB1:
       - FSB1
       - disk.read.requests
-      network.incoming.packets_FSB1_FSB_OAM:
-      - FSB1_FSB_OAM
-      - network.incoming.packets
       disk.device.write.requests_FSB1:
       - FSB1
       - disk.device.write.requests
@@ -487,6 +487,12 @@ topology_template:
       - FSB1
       - disk.device.iops
     requirements:
+      link_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - link
+      dependency_FSB1_FSB1_OAM:
+      - FSB1_FSB1_OAM
+      - dependency
       dependency_FSB1:
       - FSB1
       - dependency
@@ -502,12 +508,6 @@ topology_template:
       local_storage_FSB1:
       - FSB1
       - local_storage
-      dependency_FSB1_FSB_OAM:
-      - FSB1_FSB_OAM
-      - dependency
-      link_FSB1_FSB_OAM:
-      - FSB1_FSB_OAM
-      - link
       dependency_FSB1_FSB2_Internal:
       - FSB1_FSB2_Internal
       - dependency