1 files changed, 154 insertions, 154 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
index 6271474b83..57da03d117 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instanceServiceTemplate.yaml
@@ -11,58 +11,65 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1c2_catalog_instance_201_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_1c2_catalog_instance_202_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     compute_1c2_catalog_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c201_port_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     vm_flavor_name:
       type: string
       required: true
+    port_1c2_catalog_instance_202_port_0_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
     compute_1c2_catalog_instance_personality:
       type: list
       required: true
       entry_schema:
         type: json
-    port_2c202_port_subnetpoolid:
-      type: string
+    port_1c2_catalog_instance_201_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_2c202_port_ip_requirements:
+    port_1c2_catalog_instance_202_port_0_network:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    port_1c201_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_2c202_port_network_role_tag:
+        type: string
+    vm_image_name:
       type: string
       required: true
-    port_2c202_port_network_role:
-      type: string
+    port_1c2_catalog_instance_202_port_0_vlan_requirements:
+      type: list
       required: true
-    vm_image_name:
-      type: string
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_1c2_catalog_instance_202_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_2c202_port_order:
-      type: integer
+    port_1c2_catalog_instance_201_port_0_vlan_requirements:
+      type: list
       required: true
-    port_1c201_port_network_role_tag:
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_1c2_catalog_instance_201_port_0_network_role_tag:
       type: string
       required: true
-    port_1c201_port_order:
-      type: integer
+    port_1c2_catalog_instance_201_port_0_network_role:
+      type: string
       required: true
-    port_2c202_port_vlan_requirements:
+    port_1c2_catalog_instance_201_port_0_related_networks:
       type: list
       required: true
       entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
+        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -75,51 +82,44 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_2c202_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
+    port_1c2_catalog_instance_201_port_0_order:
+      type: integer
       required: true
-    port_2c202_port_network:
-      type: list
+    port_1c2_catalog_instance_202_port_0_order:
+      type: integer
       required: true
-      entry_schema:
-        type: string
-    port_1c201_port_ip_requirements:
+    port_1c2_catalog_instance_201_port_0_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_1c201_port_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_2c202_port_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+    port_1c2_catalog_instance_201_port_0_subnetpoolid:
+      type: string
       required: true
-    port_1c201_port_subnetpoolid:
+    port_1c2_catalog_instance_202_port_0_network_role_tag:
       type: string
       required: true
-    port_1c201_port_related_networks:
+    port_1c2_catalog_instance_202_port_0_related_networks:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_2c202_port_related_networks:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-    port_1c201_port_network_role:
+    port_1c2_catalog_instance_202_port_0_subnetpoolid:
       type: string
       required: true
-    compute_1c2_catalog_instance_user_data_format:
+    port_1c2_catalog_instance_201_port_0_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c201_port_network:
+    compute_1c2_catalog_instance_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
+    port_1c2_catalog_instance_202_port_0_network_role:
+      type: string
+      required: true
     compute_1c2_catalog_instance_scheduler_hints:
       type: list
       required: true
@@ -143,7 +143,7 @@ topology_template:
           get_input: vm_image_name
         diskConfig:
           get_attribute:
-          - 1c2_catalog_instance_1c201_port
+          - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
           - tenant_id
         name:
           get_input:
@@ -157,62 +157,62 @@ topology_template:
           get_input:
           - compute_1c2_catalog_instance_user_data_format
           - index_value
-    1c2_catalog_instance_1c201_port:
+    1c2_catalog_instance_1c2_catalog_instance_202_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_1c201_port_exCP_naming
+          get_input: port_1c2_catalog_instance_202_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_1c201_port_vlan_requirements
+          get_input: port_1c2_catalog_instance_202_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_1c201_port_related_networks
+          get_input: port_1c2_catalog_instance_202_port_0_related_networks
         ip_requirements:
-          get_input: port_1c201_port_ip_requirements
+          get_input: port_1c2_catalog_instance_202_port_0_ip_requirements
         network_role_tag:
-          get_input: port_1c201_port_network_role_tag
+          get_input: port_1c2_catalog_instance_202_port_0_network_role_tag
         mac_requirements:
