[sdc] - latest code changes

Change-Id: I861387094b000367218bb417624fe50d3c37f70e
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

5 files changed, 573 insertions, 309 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/in/hot-nimbus-pcm_v0.4.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/in/hot-nimbus-pcm_v0.4.yaml
index dea5d4296c..2b0742207c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/in/hot-nimbus-pcm_v0.4.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/in/hot-nimbus-pcm_v0.4.yaml
@@ -57,7 +57,7 @@ parameters:
     description: the name of security group
   compute_image_name:
     type: string
-  net_name:
+  port_net_name:
     type: string
 
 resources:
@@ -87,11 +87,14 @@ resources:
       flavor: { compute_flavor_name }
       user_data_format: { get_attr: [server_pcm_001 , oam_net_gw] }
       metadata: { get_attr: [server_pcm_001]}
+      networks:
+        - port: { get_resource: compute_port_0}
+
 
   compute_port_0:
     type: OS::Neutron::Port
     properties:
-      network: { get_param: net_name }
+      network: { get_param: port_net_name }
 
   packet_mirror_network:
     type: OS::Neutron::Net
@@ -99,5 +102,5 @@ resources:
       - server_pcm_001
     properties:
       name:
-        get_param: net_name
+        get_param: port_net_name
 
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
index fa86dbe5ce..83a37609e0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -14,14 +14,15 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      availabilityzone_name:
-        type: string
-        description: availabilityzone name
+      port_pcm_port_1_network_role_tag:
+        type: list
         required: true
         status: SUPPORTED
-      oam_net_gw:
+        entry_schema:
+          type: string
+      availabilityzone_name:
         type: string
-        description: CPS network gateway
+        description: availabilityzone name
         required: true
         status: SUPPORTED
       port_pcm_port_0_vlan_requirements:
@@ -29,33 +30,12 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.VlanRequirements
       pcm_image_name:
         type: string
         description: PCRF CM image name
         required: true
         status: SUPPORTED
-      security_group_name:
-        type: string
-        description: the name of security group
-        required: true
-        status: SUPPORTED
-      cps_net_ip:
-        type: string
-        description: CPS network ip
-        required: true
-        status: SUPPORTED
-      port_pcm_port_1_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: json
-      pcm_flavor_name:
-        type: string
-        description: flavor name of PCRF CM instance
-        required: true
-        status: SUPPORTED
       port_pcm_port_0_order:
         type: list
         required: true
@@ -74,65 +54,113 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      pcm_vol:
-        type: string
-        description: CPS Cluman Cinder Volume
+      port_pcm_port_0_network_role_tag:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       pcm_server_name:
         type: string
         description: PCRF CM server name
         required: true
         status: SUPPORTED
-      cps_net_name:
-        type: string
-        description: CPS network name
-        required: true
-        status: SUPPORTED
       cps_net_mask:
         type: string
         description: CPS network mask
         required: true
         status: SUPPORTED
-      oam_net_ip:
-        type: string
-        description: OAM network ip
+      port_pcm_port_1_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-      oam_net_mask:
+      port_pcm_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      oam_net_name:
         type: string
-        description: CPS network mask
+        description: OAM network name
         required: true
         status: SUPPORTED
-      port_pcm_port_1_exCP_naming:
+      port_pcm_port_1_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      port_pcm_port_0_exCP_naming:
+          type: string
+      port_pcm_port_0_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      oam_net_name:
+          type: org.openecomp.datatypes.network.IpRequirements
+      oam_net_gw:
         type: string
-        description: OAM network name
+        description: CPS network gateway
         required: true
         status: SUPPORTED
-      port_pcm_port_1_order:
+      security_group_name:
+        type: string
+        description: the name of security group
+        required: true
+        status: SUPPORTED
+      cps_net_ip:
+        type: string
+        description: CPS network ip
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: integer
-      port_pcm_port_1_network_role:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      pcm_flavor_name:
+        type: string
+        description: flavor name of PCRF CM instance
+        required: true
+        status: SUPPORTED
+      pcm_vol:
+        type: string
+        description: CPS Cluman Cinder Volume
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_ip_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_pcm_port_0_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      cps_net_name:
+        type: string
+        description: CPS network name
+        required: true
+        status: SUPPORTED
+      oam_net_ip:
+        type: string
+        description: OAM network ip
+        required: true
+        status: SUPPORTED
+      oam_net_mask:
+        type: string
+        description: CPS network mask
+        required: true
+        status: SUPPORTED
+      port_pcm_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
     attributes:
       server_pcm_id:
         type: string
