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>

8 files changed, 1838 insertions, 1838 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server.yaml
index 7d8d5129d0..3f422dbb5e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server.yaml
@@ -148,7 +148,7 @@ resources:
     type: OS::Heat::SwiftSignalHandle
 
 # vSON server OAM network port
-  vson_server_oam_net_port_0:
+  vson_server_oam_net_port_20:
     type: OS::Neutron::Port
     properties:
       name: 
@@ -165,9 +165,9 @@ resources:
       - {get_param: oam_net_security_group_id}
 
 # Create vSON server 
-  vson_server:
+  vson_server_1:
     type: OS::Nova::Server
-    depends_on: [vson_server_oam_net_port_0]
+    depends_on: [vson_server_oam_net_port_20]
     properties:
       name: {get_param: [vson_vm_names, {get_param: instance_index}]}
       availability_zone: {get_param: [availability_zones, {get_param: instance_index}]}
@@ -181,7 +181,7 @@ resources:
         vf_module_id: {get_param: vf_module_id}
         vm_role: {get_param: vfc_role}
       networks:
-      - port: {get_resource: vson_server_oam_net_port_0}
+      - port: {get_resource: vson_server_oam_net_port_20}
       scheduler_hints:
         group: {get_param: vson_server_group_id}
       user_data_format: RAW
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_from_vol.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_from_vol.yaml
index 93f0fe7420..9447289bcc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_from_vol.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_from_vol.yaml
@@ -134,7 +134,7 @@ resources:
     type: OS::Heat::SwiftSignalHandle
 
 # vSON server OAM network port
-  vson_server_oam_net_port_0:
+  vson_server_oam_net_port_10:
     type: OS::Neutron::Port
     properties:
       name: 
@@ -151,9 +151,9 @@ resources:
       - {get_param: oam_net_security_group_id}
 
 # Create vSON server 
-  vson_server:
+  vson_server_3:
     type: OS::Nova::Server
-    depends_on: [vson_server_oam_net_port_0]
+    depends_on: [vson_server_oam_net_port_10]
     properties:
       name: {get_param: [vson_vm_names, {get_param: instance_index}]}
       block_device_mapping_v2:
@@ -170,7 +170,7 @@ resources:
         vf_module_id: {get_param: vf_module_id}
         vm_role: {get_param: vfc_role}
       networks:
-      - port: {get_resource: vson_server_oam_net_port_0}
+      - port: {get_resource: vson_server_oam_net_port_10}
       scheduler_hints:
         group: {get_param: vson_server_group_id}
       user_data_format: RAW
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol.yaml
index 84cf6a783a..02660dc5ed 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/in/nested_vson_server_with_vol.yaml
@@ -145,7 +145,7 @@ resources:
     type: OS::Heat::SwiftSignalHandle
 
 # vSON server OAM network port
-  vson_server_oam_net_port_0:
+  vson_server_oam_net_port_00:
     type: OS::Neutron::Port
     properties:
       name: 
@@ -162,17 +162,17 @@ resources:
       - {get_param: oam_net_security_group_id}
 
 # Attach Cinder volume to the server
-  vson_server_volume_attach:
+  vson_server_volume_attach_1:
     type: OS::Cinder::VolumeAttachment
-    depends_on: vson_server
+    depends_on: vson_server_2
     properties:
-      instance_uuid: {get_resource: vson_server}
+      instance_uuid: {get_resource: vson_server_2}
       volume_id: {get_param: [volume_ids, {get_param: instance_index}]}
 
 # Create vSON server 
-  vson_server:
+  vson_server_2:
     type: OS::Nova::Server
-    depends_on: [vson_server_oam_net_port_0]
+    depends_on: [vson_server_oam_net_port_00]
     properties:
       name: {get_param: [vson_vm_names, {get_param: instance_index}]}
       availability_zone: {get_param: [availability_zones, {get_param: instance_index}]}
@@ -186,7 +186,7 @@ resources:
         vf_module_id: {get_param: vf_module_id}
         vm_role: {get_param: vfc_role}
       networks:
-      - port: {get_resource: vson_server_oam_net_port_0}
+      - port: {get_resource: vson_server_oam_net_port_00}
       scheduler_hints:
         group: {get_param: vson_server_group_id}
       user_data_format: RAW
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 95604246af..d8c52bc864 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -18,12 +18,6 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -34,11 +28,21 @@ node_types:
         description: Unique name for this VF instance.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_10_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_10_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -62,20 +66,12 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
+      port_vson_server_oam_net_port_10_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -113,16 +109,6 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -137,6 +123,10 @@ node_types:
         status: SUPPORTED
         entry_schema: &id010
           type: string
+      port_vson_server_oam_net_port_10_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
       ntp_servers:
         type: list
         description: List of NTP servers.
@@ -144,19 +134,19 @@ node_types:
         status: SUPPORTED
         entry_schema: &id011
           type: string
+      port_vson_server_oam_net_port_10_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
+      port_vson_server_oam_net_port_10_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
@@ -164,337 +154,347 @@ node_types:
         status: SUPPORTED
         entry_schema: &id012
           type: string
+      port_vson_server_oam_net_port_10_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_10_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_10:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_10:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_vson_server_3:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_vson_server:
+      disk.read.bytes_vson_server_3:
         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_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_3:
         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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_port_10:
         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_vson_server_oam_net_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.
+      binding_vson_server_3:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_vson_server:
+      disk.read.bytes.rate_vson_server_3:
         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_vson_server:
+      disk.device.write.bytes_vson_server_3:
         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_vson_server:
+      instance_vson_server_3:
         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_vson_server:
+      disk.latency_vson_server_3:
         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.latency_vson_server:
+      cpu_util_vson_server_3:
         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_vson_server:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_vson_server_oam_net_port_0:
+      feature_vson_server_oam_net_port_10:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      instance_vson_server:
+      disk.write.requests_vson_server_3:
         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_vson_server:
+      memory_vson_server_3:
         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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_port_10:
         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_vson_server_oam_net_port_0:
+      disk.device.read.requests.rate_vson_server_3:
         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_vson_server:
+      disk.device.iops_vson_server_3:
         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_vson_server:
+      disk.capacity_vson_server_3:
         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
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_vson_server_3:
+        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
-      vcpus_vson_server:
+      disk.usage_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
+      disk.device.read.bytes.rate_vson_server_3:
         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_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_port_10:
         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.rate_vson_server:
+      disk.allocation_vson_server_3:
         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_vson_server:
+      disk.write.requests.rate_vson_server_3:
         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_vson_server:
+      disk.ephemeral.size_vson_server_3:
         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.iops_vson_server:
+      network.incoming.bytes.rate_vson_server_oam_net_port_10:
         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.requests.rate_vson_server:
+      disk.device.read.bytes_vson_server_3:
         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_vson_server_oam_net_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.
+      binding_vson_server_oam_net_port_10:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      os_vson_server_3:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_vson_server:
+      disk.root.size_vson_server_3:
         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_vson_server:
+      disk.device.write.bytes.rate_vson_server_3:
         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.requests_vson_server:
+      disk.device.write.requests_vson_server_3:
         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_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_port_10:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_vson_server:
+      disk.device.latency_vson_server_3:
         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.resident_vson_server:
+      cpu.delta_vson_server_3:
         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_vson_server:
+      memory.resident_vson_server_3:
         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_vson_server:
-        type: tosca.capabilities.Scalable
+      attachment_vson_server_oam_net_port_10:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      network.incoming.bytes_vson_server_oam_net_port_10:
         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_vson_server:
+      feature_vson_server_3:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes_vson_server_3:
         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_vson_server:
+      disk.device.read.requests_vson_server_3:
         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_vson_server:
+      network.outpoing.packets_vson_server_oam_net_port_10:
         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_vson_server:
+      disk.device.usage_vson_server_3:
         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.delta_vson_server:
+      disk.device.write.requests.rate_vson_server_3:
         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.rate_vson_server:
+      vcpus_vson_server_3:
         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_vson_server:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_vson_server_3:
+        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_vson_server:
+      disk.iops_vson_server_3:
         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_vson_server:
-        type: tosca.capabilities.network.Bindable
+      scalable_vson_server_3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      host_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.capacity_vson_server_3:
+        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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.allocation_vson_server_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      cpu_vson_server_3:
         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.requests_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_port_10:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1036,12 +1036,10 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
+      port_vson_server_oam_net_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -1057,6 +1055,12 @@ node_types:
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -1085,23 +1089,11 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
@@ -1125,6 +1117,10 @@ node_types:
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       vson_server_group_id:
         type: string
         description: |
@@ -1136,16 +1132,6 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -1173,17 +1159,27 @@ node_types:
           \  a new Datacenter/vSON member to existing vSON Cluster. \n"
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
-        type: integer
+      port_vson_server_oam_net_port_00_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_vson_server_oam_net_port_00_network_role:
+        type: string
         required: true
         status: SUPPORTED
       vson_vm_names:
@@ -1193,337 +1189,341 @@ node_types:
         status: SUPPORTED
         entry_schema: &id006
           type: string
+      port_vson_server_oam_net_port_00_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
+      network.outpoing.packets_vson_server_oam_net_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.allocation_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_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_vson_server_oam_net_port_0:
+      instance_vson_server_2:
         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_vson_server:
+      disk.device.write.bytes_vson_server_2:
         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_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_2:
         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_vson_server:
+      disk.read.bytes_vson_server_2:
         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_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_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.read.requests_vson_server:
+      disk.latency_vson_server_2:
         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_vson_server:
+      disk.read.bytes.rate_vson_server_2:
         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.latency_vson_server:
+      endpoint_vson_server_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_vson_server_oam_net_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
-      os_vson_server:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests_vson_server_2:
+        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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Node
+      binding_vson_server_oam_net_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      instance_vson_server:
+      memory_vson_server_2:
         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_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_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
-      attachment_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_vson_server:
+      cpu_util_vson_server_2:
         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_vson_server_oam_net_port_0:
+      disk.device.read.requests.rate_vson_server_2:
         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_vson_server:
+      disk.device.iops_vson_server_2:
         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_vson_server:
+      disk.allocation_vson_server_2:
         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
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_vson_server_2:
+        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
-      vcpus_vson_server:
+      disk.usage_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_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.read.requests.rate_vson_server:
+      disk.capacity_vson_server_2:
         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.rate_vson_server:
+      disk.device.read.bytes.rate_vson_server_2:
         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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_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.capacity_vson_server:
+      network.incoming.bytes_vson_server_oam_net_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.iops_vson_server:
+      disk.write.requests.rate_vson_server_2:
         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.requests.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_vson_server_oam_net_port_0:
+      disk.ephemeral.size_vson_server_2:
         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_vson_server:
+      disk.device.read.bytes_vson_server_2:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_vson_server_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_vson_server:
+      disk.root.size_vson_server_2:
         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_vson_server_oam_net_port_0:
+      disk.device.write.requests_vson_server_2:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_vson_server:
+      disk.device.write.bytes.rate_vson_server_2:
         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.resident_vson_server:
+      cpu.delta_vson_server_2:
         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_vson_server:
+      disk.device.latency_vson_server_2:
         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_vson_server:
-        type: tosca.capabilities.Scalable
+      feature_vson_server_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      memory.resident_vson_server_2:
         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_vson_server:
+      disk.write.bytes_vson_server_2:
         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_vson_server:
+      disk.device.usage_vson_server_2:
         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_vson_server:
+      disk.device.write.requests.rate_vson_server_2:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_vson_server_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_vson_server:
+      vcpus_vson_server_2:
         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.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_vson_server_2:
+        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_vson_server:
+      disk.iops_vson_server_2:
         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_vson_server:
-        type: tosca.capabilities.network.Bindable
+      cpu_vson_server_2:
+        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_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      feature_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.allocation_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      disk.device.read.requests_vson_server_2:
         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.requests_vson_server:
+      disk.device.capacity_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -1542,12 +1542,10 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
+      port_vson_server_oam_net_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -1563,6 +1561,12 @@ node_types:
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -1590,23 +1594,11 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
@@ -1629,6 +1621,10 @@ node_types:
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       vson_server_group_id:
         type: string
         description: |