-          get_input: port_1c201_port_mac_requirements
+          get_input: port_1c2_catalog_instance_202_port_0_mac_requirements
         order:
-          get_input: port_1c201_port_order
+          get_input: port_1c2_catalog_instance_202_port_0_order
         network_role:
-          get_input: port_1c201_port_network_role
+          get_input: port_1c2_catalog_instance_202_port_0_network_role
         subnetpoolid:
-          get_input: port_1c201_port_subnetpoolid
+          get_input: port_1c2_catalog_instance_202_port_0_subnetpoolid
         network:
           get_input:
-          - port_1c201_port_network
+          - port_1c2_catalog_instance_202_port_0_network
           - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
           node: 1c2_catalog_instance
           relationship: tosca.relationships.network.BindsTo
-    1c2_catalog_instance_2c202_port:
+    1c2_catalog_instance_1c2_catalog_instance_201_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input: port_2c202_port_exCP_naming
+          get_input: port_1c2_catalog_instance_201_port_0_exCP_naming
         vlan_requirements:
-          get_input: port_2c202_port_vlan_requirements
+          get_input: port_1c2_catalog_instance_201_port_0_vlan_requirements
         subinterface_indicator: false
         related_networks:
-          get_input: port_2c202_port_related_networks
+          get_input: port_1c2_catalog_instance_201_port_0_related_networks
         ip_requirements:
-          get_input: port_2c202_port_ip_requirements
+          get_input: port_1c2_catalog_instance_201_port_0_ip_requirements
         network_role_tag:
-          get_input: port_2c202_port_network_role_tag
+          get_input: port_1c2_catalog_instance_201_port_0_network_role_tag
         mac_requirements:
-          get_input: port_2c202_port_mac_requirements
+          get_input: port_1c2_catalog_instance_201_port_0_mac_requirements
         order:
-          get_input: port_2c202_port_order
+          get_input: port_1c2_catalog_instance_201_port_0_order
         network_role:
-          get_input: port_2c202_port_network_role
+          get_input: port_1c2_catalog_instance_201_port_0_network_role
         subnetpoolid:
-          get_input: port_2c202_port_subnetpoolid
+          get_input: port_1c2_catalog_instance_201_port_0_subnetpoolid
         network:
           get_input:
-          - port_2c202_port_network
+          - port_1c2_catalog_instance_201_port_0_network
           - index_value
       requirements:
       - binding:
@@ -226,60 +226,66 @@ topology_template:
         get_attribute:
         - 1c2_catalog_instance
         - instance_name
-    1c2_catalog_instance_1c201_port_tenant_id:
+    1c2_catalog_instance_1c2_catalog_instance_201_port_0_tenant_id:
       type: string
       value:
         get_attribute:
-        - 1c2_catalog_instance_1c201_port
+        - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
         - tenant_id
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.1c2_catalog_instance
     capabilities:
+      network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_202_port_0
+      - network.outgoing.packets.rate
       disk.device.capacity_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.capacity
-      attachment_1c2_catalog_instance_2c202_port:
-      - 1c2_catalog_instance_2c202_port
-      - attachment
-      network.incoming.bytes.rate_1c2_catalog_instance_2c202_port:
-      - 1c2_catalog_instance_2c202_port
-      - network.incoming.bytes.rate
-      network.incoming.packets_1c2_catalog_instance_2c202_port:
-      - 1c2_catalog_instance_2c202_port
-      - network.incoming.packets
-      network.incoming.packets.rate_1c2_catalog_instance_1c201_port:
-      - 1c2_catalog_instance_1c201_port
-      - network.incoming.packets.rate
       disk.read.bytes.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.read.bytes.rate
-      network.incoming.bytes_1c2_catalog_instance_1c201_port:
-      - 1c2_catalog_instance_1c201_port
-      - network.incoming.bytes
+      network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_202_port_0
+      - network.incoming.bytes.rate
+      network.incoming.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
+      - network.incoming.bytes.rate
       memory.usage_1c2_catalog_instance:
       - 1c2_catalog_instance
       - memory.usage