@@ -561,10 +589,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_image_name:
-        type: string
+      port_compute_port_subnetpoolid:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: string
       index_value:
         type: integer
         description: Index value of this substitution service template runtime instance
@@ -573,12 +603,12 @@ node_types:
         status: SUPPORTED
         constraints:
         - greater_or_equal: 0
-      compute_compute_metadata:
+      port_compute_port_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.VlanRequirements
       compute_compute_name:
         type: list
         required: true
@@ -589,12 +619,54 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      compute_compute_config_drive:
+      port_compute_port_network_role:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      vm_image_name:
+        type: string
+        required: true
+        status: SUPPORTED
+      port_compute_port_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: boolean
+          type: string
+      port_compute_port_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_compute_metadata:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_compute_port_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_compute_port_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
+        required: true
+        status: SUPPORTED
+      port_compute_port_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      port_compute_port_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
     requirements:
     - dependency_compute:
         capability: tosca.capabilities.Node
@@ -610,246 +682,324 @@ node_types:
         occurrences:
         - 0
         - UNBOUNDED
+    - dependency_compute_compute_port:
+        capability: tosca.capabilities.Node
+        node: tosca.nodes.Root
+        relationship: tosca.relationships.DependsOn
+        occurrences:
+        - 0
+        - UNBOUNDED
+    - link_compute_compute_port:
+        capability: tosca.capabilities.network.Linkable
+        relationship: tosca.relationships.network.LinksTo
+        occurrences:
+        - 1
+        - 1
     capabilities:
-      disk.device.usage_compute:
+      disk.write.requests_compute:
         type: org.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_compute:
+      disk.latency_compute:
         type: org.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_compute:
+      network.incoming.bytes_compute_compute_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.ephemeral.size_compute:
+      disk.root.size_compute:
         type: org.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_compute:
+      disk.write.requests.rate_compute:
         type: org.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_compute:
+      disk.read.requests_compute:
         type: org.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_compute:
+      os_compute:
+        type: tosca.capabilities.OperatingSystem
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.write.bytes.rate_compute:
         type: org.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_compute:
+      vcpus_compute:
         type: org.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_compute:
+      disk.device.iops_compute:
         type: org.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_compute:
+      network.incoming.bytes.rate_compute_compute_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.write.requests.rate_compute:
+      disk.device.write.requests.rate_compute:
         type: org.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_compute:
+      attachment_compute_compute_port:
+        type: tosca.capabilities.Attachment
+        occurrences:
+        - 1
+        - UNBOUNDED
+      host_compute:
+        type: tosca.capabilities.Container
+        valid_source_types:
+        - tosca.nodes.SoftwareComponent
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes_compute:
         type: org.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_compute:
+      cpu_compute:
         type: org.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_compute:
+      binding_compute_compute_port:
+        type: tosca.capabilities.network.Bindable
+        valid_source_types:
+        - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+        occurrences:
+        - 0
+        - UNBOUNDED
+      disk.allocation_compute:
         type: org.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_compute:
+      cpu.delta_compute:
         type: org.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_compute:
+      binding_compute:
+        type: tosca.capabilities.network.Bindable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      feature_compute_compute_port:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.usage_compute:
         type: org.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_compute:
+      network.incoming.packets_compute_compute_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      os_compute:
-        type: tosca.capabilities.OperatingSystem
+      instance_compute:
+        type: org.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_compute:
+      disk.ephemeral.size_compute:
         type: org.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_compute:
+      disk.device.read.bytes.rate_compute:
         type: org.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_compute:
+      memory.resident_compute:
         type: org.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_compute:
+      memory_compute:
         type: org.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_compute:
+      disk.iops_compute:
         type: org.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_compute:
+      network.incoming.packets.rate_compute_compute_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.write.requests_compute:
+      disk.device.read.requests.rate_compute:
         type: org.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_compute:
+      disk.read.bytes_compute:
         type: org.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_compute:
+      disk.device.read.bytes_compute:
         type: org.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_compute:
-        type: tosca.capabilities.Endpoint.Admin
+      disk.write.bytes_compute:
+        type: org.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_compute:
+      disk.usage_compute:
         type: org.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_compute:
-        type: tosca.capabilities.Container
-        valid_source_types:
-        - tosca.nodes.SoftwareComponent
+      network.outgoing.bytes.rate_compute_compute_port:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      feature_compute:
-        type: tosca.capabilities.Node
+      disk.capacity_compute:
+        type: org.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_compute:
+      cpu_util_compute:
         type: org.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_compute:
+      disk.read.bytes.rate_compute:
         type: org.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_compute:
+      disk.device.latency_compute:
         type: org.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_compute:
-        type: tosca.capabilities.Scalable
+      disk.device.write.requests_compute:
+        type: org.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_compute:
+      network.outgoing.packets.rate_compute_compute_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.allocation_compute:
+      network.outgoing.bytes_compute_compute_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      disk.device.capacity_compute:
+      endpoint_compute:
+        type: tosca.capabilities.Endpoint.Admin
+        occurrences:
+        - 1
+        - UNBOUNDED
+      memory.usage_compute:
         type: org.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_compute:
+      feature_compute:
+        type: tosca.capabilities.Node
+        occurrences:
+        - 1
+        - UNBOUNDED
+      disk.device.write.bytes.rate_compute:
         type: org.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_compute:
+      scalable_compute:
+        type: tosca.capabilities.Scalable
+        occurrences:
+        - 1
+        - UNBOUNDED
+      network.outpoing.packets_compute_compute_port:
         type: org.openecomp.capabilities.metric.Ceilometer
         description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - UNBOUNDED
-      binding_compute:
-        type: tosca.capabilities.network.Bindable
+      disk.device.read.requests_compute:
+        type: org.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_compute:
+        type: org.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_compute:
+        type: org.openecomp.capabilities.metric.Ceilometer
+        description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
         occurrences:
         - 1
         - 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/nestedWithOneCompute/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml
index 03d069f43d..77a2573b21 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml
@@ -87,10 +87,6 @@ topology_template:
       type: string
       description: flavor name of PCRF CM instance
       default: cps
-    net_name:
-      hidden: false
-      immutable: false
-      type: string
     cps_net_name:
       label: CPS network name
       hidden: false
@@ -119,14 +115,25 @@ topology_template:
       type: string
       description: OAM network name
       default: oam_protected_net_0
+    port_net_name:
+      hidden: false
+      immutable: false
+      type: string
   node_templates:
     abstract_pcm_server_0:
       type: org.openecomp.resource.abstract.nodes.heat.pcm_server
       directives:
       - substitutable
       properties:
+        port_pcm_port_1_network_role_tag: oam
         availabilityzone_name:
           get_input: availabilityzone_name
+        port_pcm_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         oam_net_gw:
           get_input: oam_net_gw
         pcm_image_name:
@@ -137,6 +144,9 @@ topology_template:
           get_input:
           - cps_net_ips
           - 0
+        port_pcm_port_1_mac_requirements:
+          mac_count_required:
+            is_required: false
         pcm_flavor_name:
           get_input: pcm_flavor_name
         service_template_filter:
@@ -145,6 +155,16 @@ topology_template:
           get_input:
           - pcm_volumes
           - 0
+        port_pcm_port_1_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        port_pcm_port_0_network_role_tag: cps
+        port_pcm_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         pcm_server_name:
           get_input:
           - pcm_server_names
@@ -165,26 +185,12 @@ topology_template:
       type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net
       properties:
         network_name:
-          get_input: net_name
+          get_input: port_net_name
       requirements:
       - dependency:
           capability: tosca.capabilities.Node
           node: abstract_pcm_server_0
           relationship: tosca.relationships.DependsOn
-    compute_port_0:
-      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
-      properties:
-        ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        mac_requirements:
-          mac_count_required:
-            is_required: false
-        network:
-          get_input: net_name
     abstract_compute:
       type: org.openecomp.resource.abstract.nodes.compute
       directives:
@@ -194,34 +200,29 @@ topology_template:
         - get_attribute:
           - abstract_pcm_server_0
           - oam_net_gw
+        compute_compute_name:
+        - compute_name: null
+        vm_flavor_name:
+          compute_flavor_name: null
         vm_image_name:
           get_input: compute_image_name
+        port_compute_port_network:
+        - get_input: port_net_name
+        port_compute_port_network_role_tag:
+        - port
         compute_compute_metadata:
         - get_attribute:
           - abstract_pcm_server_0
           - server_pcm_id