@@ -1640,16 +1636,6 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -1674,17 +1660,27 @@ node_types:
           \  a new Datacenter/vSON member to existing vSON Cluster. \n"
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
-        type: integer
+      port_vson_server_oam_net_port_00_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_vson_server_oam_net_port_00_network_role:
+        type: string
         required: true
         status: SUPPORTED
       vson_vm_names:
@@ -1693,337 +1689,341 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id006
+      port_vson_server_oam_net_port_00_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
+      network.outpoing.packets_vson_server_oam_net_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.allocation_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_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_vson_server_oam_net_port_0:
+      instance_vson_server_2:
         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_vson_server:
+      disk.device.write.bytes_vson_server_2:
         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_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_2:
         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_vson_server:
+      disk.read.bytes_vson_server_2:
         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_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_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.read.requests_vson_server:
+      disk.latency_vson_server_2:
         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_vson_server:
+      disk.read.bytes.rate_vson_server_2:
         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.latency_vson_server:
+      endpoint_vson_server_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_vson_server_oam_net_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
-      os_vson_server:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests_vson_server_2:
+        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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Node
+      binding_vson_server_oam_net_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      instance_vson_server:
+      memory_vson_server_2:
         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_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_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
-      attachment_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_vson_server:
+      cpu_util_vson_server_2:
         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_vson_server_oam_net_port_0:
+      disk.device.read.requests.rate_vson_server_2:
         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_vson_server:
+      disk.device.iops_vson_server_2:
         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_vson_server:
+      disk.allocation_vson_server_2:
         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
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_vson_server_2:
+        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
-      vcpus_vson_server:
+      disk.usage_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_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.read.requests.rate_vson_server:
+      disk.capacity_vson_server_2:
         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.rate_vson_server:
+      disk.device.read.bytes.rate_vson_server_2:
         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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_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.capacity_vson_server:
+      network.incoming.bytes_vson_server_oam_net_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.iops_vson_server:
+      disk.write.requests.rate_vson_server_2:
         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.requests.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_vson_server_oam_net_port_0:
+      disk.ephemeral.size_vson_server_2:
         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_vson_server:
+      disk.device.read.bytes_vson_server_2:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_vson_server_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_vson_server:
+      disk.root.size_vson_server_2:
         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_vson_server_oam_net_port_0:
+      disk.device.write.requests_vson_server_2:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_vson_server:
+      disk.device.write.bytes.rate_vson_server_2:
         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.resident_vson_server:
+      cpu.delta_vson_server_2:
         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_vson_server:
+      disk.device.latency_vson_server_2:
         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_vson_server:
-        type: tosca.capabilities.Scalable
+      feature_vson_server_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      memory.resident_vson_server_2:
         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_vson_server:
+      disk.write.bytes_vson_server_2:
         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_vson_server:
+      disk.device.usage_vson_server_2:
         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_vson_server:
+      disk.device.write.requests.rate_vson_server_2:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_vson_server_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_vson_server:
+      vcpus_vson_server_2:
         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.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_vson_server_2:
+        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_vson_server:
+      disk.iops_vson_server_2:
         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_vson_server:
-        type: tosca.capabilities.network.Bindable
+      cpu_vson_server_2:
+        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_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      feature_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.allocation_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      disk.device.read.requests_vson_server_2:
         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.requests_vson_server:
+      disk.device.capacity_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2042,12 +2042,6 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -2058,11 +2052,21 @@ node_types:
         description: Unique name for this VF instance.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_10_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_10_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -2085,20 +2089,12 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
+      port_vson_server_oam_net_port_10_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -2135,16 +2131,6 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -2157,362 +2143,376 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id010
+      port_vson_server_oam_net_port_10_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
       ntp_servers:
         type: list
         description: List of NTP servers.
         required: true
         status: SUPPORTED
         entry_schema: *id011
+      port_vson_server_oam_net_port_10_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
+      port_vson_server_oam_net_port_10_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
         required: true
         status: SUPPORTED
         entry_schema: *id012
+      port_vson_server_oam_net_port_10_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_10_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_10:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_10:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_vson_server_3:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_vson_server:
+      disk.read.bytes_vson_server_3:
         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_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_3:
         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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_port_10:
         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_vson_server_oam_net_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.
+      binding_vson_server_3:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_vson_server:
+      disk.read.bytes.rate_vson_server_3:
         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_vson_server:
+      disk.device.write.bytes_vson_server_3:
         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_vson_server:
+      instance_vson_server_3:
         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_vson_server:
+      disk.latency_vson_server_3:
         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.latency_vson_server:
+      cpu_util_vson_server_3:
         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_vson_server:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_vson_server_oam_net_port_0:
+      feature_vson_server_oam_net_port_10:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      instance_vson_server:
+      disk.write.requests_vson_server_3:
         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_vson_server:
+      memory_vson_server_3:
         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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_port_10:
         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_vson_server_oam_net_port_0:
+      disk.device.read.requests.rate_vson_server_3:
         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_vson_server:
+      disk.device.iops_vson_server_3:
         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_vson_server:
+      disk.capacity_vson_server_3:
         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
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_vson_server_3:
+        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
-      vcpus_vson_server:
+      disk.usage_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
+      disk.device.read.bytes.rate_vson_server_3:
         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_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_port_10:
         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.rate_vson_server:
+      disk.allocation_vson_server_3:
         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_vson_server:
+      disk.write.requests.rate_vson_server_3:
         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_vson_server:
+      disk.ephemeral.size_vson_server_3:
         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.iops_vson_server:
+      network.incoming.bytes.rate_vson_server_oam_net_port_10:
         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.requests.rate_vson_server:
+      disk.device.read.bytes_vson_server_3:
         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_vson_server_oam_net_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.
+      binding_vson_server_oam_net_port_10:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      os_vson_server_3:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_vson_server:
+      disk.root.size_vson_server_3:
         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_vson_server:
+      disk.device.write.bytes.rate_vson_server_3:
         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.requests_vson_server:
+      disk.device.write.requests_vson_server_3:
         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_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_port_10:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_vson_server:
+      disk.device.latency_vson_server_3:
         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.resident_vson_server:
+      cpu.delta_vson_server_3:
         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_vson_server:
+      memory.resident_vson_server_3:
         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_vson_server:
-        type: tosca.capabilities.Scalable
+      attachment_vson_server_oam_net_port_10:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      network.incoming.bytes_vson_server_oam_net_port_10:
         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_vson_server:
+      feature_vson_server_3:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes_vson_server_3:
         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_vson_server:
+      disk.device.read.requests_vson_server_3:
         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_vson_server:
+      network.outpoing.packets_vson_server_oam_net_port_10:
         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_vson_server:
+      disk.device.usage_vson_server_3:
         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.delta_vson_server:
+      disk.device.write.requests.rate_vson_server_3:
         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.rate_vson_server:
+      vcpus_vson_server_3:
         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_vson_server:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_vson_server_3:
+        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_vson_server:
+      disk.iops_vson_server_3:
         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_vson_server:
-        type: tosca.capabilities.network.Bindable
+      scalable_vson_server_3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      host_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.capacity_vson_server_3:
+        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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.allocation_vson_server_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      cpu_vson_server_3:
         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.requests_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_port_10:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -2531,12 +2531,10 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
+      port_vson_server_oam_net_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -2552,6 +2550,12 @@ node_types:
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -2579,23 +2583,11 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
@@ -2618,6 +2610,10 @@ node_types:
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       vson_server_group_id:
         type: string
         description: |
@@ -2629,16 +2625,6 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -2663,17 +2649,27 @@ node_types:
           \  a new Datacenter/vSON member to existing vSON Cluster. \n"
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
-        type: integer
+      port_vson_server_oam_net_port_00_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_vson_server_oam_net_port_00_network_role:
+        type: string
         required: true
         status: SUPPORTED
       vson_vm_names:
@@ -2682,337 +2678,341 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id006
+      port_vson_server_oam_net_port_00_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
+      network.outpoing.packets_vson_server_oam_net_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.allocation_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_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_vson_server_oam_net_port_0:
+      instance_vson_server_2:
         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_vson_server:
+      disk.device.write.bytes_vson_server_2:
         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_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_2:
         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_vson_server:
+      disk.read.bytes_vson_server_2:
         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_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_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.read.requests_vson_server:
+      disk.latency_vson_server_2:
         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_vson_server:
+      disk.read.bytes.rate_vson_server_2:
         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.latency_vson_server:
+      endpoint_vson_server_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_vson_server_oam_net_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
-      os_vson_server:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests_vson_server_2:
+        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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Node
+      binding_vson_server_oam_net_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      instance_vson_server:
+      memory_vson_server_2:
         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_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_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
-      attachment_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_vson_server:
+      cpu_util_vson_server_2:
         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_vson_server_oam_net_port_0:
+      disk.device.read.requests.rate_vson_server_2:
         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_vson_server:
+      disk.device.iops_vson_server_2:
         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_vson_server:
+      disk.allocation_vson_server_2:
         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
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_vson_server_2:
+        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
-      vcpus_vson_server:
+      disk.usage_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_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.read.requests.rate_vson_server:
+      disk.capacity_vson_server_2:
         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.rate_vson_server:
+      disk.device.read.bytes.rate_vson_server_2:
         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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_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.capacity_vson_server:
+      network.incoming.bytes_vson_server_oam_net_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.iops_vson_server:
+      disk.write.requests.rate_vson_server_2:
         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.requests.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_vson_server_oam_net_port_0:
+      disk.ephemeral.size_vson_server_2:
         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_vson_server:
+      disk.device.read.bytes_vson_server_2:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_vson_server_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_vson_server:
+      disk.root.size_vson_server_2:
         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_vson_server_oam_net_port_0:
+      disk.device.write.requests_vson_server_2:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_vson_server:
+      disk.device.write.bytes.rate_vson_server_2:
         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.resident_vson_server:
+      cpu.delta_vson_server_2:
         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_vson_server:
+      disk.device.latency_vson_server_2:
         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_vson_server:
-        type: tosca.capabilities.Scalable
+      feature_vson_server_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      memory.resident_vson_server_2:
         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_vson_server:
+      disk.write.bytes_vson_server_2:
         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_vson_server:
+      disk.device.usage_vson_server_2:
         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_vson_server:
+      disk.device.write.requests.rate_vson_server_2:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_vson_server_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_vson_server:
+      vcpus_vson_server_2:
         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.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_vson_server_2:
+        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_vson_server:
+      disk.iops_vson_server_2:
         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_vson_server:
-        type: tosca.capabilities.network.Bindable
+      cpu_vson_server_2:
+        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_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      feature_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.allocation_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      disk.device.read.requests_vson_server_2:
         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.requests_vson_server:
+      disk.device.capacity_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3031,12 +3031,10 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
+      port_vson_server_oam_net_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -3052,6 +3050,12 @@ node_types:
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -3079,23 +3083,11 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
@@ -3118,6 +3110,10 @@ node_types:
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       vson_server_group_id:
         type: string
         description: |
@@ -3129,16 +3125,6 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -3163,17 +3149,27 @@ node_types:
           \  a new Datacenter/vSON member to existing vSON Cluster. \n"
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
-        type: integer
+      port_vson_server_oam_net_port_00_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_vson_server_oam_net_port_00_network_role:
+        type: string
         required: true
         status: SUPPORTED
       vson_vm_names:
@@ -3182,337 +3178,341 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id006
+      port_vson_server_oam_net_port_00_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
+      network.outpoing.packets_vson_server_oam_net_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.allocation_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_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_vson_server_oam_net_port_0:
+      instance_vson_server_2:
         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_vson_server:
+      disk.device.write.bytes_vson_server_2:
         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_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_2:
         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_vson_server:
+      disk.read.bytes_vson_server_2:
         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_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_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.read.requests_vson_server:
+      disk.latency_vson_server_2:
         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_vson_server:
+      disk.read.bytes.rate_vson_server_2:
         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.latency_vson_server:
+      endpoint_vson_server_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_vson_server_oam_net_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
-      os_vson_server:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests_vson_server_2:
+        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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Node
+      binding_vson_server_oam_net_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      instance_vson_server:
+      memory_vson_server_2:
         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_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_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
-      attachment_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_vson_server:
+      cpu_util_vson_server_2:
         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_vson_server_oam_net_port_0:
+      disk.device.read.requests.rate_vson_server_2:
         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_vson_server:
+      disk.device.iops_vson_server_2:
         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_vson_server:
+      disk.allocation_vson_server_2:
         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
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_vson_server_2:
+        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
-      vcpus_vson_server:
+      disk.usage_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_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.read.requests.rate_vson_server:
+      disk.capacity_vson_server_2:
         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.rate_vson_server:
+      disk.device.read.bytes.rate_vson_server_2:
         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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_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.capacity_vson_server:
+      network.incoming.bytes_vson_server_oam_net_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.iops_vson_server:
+      disk.write.requests.rate_vson_server_2:
         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.requests.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_vson_server_oam_net_port_0:
+      disk.ephemeral.size_vson_server_2:
         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_vson_server:
+      disk.device.read.bytes_vson_server_2:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_vson_server_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_vson_server:
+      disk.root.size_vson_server_2:
         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_vson_server_oam_net_port_0:
+      disk.device.write.requests_vson_server_2:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_vson_server:
+      disk.device.write.bytes.rate_vson_server_2:
         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.resident_vson_server:
+      cpu.delta_vson_server_2:
         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_vson_server:
+      disk.device.latency_vson_server_2:
         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_vson_server:
-        type: tosca.capabilities.Scalable
+      feature_vson_server_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      memory.resident_vson_server_2:
         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_vson_server:
+      disk.write.bytes_vson_server_2:
         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_vson_server:
+      disk.device.usage_vson_server_2:
         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_vson_server:
+      disk.device.write.requests.rate_vson_server_2:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_vson_server_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_vson_server:
+      vcpus_vson_server_2:
         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.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_vson_server_2:
+        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_vson_server:
+      disk.iops_vson_server_2:
         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_vson_server:
-        type: tosca.capabilities.network.Bindable
+      cpu_vson_server_2:
+        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_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      feature_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.allocation_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      disk.device.read.requests_vson_server_2:
         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.requests_vson_server:
+      disk.device.capacity_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -3531,12 +3531,10 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
+      port_vson_server_oam_net_port_00_network_role_tag:
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -3552,6 +3550,12 @@ node_types:
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -3579,23 +3583,11 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_dc_unit:
         type: string
         description: Name of the vSON Data Center.
@@ -3618,6 +3610,10 @@ node_types:
           Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
       vson_server_group_id:
         type: string
         description: |
@@ -3629,16 +3625,6 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -3663,17 +3649,27 @@ node_types:
           \  a new Datacenter/vSON member to existing vSON Cluster. \n"
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_00_order:
+        type: integer
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_00_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
-        type: integer
+      port_vson_server_oam_net_port_00_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_vson_server_oam_net_port_00_network_role:
+        type: string
         required: true
         status: SUPPORTED
       vson_vm_names:
@@ -3682,337 +3678,341 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id006
+      port_vson_server_oam_net_port_00_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_2:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_2:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_00:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_00:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
+      network.outpoing.packets_vson_server_oam_net_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.allocation_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_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_vson_server_oam_net_port_0:
+      instance_vson_server_2:
         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_vson_server:
+      disk.device.write.bytes_vson_server_2:
         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_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_2:
         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_vson_server:
+      disk.read.bytes_vson_server_2:
         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_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_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.read.requests_vson_server:
+      disk.latency_vson_server_2:
         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_vson_server:
+      disk.read.bytes.rate_vson_server_2:
         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.latency_vson_server:
+      endpoint_vson_server_2:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.incoming.bytes.rate_vson_server_oam_net_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
-      os_vson_server:
-        type: tosca.capabilities.OperatingSystem
+      disk.write.requests_vson_server_2:
+        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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Node
+      binding_vson_server_oam_net_port_00:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
         occurrences:
-        - 1
+        - 0
         - UNBOUNDED
-      instance_vson_server:
+      memory_vson_server_2:
         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_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_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
-      attachment_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_vson_server:
+      cpu_util_vson_server_2:
         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_vson_server_oam_net_port_0:
+      disk.device.read.requests.rate_vson_server_2:
         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_vson_server:
+      disk.device.iops_vson_server_2:
         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_vson_server:
+      disk.allocation_vson_server_2:
         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
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_vson_server_2:
+        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
-      vcpus_vson_server:
+      disk.usage_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_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.read.requests.rate_vson_server:
+      disk.capacity_vson_server_2:
         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.rate_vson_server:
+      disk.device.read.bytes.rate_vson_server_2:
         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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_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.capacity_vson_server:
+      network.incoming.bytes_vson_server_oam_net_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.iops_vson_server:
+      disk.write.requests.rate_vson_server_2:
         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.requests.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      attachment_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outpoing.packets_vson_server_oam_net_port_0:
+      disk.ephemeral.size_vson_server_2:
         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_vson_server:
+      disk.device.read.bytes_vson_server_2:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      os_vson_server_2:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_vson_server:
+      disk.root.size_vson_server_2:
         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_vson_server_oam_net_port_0:
+      disk.device.write.requests_vson_server_2:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_2:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_vson_server:
+      disk.device.write.bytes.rate_vson_server_2:
         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.resident_vson_server:
+      cpu.delta_vson_server_2:
         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_vson_server:
+      disk.device.latency_vson_server_2:
         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_vson_server:
-        type: tosca.capabilities.Scalable
+      feature_vson_server_2:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      memory.resident_vson_server_2:
         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_vson_server:
+      disk.write.bytes_vson_server_2:
         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_vson_server:
+      disk.device.usage_vson_server_2:
         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_vson_server:
+      disk.device.write.requests.rate_vson_server_2:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      scalable_vson_server_2:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu.delta_vson_server:
+      vcpus_vson_server_2:
         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.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_2:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      feature_vson_server:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_vson_server_2:
+        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_vson_server:
+      disk.iops_vson_server_2:
         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_vson_server:
-        type: tosca.capabilities.network.Bindable
+      cpu_vson_server_2:
+        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_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      feature_vson_server_oam_net_port_00:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      binding_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.allocation_vson_server_2:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      disk.device.read.requests_vson_server_2:
         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.requests_vson_server:
+      disk.device.capacity_vson_server_2:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4036,12 +4036,6 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -4075,6 +4069,12 @@ node_types:
         status: SUPPORTED
         entry_schema: &id013
           type: string
+      port_vson_server_oam_net_port_20_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       oam_net_security_group_id:
         type: string
         description: |
@@ -4091,7 +4091,7 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
+      port_vson_server_oam_net_port_20_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
@@ -4100,14 +4100,6 @@ node_types:
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       oam_net_ips:
         type: list
         description: Fixed IP assignments for vSON instances on the OAM network.
@@ -4142,16 +4134,10 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
+      port_vson_server_oam_net_port_20_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -4166,19 +4152,33 @@ node_types:
         status: SUPPORTED
         entry_schema: &id016
           type: string
+      port_vson_server_oam_net_port_20_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_20_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_20_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_vson_server_oam_net_port_20_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
+      port_vson_server_oam_net_port_20_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
@@ -4187,336 +4187,336 @@ node_types:
         entry_schema: &id017
           type: string
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_20:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_20:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
+      instance_vson_server_1:
         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.allocation_vson_server:
+      disk.device.write.bytes_vson_server_1:
         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_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_1:
         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_vson_server:
+      disk.read.bytes_vson_server_1:
         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_vson_server_oam_net_port_0:
+      disk.read.bytes.rate_vson_server_1:
         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_vson_server:
+      disk.latency_vson_server_1:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_vson_server_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_vson_server:
+      disk.write.requests_vson_server_1:
         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_vson_server:
+      memory_vson_server_1:
         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.latency_vson_server:
+      cpu_util_vson_server_1:
         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_vson_server:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.read.requests.rate_vson_server_1:
+        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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Node
+      disk.device.iops_vson_server_1:
+        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
-      instance_vson_server:
+      disk.usage_vson_server_1:
         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_vson_server:
+      disk.allocation_vson_server_1:
         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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
+      disk.capacity_vson_server_1:
+        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.iops_vson_server:
+      memory.usage_vson_server_1:
         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_vson_server_oam_net_port_0:
+      disk.device.read.bytes.rate_vson_server_1:
         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_vson_server:
+      disk.write.requests.rate_vson_server_1:
         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_vson_server:
+      disk.ephemeral.size_vson_server_1:
         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
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      feature_vson_server_oam_net_port_20:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_vson_server:
+      disk.device.read.bytes_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vson_server_oam_net_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.
+      os_vson_server_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_vson_server_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_vson_server:
+      network.outpoing.packets_vson_server_oam_net_port_20:
         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_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_port_20:
         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_vson_server:
+      disk.root.size_vson_server_1:
         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.iops_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_port_20:
         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.requests.rate_vson_server:
+      disk.device.write.requests_vson_server_1:
         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_vson_server_oam_net_port_0:
+      disk.device.write.bytes.rate_vson_server_1:
         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_vson_server:
+      host_vson_server_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.latency_vson_server_1:
         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_vson_server:
+      cpu.delta_vson_server_1:
         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.requests_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_port_20:
         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_vson_server_oam_net_port_0:
+      network.incoming.bytes.rate_vson_server_oam_net_port_20:
         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_vson_server:
+      memory.resident_vson_server_1:
         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_vson_server:
+      binding_vson_server_oam_net_port_20:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.bytes_vson_server_1:
         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.resident_vson_server:
+      disk.device.usage_vson_server_1:
         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_vson_server:
+      disk.device.write.requests.rate_vson_server_1:
         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_vson_server:
+      scalable_vson_server_1:
         type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_port_20:
         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_vson_server:
+      vcpus_vson_server_1:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_port_20:
         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_vson_server:
+      disk.iops_vson_server_1:
         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.delta_vson_server:
+      disk.write.bytes.rate_vson_server_1:
         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.rate_vson_server:
+      network.incoming.bytes_vson_server_oam_net_port_20:
         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_vson_server:
-        type: tosca.capabilities.Node
+      attachment_vson_server_oam_net_port_20:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_vson_server:
+      disk.device.allocation_vson_server_1:
         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_vson_server:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      host_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      cpu_vson_server_1:
+        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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      disk.device.read.requests_vson_server_1:
         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.requests_vson_server:
+      disk.device.capacity_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -4540,12 +4540,6 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -4578,6 +4572,12 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id013
+      port_vson_server_oam_net_port_20_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       oam_net_security_group_id:
         type: string
         description: |
@@ -4594,7 +4594,7 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
+      port_vson_server_oam_net_port_20_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
@@ -4603,14 +4603,6 @@ node_types:
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
       oam_net_ips:
         type: list
         description: Fixed IP assignments for vSON instances on the OAM network.
@@ -4644,16 +4636,10 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
+      port_vson_server_oam_net_port_20_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -4666,19 +4652,33 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id016
+      port_vson_server_oam_net_port_20_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_20_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_20_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_vson_server_oam_net_port_20_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
+      port_vson_server_oam_net_port_20_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
@@ -4686,336 +4686,336 @@ node_types:
         status: SUPPORTED
         entry_schema: *id017
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_1:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_1:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_20:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_20:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
+      instance_vson_server_1:
         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.allocation_vson_server:
+      disk.device.write.bytes_vson_server_1:
         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_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_1:
         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_vson_server:
+      disk.read.bytes_vson_server_1:
         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_vson_server_oam_net_port_0:
+      disk.read.bytes.rate_vson_server_1:
         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_vson_server:
+      disk.latency_vson_server_1:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_vson_server_1:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests_vson_server:
+      disk.write.requests_vson_server_1:
         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_vson_server:
+      memory_vson_server_1:
         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.latency_vson_server:
+      cpu_util_vson_server_1:
         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_vson_server:
-        type: tosca.capabilities.OperatingSystem
+      disk.device.read.requests.rate_vson_server_1:
+        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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Node
+      disk.device.iops_vson_server_1:
+        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
-      instance_vson_server:
+      disk.usage_vson_server_1:
         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_vson_server:
+      disk.allocation_vson_server_1:
         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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
+      disk.capacity_vson_server_1:
+        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.iops_vson_server:
+      memory.usage_vson_server_1:
         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_vson_server_oam_net_port_0:
+      disk.device.read.bytes.rate_vson_server_1:
         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_vson_server:
+      disk.write.requests.rate_vson_server_1:
         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_vson_server:
+      disk.ephemeral.size_vson_server_1:
         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
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      feature_vson_server_oam_net_port_20:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      vcpus_vson_server:
+      disk.device.read.bytes_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vson_server_oam_net_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.
+      os_vson_server_1:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.read.requests.rate_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      feature_vson_server_1:
+        type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_vson_server:
+      network.outpoing.packets_vson_server_oam_net_port_20:
         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_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_port_20:
         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_vson_server:
+      disk.root.size_vson_server_1:
         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.iops_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_port_20:
         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.requests.rate_vson_server:
+      disk.device.write.requests_vson_server_1:
         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_vson_server_oam_net_port_0:
+      disk.device.write.bytes.rate_vson_server_1:
         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_vson_server:
+      host_vson_server_1:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.latency_vson_server_1:
         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_vson_server:
+      cpu.delta_vson_server_1:
         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.requests_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_port_20:
         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_vson_server_oam_net_port_0:
+      network.incoming.bytes.rate_vson_server_oam_net_port_20:
         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_vson_server:
+      memory.resident_vson_server_1:
         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_vson_server:
+      binding_vson_server_oam_net_port_20:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.write.bytes_vson_server_1:
         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.resident_vson_server:
+      disk.device.usage_vson_server_1:
         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_vson_server:
+      disk.device.write.requests.rate_vson_server_1:
         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_vson_server:
+      scalable_vson_server_1:
         type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_port_20:
         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_vson_server:
+      vcpus_vson_server_1:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      binding_vson_server_1:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      cpu_util_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_port_20:
         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_vson_server:
+      disk.iops_vson_server_1:
         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.delta_vson_server:
+      disk.write.bytes.rate_vson_server_1:
         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.rate_vson_server:
+      network.incoming.bytes_vson_server_oam_net_port_20:
         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_vson_server:
-        type: tosca.capabilities.Node
+      attachment_vson_server_oam_net_port_20:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_vson_server:
+      disk.device.allocation_vson_server_1:
         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_vson_server:
-        type: tosca.capabilities.network.Bindable
-        occurrences:
-        - 1
-        - UNBOUNDED
-      host_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      cpu_vson_server_1:
+        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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
-        occurrences:
-        - 0
-        - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      disk.device.read.requests_vson_server_1:
         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.requests_vson_server:
+      disk.device.capacity_vson_server_1:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
@@ -5034,12 +5034,6 @@ node_types:
         description: Default gateway.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
       instance_index:
         type: float
         description: Index of the instance.
@@ -5050,11 +5044,21 @@ node_types:
         description: Unique name for this VF instance.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_10_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
       oam_net_subnet_prefix_length:
         type: string
         description: Prefix length of the subnet on the OAM network.
         required: true
         status: SUPPORTED
+      port_vson_server_oam_net_port_10_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
       vf_module_name:
         type: string
         description: Unique name for this VF module instance.
@@ -5077,20 +5081,12 @@ node_types:
         description: Unique ID for this VF instance.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
       vson_clm_oam_net_ip:
         type: string
         description: IP of the vSON Cluster Manager.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_subnetpoolid:
+      port_vson_server_oam_net_port_10_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
@@ -5127,16 +5123,6 @@ node_types:
         description: The ID or name of the flavor to boot onto.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_vson_server_oam_net_port_0_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
       availability_zones:
         type: list
         description: List of availability zones.
@@ -5149,364 +5135,378 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema: *id010
+      port_vson_server_oam_net_port_10_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
       ntp_servers:
         type: list
         description: List of NTP servers.
         required: true
         status: SUPPORTED
         entry_schema: *id011
+      port_vson_server_oam_net_port_10_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       oam_net_id:
         type: string
         description: The ID of the OAM network.
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_order:
+      port_vson_server_oam_net_port_10_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_vson_server_oam_net_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
       vson_vm_names:
         type: list
         description: A list of unique names to be issued to the vSON Cluster leaders.
         required: true
         status: SUPPORTED
         entry_schema: *id012
+      port_vson_server_oam_net_port_10_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_vson_server_oam_net_port_10_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
     requirements:
-    - dependency_vson_server:
+    - dependency_vson_server_3:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - local_storage_vson_server:
+    - local_storage_vson_server_3:
         capability: tosca.capabilities.Attachment
         node: tosca.nodes.BlockStorage
         relationship: tosca.relationships.AttachesTo
         occurrences:
         - 0
         - UNBOUNDED
-    - dependency_vson_server_oam_net_port_0:
+    - dependency_vson_server_oam_net_port_10:
         capability: tosca.capabilities.Node
         node: tosca.nodes.Root
         relationship: tosca.relationships.DependsOn
         occurrences:
         - 0
         - UNBOUNDED
-    - link_vson_server_oam_net_port_0:
+    - link_vson_server_oam_net_port_10:
         capability: tosca.capabilities.network.Linkable
         relationship: tosca.relationships.network.LinksTo
         occurrences:
         - 1
         - 1
     capabilities:
-      disk.write.bytes_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      endpoint_vson_server_3:
+        type: tosca.capabilities.Endpoint.Admin
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.allocation_vson_server:
+      disk.read.bytes_vson_server_3:
         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_vson_server_oam_net_port_0:
+      disk.read.requests_vson_server_3:
         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_vson_server:
+      network.incoming.packets.rate_vson_server_oam_net_port_10:
         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_vson_server_oam_net_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.
+      binding_vson_server_3:
+        type: tosca.capabilities.network.Bindable
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.latency_vson_server:
+      disk.read.bytes.rate_vson_server_3:
         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_vson_server:
+      disk.device.write.bytes_vson_server_3:
         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_vson_server:
+      instance_vson_server_3:
         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_vson_server:
+      disk.latency_vson_server_3:
         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.latency_vson_server:
+      cpu_util_vson_server_3:
         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_vson_server:
-        type: tosca.capabilities.OperatingSystem
-        occurrences:
-        - 1
-        - UNBOUNDED
-      feature_vson_server_oam_net_port_0:
+      feature_vson_server_oam_net_port_10:
         type: tosca.capabilities.Node
         occurrences:
         - 1
         - UNBOUNDED
-      instance_vson_server:
+      disk.write.requests_vson_server_3:
         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_vson_server:
+      memory_vson_server_3:
         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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.Attachment
-        occurrences:
-        - 1
-        - UNBOUNDED
-      disk.iops_vson_server:
+      network.outgoing.bytes.rate_vson_server_oam_net_port_10:
         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_vson_server_oam_net_port_0:
+      disk.device.read.requests.rate_vson_server_3:
         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_vson_server:
+      disk.device.iops_vson_server_3:
         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_vson_server:
+      disk.capacity_vson_server_3:
         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
-      endpoint_vson_server:
-        type: tosca.capabilities.Endpoint.Admin
+      memory.usage_vson_server_3:
+        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
-      vcpus_vson_server:
+      disk.usage_vson_server_3:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
+      disk.device.read.bytes.rate_vson_server_3:
         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_vson_server:
+      network.outgoing.packets.rate_vson_server_oam_net_port_10:
         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.rate_vson_server:
+      disk.allocation_vson_server_3:
         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_vson_server:
+      disk.write.requests.rate_vson_server_3:
         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_vson_server:
+      disk.ephemeral.size_vson_server_3:
         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.iops_vson_server:
+      network.incoming.bytes.rate_vson_server_oam_net_port_10:
         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.requests.rate_vson_server:
+      disk.device.read.bytes_vson_server_3:
         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_vson_server_oam_net_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.
+      binding_vson_server_oam_net_port_10:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      os_vson_server_3:
+        type: tosca.capabilities.OperatingSystem
         occurrences:
         - 1
         - UNBOUNDED
-      disk.read.bytes_vson_server:
+      disk.root.size_vson_server_3:
         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_vson_server:
+      disk.device.write.bytes.rate_vson_server_3:
         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.requests_vson_server:
+      disk.device.write.requests_vson_server_3:
         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_vson_server_oam_net_port_0:
+      network.incoming.packets_vson_server_oam_net_port_10:
         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_vson_server:
-        type: org.openecomp.capabilities.metric.Ceilometer
-        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
+      host_vson_server_3:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_vson_server:
+      disk.device.latency_vson_server_3:
         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.resident_vson_server:
+      cpu.delta_vson_server_3:
         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_vson_server:
+      memory.resident_vson_server_3:
         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_vson_server:
-        type: tosca.capabilities.Scalable
+      attachment_vson_server_oam_net_port_10:
+        type: tosca.capabilities.Attachment
         occurrences:
         - 1
         - UNBOUNDED
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
+      network.incoming.bytes_vson_server_oam_net_port_10:
         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_vson_server:
+      feature_vson_server_3:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes_vson_server_3:
         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_vson_server:
+      disk.device.read.requests_vson_server_3:
         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_vson_server:
+      network.outpoing.packets_vson_server_oam_net_port_10:
         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_vson_server:
+      disk.device.usage_vson_server_3:
         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.delta_vson_server:
+      disk.device.write.requests.rate_vson_server_3:
         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.rate_vson_server:
+      vcpus_vson_server_3:
         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_vson_server:
-        type: tosca.capabilities.Node
+      disk.write.bytes.rate_vson_server_3:
+        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_vson_server:
+      disk.iops_vson_server_3:
         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_vson_server:
-        type: tosca.capabilities.network.Bindable
+      scalable_vson_server_3:
+        type: tosca.capabilities.Scalable
         occurrences:
         - 1
         - UNBOUNDED
-      host_vson_server:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      disk.device.capacity_vson_server_3:
+        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_vson_server_oam_net_port_0:
-        type: tosca.capabilities.network.Bindable
-        valid_source_types:
-        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+      disk.device.allocation_vson_server_3:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
-        - 0
+        - 1
         - UNBOUNDED
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
+      cpu_vson_server_3:
         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.requests_vson_server:
+      network.outgoing.bytes_vson_server_oam_net_port_10:
         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
+        - 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/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
index e1fcf51fae..c36094adeb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml
@@ -1009,12 +1009,6 @@ topology_template:
           get_input: vson_cluster_name
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         instance_index: 0
         vnf_name:
           get_input: vnf_name
@@ -1033,11 +1027,9 @@ topology_template:
           get_input: vson_clm_image_name
         vnf_id:
           get_input: vnf_id
+        port_vson_server_oam_net_port_20_network_role_tag: oam
         vson_clm_oam_net_ip:
           get_input: vson_master_clm_ip
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         oam_net_ips:
         - get_input: vson_clm_oam_net_ip_0
         swift_son_container_name:
@@ -1048,17 +1040,25 @@ topology_template:
         vson_server_group_id: UNSUPPORTED_RESOURCE_vson_clm_server_group
         vson_vm_flavor_name:
           get_input: vson_clm_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         ntp_servers:
           get_input: ntp_servers
+        port_vson_server_oam_net_port_20_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_vson_server_oam_net_port_20_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         oam_net_id:
           get_input: oam_net_id
         vson_vm_names:
         - get_input: vson_clm_name_0
       requirements:
-      - dependency_vson_server:
+      - dependency_vson_server_1:
           capability: tosca.capabilities.Node
           node: oam_net_security_group
           relationship: tosca.relationships.DependsOn
@@ -1071,12 +1071,6 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         instance_index:
           get_property:
           - SELF
@@ -1101,9 +1095,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1115,17 +1106,26 @@ topology_template:
           get_input: vson_mgt_server_group_id
         vson_vm_flavor_name:
           get_input: vson_mgt_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         volume_ids:
         - get_input: vson_mgt_volume_id_0
+        port_vson_server_oam_net_port_10_network_role_tag: oam
         ntp_servers:
           get_input: ntp_servers
         oam_net_id:
           get_input: oam_net_id
         vson_vm_names:
         - get_input: vson_mgt_name_0
+        port_vson_server_oam_net_port_10_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_vson_server_oam_net_port_10_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
     vson_dbs_volume_1:
       type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume
       properties:
@@ -1149,12 +1149,7 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
+        port_vson_server_oam_net_port_00_network_role_tag: oam
         instance_index:
           get_property:
           - SELF
@@ -1164,6 +1159,12 @@ topology_template:
           get_input: vnf_name
         oam_net_subnet_prefix_length:
           get_input: oam_net_subnet_prefix_length
+        port_vson_server_oam_net_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         vf_module_name:
           get_input: vf_module_name
         dns_servers:
@@ -1181,9 +1182,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1191,11 +1189,13 @@ topology_template:
         vfc_role: dbc
         swift_account_auth_token:
           get_input: swift_account_auth_token
+        port_vson_server_oam_net_port_00_mac_requirements:
+          mac_count_required:
+            is_required: false
         vson_server_group_id:
           get_input: vson_dbc_server_group_id
         vson_vm_flavor_name:
           get_input: vson_dbc_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         volume_ids:
@@ -1232,12 +1232,6 @@ topology_template:
         vson_cluster_name: ''
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         instance_index:
           get_property:
           - SELF
@@ -1263,11 +1257,9 @@ topology_template:
           get_input: vson_clm_image_name
         vnf_id:
           get_input: vnf_id
+        port_vson_server_oam_net_port_20_network_role_tag: oam
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         oam_net_ips:
         - get_input: vson_clm_oam_net_ip_0
         swift_son_container_name: ''
@@ -1278,11 +1270,19 @@ topology_template:
           get_input: vson_clm_server_group_id
         vson_vm_flavor_name:
           get_input: vson_clm_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         ntp_servers:
           get_input: ntp_servers
+        port_vson_server_oam_net_port_20_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_vson_server_oam_net_port_20_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         oam_net_id:
           get_input: oam_net_id
         vson_vm_names:
@@ -1350,12 +1350,6 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         instance_index:
           get_property:
           - SELF
@@ -1380,9 +1374,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1394,17 +1385,26 @@ topology_template:
           get_input: vson_mdr_server_group_id
         vson_vm_flavor_name:
           get_input: vson_mdr_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         volume_ids:
         - get_input: vson_mdr_volume_id_0
+        port_vson_server_oam_net_port_10_network_role_tag: oam
         ntp_servers:
           get_input: ntp_servers
         oam_net_id:
           get_input: oam_net_id
         vson_vm_names:
         - get_input: vson_mdr_name_0
+        port_vson_server_oam_net_port_10_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_vson_server_oam_net_port_10_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
     vson_dbs_group:
       type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1
       directives:
@@ -1414,12 +1414,7 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
+        port_vson_server_oam_net_port_00_network_role_tag: oam
         instance_index:
           get_property:
           - SELF
@@ -1429,6 +1424,12 @@ topology_template:
           get_input: vnf_name
         oam_net_subnet_prefix_length:
           get_input: oam_net_subnet_prefix_length
+        port_vson_server_oam_net_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         vf_module_name:
           get_input: vf_module_name
         dns_servers:
@@ -1446,9 +1447,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1457,11 +1455,13 @@ topology_template:
         vfc_role: dbs
         swift_account_auth_token:
           get_input: swift_account_auth_token
+        port_vson_server_oam_net_port_00_mac_requirements:
+          mac_count_required:
+            is_required: false
         vson_server_group_id:
           get_input: vson_dbs_server_group_id
         vson_vm_flavor_name:
           get_input: vson_dbs_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         - get_input: availability_zone_1
@@ -1652,31 +1652,31 @@ topology_template:
           direction: ingress
       requirements:
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_20
           node: vson_clm_0
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_00
           node: vson_dcl_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_00
           node: vson_dbs_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_00
           node: vson_dbg_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_20
           node: vson_clm_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_10
           node: vson_mdr_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_00
           node: vson_cll_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
@@ -1684,15 +1684,15 @@ topology_template:
           node: vson_app_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_00
           node: vson_dbc_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_10
           node: vson_mon_group
           relationship: org.openecomp.relationships.AttachesTo
       - port:
-          capability: attachment_vson_server_oam_net_port_0
+          capability: attachment_vson_server_oam_net_port_10
           node: vson_mgt_group
           relationship: org.openecomp.relationships.AttachesTo
     vson_dbg_volume_0:
@@ -1718,12 +1718,7 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
+        port_vson_server_oam_net_port_00_network_role_tag: oam
         instance_index:
           get_property:
           - SELF
@@ -1733,6 +1728,12 @@ topology_template:
           get_input: vnf_name
         oam_net_subnet_prefix_length:
           get_input: oam_net_subnet_prefix_length
+        port_vson_server_oam_net_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         vf_module_name:
           get_input: vf_module_name
         dns_servers:
@@ -1750,9 +1751,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1760,11 +1758,13 @@ topology_template:
         vfc_role: dbg
         swift_account_auth_token:
           get_input: swift_account_auth_token
+        port_vson_server_oam_net_port_00_mac_requirements:
+          mac_count_required:
+            is_required: false
         vson_server_group_id:
           get_input: vson_dbg_server_group_id
         vson_vm_flavor_name:
           get_input: vson_dbg_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         volume_ids:
@@ -1786,12 +1786,7 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
+        port_vson_server_oam_net_port_00_network_role_tag: oam
         instance_index:
           get_property:
           - SELF
@@ -1801,6 +1796,12 @@ topology_template:
           get_input: vnf_name
         oam_net_subnet_prefix_length:
           get_input: oam_net_subnet_prefix_length
+        port_vson_server_oam_net_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         vf_module_name:
           get_input: vf_module_name
         dns_servers:
@@ -1818,9 +1819,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1830,11 +1828,13 @@ topology_template:
         vfc_role: cll
         swift_account_auth_token:
           get_input: swift_account_auth_token
+        port_vson_server_oam_net_port_00_mac_requirements:
+          mac_count_required:
+            is_required: false
         vson_server_group_id:
           get_input: vson_leader_server_group_id
         vson_vm_flavor_name:
           get_input: vson_cll_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         - get_input: availability_zone_1
@@ -1875,12 +1875,6 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
         instance_index:
           get_property:
           - SELF
@@ -1905,9 +1899,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1919,17 +1910,26 @@ topology_template:
           get_input: vson_mon_server_group_id
         vson_vm_flavor_name:
           get_input: vson_mon_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         volume_ids:
         - get_input: vson_mon_volume_id_0
+        port_vson_server_oam_net_port_10_network_role_tag: oam
         ntp_servers:
           get_input: ntp_servers
         oam_net_id:
           get_input: oam_net_id
         vson_vm_names:
         - get_input: vson_mon_name_0
+        port_vson_server_oam_net_port_10_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_vson_server_oam_net_port_10_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
     vson_dcl_group:
       type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1
       directives:
@@ -1939,12 +1939,7 @@ topology_template:
           get_input: vf_module_id
         default_gateway:
           get_input: default_gateway
-        port_vson_server_oam_net_port_0_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
+        port_vson_server_oam_net_port_00_network_role_tag: oam
         instance_index:
           get_property:
           - SELF
@@ -1954,6 +1949,12 @@ topology_template:
           get_input: vnf_name
         oam_net_subnet_prefix_length:
           get_input: oam_net_subnet_prefix_length
+        port_vson_server_oam_net_port_00_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         vf_module_name:
           get_input: vf_module_name
         dns_servers:
@@ -1971,9 +1972,6 @@ topology_template:
           get_input: vnf_id
         vson_clm_oam_net_ip:
           get_input: vson_clm_0_oam_net_ip_0
-        port_vson_server_oam_net_port_0_mac_requirements:
-          mac_count_required:
-            is_required: false
         vson_dc_unit:
           get_input: vson_dc_unit
         oam_net_ips:
@@ -1983,11 +1981,13 @@ topology_template:
         vfc_role: dcl
         swift_account_auth_token:
           get_input: swift_account_auth_token
+        port_vson_server_oam_net_port_00_mac_requirements:
+          mac_count_required:
+            is_required: false
         vson_server_group_id:
           get_input: vson_leader_server_group_id
         vson_vm_flavor_name:
           get_input: vson_dcl_flavor_name
-        port_vson_server_oam_net_port_0_network_role_tag: oam
         availability_zones:
         - get_input: availability_zone_0
         - get_input: availability_zone_1
@@ -2243,4 +2243,4 @@ topology_template:
       value: vson_dbs_volume_1
     vson_mon_server_group_id:
       description: ID of the Server Group intended for vSON MON instances.
-      value: UNSUPPORTED_RESOURCE_vson_mon_server_group
+      value: UNSUPPORTED_RESOURCE_vson_mon_server_group
\ 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/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml
index 1a228242f5..fa4b53a50a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml
@@ -29,11 +29,6 @@ topology_template:
       immutable: false
       type: string
       description: Default gateway.
-    port_vson_server_oam_net_port_0_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     instance_index:
       label: Instance Index
       hidden: false
@@ -73,6 +68,11 @@ topology_template:
       description: List of DNS servers.
       entry_schema:
         type: string
+    port_vson_server_oam_net_port_20_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     oam_net_security_group_id:
       label: OAM network security group ID
       hidden: false
@@ -92,7 +92,7 @@ topology_template:
       immutable: false
       type: string
       description: Unique ID for this VF instance.
-    port_vson_server_oam_net_port_0_network_role:
+    port_vson_server_oam_net_port_20_network_role_tag:
       type: string
       required: true
     vson_clm_oam_net_ip:
@@ -101,12 +101,6 @@ topology_template:
       immutable: false
       type: string
       description: IP of the vSON Cluster Manager.
-    port_vson_server_oam_net_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_vson_server_oam_net_port_0_subnetpoolid:
-      type: string
-      required: true
     oam_net_ips:
       label: vSON OAM network IP addresses
       hidden: false
@@ -147,14 +141,9 @@ topology_template:
       immutable: false
       type: string
       description: The ID or name of the flavor to boot onto.
-    port_vson_server_oam_net_port_0_network_role_tag:
-      type: string
-      required: true
-    port_vson_server_oam_net_port_0_vlan_requirements:
-      type: list
+    port_vson_server_oam_net_port_20_exCP_naming:
+      type: org.openecomp.datatypes.Naming
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     availability_zones:
       label: Availability zones
       hidden: false
@@ -171,18 +160,29 @@ topology_template:
       description: List of NTP servers.
       entry_schema:
         type: string
+    port_vson_server_oam_net_port_20_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_vson_server_oam_net_port_20_network_role:
+      type: string
+      required: true
+    port_vson_server_oam_net_port_20_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_vson_server_oam_net_port_20_subnetpoolid:
+      type: string
+      required: true
     oam_net_id:
       label: OAM network ID
       hidden: false
       immutable: false
       type: string
       description: The ID of the OAM network.
-    port_vson_server_oam_net_port_0_order:
+    port_vson_server_oam_net_port_20_order:
       type: integer
       required: true
-    port_vson_server_oam_net_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     vson_vm_names:
       label: vSON Cluster leader names
       hidden: false
@@ -192,7 +192,7 @@ topology_template:
       entry_schema:
         type: string
   node_templates:
-    vson_server:
+    vson_server_1:
       type: org.openecomp.resource.vfc.compute.nodes.heat.vson_vm
       properties:
         flavor:
@@ -223,24 +223,24 @@ topology_template:
         scheduler_hints:
           group:
             get_input: vson_server_group_id
-    vson_server_oam_net_port_0:
+    vson_server_oam_net_port_20:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_vson_server_oam_net_port_0_ip_requirements
+          get_input: port_vson_server_oam_net_port_20_ip_requirements
         security_groups:
         - get_input: oam_net_security_group_id
         network_role:
-          get_input: port_vson_server_oam_net_port_0_network_role
+          get_input: port_vson_server_oam_net_port_20_network_role
         fixed_ips:
         - ip_address:
             get_input:
             - oam_net_ips
             - get_input: instance_index
         subnetpoolid:
-          get_input: port_vson_server_oam_net_port_0_subnetpoolid
+          get_input: port_vson_server_oam_net_port_20_subnetpoolid
         mac_requirements:
-          get_input: port_vson_server_oam_net_port_0_mac_requirements
+          get_input: port_vson_server_oam_net_port_20_mac_requirements
         name:
           str_replace:
             template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0
@@ -254,19 +254,19 @@ topology_template:
                 - vson_vm_names
                 - get_input: instance_index
         exCP_naming:
-          get_input: port_vson_server_oam_net_port_0_exCP_naming
+          get_input: port_vson_server_oam_net_port_20_exCP_naming
         vlan_requirements:
-          get_input: port_vson_server_oam_net_port_0_vlan_requirements
+          get_input: port_vson_server_oam_net_port_20_vlan_requirements
         network_role_tag:
-          get_input: port_vson_server_oam_net_port_0_network_role_tag
+          get_input: port_vson_server_oam_net_port_20_network_role_tag
         network:
           get_input: oam_net_id
         order:
-          get_input: port_vson_server_oam_net_port_0_order
+          get_input: port_vson_server_oam_net_port_20_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: vson_server
+          node: vson_server_1
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested_vson_server_group:
@@ -276,177 +276,177 @@ topology_template:
         description: |
           The template intended for deploying vSON VM instance.
       members:
-      - vson_server
-      - vson_server_oam_net_port_0
+      - vson_server_1
+      - vson_server_oam_net_port_20
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.vson_vm_4
     capabilities:
-      disk.write.bytes_vson_server:
-      - vson_server
-      - disk.write.bytes
-      disk.device.allocation_vson_server:
-      - vson_server
-      - disk.device.allocation
-      network.incoming.packets_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.packets
-      memory.usage_vson_server:
-      - vson_server
-      - memory.usage
-      network.incoming.bytes_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.bytes
-      disk.device.latency_vson_server:
-      - vson_server
-      - disk.device.latency
-      disk.device.write.bytes.rate_vson_server:
-      - vson_server
-      - disk.device.write.bytes.rate
-      disk.device.read.requests_vson_server:
-      - vson_server
-      - disk.device.read.requests
-      memory_vson_server:
-      - vson_server
-      - memory
-      disk.latency_vson_server:
-      - vson_server
-      - disk.latency
-      os_vson_server:
-      - vson_server
-      - os
-      feature_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - feature
-      instance_vson_server:
-      - vson_server
+      instance_vson_server_1:
+      - vson_server_1
       - instance
-      cpu_vson_server:
-      - vson_server
-      - cpu
-      attachment_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - attachment
-      disk.iops_vson_server:
-      - vson_server
-      - disk.iops
-      network.outgoing.bytes_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outgoing.bytes
-      disk.device.write.bytes_vson_server:
-      - vson_server
+      disk.device.write.bytes_vson_server_1:
+      - vson_server_1
       - disk.device.write.bytes
-      disk.device.read.bytes.rate_vson_server:
-      - vson_server
-      - disk.device.read.bytes.rate
-      endpoint_vson_server:
-      - vson_server
+      disk.read.requests_vson_server_1:
+      - vson_server_1
+      - disk.read.requests
+      disk.read.bytes_vson_server_1:
+      - vson_server_1
+      - disk.read.bytes
+      disk.read.bytes.rate_vson_server_1:
+      - vson_server_1
+      - disk.read.bytes.rate
+      disk.latency_vson_server_1:
+      - vson_server_1
+      - disk.latency
+      endpoint_vson_server_1:
+      - vson_server_1
       - endpoint
-      vcpus_vson_server:
-      - vson_server
-      - vcpus
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.packets.rate
-      disk.device.read.requests.rate_vson_server:
-      - vson_server
+      disk.write.requests_vson_server_1:
+      - vson_server_1
+      - disk.write.requests
+      memory_vson_server_1:
+      - vson_server_1
+      - memory
+      cpu_util_vson_server_1:
+      - vson_server_1
+      - cpu_util
+      disk.device.read.requests.rate_vson_server_1:
+      - vson_server_1
       - disk.device.read.requests.rate
-      disk.write.requests.rate_vson_server:
-      - vson_server
-      - disk.write.requests.rate
-      disk.capacity_vson_server:
-      - vson_server
-      - disk.capacity
-      disk.device.capacity_vson_server:
-      - vson_server
-      - disk.device.capacity
-      disk.device.iops_vson_server:
-      - vson_server
+      disk.device.iops_vson_server_1:
+      - vson_server_1
       - disk.device.iops
-      disk.device.write.requests.rate_vson_server:
-      - vson_server
-      - disk.device.write.requests.rate
-      network.outpoing.packets_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outpoing.packets
-      disk.read.bytes_vson_server:
-      - vson_server
-      - disk.read.bytes
-      disk.read.bytes.rate_vson_server:
-      - vson_server
-      - disk.read.bytes.rate
-      disk.device.write.requests_vson_server:
-      - vson_server
-      - disk.device.write.requests
-      network.outgoing.packets.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outgoing.packets.rate
-      disk.root.size_vson_server:
-      - vson_server
-      - disk.root.size
-      disk.ephemeral.size_vson_server:
-      - vson_server
+      disk.usage_vson_server_1:
+      - vson_server_1
+      - disk.usage
+      disk.allocation_vson_server_1:
+      - vson_server_1
+      - disk.allocation
+      disk.capacity_vson_server_1:
+      - vson_server_1
+      - disk.capacity
+      memory.usage_vson_server_1:
+      - vson_server_1
+      - memory.usage
+      disk.device.read.bytes.rate_vson_server_1:
+      - vson_server_1
+      - disk.device.read.bytes.rate
+      disk.write.requests.rate_vson_server_1:
+      - vson_server_1
+      - disk.write.requests.rate
+      disk.ephemeral.size_vson_server_1:
+      - vson_server_1
       - disk.ephemeral.size
-      memory.resident_vson_server:
-      - vson_server
-      - memory.resident
-      disk.device.read.bytes_vson_server:
-      - vson_server
+      feature_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - feature
+      disk.device.read.bytes_vson_server_1:
+      - vson_server_1
       - disk.device.read.bytes
-      scalable_vson_server:
-      - vson_server
-      - scalable
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
+      os_vson_server_1:
+      - vson_server_1
+      - os
+      feature_vson_server_1:
+      - vson_server_1
+      - feature
+      network.outpoing.packets_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - network.outpoing.packets
+      network.outgoing.bytes.rate_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
       - network.outgoing.bytes.rate
-      disk.write.requests_vson_server:
-      - vson_server
-      - disk.write.requests
-      disk.usage_vson_server:
-      - vson_server
-      - disk.usage
-      cpu_util_vson_server:
-      - vson_server
-      - cpu_util
-      disk.device.usage_vson_server:
-      - vson_server
-      - disk.device.usage
-      cpu.delta_vson_server:
-      - vson_server
+      disk.root.size_vson_server_1:
+      - vson_server_1
+      - disk.root.size
+      network.outgoing.packets.rate_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - network.outgoing.packets.rate
+      disk.device.write.requests_vson_server_1:
+      - vson_server_1
+      - disk.device.write.requests
+      disk.device.write.bytes.rate_vson_server_1:
+      - vson_server_1
+      - disk.device.write.bytes.rate
+      host_vson_server_1:
+      - vson_server_1
+      - host
+      disk.device.latency_vson_server_1:
+      - vson_server_1
+      - disk.device.latency
+      cpu.delta_vson_server_1:
+      - vson_server_1
       - cpu.delta
-      disk.write.bytes.rate_vson_server:
-      - vson_server
-      - disk.write.bytes.rate
-      feature_vson_server:
-      - vson_server
-      - feature
-      disk.allocation_vson_server:
-      - vson_server
-      - disk.allocation
-      binding_vson_server:
-      - vson_server
+      network.outgoing.bytes_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - network.outgoing.bytes
+      network.incoming.bytes.rate_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - network.incoming.bytes.rate
+      memory.resident_vson_server_1:
+      - vson_server_1
+      - memory.resident
+      binding_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
       - binding
-      host_vson_server:
-      - vson_server
-      - host
-      binding_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
+      disk.write.bytes_vson_server_1:
+      - vson_server_1
+      - disk.write.bytes
+      disk.device.usage_vson_server_1:
+      - vson_server_1
+      - disk.device.usage
+      disk.device.write.requests.rate_vson_server_1:
+      - vson_server_1
+      - disk.device.write.requests.rate
+      scalable_vson_server_1:
+      - vson_server_1
+      - scalable
+      network.incoming.packets_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - network.incoming.packets
+      vcpus_vson_server_1:
+      - vson_server_1
+      - vcpus
+      binding_vson_server_1:
+      - vson_server_1
       - binding
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.bytes.rate
-      disk.read.requests_vson_server:
-      - vson_server
-      - disk.read.requests
+      network.incoming.packets.rate_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - network.incoming.packets.rate
+      disk.iops_vson_server_1:
+      - vson_server_1
+      - disk.iops
+      disk.write.bytes.rate_vson_server_1:
+      - vson_server_1
+      - disk.write.bytes.rate
+      network.incoming.bytes_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - network.incoming.bytes
+      attachment_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
+      - attachment
+      disk.device.allocation_vson_server_1:
+      - vson_server_1
+      - disk.device.allocation
+      cpu_vson_server_1:
+      - vson_server_1
+      - cpu
+      disk.device.read.requests_vson_server_1:
+      - vson_server_1
+      - disk.device.read.requests
+      disk.device.capacity_vson_server_1:
+      - vson_server_1
+      - disk.device.capacity
     requirements:
-      link_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
+      local_storage_vson_server_1:
+      - vson_server_1
+      - local_storage
+      link_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
       - link
-      dependency_vson_server:
-      - vson_server
-      - dependency
-      dependency_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
+      dependency_vson_server_oam_net_port_20:
+      - vson_server_oam_net_port_20
       - dependency
-      local_storage_vson_server:
-      - vson_server
-      - local_storage
+      dependency_vson_server_1:
+      - vson_server_1
+      - dependency
\ 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/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml
index 12f38c972e..3ac286aba1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml
@@ -23,11 +23,6 @@ topology_template:
       immutable: false
       type: string
       description: Default gateway.
-    port_vson_server_oam_net_port_0_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     instance_index:
       label: Instance Index
       hidden: false
@@ -40,12 +35,20 @@ topology_template:
       immutable: false
       type: string
       description: Unique name for this VF instance.
+    port_vson_server_oam_net_port_10_network_role:
+      type: string
+      required: true
     oam_net_subnet_prefix_length:
       label: OAM net subnet prefix length
       hidden: false
       immutable: false
       type: string
       description: Prefix length of the subnet on the OAM network.
+    port_vson_server_oam_net_port_10_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     vf_module_name:
       label: VF module name
       hidden: false
@@ -73,19 +76,13 @@ topology_template:
       immutable: false
       type: string
       description: Unique ID for this VF instance.
-    port_vson_server_oam_net_port_0_network_role:
-      type: string
-      required: true
     vson_clm_oam_net_ip:
       label: vSON Cluster Manager IP
       hidden: false
       immutable: false
       type: string
       description: IP of the vSON Cluster Manager.
-    port_vson_server_oam_net_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_vson_server_oam_net_port_0_subnetpoolid:
+    port_vson_server_oam_net_port_10_subnetpoolid:
       type: string
       required: true
     vson_dc_unit:
@@ -128,14 +125,6 @@ topology_template:
       immutable: false
       type: string
       description: The ID or name of the flavor to boot onto.
-    port_vson_server_oam_net_port_0_network_role_tag:
-      type: string
-      required: true
-    port_vson_server_oam_net_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     availability_zones:
       label: Availability zones
       hidden: false
@@ -152,6 +141,9 @@ topology_template:
       description: List of Volumes IDs.
       entry_schema:
         type: string
+    port_vson_server_oam_net_port_10_network_role_tag:
+      type: string
+      required: true
     ntp_servers:
       label: NTP servers
       hidden: false
@@ -160,18 +152,18 @@ topology_template:
       description: List of NTP servers.
       entry_schema:
         type: string
+    port_vson_server_oam_net_port_10_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     oam_net_id:
       label: OAM network ID
       hidden: false
       immutable: false
       type: string
       description: The ID of the OAM network.
-    port_vson_server_oam_net_port_0_order:
+    port_vson_server_oam_net_port_10_order:
       type: integer
       required: true
-    port_vson_server_oam_net_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
     vson_vm_names:
       label: vSON Cluster leader names
       hidden: false
@@ -180,8 +172,16 @@ topology_template:
       description: A list of unique names to be issued to the vSON Cluster leaders.
       entry_schema:
         type: string
+    port_vson_server_oam_net_port_10_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_vson_server_oam_net_port_10_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
   node_templates:
-    vson_server:
+    vson_server_3:
       type: org.openecomp.resource.vfc.compute.nodes.heat.vson_vm
       properties:
         flavor:
@@ -210,24 +210,24 @@ topology_template:
         scheduler_hints:
           group:
             get_input: vson_server_group_id
-    vson_server_oam_net_port_0:
+    vson_server_oam_net_port_10:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_vson_server_oam_net_port_0_ip_requirements
+          get_input: port_vson_server_oam_net_port_10_ip_requirements
         security_groups:
         - get_input: oam_net_security_group_id
         network_role:
-          get_input: port_vson_server_oam_net_port_0_network_role
+          get_input: port_vson_server_oam_net_port_10_network_role
         fixed_ips:
         - ip_address:
             get_input:
             - oam_net_ips
             - get_input: instance_index
         subnetpoolid:
-          get_input: port_vson_server_oam_net_port_0_subnetpoolid
+          get_input: port_vson_server_oam_net_port_10_subnetpoolid
         mac_requirements:
-          get_input: port_vson_server_oam_net_port_0_mac_requirements
+          get_input: port_vson_server_oam_net_port_10_mac_requirements
         name:
           str_replace:
             template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0
@@ -241,19 +241,19 @@ topology_template:
                 - vson_vm_names
                 - get_input: instance_index
         exCP_naming:
-          get_input: port_vson_server_oam_net_port_0_exCP_naming
+          get_input: port_vson_server_oam_net_port_10_exCP_naming
         vlan_requirements:
-          get_input: port_vson_server_oam_net_port_0_vlan_requirements
+          get_input: port_vson_server_oam_net_port_10_vlan_requirements
         network_role_tag:
-          get_input: port_vson_server_oam_net_port_0_network_role_tag
+          get_input: port_vson_server_oam_net_port_10_network_role_tag
         network:
           get_input: oam_net_id
         order:
-          get_input: port_vson_server_oam_net_port_0_order
+          get_input: port_vson_server_oam_net_port_10_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: vson_server
+          node: vson_server_3
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested_vson_server_from_vol_group:
@@ -263,177 +263,177 @@ topology_template:
         description: |
           The template intended for deploying vSON VM instance that's supposed to be booted from a Cinder volume.
       members:
-      - vson_server
-      - vson_server_oam_net_port_0
+      - vson_server_3
+      - vson_server_oam_net_port_10
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.vson_vm_2
     capabilities:
-      disk.write.bytes_vson_server:
-      - vson_server
-      - disk.write.bytes
-      disk.device.allocation_vson_server:
-      - vson_server
-      - disk.device.allocation
-      network.incoming.packets_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.packets
-      memory.usage_vson_server:
-      - vson_server
-      - memory.usage
-      network.incoming.bytes_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.bytes
-      disk.device.latency_vson_server:
-      - vson_server
-      - disk.device.latency
-      disk.device.write.bytes.rate_vson_server:
-      - vson_server
-      - disk.device.write.bytes.rate
-      disk.device.read.requests_vson_server:
-      - vson_server
-      - disk.device.read.requests
-      memory_vson_server:
-      - vson_server
-      - memory
-      disk.latency_vson_server:
-      - vson_server
-      - disk.latency
-      os_vson_server:
-      - vson_server
-      - os
-      feature_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - feature
-      instance_vson_server:
-      - vson_server
-      - instance
-      cpu_vson_server:
-      - vson_server
-      - cpu
-      attachment_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - attachment
-      disk.iops_vson_server:
-      - vson_server
-      - disk.iops
-      network.outgoing.bytes_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outgoing.bytes
-      disk.device.write.bytes_vson_server:
-      - vson_server
-      - disk.device.write.bytes
-      disk.device.read.bytes.rate_vson_server:
-      - vson_server
-      - disk.device.read.bytes.rate
-      endpoint_vson_server:
-      - vson_server
+      endpoint_vson_server_3:
+      - vson_server_3
       - endpoint
-      vcpus_vson_server:
-      - vson_server
-      - vcpus
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
+      disk.read.bytes_vson_server_3:
+      - vson_server_3
+      - disk.read.bytes
+      disk.read.requests_vson_server_3:
+      - vson_server_3
+      - disk.read.requests
+      network.incoming.packets.rate_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
       - network.incoming.packets.rate
-      disk.device.read.requests.rate_vson_server:
-      - vson_server
+      binding_vson_server_3:
+      - vson_server_3
+      - binding
+      disk.read.bytes.rate_vson_server_3:
+      - vson_server_3
+      - disk.read.bytes.rate
+      disk.device.write.bytes_vson_server_3:
+      - vson_server_3
+      - disk.device.write.bytes
+      instance_vson_server_3:
+      - vson_server_3
+      - instance
+      disk.latency_vson_server_3:
+      - vson_server_3
+      - disk.latency
+      cpu_util_vson_server_3:
+      - vson_server_3
+      - cpu_util
+      feature_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - feature
+      disk.write.requests_vson_server_3:
+      - vson_server_3
+      - disk.write.requests
+      memory_vson_server_3:
+      - vson_server_3
+      - memory
+      network.outgoing.bytes.rate_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - network.outgoing.bytes.rate
+      disk.device.read.requests.rate_vson_server_3:
+      - vson_server_3
       - disk.device.read.requests.rate
-      disk.write.requests.rate_vson_server:
-      - vson_server
-      - disk.write.requests.rate
-      disk.capacity_vson_server:
-      - vson_server
-      - disk.capacity
-      disk.device.capacity_vson_server:
-      - vson_server
-      - disk.device.capacity
-      disk.device.iops_vson_server:
-      - vson_server
+      disk.device.iops_vson_server_3:
+      - vson_server_3
       - disk.device.iops
-      disk.device.write.requests.rate_vson_server:
-      - vson_server
-      - disk.device.write.requests.rate
-      network.outpoing.packets_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outpoing.packets
-      disk.read.bytes_vson_server:
-      - vson_server
-      - disk.read.bytes
-      disk.read.bytes.rate_vson_server:
-      - vson_server
-      - disk.read.bytes.rate
-      disk.device.write.requests_vson_server:
-      - vson_server
-      - disk.device.write.requests
-      network.outgoing.packets.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
+      disk.capacity_vson_server_3:
+      - vson_server_3
+      - disk.capacity
+      memory.usage_vson_server_3:
+      - vson_server_3
+      - memory.usage
+      disk.usage_vson_server_3:
+      - vson_server_3
+      - disk.usage
+      disk.device.read.bytes.rate_vson_server_3:
+      - vson_server_3
+      - disk.device.read.bytes.rate
+      network.outgoing.packets.rate_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
       - network.outgoing.packets.rate
-      disk.root.size_vson_server:
-      - vson_server
-      - disk.root.size
-      disk.ephemeral.size_vson_server:
-      - vson_server
+      disk.allocation_vson_server_3:
+      - vson_server_3
+      - disk.allocation
+      disk.write.requests.rate_vson_server_3:
+      - vson_server_3
+      - disk.write.requests.rate
+      disk.ephemeral.size_vson_server_3:
+      - vson_server_3
       - disk.ephemeral.size
-      memory.resident_vson_server:
-      - vson_server
-      - memory.resident
-      disk.device.read.bytes_vson_server:
-      - vson_server
+      network.incoming.bytes.rate_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - network.incoming.bytes.rate
+      disk.device.read.bytes_vson_server_3:
+      - vson_server_3
       - disk.device.read.bytes
-      scalable_vson_server:
-      - vson_server
-      - scalable
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outgoing.bytes.rate
-      disk.write.requests_vson_server:
-      - vson_server
-      - disk.write.requests
-      disk.usage_vson_server:
-      - vson_server
-      - disk.usage
-      cpu_util_vson_server:
-      - vson_server
-      - cpu_util
-      disk.device.usage_vson_server:
-      - vson_server
-      - disk.device.usage
-      cpu.delta_vson_server:
-      - vson_server
-      - cpu.delta
-      disk.write.bytes.rate_vson_server:
-      - vson_server
-      - disk.write.bytes.rate
-      feature_vson_server:
-      - vson_server
-      - feature
-      disk.allocation_vson_server:
-      - vson_server
-      - disk.allocation
-      binding_vson_server:
-      - vson_server
+      binding_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
       - binding
-      host_vson_server:
-      - vson_server
+      os_vson_server_3:
+      - vson_server_3
+      - os
+      disk.root.size_vson_server_3:
+      - vson_server_3
+      - disk.root.size
+      disk.device.write.bytes.rate_vson_server_3:
+      - vson_server_3
+      - disk.device.write.bytes.rate
+      disk.device.write.requests_vson_server_3:
+      - vson_server_3
+      - disk.device.write.requests
+      network.incoming.packets_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - network.incoming.packets
+      host_vson_server_3:
+      - vson_server_3
       - host
-      binding_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - binding
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.bytes.rate
-      disk.read.requests_vson_server:
-      - vson_server
-      - disk.read.requests
+      disk.device.latency_vson_server_3:
+      - vson_server_3
+      - disk.device.latency
+      cpu.delta_vson_server_3:
+      - vson_server_3
+      - cpu.delta
+      memory.resident_vson_server_3:
+      - vson_server_3
+      - memory.resident
+      attachment_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - attachment
+      network.incoming.bytes_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - network.incoming.bytes
+      feature_vson_server_3:
+      - vson_server_3
+      - feature
+      disk.write.bytes_vson_server_3:
+      - vson_server_3
+      - disk.write.bytes
+      disk.device.read.requests_vson_server_3:
+      - vson_server_3
+      - disk.device.read.requests
+      network.outpoing.packets_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - network.outpoing.packets
+      disk.device.usage_vson_server_3:
+      - vson_server_3
+      - disk.device.usage
+      disk.device.write.requests.rate_vson_server_3:
+      - vson_server_3
+      - disk.device.write.requests.rate
+      vcpus_vson_server_3:
+      - vson_server_3
+      - vcpus
+      disk.write.bytes.rate_vson_server_3:
+      - vson_server_3
+      - disk.write.bytes.rate
+      disk.iops_vson_server_3:
+      - vson_server_3
+      - disk.iops
+      scalable_vson_server_3:
+      - vson_server_3
+      - scalable
+      disk.device.capacity_vson_server_3:
+      - vson_server_3
+      - disk.device.capacity
+      disk.device.allocation_vson_server_3:
+      - vson_server_3
+      - disk.device.allocation
+      cpu_vson_server_3:
+      - vson_server_3
+      - cpu
+      network.outgoing.bytes_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - network.outgoing.bytes
     requirements:
-      link_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - link
-      dependency_vson_server:
-      - vson_server
-      - dependency
-      dependency_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - dependency
-      local_storage_vson_server:
-      - vson_server
+      local_storage_vson_server_3:
+      - vson_server_3
       - local_storage
+      dependency_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - dependency
+      link_vson_server_oam_net_port_10:
+      - vson_server_oam_net_port_10
+      - link
+      dependency_vson_server_3:
+      - vson_server_3
+      - dependency
\ 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/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml
index 8be5401b03..8292248260 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml
@@ -23,11 +23,9 @@ topology_template:
       immutable: false
       type: string
       description: Default gateway.
-    port_vson_server_oam_net_port_0_ip_requirements:
-      type: list
+    port_vson_server_oam_net_port_00_network_role_tag:
+      type: string
       required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
     instance_index:
       label: Instance Index
       hidden: false
@@ -46,6 +44,11 @@ topology_template:
       immutable: false
       type: string
       description: Prefix length of the subnet on the OAM network.
+    port_vson_server_oam_net_port_00_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
     vf_module_name:
       label: VF module name
       hidden: false
@@ -79,21 +82,12 @@ topology_template:
       immutable: false
       type: string
       description: Unique ID for this VF instance.
-    port_vson_server_oam_net_port_0_network_role:
-      type: string
-      required: true
     vson_clm_oam_net_ip:
       label: vSON Cluster Manager IP
       hidden: false
       immutable: false
       type: string
       description: IP of the vSON Cluster Manager.
-    port_vson_server_oam_net_port_0_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_vson_server_oam_net_port_0_subnetpoolid:
-      type: string
-      required: true
     vson_dc_unit:
       label: vSON Data Center name
       hidden: false
@@ -121,6 +115,9 @@ topology_template:
       type: string
       description: |
         Swift account auth token. Example:  041a5187bb4641f9b89583e2539776b0
+    port_vson_server_oam_net_port_00_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     vson_server_group_id:
       label: vSON server group ID
       hidden: false
@@ -134,14 +131,6 @@ topology_template:
       immutable: false
       type: string
       description: The ID or name of the flavor to boot onto.
-    port_vson_server_oam_net_port_0_network_role_tag:
-      type: string
-      required: true
-    port_vson_server_oam_net_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
     availability_zones:
       label: Availability zones
       hidden: false
@@ -173,17 +162,25 @@ topology_template:
       type: string
       description: "Authentication Token generated for the user permitted to add \
         \ a new Datacenter/vSON member to existing vSON Cluster. \n"
+    port_vson_server_oam_net_port_00_order:
+      type: integer
+      required: true
+    port_vson_server_oam_net_port_00_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     oam_net_id:
       label: OAM network ID
       hidden: false
       immutable: false
       type: string
       description: The ID of the OAM network.
-    port_vson_server_oam_net_port_0_order:
-      type: integer
+    port_vson_server_oam_net_port_00_vlan_requirements:
+      type: list
       required: true
-    port_vson_server_oam_net_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_vson_server_oam_net_port_00_network_role:
+      type: string
       required: true
     vson_vm_names:
       label: vSON Cluster leader names
@@ -193,8 +190,11 @@ topology_template:
       description: A list of unique names to be issued to the vSON Cluster leaders.
       entry_schema:
         type: string
+    port_vson_server_oam_net_port_00_subnetpoolid:
+      type: string
+      required: true
   node_templates:
-    vson_server:
+    vson_server_2:
       type: org.openecomp.resource.vfc.compute.nodes.heat.vson_vm
       properties:
         flavor:
@@ -225,24 +225,24 @@ topology_template:
         scheduler_hints:
           group:
             get_input: vson_server_group_id
-    vson_server_oam_net_port_0:
+    vson_server_oam_net_port_00:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-          get_input: port_vson_server_oam_net_port_0_ip_requirements
+          get_input: port_vson_server_oam_net_port_00_ip_requirements
         security_groups:
         - get_input: oam_net_security_group_id
         network_role:
-          get_input: port_vson_server_oam_net_port_0_network_role
+          get_input: port_vson_server_oam_net_port_00_network_role
         fixed_ips:
         - ip_address:
             get_input:
             - oam_net_ips
             - get_input: instance_index
         subnetpoolid:
-          get_input: port_vson_server_oam_net_port_0_subnetpoolid
+          get_input: port_vson_server_oam_net_port_00_subnetpoolid
         mac_requirements:
-          get_input: port_vson_server_oam_net_port_0_mac_requirements
+          get_input: port_vson_server_oam_net_port_00_mac_requirements
         name:
           str_replace:
             template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0
@@ -256,19 +256,19 @@ topology_template:
                 - vson_vm_names
                 - get_input: instance_index
         exCP_naming:
-          get_input: port_vson_server_oam_net_port_0_exCP_naming
+          get_input: port_vson_server_oam_net_port_00_exCP_naming
         vlan_requirements:
-          get_input: port_vson_server_oam_net_port_0_vlan_requirements
+          get_input: port_vson_server_oam_net_port_00_vlan_requirements
         network_role_tag:
-          get_input: port_vson_server_oam_net_port_0_network_role_tag
+          get_input: port_vson_server_oam_net_port_00_network_role_tag
         network:
           get_input: oam_net_id
         order:
-          get_input: port_vson_server_oam_net_port_0_order
+          get_input: port_vson_server_oam_net_port_00_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
-          node: vson_server
+          node: vson_server_2
           relationship: tosca.relationships.network.BindsTo
   groups:
     nested_vson_server_with_vol_group:
@@ -278,177 +278,177 @@ topology_template:
         description: |
           The template intended for deploying vSON VM instance.
       members:
-      - vson_server
-      - vson_server_oam_net_port_0
+      - vson_server_2
+      - vson_server_oam_net_port_00
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1
     capabilities:
-      disk.write.bytes_vson_server:
-      - vson_server
-      - disk.write.bytes
-      disk.device.allocation_vson_server:
-      - vson_server
-      - disk.device.allocation
-      network.incoming.packets_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.packets
-      memory.usage_vson_server:
-      - vson_server
-      - memory.usage
-      network.incoming.bytes_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.bytes
-      disk.device.latency_vson_server:
-      - vson_server
-      - disk.device.latency
-      disk.device.write.bytes.rate_vson_server:
-      - vson_server
-      - disk.device.write.bytes.rate
-      disk.device.read.requests_vson_server:
-      - vson_server
-      - disk.device.read.requests
-      memory_vson_server:
-      - vson_server
-      - memory
-      disk.latency_vson_server:
-      - vson_server
-      - disk.latency
-      os_vson_server:
-      - vson_server
-      - os
-      feature_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - feature
-      instance_vson_server:
-      - vson_server
+      network.outpoing.packets_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.outpoing.packets
+      network.outgoing.bytes.rate_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.outgoing.bytes.rate
+      instance_vson_server_2:
+      - vson_server_2
       - instance
-      cpu_vson_server:
-      - vson_server
-      - cpu
-      attachment_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - attachment
-      disk.iops_vson_server:
-      - vson_server
-      - disk.iops
-      network.outgoing.bytes_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outgoing.bytes
-      disk.device.write.bytes_vson_server:
-      - vson_server
+      disk.device.write.bytes_vson_server_2:
+      - vson_server_2
       - disk.device.write.bytes
-      disk.device.read.bytes.rate_vson_server:
-      - vson_server
-      - disk.device.read.bytes.rate
-      endpoint_vson_server:
-      - vson_server
+      disk.read.requests_vson_server_2:
+      - vson_server_2
+      - disk.read.requests
+      disk.read.bytes_vson_server_2:
+      - vson_server_2
+      - disk.read.bytes
+      network.outgoing.packets.rate_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.outgoing.packets.rate
+      disk.latency_vson_server_2:
+      - vson_server_2
+      - disk.latency
+      disk.read.bytes.rate_vson_server_2:
+      - vson_server_2
+      - disk.read.bytes.rate
+      endpoint_vson_server_2:
+      - vson_server_2
       - endpoint
-      vcpus_vson_server:
-      - vson_server
-      - vcpus
-      network.incoming.packets.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.packets.rate
-      disk.device.read.requests.rate_vson_server:
-      - vson_server
+      network.incoming.bytes.rate_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.incoming.bytes.rate
+      disk.write.requests_vson_server_2:
+      - vson_server_2
+      - disk.write.requests
+      binding_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - binding
+      memory_vson_server_2:
+      - vson_server_2
+      - memory
+      network.outgoing.bytes_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.outgoing.bytes
+      cpu_util_vson_server_2:
+      - vson_server_2
+      - cpu_util
+      disk.device.read.requests.rate_vson_server_2:
+      - vson_server_2
       - disk.device.read.requests.rate
-      disk.write.requests.rate_vson_server:
-      - vson_server
-      - disk.write.requests.rate
-      disk.capacity_vson_server:
-      - vson_server
-      - disk.capacity
-      disk.device.capacity_vson_server:
-      - vson_server
-      - disk.device.capacity
-      disk.device.iops_vson_server:
-      - vson_server
+      disk.device.iops_vson_server_2:
+      - vson_server_2
       - disk.device.iops
-      disk.device.write.requests.rate_vson_server:
-      - vson_server
-      - disk.device.write.requests.rate
-      network.outpoing.packets_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outpoing.packets
-      disk.read.bytes_vson_server:
-      - vson_server
-      - disk.read.bytes
-      disk.read.bytes.rate_vson_server:
-      - vson_server
-      - disk.read.bytes.rate
-      disk.device.write.requests_vson_server:
-      - vson_server
-      - disk.device.write.requests
-      network.outgoing.packets.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outgoing.packets.rate
-      disk.root.size_vson_server:
-      - vson_server
-      - disk.root.size
-      disk.ephemeral.size_vson_server:
-      - vson_server
+      disk.allocation_vson_server_2:
+      - vson_server_2
+      - disk.allocation
+      memory.usage_vson_server_2:
+      - vson_server_2
+      - memory.usage
+      disk.usage_vson_server_2:
+      - vson_server_2
+      - disk.usage
+      network.incoming.packets_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.incoming.packets
+      disk.capacity_vson_server_2:
+      - vson_server_2
+      - disk.capacity
+      disk.device.read.bytes.rate_vson_server_2:
+      - vson_server_2
+      - disk.device.read.bytes.rate
+      network.incoming.packets.rate_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.incoming.packets.rate
+      network.incoming.bytes_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - network.incoming.bytes
+      disk.write.requests.rate_vson_server_2:
+      - vson_server_2
+      - disk.write.requests.rate
+      attachment_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - attachment
+      disk.ephemeral.size_vson_server_2:
+      - vson_server_2
       - disk.ephemeral.size
-      memory.resident_vson_server:
-      - vson_server
-      - memory.resident
-      disk.device.read.bytes_vson_server:
-      - vson_server
+      disk.device.read.bytes_vson_server_2:
+      - vson_server_2
       - disk.device.read.bytes
-      scalable_vson_server:
-      - vson_server
-      - scalable
-      network.outgoing.bytes.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.outgoing.bytes.rate
-      disk.write.requests_vson_server:
-      - vson_server
-      - disk.write.requests
-      disk.usage_vson_server:
-      - vson_server
-      - disk.usage
-      cpu_util_vson_server:
-      - vson_server
-      - cpu_util
-      disk.device.usage_vson_server:
-      - vson_server
-      - disk.device.usage
-      cpu.delta_vson_server:
-      - vson_server
+      os_vson_server_2:
+      - vson_server_2
+      - os
+      disk.root.size_vson_server_2:
+      - vson_server_2
+      - disk.root.size
+      disk.device.write.requests_vson_server_2:
+      - vson_server_2
+      - disk.device.write.requests
+      host_vson_server_2:
+      - vson_server_2
+      - host
+      disk.device.write.bytes.rate_vson_server_2:
+      - vson_server_2
+      - disk.device.write.bytes.rate
+      cpu.delta_vson_server_2:
+      - vson_server_2
       - cpu.delta
-      disk.write.bytes.rate_vson_server:
-      - vson_server
-      - disk.write.bytes.rate
-      feature_vson_server:
-      - vson_server
+      disk.device.latency_vson_server_2:
+      - vson_server_2
+      - disk.device.latency
+      feature_vson_server_2:
+      - vson_server_2
       - feature
-      disk.allocation_vson_server:
-      - vson_server
-      - disk.allocation
-      binding_vson_server:
-      - vson_server
-      - binding
-      host_vson_server:
-      - vson_server
-      - host
-      binding_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
+      memory.resident_vson_server_2:
+      - vson_server_2
+      - memory.resident
+      disk.write.bytes_vson_server_2:
+      - vson_server_2
+      - disk.write.bytes
+      disk.device.usage_vson_server_2:
+      - vson_server_2
+      - disk.device.usage
+      disk.device.write.requests.rate_vson_server_2:
+      - vson_server_2
+      - disk.device.write.requests.rate
+      scalable_vson_server_2:
+      - vson_server_2
+      - scalable
+      vcpus_vson_server_2:
+      - vson_server_2
+      - vcpus
+      binding_vson_server_2:
+      - vson_server_2
       - binding
-      network.incoming.bytes.rate_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - network.incoming.bytes.rate
-      disk.read.requests_vson_server:
-      - vson_server
-      - disk.read.requests
+      disk.write.bytes.rate_vson_server_2:
+      - vson_server_2
+      - disk.write.bytes.rate
+      disk.iops_vson_server_2:
+      - vson_server_2
+      - disk.iops
+      cpu_vson_server_2:
+      - vson_server_2
+      - cpu
+      feature_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - feature
+      disk.device.allocation_vson_server_2:
+      - vson_server_2
+      - disk.device.allocation
+      disk.device.read.requests_vson_server_2:
+      - vson_server_2
+      - disk.device.read.requests
+      disk.device.capacity_vson_server_2:
+      - vson_server_2
+      - disk.device.capacity
     requirements:
-      link_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - link
-      dependency_vson_server:
-      - vson_server
-      - dependency
-      dependency_vson_server_oam_net_port_0:
-      - vson_server_oam_net_port_0
-      - dependency
-      local_storage_vson_server:
-      - vson_server
+      local_storage_vson_server_2:
+      - vson_server_2
       - local_storage
+      dependency_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - dependency
+      link_vson_server_oam_net_port_00:
+      - vson_server_oam_net_port_00
+      - link
+      dependency_vson_server_2:
+      - vson_server_2
+      - dependency
\ No newline at end of file