-      binding_1c2_catalog_instance_1c201_port:
-      - 1c2_catalog_instance_1c201_port
-      - binding
-      forwarder_1c2_catalog_instance_1c201_port:
-      - 1c2_catalog_instance_1c201_port
-      - forwarder
       disk.write.bytes.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.write.bytes.rate
+      network.outgoing.packets.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
+      - network.outgoing.packets.rate
+      network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_202_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_202_port_0
+      - network.outpoing.packets
+      network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_202_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_202_port_0
+      - network.incoming.bytes
+      network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
+      - network.incoming.packets.rate
       cpu_util_1c2_catalog_instance:
       - 1c2_catalog_instance
       - cpu_util
+      network.outpoing.packets_1c2_catalog_instance_1c2_catalog_instance_201_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
+      - network.outpoing.packets
+      network.incoming.bytes_1c2_catalog_instance_1c2_catalog_instance_201_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
+      - network.incoming.bytes
+      network.incoming.packets.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_202_port_0
+      - network.incoming.packets.rate
       cpu_1c2_catalog_instance:
       - 1c2_catalog_instance
       - cpu
       disk.read.requests_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.read.requests
-      network.outpoing.packets_1c2_catalog_instance_1c201_port:
-      - 1c2_catalog_instance_1c201_port
-      - network.outpoing.packets
       disk.ephemeral.size_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.ephemeral.size
@@ -292,18 +298,18 @@ topology_template:
       disk.device.write.requests.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.write.requests.rate
+      forwarder_1c2_catalog_instance_1c2_catalog_instance_202_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_202_port_0
+      - forwarder
       os_1c2_catalog_instance:
       - 1c2_catalog_instance
       - os
       disk.device.iops_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.iops
-      feature_1c2_catalog_instance_2c202_port:
-      - 1c2_catalog_instance_2c202_port
-      - feature
-      network.outgoing.packets.rate_1c2_catalog_instance_2c202_port:
-      - 1c2_catalog_instance_2c202_port
-      - network.outgoing.packets.rate
+      network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_202_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_202_port_0
+      - network.outgoing.bytes.rate
       endpoint_1c2_catalog_instance:
       - 1c2_catalog_instance
       - endpoint
@@ -313,33 +319,27 @@ topology_template:
       disk.latency_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.latency
-      network.outgoing.bytes.rate_1c2_catalog_instance_2c202_port:
-      - 1c2_catalog_instance_2c202_port
-      - network.outgoing.bytes.rate
       disk.iops_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.iops
-      binding_1c2_catalog_instance_2c202_port:
-      - 1c2_catalog_instance_2c202_port
-      - binding
+      attachment_1c2_catalog_instance_1c2_catalog_instance_201_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
+      - attachment
       vcpus_1c2_catalog_instance:
       - 1c2_catalog_instance
       - vcpus
       disk.device.latency_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.latency
-      network.outgoing.bytes_1c2_catalog_instance_1c201_port:
-      - 1c2_catalog_instance_1c201_port
+      feature_1c2_catalog_instance_1c2_catalog_instance_202_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_202_port_0
+      - feature
+      binding_1c2_catalog_instance_1c2_catalog_instance_201_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
+      - binding
+      network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_202_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_202_port_0
       - network.outgoing.bytes
-      attachment_1c2_catalog_instance_1c201_port:
-      - 1c2_catalog_instance_1c201_port
-      - attachment
-      network.incoming.bytes.rate_1c2_catalog_instance_1c201_port:
-      - 1c2_catalog_instance_1c201_port
-      - network.incoming.bytes.rate
-      network.incoming.packets_1c2_catalog_instance_1c201_port:
-      - 1c2_catalog_instance_1c201_port
-      - network.incoming.packets
       disk.read.bytes_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.read.bytes
@@ -355,15 +355,9 @@ topology_template:
       disk.device.read.bytes.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.read.bytes.rate
-      network.incoming.bytes_1c2_catalog_instance_2c202_port:
-      - 1c2_catalog_instance_2c202_port
-      - network.incoming.bytes
       disk.device.allocation_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.allocation