-        compute_compute_name:
-        - compute_name: null
-        vm_flavor_name:
-          compute_flavor_name: null
-        compute_compute_config_drive:
-        - get_attribute:
-          - compute_port_0
-          - tenant_id
-          - port_security_enabled
-          - device_id
-          - qos_policy
-          - allowed_address_pairs
-          - show
-          - device_owner
-          - network
-          - security_groups
-          - fixed_ips
-          - mac_address
-          - admin_state_up
-          - name
-          - subnets
-          - status
+        port_compute_port_mac_requirements:
+          mac_count_required:
+            is_required: false
+        port_compute_port_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         service_template_filter:
           substitute_service_template: Nested_computeServiceTemplate.yaml
           count: 1
@@ -238,6 +239,5 @@ topology_template:
         description: heat template that creates PCRF Cluman stack
       members:
       - packet_mirror_network
-      - compute_port_0
       - abstract_compute
       - abstract_pcm_server_0
\ 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/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml
index 22bdef3d42..0695e7dc03 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml
@@ -16,9 +16,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
+    port_compute_port_subnetpoolid:
+      type: list
       required: true
+      entry_schema:
+        type: string
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -26,11 +28,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    compute_compute_metadata:
+    port_compute_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.VlanRequirements
     compute_compute_name:
       type: list
       required: true
@@ -39,11 +41,45 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    compute_compute_config_drive:
+    port_compute_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_image_name:
+      type: string
+      required: true
+    port_compute_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_compute_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_compute_metadata:
       type: list
       required: true
       entry_schema:
-        type: boolean
+        type: json
+    port_compute_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_compute_port_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
+    port_compute_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_compute_port_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
   node_templates:
     compute:
       type: org.openecomp.resource.vfc.nodes.heat.compute
@@ -55,9 +91,23 @@ topology_template:
           - compute_compute_metadata
           - index_value
         config_drive:
-          get_input:
-          - compute_compute_config_drive
-          - index_value
+          get_attribute:
+          - compute_compute_port
+          - tenant_id
+          - port_security_enabled
+          - device_id
+          - qos_policy
+          - allowed_address_pairs
+          - show
+          - device_owner
+          - network
+          - security_groups
+          - fixed_ips
+          - mac_address
+          - admin_state_up
+          - name
+          - subnets
+          - status
         image:
           get_input: vm_image_name
         name:
@@ -68,15 +118,106 @@ topology_template:
           get_input:
           - compute_compute_user_data_format
           - index_value
+    compute_compute_port:
+      type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
+      properties:
+        exCP_naming:
+          get_input: port_compute_port_exCP_naming
+        vlan_requirements:
+          get_input: port_compute_port_vlan_requirements
+        ip_requirements:
+          get_input: port_compute_port_ip_requirements
+        network_role_tag:
+          get_input: port_compute_port_network_role_tag
+        mac_requirements:
+          get_input: port_compute_port_mac_requirements
+        order:
+          get_input: port_compute_port_order
+        network_role:
+          get_input: port_compute_port_network_role
+        subnetpoolid:
+          get_input: port_compute_port_subnetpoolid
+        network:
+          get_input:
+          - port_compute_port_network
+          - index_value
+      requirements:
+      - binding:
+          capability: tosca.capabilities.network.Bindable
+          node: compute
+          relationship: tosca.relationships.network.BindsTo
   substitution_mappings:
     node_type: org.openecomp.resource.abstract.nodes.compute
     capabilities:
-      disk.device.usage_compute:
-      - compute
-      - disk.device.usage
       disk.write.requests_compute:
       - compute
       - disk.write.requests
+      disk.latency_compute:
+      - compute
+      - disk.latency
+      network.incoming.bytes_compute_compute_port:
+      - compute_compute_port
+      - network.incoming.bytes
+      disk.root.size_compute:
+      - compute
+      - disk.root.size
+      disk.write.requests.rate_compute:
+      - compute
+      - disk.write.requests.rate
+      disk.read.requests_compute:
+      - compute
+      - disk.read.requests
+      os_compute:
+      - compute
+      - os
+      disk.write.bytes.rate_compute:
+      - compute
+      - disk.write.bytes.rate
+      vcpus_compute:
+      - compute
+      - vcpus
+      disk.device.iops_compute:
+      - compute
+      - disk.device.iops
+      network.incoming.bytes.rate_compute_compute_port:
+      - compute_compute_port
+      - network.incoming.bytes.rate
+      disk.device.write.requests.rate_compute:
+      - compute
+      - disk.device.write.requests.rate
+      attachment_compute_compute_port:
+      - compute_compute_port
+      - attachment
+      host_compute:
+      - compute
+      - host
+      disk.device.write.bytes_compute:
+      - compute
+      - disk.device.write.bytes
+      cpu_compute:
+      - compute
+      - cpu
+      binding_compute_compute_port:
+      - compute_compute_port
+      - binding
+      disk.allocation_compute:
+      - compute
+      - disk.allocation
+      cpu.delta_compute:
+      - compute
+      - cpu.delta
+      binding_compute:
+      - compute
+      - binding
+      feature_compute_compute_port:
+      - compute_compute_port
+      - feature
+      disk.device.usage_compute:
+      - compute
+      - disk.device.usage
+      network.incoming.packets_compute_compute_port:
+      - compute_compute_port
+      - network.incoming.packets
       instance_compute:
       - compute
       - instance
@@ -86,9 +227,6 @@ topology_template:
       disk.device.read.bytes.rate_compute:
       - compute
       - disk.device.read.bytes.rate
-      disk.latency_compute:
-      - compute
-      - disk.latency
       memory.resident_compute:
       - compute
       - memory.resident
@@ -98,15 +236,9 @@ topology_template:
       disk.iops_compute:
       - compute
       - disk.iops
-      disk.root.size_compute:
-      - compute
-      - disk.root.size
-      disk.write.requests.rate_compute:
-      - compute
-      - disk.write.requests.rate
-      disk.read.requests_compute:
-      - compute
-      - disk.read.requests
+      network.incoming.packets.rate_compute_compute_port:
+      - compute_compute_port
+      - network.incoming.packets.rate
       disk.device.read.requests.rate_compute:
       - compute
       - disk.device.read.requests.rate
@@ -122,15 +254,9 @@ topology_template:
       disk.usage_compute:
       - compute
       - disk.usage
-      os_compute:
-      - compute
-      - os
-      disk.write.bytes.rate_compute:
-      - compute
-      - disk.write.bytes.rate
-      vcpus_compute:
-      - compute
-      - vcpus
+      network.outgoing.bytes.rate_compute_compute_port:
+      - compute_compute_port
+      - network.outgoing.bytes.rate
       disk.capacity_compute:
       - compute
       - disk.capacity
@@ -146,58 +272,49 @@ topology_template:
       disk.device.write.requests_compute:
       - compute
       - disk.device.write.requests
-      disk.device.iops_compute:
-      - compute
-      - disk.device.iops
-      disk.device.write.requests.rate_compute:
-      - compute
-      - disk.device.write.requests.rate
+      network.outgoing.packets.rate_compute_compute_port:
+      - compute_compute_port
+      - network.outgoing.packets.rate
+      network.outgoing.bytes_compute_compute_port:
+      - compute_compute_port
+      - network.outgoing.bytes
       endpoint_compute:
       - compute
       - endpoint
       memory.usage_compute:
       - compute
       - memory.usage
-      host_compute:
-      - compute
-      - host
       feature_compute:
       - compute
       - feature
-      disk.device.write.bytes_compute:
-      - compute
-      - disk.device.write.bytes
-      cpu_compute:
-      - compute
-      - cpu
       disk.device.write.bytes.rate_compute:
       - compute
       - disk.device.write.bytes.rate
       scalable_compute:
       - compute
       - scalable
+      network.outpoing.packets_compute_compute_port:
+      - compute_compute_port
+      - network.outpoing.packets
       disk.device.read.requests_compute:
       - compute
       - disk.device.read.requests
-      disk.allocation_compute:
-      - compute
-      - disk.allocation
       disk.device.capacity_compute:
       - compute
       - disk.device.capacity
       disk.device.allocation_compute:
       - compute
       - disk.device.allocation
-      cpu.delta_compute:
-      - compute
-      - cpu.delta
-      binding_compute:
-      - compute
-      - binding
     requirements:
       local_storage_compute:
       - compute
       - local_storage
+      dependency_compute_compute_port:
+      - compute_compute_port
+      - dependency
+      link_compute_compute_port:
+      - compute_compute_port
+      - link
       dependency_compute:
       - compute
       - 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/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
index 51429041fe..7da1206ebe 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -16,29 +16,88 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pcm_port_1_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     availabilityzone_name:
       label: availabilityzone name
       hidden: false
       immutable: false
       type: string
       description: availabilityzone name