-      forwarder_1c2_catalog_instance_2c202_port:
-      - 1c2_catalog_instance_2c202_port
-      - forwarder
       disk.device.read.bytes_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.read.bytes
@@ -385,21 +379,21 @@ topology_template:
       disk.root.size_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.root.size
-      feature_1c2_catalog_instance_1c201_port:
-      - 1c2_catalog_instance_1c201_port
-      - feature
-      network.outpoing.packets_1c2_catalog_instance_2c202_port:
-      - 1c2_catalog_instance_2c202_port
-      - network.outpoing.packets
-      network.incoming.packets.rate_1c2_catalog_instance_2c202_port:
-      - 1c2_catalog_instance_2c202_port
-      - network.incoming.packets.rate
+      network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_201_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
+      - network.incoming.packets
+      network.incoming.packets_1c2_catalog_instance_1c2_catalog_instance_202_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_202_port_0
+      - network.incoming.packets
+      forwarder_1c2_catalog_instance_1c2_catalog_instance_201_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
+      - forwarder
       disk.device.usage_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.usage
-      network.outgoing.packets.rate_1c2_catalog_instance_1c201_port:
-      - 1c2_catalog_instance_1c201_port
-      - network.outgoing.packets.rate
+      network.outgoing.bytes.rate_1c2_catalog_instance_1c2_catalog_instance_201_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
+      - network.outgoing.bytes.rate
       disk.usage_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.usage
@@ -409,43 +403,49 @@ topology_template:
       memory_1c2_catalog_instance:
       - 1c2_catalog_instance
       - memory
-      network.outgoing.bytes.rate_1c2_catalog_instance_1c201_port:
-      - 1c2_catalog_instance_1c201_port
-      - network.outgoing.bytes.rate
       disk.write.requests.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.write.requests.rate
       disk.write.requests_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.write.requests
+      binding_1c2_catalog_instance_1c2_catalog_instance_202_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_202_port_0
+      - binding
+      attachment_1c2_catalog_instance_1c2_catalog_instance_202_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_202_port_0
+      - attachment
       binding_1c2_catalog_instance:
       - 1c2_catalog_instance
       - binding
       cpu.delta_1c2_catalog_instance:
       - 1c2_catalog_instance
       - cpu.delta
-      network.outgoing.bytes_1c2_catalog_instance_2c202_port:
-      - 1c2_catalog_instance_2c202_port
-      - network.outgoing.bytes
       disk.device.read.requests.rate_1c2_catalog_instance:
       - 1c2_catalog_instance
       - disk.device.read.requests.rate
+      feature_1c2_catalog_instance_1c2_catalog_instance_201_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
+      - feature
+      network.outgoing.bytes_1c2_catalog_instance_1c2_catalog_instance_201_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
+      - network.outgoing.bytes
     requirements:
-      dependency_1c2_catalog_instance_2c202_port:
-      - 1c2_catalog_instance_2c202_port
-      - dependency
+      link_1c2_catalog_instance_1c2_catalog_instance_202_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_202_port_0
+      - link
       dependency_1c2_catalog_instance:
       - 1c2_catalog_instance
       - dependency
       local_storage_1c2_catalog_instance:
       - 1c2_catalog_instance
       - local_storage
-      link_1c2_catalog_instance_1c201_port:
-      - 1c2_catalog_instance_1c201_port
-      - link
-      link_1c2_catalog_instance_2c202_port:
-      - 1c2_catalog_instance_2c202_port
-      - link
-      dependency_1c2_catalog_instance_1c201_port:
-      - 1c2_catalog_instance_1c201_port
-      - dependency
-\ No newline at end of file
+      dependency_1c2_catalog_instance_1c2_catalog_instance_202_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_202_port_0
+      - dependency
+      dependency_1c2_catalog_instance_1c2_catalog_instance_201_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
+      - dependency
+      link_1c2_catalog_instance_1c2_catalog_instance_201_port_0:
+      - 1c2_catalog_instance_1c2_catalog_instance_201_port_0
+      - link
+\ No newline at end of file