-    oam_net_gw:
-      label: CPS network gateway
-      hidden: false
-      immutable: false
-      type: string
-      description: CPS network gateway
     port_pcm_port_0_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_image_name:
       label: image name
       hidden: false
       immutable: false
       type: string
       description: PCRF CM image name
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_0_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    pcm_server_name:
+      label: PCRF CM server name
+      hidden: false
+      immutable: false
+      type: string
+      description: PCRF CM server name
+    cps_net_mask:
+      label: CPS network mask
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_pcm_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    oam_net_name:
+      label: OAM network name
+      hidden: false
+      immutable: false
+      type: string
+      description: OAM network name
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_0_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    oam_net_gw:
+      label: CPS network gateway
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network gateway
     security_group_name:
       label: security group name
       hidden: false
@@ -51,56 +110,40 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     port_pcm_port_1_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.VlanRequirements
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
       immutable: false
       type: string
       description: flavor name of PCRF CM instance
-    port_pcm_port_0_order:
-      type: list
-      required: true
-      entry_schema:
-        type: integer
-    port_pcm_port_0_subnetpoolid:
-      type: list
-      required: true
-      entry_schema:
-        type: string
-    port_pcm_port_1_subnetpoolid:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     pcm_vol:
       label: CPS Cluman Cinder Volume
       hidden: false
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    pcm_server_name:
-      label: PCRF CM server name
-      hidden: false
-      immutable: false
-      type: string
-      description: PCRF CM server name
+    port_pcm_port_1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    port_pcm_port_0_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     cps_net_name:
       label: CPS network name
       hidden: false
       immutable: false
       type: string
       description: CPS network name
-    cps_net_mask:
-      label: CPS network mask
-      hidden: false
-      immutable: false
-      type: string
-      description: CPS network mask
     oam_net_ip:
       label: OAM network ip
       hidden: false
@@ -113,73 +156,38 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    port_pcm_port_1_exCP_naming:
-      type: list
-      required: true
-      entry_schema:
-        type: json
-    port_pcm_port_0_exCP_naming:
-      type: list
-      required: true
-      entry_schema:
-        type: json
-    oam_net_name:
-      label: OAM network name
-      hidden: false
-      immutable: false
-      type: string
-      description: OAM network name
     port_pcm_port_1_order:
       type: list
       required: true
       entry_schema:
         type: integer
-    port_pcm_port_1_network_role:
-      type: list
-      required: true
-      entry_schema:
-        type: string
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
+          get_input: port_pcm_port_1_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input:
-          - port_pcm_port_1_network_role
-          - index_value
+          get_input: port_pcm_port_1_network_role
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
         subnetpoolid:
-          get_input:
-          - port_pcm_port_1_subnetpoolid
-          - index_value
+          get_input: port_pcm_port_1_subnetpoolid
         mac_requirements:
-          mac_count_required:
-            is_required: false
+          get_input: port_pcm_port_1_mac_requirements
         exCP_naming:
-          get_input:
-          - port_pcm_port_1_exCP_naming
-          - index_value
+          get_input: port_pcm_port_1_exCP_naming
         vlan_requirements:
-          get_input:
-          - port_pcm_port_1_vlan_requirements
-          - index_value
-        network_role_tag: oam
+          get_input: port_pcm_port_1_vlan_requirements
+        network_role_tag:
+          get_input: port_pcm_port_1_network_role_tag
         network:
           get_input: oam_net_name
         order:
-          get_input:
-          - port_pcm_port_1_order
-          - index_value
+          get_input: port_pcm_port_1_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -202,42 +210,28 @@ topology_template:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: true
-          floating_ip_count_required:
-            is_required: false
+          get_input: port_pcm_port_0_ip_requirements
         security_groups:
         - get_input: security_group_name
         network_role:
-          get_input:
-          - port_pcm_port_0_network_role
-          - index_value
+          get_input: port_pcm_port_0_network_role
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
         subnetpoolid:
-          get_input:
-          - port_pcm_port_0_subnetpoolid
-          - index_value
+          get_input: port_pcm_port_0_subnetpoolid
         mac_requirements:
-          mac_count_required:
-            is_required: false
+          get_input: port_pcm_port_0_mac_requirements
         exCP_naming:
-          get_input:
-          - port_pcm_port_0_exCP_naming
-          - index_value
+          get_input: port_pcm_port_0_exCP_naming
         vlan_requirements:
-          get_input:
-          - port_pcm_port_0_vlan_requirements
-          - index_value
-        network_role_tag: cps
+          get_input: port_pcm_port_0_vlan_requirements
+        network_role_tag:
+          get_input: port_pcm_port_0_network_role_tag
         network:
           get_input: cps_net_name
         order:
-          get_input:
-          - port_pcm_port_0_order
-          - index_value
+          get_input: port_pcm_port_0_order
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable